From nobody Sun Jul 16 10:44:31 2023
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 4R3hfm0Pl5z2tv2P;
Sun, 16 Jul 2023 10:44:32 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R3hfl73mhz42sM;
Sun, 16 Jul 2023 10:44:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689504272;
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=wmjW9ZXYupZAtmHNKJDKY8EiIR4F4XEjO3BXnLAqE8Q=;
b=gtJ8Yl6kcG3JOZCfaYv9VreEMIRzqsFOZ8gQBCorb1eEl6sISokMjS+FTP+p9zDjPTVayZ
6DtNXiY/T2osLJ0vFJqL2Q+OBO20bxVCii0ZfMuoBeSagNpi4S4OVbENihZRlKnkLdEQ18
H3C5F7aYJ2b7UKZtWS+CbySrnUzb7aWr/c31TrxRx3jr2gWenBTzMJn0dOsJJKkj1COqsB
xf8JNh+9OOMLByGaeyiOkRJZZ0pMW3oJcxANGbSOwr9InVLp25ItE124rvN9Ip34ha1nzm
8f9V04Rr/2W3/LHOiK3KY5ojPrJoQD6+CxZgp1GuiurvbQ8EkMaFO+3n164KSQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689504272;
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=wmjW9ZXYupZAtmHNKJDKY8EiIR4F4XEjO3BXnLAqE8Q=;
b=F61W+yyRnomyre3i5UtPCeB2r+2lAZb/O7mdBuX9Fat1hHSCR3Pu0PQN6DYHNMTFqV+cD6
ggpEPqaCLEexhVT9ZaLRNMq5XEsg0LHeq7gQI+CvXvrgovfabEeytySxT2/Nn34oHVfhab
pLA7w1tBC8iwKHdqouW005KnQl2cfbkTq0WJ0VvRpP2tU6ndnj9l/tH7cT1muuVg45oANl
PyKaz3hxB0im13uuj1UxzCQteUXj6kiCR5bbWOST64pbw1adMi1t6gfVwvxeaLfVWfTuDA
EX3HejYonuQ78jrY3Sbj3pOeLEOh0p8FYaokIZ7vifVPKLRM1LfXo1ytRxenFA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689504272; a=rsa-sha256; cv=none;
b=iKtytlNMNX2jXRHF0aoJXv0AlTt//s7A3oDoMUxNblmK8M3901ZlS6/9Yhy5EzCdU5Y+9q
NhTJU6aWYzKaGhkD9hCwYYhef59G7iSY+Gi7DrzNYv0Djg5kMIe6HWISRkOwNJB/9gt2AL
7sp847jT5RxD8aFjsO8FBteauPgxFbi7twf8KOIzqsU/9vOk74IMAxL2jEYRm307+h3F7x
8Hl9V7YR7J3h8Y0qRmwRBMVuvn75YUHEKeLkxHI+yzdA78iLs1KaJW87OAWg8+oGR4DPf9
rllJlxzoOkmKgbCUttT/BBtPf1iNdB7eq5k6CG2P0jorYAZyA5PSOhfPT5FVwA==
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 4R3hfl674zzfmr;
Sun, 16 Jul 2023 10:44:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36GAiV4i098669;
Sun, 16 Jul 2023 10:44:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GAiVm5098668;
Sun, 16 Jul 2023 10:44:31 GMT
(envelope-from git)
Date: Sun, 16 Jul 2023 10:44:31 GMT
Message-Id: <202307161044.36GAiVm5098668@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Doug Rabson <dfr@FreeBSD.org>
Subject: git: b22299c457b2 - stable/13 - netinet*: Fix redirects for connections from localhost
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dfr
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b22299c457b21d77fc5770b9f1a9043487b25ed9
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by dfr:
URL: https://cgit.FreeBSD.org/src/commit/?id=b22299c457b21d77fc5770b9f1a9043487b25ed9
commit b22299c457b21d77fc5770b9f1a9043487b25ed9
Author: Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2023-05-24 13:11:37 +0000
Commit: Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2023-07-14 10:07:58 +0000
netinet*: Fix redirects for connections from localhost
Redirect rules use PFIL_IN and PFIL_OUT events to allow packet filter
rules to change the destination address and port for a connection.
Typically, the rule triggers on an input event when a packet is received
by a router and the destination address and/or port is changed to
implement the redirect. When a reply packet on this connection is output
to the network, the rule triggers again, reversing the modification.
When the connection is initiated on the same host as the packet filter,
it is initially output via lo0 which queues it for input processing.
This causes an input event on the lo0 interface, allowing redirect
processing to rewrite the destination and create state for the
connection. However, when the reply is received, no corresponding output
event is generated; instead, the packet is delivered to the higher level
protocol (e.g. tcp or udp) without reversing the redirect, the reply is
not matched to the connection and the packet is dropped (for tcp, a
connection reset is also sent).
This commit fixes the problem by adding a second packet filter call in
the input path. The second call happens right before the handoff to
higher level processing and provides the missing output event to allow
the redirect's reply processing to perform its rewrite. This extra
processing is disabled by default and can be enabled using pfilctl:
pfilctl link -o pf:default-out inet-local
pfilctl link -o pf:default-out6 inet6-local
PR: 268717
Reviewed-by: kp, melifaro
MFC-after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D40256
(cherry picked from commit 5ab151574c8a1824c6cd8eded28506cb983284bc)
---
sys/netinet/ip_input.c | 22 ++++++++-
sys/netinet/ip_var.h | 4 ++
sys/netinet6/ip6_input.c | 19 ++++++++
sys/netinet6/ip6_var.h | 4 ++
tests/sys/netpfil/common/Makefile | 1 +
tests/sys/netpfil/{pf => common}/rdr.sh | 84 +++++++++++++++++++++++++++++----
tests/sys/netpfil/common/utils.subr | 4 ++
tests/sys/netpfil/pf/Makefile | 1 -
8 files changed, 127 insertions(+), 12 deletions(-)
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 2cfd3c544c72..50b5b5a00a96 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -140,7 +140,9 @@ SYSCTL_INT(_net_inet_ip, OID_AUTO, check_interface, CTLFLAG_VNET | CTLFLAG_RW,
&VNET_NAME(ip_checkinterface), 0,
"Verify packet arrives on correct interface");
-VNET_DEFINE(pfil_head_t, inet_pfil_head); /* Packet filter hooks */
+/* Packet filter hooks */
+VNET_DEFINE(pfil_head_t, inet_pfil_head);
+VNET_DEFINE(pfil_head_t, inet_local_pfil_head);
static struct netisr_handler ip_nh = {
.nh_name = "ip",
@@ -328,6 +330,10 @@ ip_init(void)
args.pa_headname = PFIL_INET_NAME;
V_inet_pfil_head = pfil_head_register(&args);
+ args.pa_flags = PFIL_OUT;
+ args.pa_headname = PFIL_INET_LOCAL_NAME;
+ V_inet_local_pfil_head = pfil_head_register(&args);
+
if (hhook_head_register(HHOOK_TYPE_IPSEC_IN, AF_INET,
&V_ipsec_hhh_in[HHOOK_IPSEC_INET],
HHOOK_WAITOK | HHOOK_HEADISINVNET) != 0)
@@ -816,6 +822,20 @@ ours:
return;
#endif /* IPSTEALTH */
+ /*
+ * We are going to ship the packet to the local protocol stack. Call the
+ * filter again for this 'output' action, allowing redirect-like rules
+ * to adjust the source address.
+ */
+ if (PFIL_HOOKED_OUT(V_inet_local_pfil_head)) {
+ if (pfil_run_hooks(V_inet_local_pfil_head, &m, V_loif, PFIL_OUT, NULL) !=
+ PFIL_PASS)
+ return;
+ if (m == NULL) /* consumed by filter */
+ return;
+ ip = mtod(m, struct ip *);
+ }
+
/*
* Attempt reassembly; if it succeeds, proceed.
* ip_reass() will return a different mbuf.
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 77b6ee88507a..79a530bca67b 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -248,6 +248,10 @@ VNET_DECLARE(struct pfil_head *, inet_pfil_head);
#define V_inet_pfil_head VNET(inet_pfil_head)
#define PFIL_INET_NAME "inet"
+VNET_DECLARE(struct pfil_head *, inet_local_pfil_head);
+#define V_inet_local_pfil_head VNET(inet_local_pfil_head)
+#define PFIL_INET_LOCAL_NAME "inet-local"
+
void in_delayed_cksum(struct mbuf *m);
/* Hooks for ipfw, dummynet, divert etc. Most are declared in raw_ip.c */
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 2423b61e0b36..e77bb9b68e5d 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -194,6 +194,7 @@ SYSCTL_PROC(_net_inet6_ip6, IPV6CTL_INTRDQMAXLEN, intr_direct_queue_maxlen,
#endif
VNET_DEFINE(pfil_head_t, inet6_pfil_head);
+VNET_DEFINE(pfil_head_t, inet6_local_pfil_head);
VNET_PCPUSTAT_DEFINE(struct ip6stat, ip6stat);
VNET_PCPUSTAT_SYSINIT(ip6stat);
@@ -233,6 +234,10 @@ ip6_init(void)
args.pa_headname = PFIL_INET6_NAME;
V_inet6_pfil_head = pfil_head_register(&args);
+ args.pa_flags = PFIL_OUT;
+ args.pa_headname = PFIL_INET6_LOCAL_NAME;
+ V_inet6_local_pfil_head = pfil_head_register(&args);
+
if (hhook_head_register(HHOOK_TYPE_IPSEC_IN, AF_INET6,
&V_ipsec_hhh_in[HHOOK_IPSEC_INET6],
HHOOK_WAITOK | HHOOK_HEADISINVNET) != 0)
@@ -895,6 +900,20 @@ passin:
return;
}
+ /*
+ * We are going to ship the packet to the local protocol stack. Call the
+ * filter again for this 'output' action, allowing redirect-like rules
+ * to adjust the source address.
+ */
+ if (PFIL_HOOKED_OUT(V_inet6_local_pfil_head)) {
+ if (pfil_run_hooks(V_inet6_local_pfil_head, &m, V_loif, PFIL_OUT,
+ NULL) != PFIL_PASS)
+ return;
+ if (m == NULL) /* consumed by filter */
+ return;
+ ip6 = mtod(m, struct ip6_hdr *);
+ }
+
/*
* Tell launch routine the next header
*/
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index de7a938a3289..632c3f9774e7 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -329,6 +329,10 @@ VNET_DECLARE(struct pfil_head *, inet6_pfil_head);
#define V_inet6_pfil_head VNET(inet6_pfil_head)
#define PFIL_INET6_NAME "inet6"
+VNET_DECLARE(struct pfil_head *, inet6_local_pfil_head);
+#define V_inet6_local_pfil_head VNET(inet6_local_pfil_head)
+#define PFIL_INET6_LOCAL_NAME "inet6-local"
+
#ifdef IPSTEALTH
VNET_DECLARE(int, ip6stealth);
#define V_ip6stealth VNET(ip6stealth)
diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile
index 5ea3e7d9b687..99c81de3462e 100644
--- a/tests/sys/netpfil/common/Makefile
+++ b/tests/sys/netpfil/common/Makefile
@@ -9,6 +9,7 @@ ATF_TESTS_SH+= \
dummynet \
pass_block \
nat \
+ rdr \
tos \
fragments \
forward
diff --git a/tests/sys/netpfil/pf/rdr.sh b/tests/sys/netpfil/common/rdr.sh
similarity index 51%
rename from tests/sys/netpfil/pf/rdr.sh
rename to tests/sys/netpfil/common/rdr.sh
index 983abe054a35..0c2169ce6b28 100644
--- a/tests/sys/netpfil/pf/rdr.sh
+++ b/tests/sys/netpfil/common/rdr.sh
@@ -26,17 +26,19 @@
# SUCH DAMAGE.
. $(atf_get_srcdir)/utils.subr
+. $(atf_get_srcdir)/runner.subr
-atf_test_case "basic" "cleanup"
basic_head()
{
- atf_set descr 'Basic rdr test'
+ atf_set descr 'Basic IPv4 NAT test'
atf_set require.user root
}
basic_body()
{
- pft_init
+ firewall=$1
+ firewall_init $firewall
+ nat_init $firewall
epair=$(vnet_mkepair)
@@ -48,10 +50,13 @@ basic_body()
jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up
jexec alcatraz sysctl net.inet.ip.forwarding=1
- # Enable pf!
- jexec alcatraz pfctl -e
- pft_set_rules alcatraz \
- "rdr pass on ${epair}b proto tcp from any to 198.51.100.0/24 port 1234 -> 192.0.2.1 port 4321"
+ # Enable redirect filter rule
+ firewall_config alcatraz ${firewall} \
+ "pf" \
+ "rdr pass on ${epair}b proto tcp from any to 198.51.100.0/24 port 1234 -> 192.0.2.1 port 4321" \
+ "ipfnat" \
+ "rdr ${epair}b from any to 198.51.100.0/24 port = 1234 -> 192.0.2.1 port 4321 tcp"
+
echo "foo" | jexec alcatraz nc -N -l 4321 &
sleep 1
@@ -64,10 +69,69 @@ basic_body()
basic_cleanup()
{
- pft_cleanup
+ firewall=$1
+ firewall_cleanup $firewall
}
-atf_init_test_cases()
+local_redirect_head()
{
- atf_add_test_case "basic"
+ atf_set descr 'Redirect local traffic test'
+ atf_set require.user root
}
+
+local_redirect_body()
+{
+ firewall=$1
+ firewall_init $firewall
+ nat_init $firewall
+
+ bridge=$(vnet_mkbridge)
+ ifconfig ${bridge} 192.0.2.1/24 up
+
+ epair1=$(vnet_mkepair)
+ epair2=$(vnet_mkepair)
+
+ vnet_mkjail first ${epair1}b
+ ifconfig ${epair1}a up
+ ifconfig ${bridge} addm ${epair1}a
+ jexec first ifconfig ${epair1}b 192.0.2.2/24 up
+ jexec first ifconfig lo0 127.0.0.1/8 up
+
+ vnet_mkjail second ${epair2}b
+ ifconfig ${epair2}a up
+ ifconfig ${bridge} addm ${epair2}a
+ jexec second ifconfig ${epair2}b 192.0.2.3/24 up
+ jexec second ifconfig lo0 127.0.0.1/8 up
+ jexec second sysctl net.inet.ip.forwarding=1
+
+ # Enable redirect filter rule
+ firewall_config second ${firewall} \
+ "pf" \
+ "rdr pass proto tcp from any to 192.0.2.3/24 port 1234 -> 192.0.2.2 port 4321" \
+ "ipfnat" \
+ "rdr '*' from any to 192.0.2.3/24 port = 1234 -> 192.0.2.2 port 4321 tcp"
+
+ echo "foo" | jexec first nc -N -l 4321 &
+ sleep 1
+
+ # Verify that second can use its rule to redirect local connections to first
+ result=$(jexec second nc -N -w 3 192.0.2.3 1234)
+ if [ "$result" != "foo" ]; then
+ atf_fail "Redirect failed"
+ fi
+}
+
+local_redirect_cleanup()
+{
+ firewall=$1
+ firewall_cleanup $firewall
+}
+
+setup_tests \
+ basic \
+ pf \
+ ipfnat \
+ local_redirect \
+ pf \
+ ipfnat
+
diff --git a/tests/sys/netpfil/common/utils.subr b/tests/sys/netpfil/common/utils.subr
index 722271981af4..d0028e663c45 100644
--- a/tests/sys/netpfil/common/utils.subr
+++ b/tests/sys/netpfil/common/utils.subr
@@ -58,12 +58,16 @@ firewall_config()
jexec ${jname} pfctl -e
jexec ${jname} pfctl -F all
jexec ${jname} pfctl -f $cwd/pf.rule
+ jexec ${jname} pfilctl link -o pf:default-out inet-local
+ jexec ${jname} pfilctl link -o pf:default-out6 inet6-local
elif [ ${fw} == "ipf" ]; then
jexec ${jname} ipf -E
jexec ${jname} ipf -Fa -f $cwd/ipf.rule
elif [ ${fw} == "ipfnat" ]; then
jexec ${jname} service ipfilter start
jexec ${jname} ipnat -CF -f $cwd/ipfnat.rule
+ jexec ${jname} pfilctl link -o ipfilter:default-ip4 inet-local
+ jexec ${jname} pfilctl link -o ipfilter:default-ip6 inet6-local
else
atf_fail "$fw is not a valid firewall to configure"
fi
diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile
index d0a17ec40f43..8f6b57797e23 100644
--- a/tests/sys/netpfil/pf/Makefile
+++ b/tests/sys/netpfil/pf/Makefile
@@ -21,7 +21,6 @@ ATF_TESTS_SH+= altq \
pass_block \
pfsync \
proxy \
- rdr \
ridentifier \
route_to \
rules_counter \
From nobody Sun Jul 16 10:44:32 2023
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 4R3hfn2h3Jz2ttwP;
Sun, 16 Jul 2023 10:44:33 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R3hfn1Ws2z42yZ;
Sun, 16 Jul 2023 10:44:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689504273;
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=2CZIBQ/yd/9v+nWh/vaNq+lsiUlNyjedooWNbHcGD1w=;
b=n7xcYHzEQp0klfUypXZAPuBc0RlydjfbsnzSRqFV+cvVyQIHVOJ1i9TiqvkgRJICVRcbBP
nU73g0Ktf8jiHyIgYnS3HOW3OWlo6lKxEusGNFnp4hP5yMWmhmAJGswJ2VA+kBZhzLpPoH
qeh3K9nNR3tnAHGsqum40jSRa9cYmQAw69LsWM/GbO2lbhxPpwMu7+TGbtKAS5nYr7gYvk
NSyKtQE+LY83p36m2VjkcL2/FbKOwg6oUTELErwN+GIu6rFsrp/U3oZNyp162EIqbe5tT4
e/Cj9TP4UCyqygC5/s3jCWi8HcNra03wgg4Kb15SXCvmTJczdPONqW3SmHv6ew==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689504273;
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=2CZIBQ/yd/9v+nWh/vaNq+lsiUlNyjedooWNbHcGD1w=;
b=FHLl50nZs+6eJMiWHJRgZFMZDvlPVUtJTElDmchwJ2DRHpmPADqeaLtcrxKeGFfgcWWpq3
oBKOEPonULmwpfT2US06nOyxS1NNULNpBWRz7fuuGkXpN9pCIYjKgOSWVVC7wDUiAZjv/s
vA9fkCYWAnqqgL4qFwUuUfpNH/P4hVCnVIHfxlT5qzkqN0WJLPNXzmT+wDcu0Tw7qNSHiI
S6XHIraIJt5BGgJ3yoGBKFXIWnbYkNTbG3o/u2lj280jdqov0FwTc2PsbemHMverkne3iA
FZfMDgU0cfVdWJmzqCefYctqOCbfw5rjNYe0LvlZBWm8OZ5AoYceVKFfrgt4Fg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689504273; a=rsa-sha256; cv=none;
b=LtHuJlxFCtLEmEGRA/2ecN/xd/6xvRBsNxjrQgtTczAe68GlIgBauovsS2IoJTRmD3wucz
LXi313tynN6ppxFK4c0TZhzmh0zOhJc/B/CCf3r0DQTlAg/2fNX6gFKRX/MG3srTuueKi3
wCSQ+Lp4wB1cxzaIVHAIfuQ/lWV+PtmooScnzqgl6gQqVAwe6iWG13fBTaRp/ew83ORca+
rhVoUMPywXSyuxmHGXBIF4/kex2zVWuloex28tcRtmLplMnbjAk/Bxr0iraXLi0oUMJYWP
PQiggEhfF6eqLw5vvRaEFQxGpgzLXtoqoFkgvEbyfiQ2SdbnSxt+hpv+gjRyKA==
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 4R3hfn00Qyzf7G;
Sun, 16 Jul 2023 10:44:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36GAiWxA098688;
Sun, 16 Jul 2023 10:44:32 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GAiWh7098687;
Sun, 16 Jul 2023 10:44:32 GMT
(envelope-from git)
Date: Sun, 16 Jul 2023 10:44:32 GMT
Message-Id: <202307161044.36GAiWh7098687@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Doug Rabson <dfr@FreeBSD.org>
Subject: git: 6dfb2c2dce0f - stable/13 - pf: Add code to enable filtering for locally delivered packets
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dfr
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 6dfb2c2dce0ffabd783ec24b8d4d128993363f72
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by dfr:
URL: https://cgit.FreeBSD.org/src/commit/?id=6dfb2c2dce0ffabd783ec24b8d4d128993363f72
commit 6dfb2c2dce0ffabd783ec24b8d4d128993363f72
Author: Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2023-06-20 13:01:58 +0000
Commit: Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2023-07-14 10:07:58 +0000
pf: Add code to enable filtering for locally delivered packets
This is disabled by default since it potentially changes the behavior of
existing filter rule sets. To enable this extra filter for packets being
delivered locally, use:
sysctl net.pf.filter_local=1
service pf restart
PR: 268717
Reviewed-by: kp
MFC-after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D40373
(cherry picked from commit 3a1f834b5228986a7c14fd60da13cf2700e80996)
---
UPDATING | 12 ++++++++++++
sys/netpfil/pf/pf_ioctl.c | 20 ++++++++++++++++++++
tests/sys/netpfil/common/utils.subr | 3 +--
tests/sys/netpfil/pf/fragmentation.sh | 3 ++-
tests/sys/netpfil/pf/killstate.sh | 24 ++++++++++++++++--------
tests/sys/netpfil/pf/map_e.sh | 3 ++-
tests/sys/netpfil/pf/pass_block.sh | 3 ++-
tests/sys/netpfil/pf/pfsync.sh | 1 +
tests/sys/netpfil/pf/route_to.sh | 3 ++-
tests/sys/netpfil/pf/set_skip.sh | 2 +-
tests/sys/netpfil/pf/table.sh | 6 ++++--
11 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/UPDATING b/UPDATING
index 2ca07499ff00..796f2b751b95 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,18 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20230619:
+ To enable pf rdr rules for connections initiated from the host, pf
+ filter rules can be optionally enabled for packets delivered
+ locally. This can change the behavior of rules which match packets
+ delivered to lo0. To enable this feature:
+
+ sysctl net.pf.filter_local=1
+ service pf restart
+
+ When enabled, its best to ensure that packets delivered locally are not
+ filtered, e.g. by adding a 'skip on lo' rule.
+
20230404:
llvm-objump is now always installed as objdump. Previously there was
no /usr/bin/objdump unless the WITH_LLVM_BINUTILS knob was used.
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 07463ecbbcf3..5c9b5d2cebb1 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -184,6 +184,12 @@ static MALLOC_DEFINE(M_PFRULE, "pf_rule", "pf(4) rules");
#error PF_QNAME_SIZE must be equal to PF_TAG_NAME_SIZE
#endif
+VNET_DEFINE_STATIC(bool, pf_filter_local) = false;
+#define V_pf_filter_local VNET(pf_filter_local)
+SYSCTL_BOOL(_net_pf, OID_AUTO, filter_local, CTLFLAG_VNET | CTLFLAG_RW,
+ &VNET_NAME(pf_filter_local), false,
+ "Enable filtering for packets delivered to local network stack");
+
static void pf_init_tagset(struct pf_tagset *, unsigned int *,
unsigned int);
static void pf_cleanup_tagset(struct pf_tagset *);
@@ -5670,6 +5676,13 @@ hook_pf(void)
pla.pa_hook = V_pf_ip4_out_hook;
ret = pfil_link(&pla);
MPASS(ret == 0);
+ if (V_pf_filter_local) {
+ pla.pa_flags = PFIL_OUT | PFIL_HEADPTR | PFIL_HOOKPTR;
+ pla.pa_head = V_inet_local_pfil_head;
+ pla.pa_hook = V_pf_ip4_out_hook;
+ ret = pfil_link(&pla);
+ MPASS(ret == 0);
+ }
#endif
#ifdef INET6
pha.pa_type = PFIL_TYPE_IP6;
@@ -5691,6 +5704,13 @@ hook_pf(void)
pla.pa_hook = V_pf_ip6_out_hook;
ret = pfil_link(&pla);
MPASS(ret == 0);
+ if (V_pf_filter_local) {
+ pla.pa_flags = PFIL_OUT | PFIL_HEADPTR | PFIL_HOOKPTR;
+ pla.pa_head = V_inet6_local_pfil_head;
+ pla.pa_hook = V_pf_ip6_out_hook;
+ ret = pfil_link(&pla);
+ MPASS(ret == 0);
+ }
#endif
V_pf_pfil_hooked = 1;
diff --git a/tests/sys/netpfil/common/utils.subr b/tests/sys/netpfil/common/utils.subr
index d0028e663c45..2a2ee0af8ebf 100644
--- a/tests/sys/netpfil/common/utils.subr
+++ b/tests/sys/netpfil/common/utils.subr
@@ -55,11 +55,10 @@ firewall_config()
jexec ${jname} ipfw -q -f flush
jexec ${jname} /bin/sh $cwd/ipfw.rule
elif [ ${fw} == "pf" ]; then
+ jexec ${jname} sysctl net.pf.filter_local=1
jexec ${jname} pfctl -e
jexec ${jname} pfctl -F all
jexec ${jname} pfctl -f $cwd/pf.rule
- jexec ${jname} pfilctl link -o pf:default-out inet-local
- jexec ${jname} pfilctl link -o pf:default-out6 inet6-local
elif [ ${fw} == "ipf" ]; then
jexec ${jname} ipf -E
jexec ${jname} ipf -Fa -f $cwd/ipf.rule
diff --git a/tests/sys/netpfil/pf/fragmentation.sh b/tests/sys/netpfil/pf/fragmentation.sh
index ae394324cddc..e62eb141eebd 100644
--- a/tests/sys/netpfil/pf/fragmentation.sh
+++ b/tests/sys/netpfil/pf/fragmentation.sh
@@ -112,7 +112,8 @@ v6_body()
"scrub fragment reassemble" \
"block in" \
"pass in inet6 proto icmp6 icmp6-type { neighbrsol, neighbradv }" \
- "pass in inet6 proto icmp6 icmp6-type { echoreq, echorep }"
+ "pass in inet6 proto icmp6 icmp6-type { echoreq, echorep }" \
+ "set skip on lo"
# Host test
atf_check -s exit:0 -o ignore \
diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh
index c2942aab41f2..7b32bacdf82c 100644
--- a/tests/sys/netpfil/pf/killstate.sh
+++ b/tests/sys/netpfil/pf/killstate.sh
@@ -49,7 +49,8 @@ v4_body()
jexec alcatraz pfctl -e
pft_set_rules alcatraz "block all" \
- "pass in proto icmp"
+ "pass in proto icmp" \
+ "set skip on lo"
# Sanity check & establish state
# Note: use pft_ping so we always use the same ID, so pf considers all
@@ -121,7 +122,8 @@ v6_body()
jexec alcatraz pfctl -e
pft_set_rules alcatraz "block all" \
- "pass in proto icmp6"
+ "pass in proto icmp6" \
+ "set skip on lo"
# Sanity check & establish state
# Note: use pft_ping so we always use the same ID, so pf considers all
@@ -189,7 +191,8 @@ label_body()
pft_set_rules alcatraz "block all" \
"pass in proto tcp label bar" \
- "pass in proto icmp label foo"
+ "pass in proto icmp label foo" \
+ "set skip on lo"
# Sanity check & establish state
# Note: use pft_ping so we always use the same ID, so pf considers all
@@ -255,7 +258,8 @@ multilabel_body()
jexec alcatraz pfctl -e
pft_set_rules alcatraz "block all" \
- "pass in proto icmp label foo label bar"
+ "pass in proto icmp label foo label bar" \
+ "set skip on lo"
# Sanity check & establish state
# Note: use pft_ping so we always use the same ID, so pf considers all
@@ -289,7 +293,8 @@ multilabel_body()
--replyif ${epair}a
pft_set_rules alcatraz "block all" \
- "pass in proto icmp label foo label bar"
+ "pass in proto icmp label foo label bar" \
+ "set skip on lo"
# Reestablish state
atf_check -s exit:0 -o ignore ${common_dir}/pft_ping.py \
@@ -333,7 +338,8 @@ gateway_body()
jexec alcatraz pfctl -e
pft_set_rules alcatraz "block all" \
- "pass in reply-to (${epair}b 192.0.2.1) proto icmp"
+ "pass in reply-to (${epair}b 192.0.2.1) proto icmp" \
+ "set skip on lo"
# Sanity check & establish state
# Note: use pft_ping so we always use the same ID, so pf considers all
@@ -475,7 +481,8 @@ interface_body()
jexec alcatraz pfctl -e
pft_set_rules alcatraz "block all" \
- "pass in proto icmp"
+ "pass in proto icmp" \
+ "set skip on lo"
# Sanity check & establish state
# Note: use pft_ping so we always use the same ID, so pf considers all
@@ -535,7 +542,8 @@ id_body()
pft_set_rules alcatraz "block all" \
"pass in proto tcp" \
- "pass in proto icmp"
+ "pass in proto icmp" \
+ "set skip on lo"
# Sanity check & establish state
# Note: use pft_ping so we always use the same ID, so pf considers all
diff --git a/tests/sys/netpfil/pf/map_e.sh b/tests/sys/netpfil/pf/map_e.sh
index cc68fe26be5e..7a2b33069c59 100644
--- a/tests/sys/netpfil/pf/map_e.sh
+++ b/tests/sys/netpfil/pf/map_e.sh
@@ -66,7 +66,8 @@ map_e_body()
pft_set_rules echo "block return all" \
"pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 19720:19723 to (${epair_echo}b) port 7" \
"pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 36104:36107 to (${epair_echo}b) port 7" \
- "pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 52488:52491 to (${epair_echo}b) port 7"
+ "pass in on ${epair_echo}b inet proto tcp from 198.51.100.1 port 52488:52491 to (${epair_echo}b) port 7" \
+ "set skip on lo"
i=0
while [ ${i} -lt ${NC_TRY_COUNT} ]
diff --git a/tests/sys/netpfil/pf/pass_block.sh b/tests/sys/netpfil/pf/pass_block.sh
index 589b89891729..51c8c432038a 100644
--- a/tests/sys/netpfil/pf/pass_block.sh
+++ b/tests/sys/netpfil/pf/pass_block.sh
@@ -230,7 +230,8 @@ urpf_body()
--replyif ${epair_one}a
pft_set_rules alcatraz \
- "block quick from urpf-failed"
+ "block quick from urpf-failed" \
+ "set skip on lo"
jexec alcatraz pfctl -e
# Correct source still works
diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh
index 513280331255..c70d7690c37b 100644
--- a/tests/sys/netpfil/pf/pfsync.sh
+++ b/tests/sys/netpfil/pf/pfsync.sh
@@ -149,6 +149,7 @@ defer_body()
route add -net 203.0.113.0/24 198.51.100.1
# Enable pf
+ jexec alcatraz sysctl net.pf.filter_local=0
jexec alcatraz pfctl -e
pft_set_rules alcatraz \
"set skip on ${epair_sync}a" \
diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh
index 570d1feb36ff..4edd9a56de3b 100644
--- a/tests/sys/netpfil/pf/route_to.sh
+++ b/tests/sys/netpfil/pf/route_to.sh
@@ -230,7 +230,8 @@ multiwanlocal_body()
"block in" \
"block out" \
"pass out quick route-to (${epair_cl_two}a 203.0.113.129) inet proto tcp from 203.0.113.128 to any port 7" \
- "pass out on ${epair_cl_one}a inet proto tcp from any to any port 7"
+ "pass out on ${epair_cl_one}a inet proto tcp from any to any port 7" \
+ "set skip on lo"
# This should work
result=$(jexec client nc -N -w 1 192.0.2.2 7 | wc -c)
diff --git a/tests/sys/netpfil/pf/set_skip.sh b/tests/sys/netpfil/pf/set_skip.sh
index ce7b1900ae00..9e9d5a5322f1 100644
--- a/tests/sys/netpfil/pf/set_skip.sh
+++ b/tests/sys/netpfil/pf/set_skip.sh
@@ -101,7 +101,7 @@ set_skip_dynamic_body()
vnet_mkjail alcatraz
jexec alcatraz pfctl -e
pft_set_rules alcatraz "set skip on epair" \
- "block"
+ "block on ! lo"
epair=$(vnet_mkepair)
ifconfig ${epair}a 192.0.2.2/24 up
diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh
index cc95daba048b..a70c003e71ae 100644
--- a/tests/sys/netpfil/pf/table.sh
+++ b/tests/sys/netpfil/pf/table.sh
@@ -52,7 +52,8 @@ v4_counters_body()
"table <foo> counters { 192.0.2.1 }" \
"block all" \
"pass in from <foo> to any" \
- "pass out from any to <foo>"
+ "pass out from any to <foo>" \
+ "set skip on lo"
atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2
@@ -91,7 +92,8 @@ v6_counters_body()
"table <foo6> counters { 2001:db8:42::1 }" \
"block all" \
"pass in from <foo6> to any" \
- "pass out from any to <foo6>"
+ "pass out from any to <foo6>" \
+ "set skip on lo"
atf_check -s exit:0 -o ignore ping -6 -c 3 2001:db8:42::2
From nobody Mon Jul 17 15:48:46 2023
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 4R4RML62B1z4nVwK;
Mon, 17 Jul 2023 15:48:46 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4RML566yz3thp;
Mon, 17 Jul 2023 15:48:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689608926;
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=KfQZVDV60D9ZXPKHe9ESia6OlRaVtc+ykqgCcvmCr20=;
b=J0WsAHM2zCghuWqn1cYRPJXvaGK8NBqP5E/jFPmiRwRLXYGjQdRlPjOTFY2jsCycTo1fa3
iFoBBp7GiZo2XymloTd886UliIlEnmgG6HAYAbgsn4k+zy6b6EtxslbTq9JGzZPVZAhtcT
DjfT47lubODiQXY87qe7VofB/p1Ch40jOpWGIYGqEkPDHygkWabw/95kfGWMUsQEKi+EyU
BNzIdq+cOKq4LfoYygqStIyVSTJQxYhitnp6r0ypeBgP1WH+81xEHJ+r+NdJpQalNtyDmB
1jRAjqsq+wsH/ctOudDz6G36VQPDiGSuny6w/9uSWk18agiNxu2FQROjzskutA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689608926;
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=KfQZVDV60D9ZXPKHe9ESia6OlRaVtc+ykqgCcvmCr20=;
b=VUwhU7Nfvv4PNhbDinxFm5gPHIyoawC11ylM8Uq6ZaLfvZXrb4+P/H76cdj3JQZAXSTegh
ZSHrZjvMw18F/7MbE3+iAy5nYxZkxtOEsJtQ2GU4v1HwjOU4NF3dc+DGo+eO0YGu3tQ1I7
8kT2jYElXVN43A9G0pebXhv48P8eYldK+bp7MSBwn56mcXrMyRi/aDD2BkUJUAmeXPlWDw
AEkGUU6m4OkStuVbr+aORcltRcTK0BnyHNEbWjKFJ4iQIE4J178NtklYM7xByOLytYnlZz
4Bu6gKsnBuYJYHcKRQNDj1Td1pFUvUEKi0I4ggPfU6R1VUrKwl8ToLeZYABn/A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689608926; a=rsa-sha256; cv=none;
b=glDN9+vbaFh0+nVtL9YU8RxXQoSqEcfjCa2wSmeeRXPeH5DpaJw2okZ0kF+gcru7Pt6THU
JScRZ/W5hzXiu+wAnoVIBQGfOnsb7k2geDEFAnG+PgHuirc/0FhkIQSaQDgrRBunH2sYqg
Drny930Yteu4XgUh09TsOHyz53+/N5tEj3l8np2u2J4GvNj6p4NDs6Mh0DHP4aWS2jlr5M
xgDSGvsaiJ+zOv3nIjlEu6GSmlP+t3LrlXJFfPOwo/CgwxWu4QwITQq8RWJR8ZBHA33KpS
PPZ1FPJpCbgUPKF2gmaKRlmHDljmLe82JzQvSj/ww2gHa3zctDT0ie5lHCFgqw==
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 4R4RML43zPzVRw;
Mon, 17 Jul 2023 15:48:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HFmk4x079999;
Mon, 17 Jul 2023 15:48:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HFmkKw079998;
Mon, 17 Jul 2023 15:48:46 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 15:48:46 GMT
Message-Id: <202307171548.36HFmkKw079998@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: d6e837c7225e - stable/13 - login.conf: document how to specify env var values with commas
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d6e837c7225e1e4853a186ed42dba183057704b3
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=d6e837c7225e1e4853a186ed42dba183057704b3
commit d6e837c7225e1e4853a186ed42dba183057704b3
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-06-28 18:50:49 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-17 15:48:28 +0000
login.conf: document how to specify env var values with commas
As of f32db406504e quotes may be used to specify login class
capabilities that include commas. This is true in general but is
particularly relevant for setenv, a comma-separated list of environment
variables and values, so mention it there.
PR: 236204
Sponsored by: The FreeBSD Foundation
(cherry picked from commit ab2f6ae8d1742f57552c37425e9cab8499d2d4ea)
---
lib/libutil/login.conf.5 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index 7276863f53a9..cf8787495a18 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -19,7 +19,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 6, 2021
+.Dd June 28, 2023
.Dt LOGIN.CONF 5
.Os
.Sh NAME
@@ -247,6 +247,7 @@ the login session will be terminated.
.It "requirehome bool false Require a valid home directory to login."
.It "setenv list A comma-separated list of environment variables and"
values to which they are to be set.
+Values containing commas must be quoted.
.It "shell prog Session shell to execute rather than the"
shell specified in the passwd file.
The SHELL environment variable will
From nobody Mon Jul 17 15:48:47 2023
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 4R4RMM6c4Bz4nW8V;
Mon, 17 Jul 2023 15:48:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4RMM5kbNz3tcw;
Mon, 17 Jul 2023 15:48:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689608927;
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=aSV8fHoRFZNdanEMPKVDWsSclM+szZLIcrI7o6oAHj4=;
b=JE7iecSGtsQ48Zq5Z16OZ1M50H6934ZY4vnV19yi0eJEM1D/07q87gAqQjhl03xA86pcV5
JdWeaeqitLKpbL+JvQo/PhcQE84/nBYlgeEQYijwqdUg94lOmpFTAp0WsLayGxV//hxkIQ
TEx5hSV9V6S/ONRZY1XDUEkYIUMyvw3YVe307U5eLkjHA+nWlGYWhm9Yjb7TWCThctbEmT
qzcErsG7/bOyhnOQaxCtFxKOL5C2H0ji40EegQCJrfFnxO8nA7w5GHUZgklx8AedKM2/MY
J0iQYncQ0TFglBBtUGOJPw4/BVQ5f8btI1eu/NALQoqaSL6xo8pemKmWUHpfNg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689608927;
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=aSV8fHoRFZNdanEMPKVDWsSclM+szZLIcrI7o6oAHj4=;
b=E/Shcjb8Md890PkW0k+kOiG6sa7R7oEOZTS+sxW/zL23AriqMgpsPSugoyHjoQ34/oh4bw
TAknDFckwiOO5C2Uy2LGv2IW6xNEHbw4qvaeL46mfaToQ7c6LoBjdlnEwqCuailpaNa/nC
FzfKGer0IYfamWiRfyZzS7zclXKogXe2J6VyRWhYMrxkEzcZeCarsyx7Lf3uxr5/nxSBvq
vtxPEln3Mpg63TPK9qdBOBLHKP6MaqES0zEgURYi/YSUzg2BRvMQtvoLcCvgt5KJEIYLPS
h44njsr587ey08DbMRIgPEM9EaBQc0ekj3kOVzrupvpC6+yo1aJKB3vDpNEmDg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689608927; a=rsa-sha256; cv=none;
b=KVEj9pcxZXrLMVlqi55IxGLZGL4X5fUowmb21yNjRHtn4TTM083iHMxnuJor+oPfHMvaQH
h5dk/VxdhcHu6OLkYJlYoJTbzQar/8NVOhyHoX+jXQ1ppM/2SEU2dQeAT08sV0XqbNq+wU
IYmtuH0K5yYBGiN4q6VAGomyo+XA3hO1tvL2eE6zGy/dz7p0DFh41gJsIZR2CcKVkj2hKN
n/O3ESkBx7uzN6wgxmHuwjUOOYA1MeXFKqdHgtUKqVFYqcbpP9DL7IsX8wNWk7GPDmyG9u
kyK5bHmQAc8bGfLZzsYxL9Gf0EZup8Itk15j2ryCYB2Ja61KVG4tMNqgzMOy1Q==
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 4R4RMM4pC7zVGr;
Mon, 17 Jul 2023 15:48:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HFmlpV080018;
Mon, 17 Jul 2023 15:48:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HFml3V080017;
Mon, 17 Jul 2023 15:48:47 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 15:48:47 GMT
Message-Id: <202307171548.36HFml3V080017@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: ed942d5a1738 - stable/13 - seq: combine asprintf return value checks
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ed942d5a173870e786fd422c9edfbe5037626b4b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=ed942d5a173870e786fd422c9edfbe5037626b4b
commit ed942d5a173870e786fd422c9edfbe5037626b4b
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-06-19 02:10:32 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-17 15:48:28 +0000
seq: combine asprintf return value checks
Error handling is identical for all of these failure cases.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 5dae8905a5141e0cba1f4f3f94116440a5ce2abb)
---
usr.bin/seq/seq.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c
index 50c6b6022967..e5350690c703 100644
--- a/usr.bin/seq/seq.c
+++ b/usr.bin/seq/seq.c
@@ -198,13 +198,9 @@ main(int argc, char *argv[])
* equal, it means the exit condition of the loop held true due to a
* rounding error and we still need to print 'last'.
*/
- if (asprintf(&cur_print, fmt, cur) < 0) {
- err(1, "asprintf");
- }
- if (asprintf(&last_print, fmt, last) < 0) {
- err(1, "asprintf");
- }
- if (asprintf(&prev_print, fmt, prev) < 0) {
+ if (asprintf(&cur_print, fmt, cur) < 0 ||
+ asprintf(&last_print, fmt, last) < 0 ||
+ asprintf(&prev_print, fmt, prev) < 0) {
err(1, "asprintf");
}
if (strcmp(cur_print, last_print) == 0 &&
From nobody Mon Jul 17 16:49:36 2023
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 4R4SjX6XGbz4n4FK;
Mon, 17 Jul 2023 16:49: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4SjX642bz4J2l;
Mon, 17 Jul 2023 16:49:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612576;
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=Z1RCJHjNdk3kEAvA0GjCNJmQxJAtjqFacN5b7tixxks=;
b=Hf/L0Es5CHIiWQAp2m38iPcwk/aRKJP9PH876l7FI7xNvRZNJD22zp3ehtkzP4P+mrzlt7
DQvQZGU31cM67RNTTeuOVRumbrB+KmDXD5aRGEpVBXXq2hYONGdvtE9vtTK0pkCRHtHAxB
HFtWsrbnUM78DIaKXmunN6b3ij6B2ebN3H+ug3mA1NbGAWnX91vtAhn3kxIoY3zsNlGiKH
MXlsejs7jmJr8XDQdnOoaH9Fo9wAEIEyew3rc9j8KyGxcySMR/kKNsJ5sfHV22ov9jCEM0
89sjcBeGf/HzVx98zVBYRnsK3tor1ILSL4ZsS5URZ9RjjfYjFN59K36KRM5kzQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612576;
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=Z1RCJHjNdk3kEAvA0GjCNJmQxJAtjqFacN5b7tixxks=;
b=IlymLSc4XI5lpXcMSUQw++go0KTqVtJRUk5FcJ91vfIkMnqAZhDad5s9XfpA9lQR90OYiQ
FJuspOEm34mBO8uVYOqQ+E5XWGt4OeOlv1OgoTCxIAt+vyi/CLUgS5ZdHtmwoYMa8kI0YT
L+yiEiKlny5IkJJTOh3BtQPh0UTT1ospAynJkUBb7TM7dFxZbCx77Mwf5QAnSfbvL7o3R0
HBUhqh6+IbUyTSycrmJsNWhXOQxLQq7Uvn2KeNjXuaPL47GMOKz9jh/rwTHfyxlGePaqDQ
Ao2GXuappm3Eq9x+EwPmy2SiWuYj+GkaQe26w2uJ7gdabTOW+bhBAEI2u6L8+w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612576; a=rsa-sha256; cv=none;
b=Orii2X0nrrcnvtWKVDO9b4cVgMObsLdrT7M7ye4ps78j4SLKPqEqN/y2iOdIuCdCQDA0Az
nIMwO7u5/XbS3W12i3sjKvV3v3l71JykFm9ehi4aEqIynwQBak7MyiI7OMEPT2qHU+lrAt
cYGBCyfpdM8fANAjasScdoz9+Mbm75m4pgFqI0WF4mhkfx2vo48/4bFr+rQrG4p0L0bXUL
hZxmq8qbmEIuY8a6uFjR533muxn0iszj3hf020A5FfuozzMYfMbXVIpsjFLUcsztNqamoF
Oy3cJyJ8+atI0xJYzVRhUXe8+ixWHG8Hun+afRBwUyTZrfbgpD0A8AxvXsa1Ag==
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 4R4SjX57fszWww;
Mon, 17 Jul 2023 16:49:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnaJW081314;
Mon, 17 Jul 2023 16:49:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGna6W081313;
Mon, 17 Jul 2023 16:49:36 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:36 GMT
Message-Id: <202307171649.36HGna6W081313@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 3c4860d3eeed - stable/13 - hwpmc: add error for HWPMC_DEBUG without KTR
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3c4860d3eeed3ef56be988ec1afdcfb2fba9f3e0
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=3c4860d3eeed3ef56be988ec1afdcfb2fba9f3e0
commit 3c4860d3eeed3ef56be988ec1afdcfb2fba9f3e0
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-16 16:38:26 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:45:38 +0000
hwpmc: add error for HWPMC_DEBUG without KTR
The option is a no-op otherwise, but this is not necessarily obvious.
Failing the compile gives the user a hint.
Reviewed by: jkoshy, emaste
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40544
(cherry picked from commit 569f89b2f442e2187f750a5892a1662390364cc6)
---
sys/sys/pmc.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 1983dbb91578..2384a3a13919 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -1070,6 +1070,12 @@ extern struct pmc_cpu **pmc_pcpu;
extern struct pmc_driverstats pmc_stats;
#if defined(HWPMC_DEBUG)
+
+/* HWPMC_DEBUG without KTR will compile but is a no-op. */
+#if !defined(KTR) || !defined(KTR_COMPILE) || ((KTR_COMPILE & KTR_SUBSYS) == 0)
+#error "HWPMC_DEBUG requires KTR and KTR_COMPILE=KTR_SUBSYS -- see ktr(4)"
+#endif
+
#include <sys/ktr.h>
/* debug flags, major flag groups */
From nobody Mon Jul 17 16:49:37 2023
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 4R4SjZ0wQcz4n4LG;
Mon, 17 Jul 2023 16:49:38 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4SjZ0BGXz4J7v;
Mon, 17 Jul 2023 16:49:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612578;
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=zV3JR6us/voofn3Sr0l+ROB+6ERQV1Qh96m4+volaGo=;
b=vvV7oJ2BX+HS88ktpYwhsx8JZQ0SdADQSYGyMbDmXtyweAeuI1bSpVivqmTTtqn5z0TF2F
kurZw97IvOjoprRv8/t+5w7PdRqjqSzI6iaUxkejaIfWxoOdMVW0Cota5+1rAIH+I3Ae/W
KljOh7DUqVVbtEMg/cL3SPooCH/Z17BGRZBQUbQJv2Ok9H7RDsZDfCaehvfrQgNYZh2GO2
5VoxFl4bD3xZGCO7JMrAGy477emnHMJL0cWHt1gG6yz9eVMtRWWvdi276QCC7nzNhbj76e
AhkwIiuofv+rH3QMrQGutDGviD/BNkHYA+abucU6XTYz31iAhxtjWaEAftTHpA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612578;
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=zV3JR6us/voofn3Sr0l+ROB+6ERQV1Qh96m4+volaGo=;
b=IcaTFFTfyYEBibl0+0JcN5we58X1q7ciZ/BV8iQrmAsGOQ3IuhRNq11MctWbyJn1kYmuOL
pbKD35IHisPSdCYUQ0on2MKxRWHPMJpMBGHq+sPpUENCaipiHjbuTM1vmHyDYN+mP1Ftf0
baltFIuKf4YF2alFG6Tyt08Ru/1ZfrUgC7nY0R4UjXipEfHLe/s+j+1GqA3vBJ7xVlcIK6
XsPZlIwyQ6/v1KQGsuKszW7qiRDI1FnOr+oWRXYeE7Zw9CGw5uscTQXy92uCtTkwDy3Mtg
cu927c08IYBVPyDdoAoDQg9YXJlhJqcj6aKxyRBzwAuIgX0nasS1vQ5qNiO/6g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612578; a=rsa-sha256; cv=none;
b=ibKbB5AwVruMTFBxS4Arq72hfq9JHNyoMFdyPPoSk9PLhN1cMWEC7L9GPjc/ulkIgcCpjN
9EMMEquMNvjIQuh4PN4HmE2YK2ch2l59bHTxRiyfkcdOvIg48CB7Msfb3ycTjLbf2jUIBZ
Ljk5otBMW1AcPQMfft5gBb0L7bfjKYsz6N2IniecTJ9LOtfkT/Wmi6nQsUGJ1qRmO165xQ
cdvYA88kDSqq9OB5NqJ60e/fs0BJOvsLGgMJDrB1rhSFUY8634y1PfoyjIcUTEGa0iVi4D
cGgVANctk/f8cZdkUWLg1u3b7/5Yofvca9qoZuHZK2/raesm97kpKGvUF5o1zw==
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 4R4SjY633zzX2f;
Mon, 17 Jul 2023 16:49:37 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnbVY081341;
Mon, 17 Jul 2023 16:49:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGnb0M081340;
Mon, 17 Jul 2023 16:49:37 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:37 GMT
Message-Id: <202307171649.36HGnb0M081340@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 35128d197dff - stable/13 - hpwmc: add __pmcdbg_used annotation
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 35128d197dff2949553f4d321b052024decab6aa
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=35128d197dff2949553f4d321b052024decab6aa
commit 35128d197dff2949553f4d321b052024decab6aa
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-14 16:30:32 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:45:38 +0000
hpwmc: add __pmcdbg_used annotation
For variables which are only used in PMCDBG* macros.
Reviewed by: jkoshy, emaste
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40288
(cherry picked from commit 0589e7059bcd238027953d1311137512cc6dddea)
---
sys/sys/pmc.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 2384a3a13919..12583e67b062 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -1078,6 +1078,8 @@ extern struct pmc_driverstats pmc_stats;
#include <sys/ktr.h>
+#define __pmcdbg_used /* unused variable annotation */
+
/* debug flags, major flag groups */
struct pmc_debugflags {
int pdb_CPU;
@@ -1194,6 +1196,7 @@ extern struct pmc_debugflags pmc_debugflags;
#define PMC_DEBUG_MIN_CLO 12 /* close */
#else
+#define __pmcdbg_used __unused
#define PMCDBG0(M, N, L, F) /* nothing */
#define PMCDBG1(M, N, L, F, p1)
#define PMCDBG2(M, N, L, F, p1, p2)
From nobody Mon Jul 17 16:49:38 2023
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 4R4Sjb1KGDz4n4Qc;
Mon, 17 Jul 2023 16:49:39 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjb0Zj6z4JGl;
Mon, 17 Jul 2023 16:49:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612579;
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=n7JvITqCZrBJ9Ox0lPd5bWRVYJ1Fai6/ial3jkC5iIM=;
b=hEsJe0nTqznK/Uw7MqYT8diuGCgLEJ/PPJy9Q0We9c1Pd5SbG3cdibjMpRbpgTOgpuXJfm
fp2tD/a0i7ORWBJE8GBpQdEcYnEuKynkc2Byut2zPqYMXpNMHgBrYlJMsDjCh7534XABEg
MTuqdD+rjCBQYAGqgDKU3SlwPE5mKxBny9oh3WJ2c8h/Zl7HwsbfSI2XxsQgsHitjQtNVG
IqxDo/tS3xNqO+o0meZsRjkkhKSmdTS+LaHIDp1TTZGiZiVinKbnw5suFcPBLDz3gWZE98
eb1/QIOhu4vxx/MFIXDVGJfxXG+oZcfgzHz8FTFUzHVHds/khauvY6W9ES6e3g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612579;
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=n7JvITqCZrBJ9Ox0lPd5bWRVYJ1Fai6/ial3jkC5iIM=;
b=Dhgnc3JzWE7vZ0klkR+XcNZQ6lNWM2R7Da5hTxwnyCswcT0zZawqgJRqtnlFEsjWyf7p7e
qnUKZ9xn+JtPRLI7gmsNwQ8D68d3GhpMrWtWAGAztZx88QkeSYp5YjHNiV8m17UDAeACmZ
24nTZtL+wEaQ0/ZTq+cjZt2s3aRlC93qgn279WNNYvU3WuNi00j765f+78aBbEA3LvU1ef
AQYoJ687BresQwIpDrap7zjBqerQWeHqVKHupC4ZmAjh2YneEnyH7gMDZwXKYw/1PWoebc
TWld+W7OSzchnDAlPOoj6SaBsDtBHR7L+vlqYzNz8C6mCzellSyosxikcVit4w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612579; a=rsa-sha256; cv=none;
b=X7+iOBYWRfQ5NFAQVsGv8kbtEvIMNQyYwOPJgnsG/ej3n5QIOftrKy4etBx/r2Msylnu7y
DniKs916YmO3o9IngRGNYmBHQ8WK9D8iz7OLxntjIrNIQZGTLDLSxK2AbWso83P/bsY60N
UWLtnmq6NPZ+q+IPIKDPHG1YSNHd0CwugM8Z7OIfiMAA2dhLl7SJ8osOC0t6IK3oKdI5Q0
0Zm0ZSXR/svyr04gxLREN/DH47nDrpetzM8Pvuq3zYFNib6GeMGEGR82Oe67DJ2XJYjGni
NOyD76tzOeXEgZD/q5pU/i7DkmcV5e2xRHXHw52IQK9nAbGoJhRjoANZInGOwA==
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 4R4SjZ6mWczWlX;
Mon, 17 Jul 2023 16:49:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGncQx081360;
Mon, 17 Jul 2023 16:49:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGncqK081359;
Mon, 17 Jul 2023 16:49:38 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:38 GMT
Message-Id: <202307171649.36HGncqK081359@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 9ebf3b43bb64 - stable/13 - hwpmc(4): remove paragraph about Pentium Pro handling
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9ebf3b43bb649fc079f4898ba8bc8c0b4503a078
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=9ebf3b43bb649fc079f4898ba8bc8c0b4503a078
commit 9ebf3b43bb649fc079f4898ba8bc8c0b4503a078
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-16 16:34:02 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:45:38 +0000
hwpmc(4): remove paragraph about Pentium Pro handling
Support for these CPUs was removed in 2018 (e92a1350b50e).
Reviewed by: jkoshy, emaste
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40541
(cherry picked from commit 0a0c599ab9a578dd175e626144eacdbb4c5ac6bc)
---
share/man/man4/hwpmc.4 | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index 5b3353ff935d..08edb6a16faf 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -480,28 +480,6 @@ PMCs, then the
driver will reject allocation requests for process-private PMCs that
request counting of hardware events that cannot be counted separately
for each logical CPU.
-.Ss Intel Pentium-Pro Handling
-Writing a value to the PMC MSRs found in Intel Pentium-Pro style PMCs
-(found in
-.Tn "Intel Pentium Pro" ,
-.Tn "Pentium II" ,
-.Tn "Pentium III" ,
-.Tn "Pentium M"
-and
-.Tn "Celeron"
-processors) will replicate bit 31 of the
-value being written into the upper 8 bits of the MSR,
-bringing down the usable width of these PMCs to 31 bits.
-For process-virtual PMCs, the
-.Nm
-driver implements a workaround in software and makes the corrected 64
-bit count available via the
-.Dv PMC_OP_RW
-operation.
-Processes that intend to use RDPMC instructions directly or
-that intend to write values larger than 2^31 into these PMCs with
-.Dv PMC_OP_RW
-need to be aware of this hardware limitation.
.Sh DIAGNOSTICS
.Bl -diag
.It "hwpmc: [class/npmc/capabilities]..."
From nobody Mon Jul 17 16:49:40 2023
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 4R4Sjc6NPbz4n4Qw;
Mon, 17 Jul 2023 16:49:40 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjc1h3xz4JHK;
Mon, 17 Jul 2023 16:49:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612580;
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=upBNkolmLu36qTqJJvn+WZmkXlfpiSM8A3o/uG9VHwY=;
b=Dmf+UrSuqcjhWbMQ0s9yzauBKrtTZaI268RZZgXxnF62iRlnYjiCdQx6JXYLxAVzy7YVLe
l+HTEdfyxEx8MVdLFFgwzA6qVlEoixpWOwTOFXvhsDr4H1jjQ8COGooVtH5RmjGn5m92w3
1jnRi93QDhUyZ1cJV+/PMvhR9fFN4VntB6wYTrlU9uSUQb6gNpo4v1b5u0dekqFI06p7qE
gK56heUapluQadfDiWR0LtYJ9eb9jvcWDOQmD8FtCrA+JXRNLxgrGz8rvTHkDqDEXJy9CG
QnZ+PIhvzmNzXsU08EW49qQHUEdpLjr1AM/P7umxMfupLxh5lry9jTwSG68zwA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612580;
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=upBNkolmLu36qTqJJvn+WZmkXlfpiSM8A3o/uG9VHwY=;
b=wlfcaQjvOlmugmAykY1HzCVP+g8SUCUAVNrl4sGaA1Ifeu8IhcF8MKcT0bvd+LU6ZEZHfU
h6pxTo90D0LTcq3Hsc9E3Jgol3V0V7hGnRu6VmsLwOpXA2ZSXyocD6MrbwJMM0cvl01bwA
zoxi/H8PSVS6r7OpeqcfFCus5nJVZj1Y6S55OACXN4+NYlr2GqAxLutzIwOnMnPEL6bXis
ztWbWp18phxVSsP2o7bcgHGy4UfgGrX7lDy8FYaoshjIJXfLqQuXKphCuvK02PYW7SsDiZ
wqC2Xa6bsq6dGsE0Ii27wuH4iHmY2KXIfBveS4GUIsfOID7i94hOyFHD1+u38g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612580; a=rsa-sha256; cv=none;
b=NFU4qSY1JgmreKVCN6Iw4zG2uPtdAirfxC5zrjvbErS93z5eTpK/aPkVS50/0XyXihzujf
59oz6gybuMikeS0I2SipcWatPUJvRQ3WOxiT0mNueUlbUzdB6Yj1IhRdiJrNYmiwJvbZ2L
dKEDAgGVtyOFA1oRgOMFbCjw31w3+DXanO3tLsKNSrqkP6nN53+S+tyn0t0EH/vAfxPHZI
OLqEiEhreva8tqhqPxXEB9ZqhUNrCtlSIFzxpZ9HImnKVbmSwoeh1+klYY25QhoTrdKqpQ
XvXkRk8kY9U8Y/pXYuyaLhFEUb8sVesFPPSqyCKtHkFuxrwfu056x8rB6Hfpew==
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 4R4Sjc0nMszWKc;
Mon, 17 Jul 2023 16:49:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGneD4081379;
Mon, 17 Jul 2023 16:49:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGnepx081378;
Mon, 17 Jul 2023 16:49:40 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:40 GMT
Message-Id: <202307171649.36HGnepx081378@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 387ee93e0794 - stable/13 - hwpmc(4): more detailed SYNOPSYS
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 387ee93e0794d8812e276745de148292bedf8ccc
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=387ee93e0794d8812e276745de148292bedf8ccc
commit 387ee93e0794d8812e276745de148292bedf8ccc
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-16 16:38:03 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:45:39 +0000
hwpmc(4): more detailed SYNOPSYS
Include some boilerplate similar to other section 4 man pages,
describing how to load the module at boot-time or include it in the
kernel.
Reviewed by: jkoshy, emaste
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40542
(cherry picked from commit 0a1a48148ccd561464d643c05597cec2ae9e88b8)
---
share/man/man4/hwpmc.4 | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index 08edb6a16faf..6bd5d571793a 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -35,11 +35,27 @@
.Nm hwpmc
.Nd "Hardware Performance Monitoring Counter support"
.Sh SYNOPSIS
+The following option must be present in the kernel configuration file:
+.Bd -ragged -offset indent
.Cd "options HWPMC_HOOKS"
-.Cd "device hwpmc"
+.Ed
.Pp
Additionally, for i386 systems:
+.Bd -ragged -offset indent
.Cd "device apic"
+.Ed
+.Pp
+To load the driver as a module at boot time, place the
+following line in
+.Xr rc.conf 5 :
+.Bd -literal -offset indent
+kld_list="${kld_list} hwpmc"
+.Ed
+.Pp
+Alternatively, to compile this driver into the kernel:
+.Bd -ragged -offset indent
+.Cd "device hwpmc"
+.Ed
.Sh DESCRIPTION
The
.Nm
From nobody Mon Jul 17 16:49:41 2023
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 4R4Sjd3WZFz4n4df;
Mon, 17 Jul 2023 16:49:41 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjd34wtz4JSJ;
Mon, 17 Jul 2023 16:49:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612581;
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=A6APlKOpQjoe6zSviCoWfxp1ELHULMtyHj+cgOG7gbY=;
b=IoV2IzwVvKFy7FP1E3703d1AW27BShCmwL1MD104SUx63Te2usJApGWi0YOi5BuP6cCApf
v/3wIKMKtbAYrGgHGwkEpWIKP2NeWNyNRv5s6QIU/GQHN50HBxjVMuAPWPI1xRhB8HE+Rz
5ucE2nD9q/cvFwpSX65PPXSBNENwmBbwMvO98Z/S786x+ClXrHHjN3B+n7AT9J1mc/VlRu
EV3i/c9Aiek17vluhqEHSBifa3FxlPWbJdl8mXTBBQ2qxZFJlf4XAfxaO9g9dWNZQM5MJ0
4YDTSq6BIXqUcrWGzujGwJ2Leb8EqJSA1tZL2zbbePEHGyQXOZWo6VcRuAT8fQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612581;
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=A6APlKOpQjoe6zSviCoWfxp1ELHULMtyHj+cgOG7gbY=;
b=mUMNTZTHcdXl2N+uwR6qD/oLBych1o1uPRP9gI+mjHV9zfG7Zo8wwHcFj0d2rxBFFNMBlh
+sTlO0qv40LxzzpSTpqGib9QQOdLweK+9/ba6mRm5/OuwNHi/hEA4dC2e8to+cSl3MZLc8
osRx5XLY9+c8rWVe+SQBbmNk5YWFgO0dqK+sOQ3WesWx1y96HQWr+4Q0dWTfD71j92yhmm
fCay7aGYsuNjIE9V+Q4lXJQfURQQnDUA6dXNXMzo2iBnieHBYyBYGnfLsXHLIm8LH5zqA9
0ikY0JgeOZ384j0yXWx7gHFebkdUZ/lTnbQS0sBAt6/F/EeSJguVqNNKDaMDHQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612581; a=rsa-sha256; cv=none;
b=XtvuhenDWwL8L47nw+BfDmLr7lntlcI0f8di1qlOFw8wTrzqwp5VSTmcAYkaoPnTd/TEAJ
MlbQl46nw/HDm8FGYQZmSIjIQJNqZLivl/odo9j4hqoQUJ42+U8lBDIInm2pDpgisfL8ed
LVsVgtGb4VJgHx35JuK7LHVX9spNa4x6/JG/FZICxGGwKbsHPWczdQlIIOmbhWn1N1SwC4
8QW9WjvNBhmROKtxRcNTB1wo8znJg9w/63w5KftBxwkg3uR7j/t6SgmmmPeXntGvpNfeIn
fQnl1jUUC6OnHUXmEImMDXBe1N+59g5HAPSzI1kFLLHuQNmP5Py/tnuzRaetUg==
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 4R4Sjd1kNCzWKd;
Mon, 17 Jul 2023 16:49:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnfYc081400;
Mon, 17 Jul 2023 16:49:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGnf4a081399;
Mon, 17 Jul 2023 16:49:41 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:41 GMT
Message-Id: <202307171649.36HGnf4a081399@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: f7df2c03753a - stable/13 - pmc: clarify and strengthen statements about API/ABI
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: f7df2c03753aab249c075f5895df1e6fc591eaf6
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=f7df2c03753aab249c075f5895df1e6fc591eaf6
commit f7df2c03753aab249c075f5895df1e6fc591eaf6
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-16 16:38:19 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:45:39 +0000
pmc: clarify and strengthen statements about API/ABI
- Make it clear that applications are not only encouraged to use the
pmc(3) library, but use of the hwpmc(4) interface directly is a
use-case we do not support
- Move the COMPATIBILITY section above PROGRAMMING API in hwpmc(4)
- Drop statements about the driver and library being "under development"
Reviewed by: jkoshy, emaste
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40543
(cherry picked from commit 3977781b987e369a9fe23bb642b9680b0a3887c1)
---
lib/libpmc/pmc.3 | 8 ++------
share/man/man4/hwpmc.4 | 27 +++++++++------------------
2 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3
index 4bf2907db129..8cc7275bc338 100644
--- a/lib/libpmc/pmc.3
+++ b/lib/libpmc/pmc.3
@@ -23,7 +23,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 10, 2021
+.Dd June 16, 2023
.Dt PMC 3
.Os
.Sh NAME
@@ -474,11 +474,7 @@ In order to ease forward compatibility with future versions of the
driver, applications are urged to dynamically link with the
.Nm pmc
library.
-.Pp
-The
-.Nm pmc
-API is
-.Ud
+Doing otherwise is unsupported.
.Sh SEE ALSO
.Xr pmc.atom 3 ,
.Xr pmc.core 3 ,
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index 6bd5d571793a..3a4be77085bc 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 2, 2012
+.Dd June 16, 2023
.Dt HWPMC 4
.Os
.Sh NAME
@@ -288,14 +288,15 @@ Non-disabled hardware counters in such a row may be used
for satisfying system scope allocation requests.
No process scope PMCs will use hardware counters in this row.
.El
-.Sh PROGRAMMING API
-The recommended way for application programs to use the facilities of
-the
-.Nm
-driver is using the API provided by the
+.Sh COMPATIBILITY
+The API and ABI documented in this manual page may change in the future.
+This interface is intended to be consumed by the
.Xr pmc 3
-library.
-.Pp
+library; other consumers are unsupported.
+Applications targeting PMCs should use the
+.Xr pmc 3
+library API.
+.Sh PROGRAMMING API
The
.Nm
driver operates using a system call number that is dynamically
@@ -526,16 +527,6 @@ The value for tunable
.Va kern.hwpmc.nsamples
was negative or greater than 65535.
.El
-.Sh COMPATIBILITY
-The
-.Nm
-driver is
-.Ud
-The API and ABI documented in this manual page may change in
-the future.
-The recommended method of accessing this driver is using the
-.Xr pmc 3
-API.
.Sh ERRORS
A command issued to the
.Nm
From nobody Mon Jul 17 16:49:42 2023
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 4R4Sjf4pC1z4n4Y3;
Mon, 17 Jul 2023 16:49:42 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjf3t41z4JWW;
Mon, 17 Jul 2023 16:49:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612582;
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=md2QhzK/PuBxe2eSr99ztQgR8/KWzUxj9BhFZhyf5vQ=;
b=wCGC8Vi/OUF2e+Zg31f6h4PRwk+LJRQP4tpac88LeTWcpx33mkNS9A4+00AzA1bB4B7Ha0
Nt/UYg2Q4lD+7eIy552zXoM9aXKsYS9aXhN0kmPpnVGqGXL5vyQ0hlHa58v0fi9yY4LR7q
KdTrCz0Hxd7fwYSm7//XxRt/SmMgcKqAo1mRKnxqlXrtk59XqaZozbpd3ybTJwy+x6HVir
j8Y3T9i/f6pOtLQlP4evlgSJlSGV/JQ/95NNMUqErpuDACWGMhxR8GTBoGYNI68DU7FJb0
U7TMCKvvQ0uFRc+6lu4070t1HB8lhbxY7LCFsctEkLx1dO0muMpoKXRpfQxjXA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612582;
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=md2QhzK/PuBxe2eSr99ztQgR8/KWzUxj9BhFZhyf5vQ=;
b=IzJrA06IZL4DZ5VEo4v6CcYEk+snuObnMZf/nky3UVjVm4NlVh0tD045nO0IAqAxvQu/uJ
EExlHaq63bhdHTLb+izf5O3v6EfvaQtQPbdfZx1wzAym4fEd9Dp0wyTgUj+YQh2M8raHGH
3S0YzuAUro4DA8290ihmYlODYP0qXx6OYLuTsXKtfniJqY9btcRiEpy1deGTUAq+3U1jeL
u2XX1wg9FnMsvcWZr1fcR9sLGm+IMVNSRqAFMmY32obnmYeoOZSAg104g+IyOOQfstbUuT
Y66n1FqA5ADltl3bX7g2D+mfYus2Tr1XP0tOYp/PYcdj2o9nIoThYwmHjcqCEg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612582; a=rsa-sha256; cv=none;
b=MRUcqnDWoCS/40B/D3+Zxh/zyLAtnXK4oFR3UzJLuoMhrMZSRwg4jXt6uFmV9lFI5hTbn5
sFfaWgj90GE8gMESpG5wV+Vu5VoB82H0QE0PUObEQl+aJ5/IFio2eSKZvBMiIRhBlAf7fP
SJF9RUVv0HPUln51QDGA1WRuGfW1S9svzTAHegGEQqG3INKh/QTl9COprel5lysfNHbMRK
s42047BGgf2pSFlw32nrBZU51aYTOVaOhXMFLAiIAOAhpeReN53uF2v2QTixIeN0oNVR9P
E79C2sNmskxl+8gQw/kvpMOWtY2JMZMDZCve+q8DBWFBCWTxepvp8NTMz35z+A==
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 4R4Sjf2ftxzWwx;
Mon, 17 Jul 2023 16:49:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGngBi081421;
Mon, 17 Jul 2023 16:49:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGngUL081420;
Mon, 17 Jul 2023 16:49:42 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:42 GMT
Message-Id: <202307171649.36HGngUL081420@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 11b3648c4cbb - stable/13 - hwpmc(4): document debugging options
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 11b3648c4cbbff70b4e74b9ac43546aece713b60
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=11b3648c4cbbff70b4e74b9ac43546aece713b60
commit 11b3648c4cbbff70b4e74b9ac43546aece713b60
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-16 16:38:43 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:48:48 +0000
hwpmc(4): document debugging options
The debug options for hwpmc are not documented in detail anywhere, and
setting it up was error-prone the first time I had to figure it out (and
each time I've had to remember it). Add some explanation of the required
options and describe the kern.hwpmc.debugflags sysctl format.
Reviewed by: emaste
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40545
(cherry picked from commit 5fc97cc32553c4073c7dafd67a2d489b8af8563e)
(cherry picked from commit 89240e0ab60a29a47c9af9f952a09a7f2e1bb72c)
---
share/man/man4/hwpmc.4 | 140 ++++++++++++++++++++++++++++++++++++++++++++++++-
sys/sys/pmc.h | 6 ++-
2 files changed, 143 insertions(+), 3 deletions(-)
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index 3a4be77085bc..bf9cb5e9e5e3 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -1,10 +1,12 @@
.\" Copyright (c) 2003-2008 Joseph Koshy
-.\" Copyright (c) 2007 The FreeBSD Foundation
-.\" All rights reserved.
+.\" Copyright (c) 2007,2023 The FreeBSD Foundation
.\"
.\" Portions of this software were developed by A. Joseph Koshy under
.\" sponsorship from the FreeBSD Foundation and Google, Inc.
.\"
+.\" Portions of this documentation were written by Mitchell Horne
+.\" under sponsorship from the FreeBSD Foundation.
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -56,6 +58,17 @@ Alternatively, to compile this driver into the kernel:
.Bd -ragged -offset indent
.Cd "device hwpmc"
.Ed
+.Pp
+To enable debugging features
+.Po see
+.Sx DEBUGGING
+.Pc :
+.Bd -ragged -offset indent
+.Cd "options KTR"
+.Cd "options KTR_COMPILE=(KTR_SUBSYS)"
+.Cd "options KTR_MASK=(KTR_SUBSYS)"
+.Cd "options HWPMC_DEBUG"
+.Ed
.Sh DESCRIPTION
The
.Nm
@@ -527,6 +540,126 @@ The value for tunable
.Va kern.hwpmc.nsamples
was negative or greater than 65535.
.El
+.Sh DEBUGGING
+The
+.Nm
+module can be configured to record trace entries using the
+.Xr ktr 4
+interface.
+This is useful for debugging the driver's functionality, primarily during
+development.
+This debugging functionality is not enabled by default, and requires
+recompiling the kernel and
+.Nm
+module after adding the following to the kernel config:
+.Bd -literal -offset indent
+.Cd options KTR
+.Cd options KTR_COMPILE=(KTR_SUBSYS)
+.Cd options KTR_MASK=(KTR_SUBSYS)
+.Cd options HWPMC_DEBUG
+.Ed
+.Pp
+This alone is not enough to enable tracing; one must also configure the
+.Va kern.hwpmc.debugflags
+.Xr sysctl 8
+variable, which provides fine-grained control over which types of events are
+logged to the trace buffer.
+.Pp
+.Nm
+trace events are grouped by 'major' and 'minor' flag types.
+The major flag names are as follows:
+.Pp
+.Bl -tag -width "sampling" -compact -offset indent
+.It cpu
+CPU events
+.It csw
+Context switch events
+.It logging
+Logging events
+.It md
+Machine-dependent/class-dependent events
+.It module
+Miscellaneous events
+.It owner
+PMC owner events
+.It pmc
+PMC management events
+.It process
+Process events
+.It sampling
+Sampling events
+.El
+.Pp
+The minor flags for each major flag group can vary.
+The individual minor flag names are:
+.Bd -ragged -offset indent
+allocaterow,
+allocate,
+attach,
+bind,
+config,
+exec,
+exit,
+find,
+flush,
+fork,
+getbuf,
+hook,
+init,
+intr,
+linktarget,
+mayberemove,
+ops,
+read,
+register,
+release,
+remove,
+sample,
+scheduleio,
+select,
+signal,
+swi,
+swo,
+start,
+stop,
+syscall,
+unlinktarget,
+write
+.Ed
+.Pp
+The
+.Va kern.hwpmc.debugflags
+variable is a string with a custom format.
+The string should contain a space-separated list of event specifiers.
+Each event specifier consists of the major flag name, followed by an equal sign
+(=), followed by a comma-separated list of minor event types.
+To track all events for a major group, an asterisk (*) can be given instead of
+minor event names.
+.Pp
+For example, to trace all allocation and release events, set
+.Va debugflags
+as follows:
+.Bd -literal -offset indent
+kern.hwpmc.debugflags="pmc=allocate,release md=allocate,release"
+.Ed
+.Pp
+To trace all events in the process and context switch major flag groups:
+.Bd -literal -offset indent
+kern.hwpmc.debugflags="process=* csw=*"
+.Ed
+.Pp
+To disable all trace events, set the variable to an empty string.
+.Bd -literal -offset indent
+kern.hwpmc.debugflags=""
+.Ed
+.Pp
+Trace events are recorded by
+.Xr ktr 4 ,
+and can be inspected at run-time using the
+.Xr ktrdump 8
+utility, or at the
+.Xr ddb 4
+prompt after a panic with the 'show ktr' command.
.Sh ERRORS
A command issued to the
.Nm
@@ -752,8 +885,11 @@ operation is not being monitored by
.Xr kenv 1 ,
.Xr pmc 3 ,
.Xr pmclog 3 ,
+.Xr ddb 4 ,
+.Xr ktr 4 ,
.Xr kgmon 8 ,
.Xr kldload 8 ,
+.Xr ktrdump 8 ,
.Xr pmccontrol 8 ,
.Xr pmcstat 8 ,
.Xr sysctl 8 ,
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 12583e67b062..153d24ca250f 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -1080,7 +1080,11 @@ extern struct pmc_driverstats pmc_stats;
#define __pmcdbg_used /* unused variable annotation */
-/* debug flags, major flag groups */
+/*
+ * Debug flags, major flag groups.
+ *
+ * Please keep the DEBUGGING section of the hwpmc(4) man page in sync.
+ */
struct pmc_debugflags {
int pdb_CPU;
int pdb_CSW;
From nobody Mon Jul 17 16:49:43 2023
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 4R4Sjg5bwBz4n4hJ;
Mon, 17 Jul 2023 16:49:43 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjg4gNNz4JZ8;
Mon, 17 Jul 2023 16:49:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612583;
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=hk56VS8n5K3cqrCUg/I4k0Y/8zNsg0LRW01ohEv5VGQ=;
b=piNyaplEghLIufqxTLk4Yyow30f3iCYmtlTbA9TUJXLnwDV5HaScbwzkCCfkv1uLxMRrdS
pcyVxzFJI5i5dUHgT3U+M/OQz7iW4i0dEN/ZtBEGRVOWYTvHV843FSa48Il+QmCkkzlcIo
OFbd1qvUlvd5zgdull/YFqiLGwV2Kj4922s7LnZRPgGsDDyWAGCUIwLaXuRehDG2maxfhF
3GstF5t2reZuwAzQqVnh7FQOnjVuaNSAEorU2mTiZrEri7lwtd+cjfc/ra9tGC/HJTLyuy
QKokuh7dceBX3iZKxgQ5ADRzhBEHOnheFg3mAkFrNZOl5E7WjvuU171csztmZA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612583;
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=hk56VS8n5K3cqrCUg/I4k0Y/8zNsg0LRW01ohEv5VGQ=;
b=f/N70jeM8G83ojcQ2HVzXtjBRHk9ma6UYAoHapT7yK5GzOfkslfN0Z6noFh9MY8wLN/CTD
4a6ZgRwzQGxDiK2sG8V0pmfg3ylwdeCS31KK8dd1U8odipx8r74Ega2RbP34Gf+lMdttsG
AEIU+4q068k+tlNAhhiliyRHbYeEGvHektxvnCsyh2apVKkbW0mlYeub/j01tsFRV5+MtD
TDlxHhnEhkmpuVOepknhPdL8sVa4Sl1G6dHLbfaY7cRmGdV+ctnwcBKXS/5odgvpxkTvOm
4DSSq1aAayyKYZueVs0adHbCzhmntsqC8/6/RVgYIVOSnOgCp2p1h/pdk7+KLg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612583; a=rsa-sha256; cv=none;
b=awjHVw6nAYwX1WYVBIGymTTOe/LpIgfNvIS4QkKQoYgg9yFeng2dBcCVZrH2q4OwTR7DOm
tmINOWkN5Il17hJNucepUxtCkNx917DHDvQb/5WUjtuq+R5TJ4wTmQhijqKYj+sPZKOUyL
AtWXdgwNlujrzsJcbKr01NmBxzn1zbDGzLoup5iPVe3SJB6w3cbR9GyeFSNSqqIPHh86tk
kcoLSWsCeJ4dtS7zjHoH3/udpuYAgu2EQDM1Hrj/XbcEurxzCgYGQWySUIaJEnb1EX/3GU
rASXFUnP68L3T4BBPtTfyfknPHIL1/vWAVXH4nUstX8kkeQBMFjqk7t4GMuCBg==
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 4R4Sjg3f2mzWjS;
Mon, 17 Jul 2023 16:49:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnhZ2081446;
Mon, 17 Jul 2023 16:49:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGnhas081445;
Mon, 17 Jul 2023 16:49:43 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:43 GMT
Message-Id: <202307171649.36HGnhas081445@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 5a421cbb9f8e - stable/13 - pmc: clean up remaining Pentium man page references
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 5a421cbb9f8e4f0b7bf32a939c98b29d253b8f93
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=5a421cbb9f8e4f0b7bf32a939c98b29d253b8f93
commit 5a421cbb9f8e4f0b7bf32a939c98b29d253b8f93
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-24 17:09:00 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:48:58 +0000
pmc: clean up remaining Pentium man page references
These have been removed.
Fixes: d78896e46f1d ("pmc(3): remove Pentium-related man pages...")
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
(cherry picked from commit ba84e87055de71452291e229f8087d612999da40)
---
tools/build/mk/OptionalObsoleteFiles.inc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 21440e6e9560..d099d5bc8850 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7335,9 +7335,6 @@ OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz
OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz
OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
-OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
-OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
-OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz
OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz
OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz
OLD_FILES+=usr/share/man/man3/pmc.sandybridgexeon.3.gz
From nobody Mon Jul 17 16:49:44 2023
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 4R4Sjq2b6vz4n4Vs;
Mon, 17 Jul 2023 16:49:45 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjj1rVCz4JP4;
Mon, 17 Jul 2023 16:49:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612585;
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=Zx1xr7ecINdBN6C4wP8VaKdUTVDfzD22Ha/BGsyaeQE=;
b=ew1xp1SbJAqgItZLLsYnMZQ4nAtRUhPCuP0wjh+P2sJzAh5KBoiaQkXPqfmFvWbLBqeAuF
99m9U8X8F3Xy/4qaO0vVEKW7r1n7AYP+G8oTonG4/BXg3kNKh/reVQHs7jzkh3FjpWBZi1
EyPcJT2+7vQ9zPwYaePqo+BfMwnoSdhAjMlE+WThfsrvEMkgf3QQXLVwFQtwp3N0I7X1DK
q4k+D2skEtzUNE0WVc9PLDMbsqnRPqJ1T7+WMxZWhycJ1a2iKfmuG+V9Lz5rBnPfmd5C0H
1qAYqbU5F/C8z9PYA6pQEUZq70BPXnMdWsQPyCukyG11Xqts4drVOAl2muqCBg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612585;
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=Zx1xr7ecINdBN6C4wP8VaKdUTVDfzD22Ha/BGsyaeQE=;
b=pZ8y2P6TxLXLp4d1fel3RKHSWmQqpOCPDpBvhHpGoyWJkb9F+aERGdU8Xmitmli6d4Qt9l
EfuoFficbEk0gWpuGvVCtfXg+FLvMs0sqb0mSi6r377SKVoG3rmBwV72WtzPUBbSfh+FgQ
nGn/ha5gwkV3I6Dw4nzRTPMFnGS0bn7V+gOVWtRSTIcMYzsQCaLdyS2F/S5dGzpIgggEAi
+vU8iXn7YEmtM+w3FokOtlCcnyhhS52FyyegC+W9jjcj81Px8qb0jm2ozjFWx9wuqgJLAN
hLKQUWXCuRDWs86Aght4EVSWpcHTyJ+e8gtXq1i0A26GgUCkslqfWlx2StkKsQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612585; a=rsa-sha256; cv=none;
b=IGke4V1MSYA6JASPZp0K/obQrD07W3/RLeA3RPLUMvRCmwRyDx05QnhMTA5D3+Oz/267VL
n28g3qhGH8IKf0FwdP4HmANICsyTv0zpsM9Ut6VdR2WBbQ3g5Q28DxZz2BdLyUQVA4Dr9Y
CjdMjPNcMxFRcwW6xx5LA7lh5VoTCvFdLa+oIXYi0wRHZiW6MFz1VGK2Fs6nA9nJX1LYSA
AcuRXj40mKj3zr+6zDEL1ak6hR4ca88MYRlMLBSCNlAXi5AcP51iyk+bXTOjOM5XUAg7o/
/tDaP1qzD7u73jw9Zbvay8pCKi7YROcfJK5eKweUtmNb/OrUviex+0ACS3Rjrw==
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 4R4Sjh6JP2zX2g;
Mon, 17 Jul 2023 16:49:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnidb081465;
Mon, 17 Jul 2023 16:49:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGninR081464;
Mon, 17 Jul 2023 16:49:44 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:44 GMT
Message-Id: <202307171649.36HGninR081464@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: ea59846e314c - stable/13 - Remove GCC 4.2 include dirs
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ea59846e314c10e2df064fc3321b6b8b88d9e7eb
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=ea59846e314c10e2df064fc3321b6b8b88d9e7eb
commit ea59846e314c10e2df064fc3321b6b8b88d9e7eb
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-07-10 13:16:13 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:48:58 +0000
Remove GCC 4.2 include dirs
These are present (and empty) on a system installed post-GCC removal.
Reviewed by: imp
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D40878
(cherry picked from commit 8ab2da68283b7228f2caa7e7df173d6d46a224f9)
---
ObsoleteFiles.inc | 2 ++
etc/mtree/BSD.include.dist | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 185349f3ec74..e06cf2cf8d7f 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -4557,6 +4557,8 @@ OLD_FILES+=usr/libexec/cc1plus
OLD_FILES+=usr/share/man/man1/gcpp.1.gz
OLD_FILES+=usr/share/man/man1/gperf.1.gz
OLD_FILES+=usr/share/man/man7/gperf.7.gz
+OLD_DIRS+=usr/include/gcc/4.2
+OLD_DIRS+=usr/include/gcc
# 20200220: Upgrade of ncurses, shlib bumped to version 9
OLD_LIBS+=lib/libncurses.so.8
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index d35b85f4249a..e6e061392729 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -179,10 +179,6 @@
unionfs
..
..
- gcc
- 4.2
- ..
- ..
geom
cache
..
From nobody Mon Jul 17 16:49:46 2023
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 4R4Sjv6yZ5z4n4dv;
Mon, 17 Jul 2023 16:49:51 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjl0QvJz4JTb;
Mon, 17 Jul 2023 16:49:47 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612587;
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=Ig2OIuMxbAq1d34uqoBHGQRv96IswxWLPYP7/MsOcXk=;
b=ZkY4rKvFt7Zk0hm+vP5Jx0S59MhapGYeqVDcY7J98UizIwkfUE3UzLbaJ3CfF8G6tYE8qE
9B7jRxajA3QlzLWqQEspOLzECh2QWzznydnXNlBWARLm/e9ZoEmF70LZoyQI3HCbfeQ00y
C2xzX8NEQ82btEaF6qbBdrLAxlP6cXfOFMHQ73maR4vud6sgljRF5ukee1LJe+g9gHm4uw
19G2UMg21mYjlWRpjXGH8Vi93wc+FPowtUPcRlklQxWWapYhCVMWq1USMoECEfyc92oiya
vs+j2yFgZRCeA4LrhY+uLD8kGAqjn33jXYJjIqpV6AKguCgB1yM1ITE1B9pFaw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612587;
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=Ig2OIuMxbAq1d34uqoBHGQRv96IswxWLPYP7/MsOcXk=;
b=d+Mm+3Qb85+L8BO4wHPKuGNONchd3pyG5AQAyK8Gb+LXVsA+lcaJRxlb4xdL9AVZtCSAiw
7Akqgh8R/7lEP6BhLTwe8rJlUcZlU2HG4E7wwtivvxImKzY3zM9kdC5c1D4Vi4DGTkOm1l
xu4DFIzcWt1rgqJ1mvu7LdOEHFPF0YrcWOBzk8r7hYv4p82wJ27M/O7lQR1EE2RcFQmLa4
VliKpvq+s18JQ2z4XfTWCb28WWIFYbJ/pk4cfr81hj2KC/dV+YDoA4W8rV/o3mlUepvWvb
WFIJFWxS67xPOi1S0x49XvqMjQwXBOCRXP0syQCnpfLMOw5BWW2MiMRAnsGXJA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612587; a=rsa-sha256; cv=none;
b=tWhtvkBocstDqbSgVYsI/rCVnn3Wvl5jpuWj6VNmKf4SKHU9rK3tBDnDm4im0wOOQTfiKv
vkdFeyJbAK2HJpQvNWZGZLhMXuw7ItbI07UTwzC49IGDyrE5YbD8isyVXIOAIsIotLAFmV
dj1XaiFcN8TgnmtfAFJsfScSXFac9DVBpL9CF1SvMFRF+Kj/69MtvXYAoAZ1vUcFBXvPnx
Lv7IsfyEy9sirOVqj3G+csF9vIjIm3/ctkXsQ6xf9JcMJzMAx1vgIIRQeYaSti4sVKegyl
PcDPz/rXCOSlNq+xx0jw4UKxpOfljMW0QKouvOn7asUGvvnFGhGaVVhT45CXzA==
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 4R4Sjk6Xx2zWtN;
Mon, 17 Jul 2023 16:49:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnk8W081504;
Mon, 17 Jul 2023 16:49:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGnkND081503;
Mon, 17 Jul 2023 16:49:46 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:46 GMT
Message-Id: <202307171649.36HGnkND081503@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: c6741d6aa703 - stable/13 - pmcstat(8): Drop .Ud
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: c6741d6aa7036361a271b2dd68c57092ef096a4b
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=c6741d6aa7036361a271b2dd68c57092ef096a4b
commit c6741d6aa7036361a271b2dd68c57092ef096a4b
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-07-10 17:23:36 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:48:58 +0000
pmcstat(8): Drop .Ud
This utility has existed for a long time and should not be advertised as
"currently under development".
While here, fix the one other warning from igor about using a newline
for a new sentence.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
(cherry picked from commit a5b3e56330b07c8163b4d62ec55edf37746c11cf)
---
usr.sbin/pmcstat/pmcstat.8 | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/pmcstat/pmcstat.8 b/usr.sbin/pmcstat/pmcstat.8
index b0dae2449cfe..37e003d5b154 100644
--- a/usr.sbin/pmcstat/pmcstat.8
+++ b/usr.sbin/pmcstat/pmcstat.8
@@ -226,8 +226,8 @@ specified in
.It Fl T
Use a
.Xr top 1 Ns -like
-mode for sampling PMCs. The following hotkeys
-can be used:
+mode for sampling PMCs.
+The following hotkeys can be used:
.Pp
.Bl -tag -compact -width "Ctrl+a" -offset 4n
.It Ic A
@@ -544,8 +544,6 @@ The
.Nm
utility first appeared in
.Fx 6.0 .
-It is
-.Ud
.Sh AUTHORS
.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org
.Sh BUGS
From nobody Mon Jul 17 16:49:45 2023
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 4R4Sjq2R5dz4n4YJ;
Mon, 17 Jul 2023 16:49:46 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjj6YRkz4JZS;
Mon, 17 Jul 2023 16:49:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612585;
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=nAFhE4Hv0lM5s2U5rWuyzNI+xbYzmkNdiHVAh0PbzZ8=;
b=aiWZelBIUTHYxu/xN9JaK/NpVweR/WoSccT227TGuMaYCr6Gt4iNdQTIlzjTaQ5GyNNEOk
qbdG5dVn2S0T/r07FhgWToaj+AiDhJqJYt+PVRUIxOnMwmT8IMJh/vZ3UInUQMeaTZ2Xog
Sgcb/SOcsSPPCcgs9DWukUo0ET7SxA2IPOR+D7YID9kmDguBJkEieT9H8Plxjo1ksU5MmQ
7tNru9kK4dkK9oBJZYcRUkJwdhEPAnEGYdNVphkNmeuihttkVy6FPcKa7OVJU1Ya8TxN6X
yXlK+8ZpoedrdQ3hJI3vbrIB0Ky1NG5DMultH/7h30T08dWcE+heyQ8opvPHLQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612585;
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=nAFhE4Hv0lM5s2U5rWuyzNI+xbYzmkNdiHVAh0PbzZ8=;
b=QMK+x0N/krxNkpSHmi5cjfzi9AJep4w2JDwdnLOSt1Pg4i0ozDn9JIG/RQXD+8ZH4Xypt9
h6joPzH+bau1TkhiJyOkvC4k4NtMhIowDg/Tl6UhKsnULJ99DFEkZE6SNj6vKT2LVrlDWt
d9Ts/wqKtoISSPZ2/h7KqnJYRk2V/b+jp0Rkb8v+NpT4elxQ78JQPpDAW+r1CAD9PQmmGl
QaLYin0iefLNWcgxBEXc0L0RCZbNmcN6guGHdeolwW57IgIHdpyv+WzOAMXKVWvF0uC5/m
XukOKNV4buqQgIBWmOWKDlVFOHEMzRY6xNfksqEpc7u7e25vpxjfKir16xwYaA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612585; a=rsa-sha256; cv=none;
b=aoRgO/WKaJsllSEO6BTRBG6SnC50h1mdcqfogpjyV61QcGVqV8HyqHCmqL5FbyNJ9WaaWj
bFwICjRFbYcmF0tgAktE6osr6YMzYO8JcDRno3wyMHvOmNWwUhKiTSnCMfG9Gjf0UjbLfe
ewpwMlzziS+Fg+OA4J1JTEx/QQnwJCJD8DxZIHbNqA78D4E5TXWpdXH2sYD52gqVinD7y0
m4Xi5Sy073mTB1FM8Zcwlxweye9RMApLKXYttRuWEr8kgafAB2VrS+NR0s/KwRop7eUVgf
2qlfP9zcAtF//ZuKTE+zvnPUWiFURYyLcRH46yXqq0R96lgeYXDGZsK8gC1BKA==
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 4R4Sjj5PpYzX2h;
Mon, 17 Jul 2023 16:49:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnj3G081485;
Mon, 17 Jul 2023 16:49:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGnjhq081484;
Mon, 17 Jul 2023 16:49:45 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:45 GMT
Message-Id: <202307171649.36HGnjhq081484@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: fbab5263d524 - stable/13 - pmclog(3): Drop .Ud
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: fbab5263d5245c8b4df2b2a5195f9f341a96ccf8
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=fbab5263d5245c8b4df2b2a5195f9f341a96ccf8
commit fbab5263d5245c8b4df2b2a5195f9f341a96ccf8
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-07-10 17:20:54 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:48:58 +0000
pmclog(3): Drop .Ud
This API is stable and should not be advertised as "currently under
development".
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 398fb4a592a3509cc73c3fc99d44712b0505fb7a)
---
lib/libpmc/pmclog.3 | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/libpmc/pmclog.3 b/lib/libpmc/pmclog.3
index d60e97085831..45bb3bfcc15c 100644
--- a/lib/libpmc/pmclog.3
+++ b/lib/libpmc/pmclog.3
@@ -315,7 +315,5 @@ for a file based parser may fail with any of the errors returned by
.Sh HISTORY
The
.Nm pmclog
-API
-.Ud
-It first appeared in
+API first appeared in
.Fx 6.0 .
From nobody Mon Jul 17 16:49:47 2023
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 4R4Sjv6yV0z4n4dt;
Mon, 17 Jul 2023 16:49:51 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4Sjm2yHPz4JTf;
Mon, 17 Jul 2023 16:49:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689612588;
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=BqeiibOwlDWf8HkZUmuYlY9PKAh26gGA/y78IG7FN/s=;
b=kLnCjZaZIUnWoT7SUaCDlwWJH7NTcPqsg1BH7uKVbbrGQEiZiruOQjwaRsveKhGz73Bk0X
sR3upFqFti0G2zSvzQ/FAEUpr18pKjj0spt5I3oftaOQFIi/1z5VmKvHylVJfXHsJtMPmN
kaw55vOx8XoRRPYaGS9DtMlYYqZP7qApl3NFHFnRn6MrEcFfGjDY5RV5OBHPT66UASHYeq
MnVuMa2q59MqtbC9aBTzdXIE4etP4DPVbqc0N6C7U2AgEOwjhlsMhtkp24uJqGFmxqz0oy
zqNlzZnC4giuthnIRgue5n3NqB7fPJ3Z5tIHKZ9A1kFkOfpY+iZJEEp4HxzALw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689612588;
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=BqeiibOwlDWf8HkZUmuYlY9PKAh26gGA/y78IG7FN/s=;
b=qHaYUstY0dmLJ7+dRD56Td2sfV+8yFM6ozKcSQUzJ6q2gk7/kGhPvY0NRoC/sqXs0Krf8q
Tfu0gEAvhyvT5N3QTEFjOFNRTAssZvQkQTALeozQF7eXV3pRcqC9yNxFRNhC3yTNgGuQSf
RPPz22KKA3y//LO1GPhXSKtoi23zEEHgCWEiRkHarUk1ETDlTOGpLV22fRuYSb8qQDxBN3
0iMRezQFlUb1xbdFoWmvnXD21v0vo0KWexKd2h1xBUtrK18PDo6Jkv4qfMDDVJTqi74LTy
LgYkbBwfg+ZLOzSD2bfvsukImn8AYuPYi+VKK+DtM8KlmDlNp6VNREAAZXuFZA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612588; a=rsa-sha256; cv=none;
b=S8fn6687o+KwDBZRzZuzTOx/wj6ixDbRez7uOIk5WzrVe0sxipX9P2+UadM7cHgeEaOzKP
2JrsCatKYKJTA+ERn6aLzPtToVM+70hLP5qUmAQHHxQBkx+oJcaJG+letZkKfDs1ICE2hY
6ZUbEhpJwcryEzVZnh3LPjm1YPBDAxjTPq5nT09K1jXOY93jxlYpXnMsw3E29IAs6PTR8x
+SVVQSAoy5DITygBgpdZJHxXCUxBtBbNbiTOgFstyqNYJ36oR1x9/2PRdPq7eb7HOgzT8p
LauCn11yh4NmY/Oca8mIs12sjXuuB+XcYST1pqxAPB2EL7cPZW2wSo+dKAhSFg==
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 4R4Sjm0gfmzWwy;
Mon, 17 Jul 2023 16:49:48 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnllv081524;
Mon, 17 Jul 2023 16:49:47 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGnlRY081523;
Mon, 17 Jul 2023 16:49:47 GMT
(envelope-from git)
Date: Mon, 17 Jul 2023 16:49:47 GMT
Message-Id: <202307171649.36HGnlRY081523@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 24f72101137d - stable/13 - pmc_events.h: update top-level comment
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mhorne
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 24f72101137d43bd0cf496dcc50b60f85ebbc26a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=24f72101137d43bd0cf496dcc50b60f85ebbc26a
commit 24f72101137d43bd0cf496dcc50b60f85ebbc26a
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-06-26 17:08:56 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-07-17 16:48:58 +0000
pmc_events.h: update top-level comment
It points to non-existent documentation. The wiki page still contains a
useful overview, so keep this link.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
(cherry picked from commit f7a217060608b5fa9e7c59724a617b7241a3ee3b)
---
sys/dev/hwpmc/pmc_events.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
index 6df2ef4d82d7..5e77443c23c9 100644
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -32,14 +32,12 @@
#define _DEV_HWPMC_PMC_EVENTS_H_
/*
- * Note: Documentation on adding events can be found both in
- * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms
- * as well as on-line at:
+ * Note: Documentation on adding events can be found online at:
*
* https://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
*
- * Please refer to those resources before you attempt to modify
- * this file or the hwpmc driver/subsystem.
+ * Please refer to this resource before you attempt to modify this file or the
+ * hwpmc driver/subsystem.
*/
/* * PMC event codes.
From nobody Tue Jul 18 05:47:09 2023
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 4R4nyj5PHcz4nb8B;
Tue, 18 Jul 2023 05:47:09 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4nyj4zgfz3K28;
Tue, 18 Jul 2023 05:47:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689659229;
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=Vy76wAWbD8Xu7TNmMYHabj2xMWdAmATbCBoESeHYM4U=;
b=Io69zMkqsb/7bzIwWnM7Ka4H5P6e29kgeoFHuc7zgcRnF3m3cpZcg5dbqWWMK0t72ee5Pj
bgTSq0cNYlGizbhNin8C2bwgSf1xzNteCfNDWlXWPniN98m0+045NFPGLQ5y224XqsDg9L
tSFSg1JlJcFNhVXJn9CJ3R5dKW11wj1C659JjoWwxkZVDJ85vl5NuQVUaLuwRvjCLAMYTF
gikLUkRMaxMxkonPoURIFpbzp6/P4DbR3YPS7o0Jfv6BxgwpIRM5E5yBSkS9PnlhtWmaBI
jlkBfld6W6RKLTsrRn1PNkaEwTONYt99hn9LCJhFg3dmBrGnh4pfWACeGYu+oA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689659229;
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=Vy76wAWbD8Xu7TNmMYHabj2xMWdAmATbCBoESeHYM4U=;
b=cm4ir73tI60bWYjIIsbUPeqUg7cugbBVz+iaqnEwaSRjzh8oIALLCO4hV8RfvB7HUTeJlM
y6xdpluD7aot3cE/zxpAKt1hBSjDzEHf+91MwJ+3HbZAN35ZzhBe2yev1vOblBDs0+fkA+
0/07Ed+QyuWvW9ATBBbwGq7RcOD0Cc1U21ts/WOZKAoXaoeTjQkVFbZ9CmlPp4qHVb3n41
7aAQhHYUREuG9o86mdAKqtncndI4/QlsdnmDg6bUxiLxfcMxrgJSbiMZjayT+MbiHk29Qd
w+8umaKmHlKMkwarj8sJoou9jl2LaXX9+bCsk0qSz/fGhWpaJSoFeOSZzGJnkA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689659229; a=rsa-sha256; cv=none;
b=FFkxxorKB3k0jHWviIK+TSn8PnZ+SrvriywFKprqF2izKpiVtppQ6cZvjqzGMmvMUQbFj1
ECyplhCelDiyG7NnLEIQCYo8hMfNsLx3CzBbr1s38yPfBcjl3hX2h5vtCmn+XJz6X57nFY
PAEgj/+U6WQ3nsx/98EPcN18i0Tp6rYxWRrQjwwb4OZn/ojHwHwEBordThF7NlWvx1sZQ/
3QnYUcnz2Mlg+hyDHPva41KtCzIQdVwb019xj3Y/8N5f1wH8K2JQY99a7ks7YwxCWhtqpc
gZxytSfP2UXMVi2hsOu2ukFsINVznGz33XnGiiM1758zv1KGY+i45ssnYW8hCg==
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 4R4nyj435mztMP;
Tue, 18 Jul 2023 05:47:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36I5l9hp072129;
Tue, 18 Jul 2023 05:47:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36I5l9Zj072128;
Tue, 18 Jul 2023 05:47:09 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 05:47:09 GMT
Message-Id: <202307180547.36I5l9Zj072128@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 868f3eadc5e0 - stable/13 - msdosfs: zero partially valid extended cluster
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: 868f3eadc5e0b50863c13457074ac1a0b03958dd
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=868f3eadc5e0b50863c13457074ac1a0b03958dd
commit 868f3eadc5e0b50863c13457074ac1a0b03958dd
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-07-06 01:51:07 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-07-18 05:46:13 +0000
msdosfs: zero partially valid extended cluster
(cherry picked from commit 7e4c6b2163fbed6be92b1e19f0eec4da973cfaec)
---
sys/fs/msdosfs/msdosfs_denode.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 59107a6ca2ea..0c58fb4396ce 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -496,6 +496,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred)
struct msdosfsmount *pmp = dep->de_pmp;
struct vnode *vp = DETOV(dep);
struct buf *bp;
+ off_t eof_clusteroff;
u_long count;
int error;
@@ -534,13 +535,19 @@ deextend(struct denode *dep, u_long length, struct ucred *cred)
* B_CACHE | B_DELWRI but with invalid pages, and cannot be
* neither written out nor validated.
*
- * Fix it by proactively clearing extended pages.
+ * Fix it by proactively clearing extended pages. Need to do
+ * both vfs_bio_clrbuf() to mark pages valid, and to zero
+ * actual buffer content which might exist in the tail of the
+ * already valid cluster.
*/
error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster,
NOCRED, &bp);
if (error != 0)
goto rewind;
vfs_bio_clrbuf(bp);
+ eof_clusteroff = de_cn2off(pmp, de_cluster(pmp, dep->de_FileSize));
+ vfs_bio_bzero_buf(bp, dep->de_FileSize - eof_clusteroff,
+ pmp->pm_bpcluster - dep->de_FileSize + eof_clusteroff);
if (!DOINGASYNC(vp))
(void)bwrite(bp);
else if (vm_page_count_severe() || buf_dirty_count_severe())
From nobody Tue Jul 18 05:47:10 2023
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 4R4nyk6Zy0z4nZsJ;
Tue, 18 Jul 2023 05:47:10 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4nyk5rFqz3K0Z;
Tue, 18 Jul 2023 05:47:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689659230;
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=iUWMhbd8pMFO9loATTXsR7RISbnZPJ3PdGrltCwUnUg=;
b=eKrCTxVrtbzxsS9MtizXUCpmi8EUNtle8O/kQ0JgPanKudwa+4L+1x0zryR+5EXyclx1M6
mzlvhREHEDG6R4uzdVSD9qX8cNMmD3BevG2uwQNYxZh+/s/42e0cQZdth9VIEYKYxQEfnr
qrAwGbg7JIhcQCOc8WQlFCPILOSw8cQt8Hu6IfZ4S1c1mAcqI1a1zX81gHDviHTq63HAKC
yFCU/WYA9f721uxzLZgszuM3JYylZclAjCC/Csb9BvbgLK/ReXxSBP4FJoe/Dx6caqGTUT
n6UWO+FUgsAOmJTjrZL1ryLQnKz1zlc4r/AdPrxRRHSzC6Ww05c+uIt50/0t6g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689659230;
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=iUWMhbd8pMFO9loATTXsR7RISbnZPJ3PdGrltCwUnUg=;
b=NF3WvOOLXdjAlWKlJUAx0mZ38gvTbOrM/U646PfVBF1eFxbQHpZmTmki69lWN24LrUyd1v
S6MJAvMeRuXBluZ/FFy7a0KeS+lGvk20aJo2ui+859YHzo3cBEBVk+AXUhw/Ii6Jcifc2r
CsUKdKca4hlyb5T2aAbavjZwcC+B27P/+RasAHGOmzTbQi/1uOuwnXd43QP5v/VOhlGpOL
Mn3GqB5+vQvuymHFGC2PjRinA6mmT8zNBNvzQvhfhPjPvws+6sq5vU+7EH+d3bS+iSIJCQ
EOmyla7cHw6ZsUFbX8GfRZicQQ0WtMNw+WHKl15ujhCWLFQAO5idKSoE9rihTA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689659230; a=rsa-sha256; cv=none;
b=kxxqlq9fNo/pvSTJklA4Z+lAPBhNo/CAuipdiPLsLvbQO+4mkawApbi2MXdGfSMnNlHrf5
RFxClJPI7M6gGywO4a0AqN5Ew8/jOzHQ0fnV9lWMERSeIHlD08OLITAj7hZViS1TevQoZ4
Q/w7J1+KnDEu2agI7pizJzB8lGXhVIwmJyqHX3OlDONH94SR0Pa+hoeTOKBuCYJrU6QJp1
rce21C88FgxXrJ+XSqh6fCrwHhbsNiZJWjVc1wlYnCnLt09Y3RGDAlswyX9QA27Z+i/7Qx
W+UUjOokNreClrgTDKOsapIAhMZd8nKx7bJtbKhj1FcoD1x6r2yWm1oxHoQG6A==
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 4R4nyk4xcxzv2N;
Tue, 18 Jul 2023 05:47:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36I5lAXo072155;
Tue, 18 Jul 2023 05:47:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36I5lAAg072154;
Tue, 18 Jul 2023 05:47:10 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 05:47:10 GMT
Message-Id: <202307180547.36I5lAAg072154@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: b81f4ea07deb - stable/13 - libthr: some style in thr_rwlock.c
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: b81f4ea07deb6fd1411635d66d1a501a2b257d86
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=b81f4ea07deb6fd1411635d66d1a501a2b257d86
commit b81f4ea07deb6fd1411635d66d1a501a2b257d86
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-07-13 15:55:50 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-07-18 05:46:45 +0000
libthr: some style in thr_rwlock.c
(cherry picked from commit 80c5588495674fc6501700fccb0ed4a37183c89c)
---
lib/libthr/thread/thr_rwlock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c
index 8457250e60f7..ab10431b9d41 100644
--- a/lib/libthr/thread/thr_rwlock.c
+++ b/lib/libthr/thread/thr_rwlock.c
@@ -343,14 +343,14 @@ rwlock_wrlock_common(pthread_rwlock_t *rwlock, const struct timespec *abstime)
int
_Tthr_rwlock_wrlock(pthread_rwlock_t *rwlock)
{
- return (rwlock_wrlock_common (rwlock, NULL));
+ return (rwlock_wrlock_common(rwlock, NULL));
}
int
_pthread_rwlock_timedwrlock(pthread_rwlock_t * __restrict rwlock,
const struct timespec * __restrict abstime)
{
- return (rwlock_wrlock_common (rwlock, abstime));
+ return (rwlock_wrlock_common(rwlock, abstime));
}
int
From nobody Tue Jul 18 07:59:00 2023
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 4R4rtr5gGmz4nrFk;
Tue, 18 Jul 2023 07:59: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4rtr5BGGz4GVq;
Tue, 18 Jul 2023 07:59:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689667140;
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=DTB1jF7Qt1rXn/jvvtzVErHIvQ0IVbcLLoBgWQu47Gk=;
b=VBQnCqkfg4t9Kv6cE3B5dFfPzqjVUVKxJe4nOAKUY4ucn8qUukYHyetubXjIbkj4WCsr2x
xHfbaELm9MoRcYTlEK9xUB8CpBqJbL1aHAyIy4IBqb7hMx4XqpLblajLcKKzUCYP32KCyo
6m+UjU3713GoZ18vvIIFCT/JtO03oiQk36HuW7D+bQ92IpdQUBpTCCmPy31MZh+IpHqTb9
nQkluM7c++aMob0p/kPcqYy0HVWolQ2UvhTYMulLeGbDvz79vU3oJ3nMxUqDpY1bjqL2Ob
iEQUg+Cf9EXp2VpX/lpXeYWTP0d8eYoCSnmEab2gpkOkU6oSCgmg3JQ6FJ0bKA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689667140;
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=DTB1jF7Qt1rXn/jvvtzVErHIvQ0IVbcLLoBgWQu47Gk=;
b=M9P8pfemlYdGixzZ4P2SZuvHfKCGSKO828o/PFBbETk1szZSeJPycnMkbWildlTMjdOBgo
yPGMggS/hGlb1Vy91D9I4CnFWKlnRE8JFuupX+tU/EzQBtQhIGfLzOqRdtOA/jD/zPs1Zd
3ryYTEeYCinwdD1d7PXWRKSM3vNgMqNokRlMzZnqKRbVX3immLsxssOioE6EIqWIL1GUwK
AJJtMZLUjJ/wQXq0qt5LnHcCuYJGZGnUrVyLnZTyi8Zgzk4YNnDZ0qhWpFyAZj9lXqUiL3
SHUFSfQXkSVWF7NUnEq+tSxb/NC4FfYcpEO3BJnciYN1F8PFy4Vb6wkgR9fnWQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689667140; a=rsa-sha256; cv=none;
b=j2zb+PIOhz4MkrG54Xq0pLAUuy/GwVpFns/6XnKyUy5BGxyUNYzzt/0r5Dy8v5so9fjhYa
JCbD4DYgrp+0IpQGV+fJKNWgeJfbxV99uSQO80UhjbDEooB2W71lWpJQbRCxSiX5q/vnJk
MefqacDhF7vohwXQnkAJjz0A1hL3Ti8pZ4Z/oCbZjTbsjqMrS7O0n1P3kS4i8duRbT8bVx
xDRUND5zU3zrB+AxaBzgC2w7+4w8wv7g1ccN0nJNQ1EXSC3MIln6ifZ3Y4bd+jNmHkdzvE
uVm/tXiY0mMj3CyW/nxAhBCvkTZTElJWGl1hyobLN471gtx1ZHvFbsgH8hE/cQ==
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 4R4rtr4HwNzxLJ;
Tue, 18 Jul 2023 07:59:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36I7x0vo087170;
Tue, 18 Jul 2023 07:59:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36I7x0jF087169;
Tue, 18 Jul 2023 07:59:00 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 07:59:00 GMT
Message-Id: <202307180759.36I7x0jF087169@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: c9d956e36438 - stable/13 - syslog.3: MFC: document ident[N] format
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: c9d956e36438460fc912cde33576db810c7122bd
Auto-Submitted: auto-generated
The branch stable/13 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=c9d956e36438460fc912cde33576db810c7122bd
commit c9d956e36438460fc912cde33576db810c7122bd
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-07-03 12:35:37 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2023-07-18 07:57:54 +0000
syslog.3: MFC: document ident[N] format
When libc switched to generation of logs as per RFC 5424,
that change broke application ability to insert specific process id
using ident[N] format, the feature existed for decades.
Some processes rely on it (including logger and syslogd).
Later the regression was fixed but the feature remained undocumented.
This change documents it.
(cherry picked from commit 5aee3e14d4914c7c99bce80da17b3100cb1f4490)
---
lib/libc/gen/syslog.3 | 7 ++++++-
usr.bin/logger/logger.1 | 9 ++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 2cb2c0d198b3..73e62997e828 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -28,7 +28,7 @@
.\" @(#)syslog.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$
.\"
-.Dd November 25, 2018
+.Dd July 3, 2023
.Dt SYSLOG 3
.Os
.Sh NAME
@@ -131,6 +131,11 @@ The
.Fa ident
argument
is a string that will be prepended to every message.
+It may be formatted as
+.Fa ident[N]
+in which case decimal number
+.Fa N
+replaces the process id within messages.
The
.Fa logopt
argument
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 7a64320cfe49..a2774b9e3500 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -28,7 +28,7 @@
.\" @(#)logger.1 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd December 5, 2017
+.Dd July 3, 2023
.Dt LOGGER 1
.Os
.Sh NAME
@@ -73,6 +73,9 @@ tries to send the message to all addresses.
.It Fl i
Log the process id of the logger process
with each line.
+This flag is ignored and the process id is always logged.
+See also
+.Fl t .
.It Fl s
Log the message to standard error, as well as the system log.
.It Fl f Ar file
@@ -152,6 +155,10 @@ and
Mark every line in the log with the specified
.Ar tag
rather than the default of current login name.
+Use
+.Fl t Ar tag[N]
+to insert specific decimal process id instead of id of
+.Nm .
.It Ar message
Write the message to log; if not specified, and the
.Fl f
From nobody Tue Jul 18 08:07:45 2023
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 4R4s4x3krrz4nwJy;
Tue, 18 Jul 2023 08:07:45 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4s4x3GxKz4JrF;
Tue, 18 Jul 2023 08:07:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689667665;
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=zl4cLXusL3DTpSX3Kk4ThN/JQs0ETlvPgwNJXpGFjAA=;
b=YQuGyovETyps6NbJCArFPMr3jqhXeLMedUMgTijhuciUsBu9bBtRZLc0wrWPrug8EmYsE6
IVxZv5a4ddFDUbpV/YeXxNoVwJf+JrBeZ+phaokftukOav4qugqOtAWLKqB6CMqgL/5E/X
gljRB5UvUa4K2edZNfEPjXDfzUmSHFm5f5hJ8VXGsoXDO4IaiB2W0mM7qnHUm9jBU4ZdYi
1bxCBlBXAVWGvElB+zXF3bByn+hclc0SD2+a6OxaX+XCYJSLQYzBAISemSqnDIpfJq32CF
iQmYwgDc1D3H1J/P/iBn3f1ZXwy98UhY8MtJ+d+d3Kd55LrgtSu81ythYonf1g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689667665;
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=zl4cLXusL3DTpSX3Kk4ThN/JQs0ETlvPgwNJXpGFjAA=;
b=PGfxCsskNX3OJAT6cfuyZTAtwtfJ6ki6eyVlTN4xxkR/eNU6zK48ciycExdl6Vduvmy2m7
/io+1QW2hofi1BAR9zDQgvilrhiwlCh1jawMYsH5iSs5DOvFFiFF5/r/Gu6P9bLXs4PreX
lKBkyagE6AvS9WN712YOSF8yBOUzvAwkskEy23Hd+mlUWyx7Sa1BCRxTBdF8X3XaECok0K
lar9iPib/yubOQoPBvBzAydLc+k0pRtFyyPaiQPAiGGuYvrll/lBcgxccI3dos+2FxZfhs
C+adWjJJEf5j59TbI5THsdllwas0h1tgpQd8gqaGO2mmlfOuogZA0Iy2o8/RDg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689667665; a=rsa-sha256; cv=none;
b=xFi6T0xwWmeo/fYfA32CXt08zVQEHbJr4rfXZJo/fQs9eswpCzIQO+1XewCKIBS1/7vMAU
RdO3h7mWAqCt0Uw6j+GgrHjrqYwGSd1/meRYNWf3EvAJ5QEWFZhFMaGUtg1xMGORwPFN9a
mXLXs6iHYCyjp2UhOV8zjdpXgyyXk6iuXfvbyHk09WkWe4akZFMxFLcssNZbFHprtqLHTg
09Mb5Mj15honrReozdRGUqOerqzzxsxos+fUXZqOt6aaHuZXOxQGgR4uObH7fZB9w+k/qU
e5xpeGTGdvBn1O7tBlgLzInVb2vDElhacEN7Ntm3shR20Ey+tieX5cgZNBcJvw==
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 4R4s4x2JRSzyFs;
Tue, 18 Jul 2023 08:07:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36I87jhK004408;
Tue, 18 Jul 2023 08:07:45 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36I87jWB004407;
Tue, 18 Jul 2023 08:07:45 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 08:07:45 GMT
Message-Id: <202307180807.36I87jWB004407@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: 829dbdcac20d - stable/12 - logger(1): MFC: fix timestamps in case of long run
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 829dbdcac20d1237ac9693d2e5489857e151754a
Auto-Submitted: auto-generated
The branch stable/12 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=829dbdcac20d1237ac9693d2e5489857e151754a
commit 829dbdcac20d1237ac9693d2e5489857e151754a
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-04-27 16:43:16 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2023-07-18 07:24:26 +0000
logger(1): MFC: fix timestamps in case of long run
An example:
( echo test; sleep 2; echo test2 ) | logger -h /var/run/log
Before fix, logger assigned same timestamp to both records.
Fixes: 65547fb33db901a9f352aacb0ed45ce68b0bd275
Reported by: Vadim Goncharov
(cherry picked from commit 83fd35b3f3fa580d2b99874abd1f67ee61dcb659)
---
usr.bin/logger/logger.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index 936bfc98803c..a99db27f6b1b 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -175,22 +175,23 @@ main(int argc, char *argv[])
openlog(tag, logflags, 0);
(void) fclose(stdout);
- (void )time(&now);
- (void )ctime_r(&now, tbuf);
- tbuf[19] = '\0';
- timestamp = tbuf + 4;
-
if (hostname == NULL) {
hostname = hbuf;
(void )gethostname(hbuf, MAXHOSTNAMELEN);
*strchrnul(hostname, '.') = '\0';
}
+ timestamp = tbuf + 4;
+
/* log input line if appropriate */
if (argc > 0) {
char *p, *endp;
size_t len;
+ (void )time(&now);
+ (void )ctime_r(&now, tbuf);
+ tbuf[19] = '\0';
+
for (p = buf, endp = buf + sizeof(buf) - 2; *argv;) {
len = strlen(*argv);
if (p + len > endp && p > buf) {
@@ -212,9 +213,14 @@ main(int argc, char *argv[])
logmessage(pri, timestamp, hostname, tag, socks, nsock,
buf);
} else
- while (fgets(buf, sizeof(buf), stdin) != NULL)
+ while (fgets(buf, sizeof(buf), stdin) != NULL) {
+ (void )time(&now);
+ (void )ctime_r(&now, tbuf);
+ tbuf[19] = '\0';
+
logmessage(pri, timestamp, hostname, tag, socks, nsock,
buf);
+ }
exit(0);
}
From nobody Tue Jul 18 08:07:46 2023
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 4R4s4y5V7Vz4nwS4;
Tue, 18 Jul 2023 08:07:46 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R4s4y4Z2fz4JbK;
Tue, 18 Jul 2023 08:07:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689667666;
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=yg0ifaFJxgw+ha39gWT6Hl9kK80fS5hl9rdzZMkkI3Q=;
b=J+aYOVKgOSgrnHuIXPKtuu7ac142FfjzaVEisk5vOLVaNuArxUhoKVxtsAqblMOR4azPMi
1LQVKs2VwE7qRUQeB/erPjL8mvroaW+WHn73Gk8b6odI/dAzkL1l2PUzw2YtqUCV71YfzV
KbtsHCxqklXasZAvaWECRkpf+mKJzbxFVLNjMapF/U2sSr2UWpUtBzdCtvExJ7vSKBXsZP
/hH2rWQX3JlQ2RKINQI7s5L+WPyJKUphO2+8KNc1cucla73CIUZpVXjeFqoLqSfnxwsrQe
5aSW6CdKOluVo/37Tlk6GSIs5HIhnOzlpXXi0Ruez9ovB1gOWVYMq2p7n7yMLw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689667666;
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=yg0ifaFJxgw+ha39gWT6Hl9kK80fS5hl9rdzZMkkI3Q=;
b=JC5T17PZQWE9wWQm/aIAU+v5VstI1ZbBo9CGFsasTH5eFlZo+Ep6+EbIFECprIxTICaJ0+
5qp0gy3psZlUZPM+XUzpYWnfabDKbCcxY0TqUaNKI/bvZ0/WSY638r51U/QSqGGN3+NbTi
g+c+eWeFd2dxFpF3c8Px9JE3E/aikR+Vm0G+sx+jdhuYsg7/o4/StnCVcjK3R4ARaRDqUN
InY7lOc+CdZyHZqu5grG7gYsCMeGOyeRQDivEhkrMCJzTMCdIwM9GVLgr7sLkuQIMddZ81
8U/KSRvKn7hnJ3mi1/BRDAYClW0La9Bd2ppZaSL2VFFBKujAdoNbLxuyPXKb6g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689667666; a=rsa-sha256; cv=none;
b=sczWvW0kZU/UW79y74tZ8jQTWfoHUsfTtdqFsj096lk+++NDgxt7RlYw0VS3MRStXx4IVu
IWq924UODw1Y7lZEUJAQpxeQXvNO02bxXwitZ8/rUFV9FwC7g8kF5IlmlM4CtJ9Whrax90
3wP6CIrandRNDs3hvdF9oUoNRvJSF97UObJBOpTzASYxfn2pxQRSEEwfcHOIhnG4RdUPNN
ZIrimH2pKpFhQzt2LG8Nx1kU0O8dmD45jbq6mdJi4NT3wvSz23wdlCOf18Sd18TL+pTpqK
/j864ggs3U5IJ7m1VXxuAe94m4Se1ZSXhrs0cBLKQjF8+NIqFOfNpSfXar5hUA==
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 4R4s4y3PJWzyHM;
Tue, 18 Jul 2023 08:07:46 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36I87kEU004427;
Tue, 18 Jul 2023 08:07:46 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36I87kFU004426;
Tue, 18 Jul 2023 08:07:46 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 08:07:46 GMT
Message-Id: <202307180807.36I87kFU004426@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eugene Grosbein <eugen@FreeBSD.org>
Subject: git: 85c1418ba1c8 - stable/12 - syslog.3: MFC: document ident[N] format
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: eugen
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 85c1418ba1c827a73c04689fceb4edd1ab0eea64
Auto-Submitted: auto-generated
The branch stable/12 has been updated by eugen:
URL: https://cgit.FreeBSD.org/src/commit/?id=85c1418ba1c827a73c04689fceb4edd1ab0eea64
commit 85c1418ba1c827a73c04689fceb4edd1ab0eea64
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2023-07-03 12:35:37 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2023-07-18 08:07:04 +0000
syslog.3: MFC: document ident[N] format
When libc switched to generation of logs as per RFC 5424,
that change broke application ability to insert specific process id
using ident[N] format, the feature existed for decades.
Some processes rely on it (including logger and syslogd).
Later the regression was fixed but the feature remained undocumented.
This change documents it.
(cherry picked from commit 5aee3e14d4914c7c99bce80da17b3100cb1f4490)
---
lib/libc/gen/syslog.3 | 7 ++++++-
usr.bin/logger/logger.1 | 9 ++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 5738d362bd0c..8a4104ab5f12 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -28,7 +28,7 @@
.\" @(#)syslog.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$
.\"
-.Dd April 12, 2018
+.Dd July 3, 2023
.Dt SYSLOG 3
.Os
.Sh NAME
@@ -130,6 +130,11 @@ The
.Fa ident
argument
is a string that will be prepended to every message.
+It may be formatted as
+.Fa ident[N]
+in which case decimal number
+.Fa N
+replaces the process id within messages.
The
.Fa logopt
argument
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 7a64320cfe49..a2774b9e3500 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -28,7 +28,7 @@
.\" @(#)logger.1 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd December 5, 2017
+.Dd July 3, 2023
.Dt LOGGER 1
.Os
.Sh NAME
@@ -73,6 +73,9 @@ tries to send the message to all addresses.
.It Fl i
Log the process id of the logger process
with each line.
+This flag is ignored and the process id is always logged.
+See also
+.Fl t .
.It Fl s
Log the message to standard error, as well as the system log.
.It Fl f Ar file
@@ -152,6 +155,10 @@ and
Mark every line in the log with the specified
.Ar tag
rather than the default of current login name.
+Use
+.Fl t Ar tag[N]
+to insert specific decimal process id instead of id of
+.Nm .
.It Ar message
Write the message to log; if not specified, and the
.Fl f
From nobody Tue Jul 18 13:36:43 2023
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 4R50Nc0kYJz4mqRg;
Tue, 18 Jul 2023 13:36:44 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R50NX0DYKz3h5j;
Tue, 18 Jul 2023 13:36:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689687404;
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=l15IdGYb6o2vDh3qrnl3T4tKXVlMTy89YHUD5Jen82w=;
b=DeNdQ8unLDKWjjidYGazU8aPsIQkf6ooBvaAd55XKSynCPNXzzMi1H1hK3Ei78WASj9ooC
HGr9GRqRSRwF/GFhXgpdCZ8WlmsMq34+gUbtxN/XQQtLiNFcMqkDrkWUIGhmF3rSaKeQnT
KmQpiqHEUk5cUmW9aVsCisMDQUpFnWs5wjEVtnie0sa+cNCMriJCzavA0HoQjju1pmCg9V
j3gUDaPX2JK3lSB+ix+Cb0vXh8pQRXwf8BkrVzPtlHQQdgPHlukdiO5vGObEZFXsYSd4tw
pvXmxlWiEQ/5bew9uUhDO/jQbvptG2LP3BZazsQjNBJZ2xAjikyE2wo18pNBMw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689687404;
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=l15IdGYb6o2vDh3qrnl3T4tKXVlMTy89YHUD5Jen82w=;
b=Cg6Ed3FOmZOe+3yydCzcfFGLfWGyKqTDBoXyPi5Tq6NMChevMBI4ugW1iMUiv0+ohi95Zx
tKIWg2ezWxdzV9P8TAHH1ksUgKy1H1l8xQetn7gHANtPN7n+i3be7q8w7iN2cDEr0SK6QG
KAObpRQVjM3FBMkbZkD8rT1otcw3ms65gNB9O/4U+P+d0hlvljvUHIewE/iDiYV5O0Ko0g
/SHa1fg609wKTZwVUitK8+PZlxFX5Fv98Ant+JF4S72Ddv4CVazZkeOrbEZdTfpqmauSd6
+D8jO9oVe6BZkzrGy6e7rapzzCYHQo1OJr3dhjDtD7q7RexmpxQrGTrHjQnsAQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689687404; a=rsa-sha256; cv=none;
b=UO7HM/Fe4/d+frKEyB+yoZonbZFI6qb4CHKqC9NADa11kh8DIshLDfNUGEiaMrMQ3iX8mO
O5FCroH5AaoiTcdjYgyAgiQFkjOy2i3nZXDMAuRgJWw8X7vVbJ0ODRJYqlGtgQKEc+RquE
iNi/dzeBaCzuzYRiKzfm1Jo0Tj372gtQIFxXECXa5LK1bWG7/CZt4gMhq2jeCH+mzg/r3I
rpkxRGNUOArvV77Un7Seev81KS694x9yB97Jad4utjqkG7wCocLloIs9CRnEkgCO2/XATO
L5lyanNgeIpa+OTwqAzmSGKPN/7i0ME1Zk99/eqHu/G6Pe6HO0IBKgLiK9gFxw==
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 4R50NW65WPz16gK;
Tue, 18 Jul 2023 13:36:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36IDahwf049906;
Tue, 18 Jul 2023 13:36:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IDahGY049905;
Tue, 18 Jul 2023 13:36:43 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 13:36:43 GMT
Message-Id: <202307181336.36IDahGY049905@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 3bc6020f3024 - stable/13 - ure(4): add support for Thinkpad Hybrid USB-C with USB-A dock
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: 3bc6020f3024eccd1c876bbc2ca5499fc7df07f1
Auto-Submitted: auto-generated
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=3bc6020f3024eccd1c876bbc2ca5499fc7df07f1
commit 3bc6020f3024eccd1c876bbc2ca5499fc7df07f1
Author: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
AuthorDate: 2023-07-04 16:08:13 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-07-18 13:36:14 +0000
ure(4): add support for Thinkpad Hybrid USB-C with USB-A dock
Add support for LAN port found on Thinkpad Hybrid USB-C with USB-A dock.
While here fix a small typo
- s/UBS/USB/
Sponsored by: Technical University of Munich
Reviewed by: markj
MFC after: 2 weeks
Pull Request: https://github.com/freebsd/freebsd-src/pull/791
(cherry picked from commit 53a03e312cf27fca9b672c22d9b1687a66785cfb)
---
sys/dev/usb/net/if_ure.c | 1 +
sys/dev/usb/usbdevs | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c
index 9a421f02732e..106182959575 100644
--- a/sys/dev/usb/net/if_ure.c
+++ b/sys/dev/usb/net/if_ure.c
@@ -106,6 +106,7 @@ static const STRUCT_USB_HOST_ID ure_devs[] = {
URE_DEV(LENOVO, RTL8153_04, URE_FLAG_8153),
URE_DEV(LENOVO, USBCLAN, 0),
URE_DEV(LENOVO, USBCLANGEN2, 0),
+ URE_DEV(LENOVO, USBCLANHYBRID, 0),
URE_DEV(MICROSOFT, WINDEVETH, 0),
URE_DEV(NVIDIA, RTL8153, URE_FLAG_8153),
URE_DEV(REALTEK, RTL8152, URE_FLAG_8152),
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index bab6d835d417..41386c7b2665 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -2830,7 +2830,8 @@ product LENOVO RTL8153_04 0x720c USB 3.0 Ethernet
product LENOVO TBT3LAN 0x3069 LAN port in Thinkpad TB3 dock
product LENOVO USBCLAN 0x3062 LAN port in Thinkpad USB-C dock
product LENOVO TBT3LANGEN2 0x3082 LAN port in Thinkpad TB3 dock gen2
-product LENOVO USBCLANGEN2 0xa387 LAN port in Thinkpad UBS-C dock gen2
+product LENOVO USBCLANGEN2 0xa387 LAN port in Thinkpad USB-C dock gen2
+product LENOVO USBCLANHYBRID 0xa359 LAN port in Thinkpad Hybrid USB-C with USB-A dock
/* Lexar products */
product LEXAR JUMPSHOT 0x0001 jumpSHOT CompactFlash Reader
From nobody Tue Jul 18 13:36:42 2023
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 4R50NW623mz4mqKN;
Tue, 18 Jul 2023 13:36:43 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R50NW05szz3h5h;
Tue, 18 Jul 2023 13:36:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689687403;
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=PMRWe4HbwmxjViUqfL18/HSYd1kdPY7oADDOutAVYwg=;
b=RP2L85FGn/ey+ivgdoIqPzOXkmy0FSZMvKyPXLGTbmsMkpW6V32V9IM17sTker5ULBxqyh
d67cJfMGZp57j1SX/GbN3U2ojoN3Pge4vxt+/5NtVwi2Fz4hDAChqwkOSvlsIGX/QPwa3L
IFANY1ygjKO5SshLsSa48QJODa3CdZ67fsso2ss9n6mwGN46WIZCZxwUuFlQuOvkug/I5r
t2lDqRJjPxXHDywLJOxx/UL+1TCTB5pSr8MnRW/tuuJ9yYtGTuTOEGWpPRnD3yS5eV+pQe
VGyg6/g9MLE2764IB+mfWtnSUcPgEV0AFBmPCE1MoAoiDrox3ixldMV2WpqlGw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689687403;
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=PMRWe4HbwmxjViUqfL18/HSYd1kdPY7oADDOutAVYwg=;
b=E8qfNNb0j5eZ55PjlF/SdNqhFu1nSkad7uSHroxxRyopkdbmS4cFqdWyYSm4koqiO6lFM7
kE6Bbfw6HfeFOhM+BjDPW8X4VZa5xGn+to04rR6lEkIHYGfq7AisoinW54bKNd7Rw7rivX
4XsXjLcZUx1bX7Sf9LzhodOYkvERnKOnt4a9xqWolZ5cww75qmesnTj78yPyCf7+LdMU1R
ITFGjAf8C64zKqkG9D3SbPpikQxM/LOUQZ8fiq6jH8VW4aaAckhB4c+B0Ri4PZnmBNxo8D
BU3pc8JDXtkmmKBV4/cSAuW3f7SIhJKqekPWxVefd3ubFzbXLpNzWIAyJSZ2Sw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689687403; a=rsa-sha256; cv=none;
b=ne2VWtAam5ZmGT/abId/h6L3rRlgPdqRQrz0EipKT4xsE0GwNoCiZmJ53o9s4dWAfgU+wj
O85m2zFtmUQCyDhY+PTc6fZ814fZdTesMgCv40MPlhYy1zFsgVKOE/DHLnyQKVP9PVW+Yj
tXiw4VaJSsBOkcKixfOxgOjpAHxyP787RgaVxrGtYp8oWIld778/8t8G6erQVI475dk12D
j7AxquPToE1rwpBT31+iZswN7b+ciSSyBZMXNyRDDJNV4xS+Pcw3mktIW/dmnQRKNu10sC
FmD/bFVYU/rqSSpfDm7FLnYVqDnKZx6UJg2Uznpw7taERRzs22pjYbmQxkipOA==
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 4R50NV5HS4z16yC;
Tue, 18 Jul 2023 13:36:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36IDagKM049887;
Tue, 18 Jul 2023 13:36:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IDag1H049886;
Tue, 18 Jul 2023 13:36:42 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 13:36:42 GMT
Message-Id: <202307181336.36IDag1H049886@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 97092573d5d4 - stable/13 - man(1): use gzcat for .gz files
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: 97092573d5d41c665034aaa93ae6779ff04c2638
Auto-Submitted: auto-generated
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=97092573d5d41c665034aaa93ae6779ff04c2638
commit 97092573d5d41c665034aaa93ae6779ff04c2638
Author: Mohamed Akram <mohd.akram@outlook.com>
AuthorDate: 2023-07-03 15:20:51 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-07-18 13:36:06 +0000
man(1): use gzcat for .gz files
POSIX zcat appends the .Z suffix to file arguments causing the command to fail
with .gz files.
Signed-off-by: Mohamed Akram <mohd.akram@outlook.com>
Reviewed by: markj
MFC after: 2 weeks
Pull Request: https://github.com/freebsd/freebsd-src/pull/789
(cherry picked from commit b35ea9bac974a5650dcc234c06b3dc41d127f1d7)
---
usr.bin/man/man.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh
index cf90b64f7991..60b329810734 100755
--- a/usr.bin/man/man.sh
+++ b/usr.bin/man/man.sh
@@ -894,7 +894,7 @@ setup_cattool() {
case "$1" in
*.bz) cattool='/usr/bin/bzcat' ;;
*.bz2) cattool='/usr/bin/bzcat' ;;
- *.gz) cattool='/usr/bin/zcat' ;;
+ *.gz) cattool='/usr/bin/gzcat' ;;
*.lzma) cattool='/usr/bin/lzcat' ;;
*.xz) cattool='/usr/bin/xzcat' ;;
*.zst) cattool='/usr/bin/zstdcat' ;;
From nobody Tue Jul 18 13:36:44 2023
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 4R50Nc0ldHz4mqVQ;
Tue, 18 Jul 2023 13:36: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R50NY0hbBz3hD0;
Tue, 18 Jul 2023 13:36:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689687405;
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=ycIPmmC7AHmV3YyQ6C03rWINV1W2qPBA243VSHjnssE=;
b=WAUJ5I+ov+c2eD/9DelaIzCedbezP/JZeaGnGK8FP6DZcSbQf4RznpOBa/hLJnNMZyKUeH
Pu6cHvkyXxlxEcZ28SyN1BsbIYC2/O4curP3wL07c7dGCWPYY2PUcES/TwpqVA0QDv27ZW
KpwHu7T40b8tnx9eMwcGkBEYfjgW7abaR6qRMBXehiojCMjxbQyQjSCOYu3jymcMVHYj5j
jI3WL/HAHbD8hzb72ms6cZV/+AURSHdTsLSUCEc5+r5cFbAOhZXk8pPqijEu3z/kZyJp2n
LE1UoBR3fg4xJaT1AZu2G6QZV8YPciKC7EcaKHXkqu8ZWa1zjroKfcvc52aWiA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689687405;
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=ycIPmmC7AHmV3YyQ6C03rWINV1W2qPBA243VSHjnssE=;
b=D+pz56pGY/SoWg1MfC8hLhcsQ5pQq+DVsK8QYYPVzzjnKkjQvF+gGLsBhqRFkL5dmrajbx
xZEkPgIQbjdia8+TPOut508qfSBDAkxdpzpwYmdrliJWObvsO+TZn2qcNkeVQS3pNiPphr
1PhRDncSwKWhYCt+1a5VxrE7X20HSFh7iUn3GOV+2SPamWuoA6pcTYWXrhGAXTgdQhV50O
PIrIVr3szRpjH5YyVnd/Nm8p4ckt6KHy+TCcj3nhdar9ykQI+HfQTwcqwilagy4Do5T3Pr
NywfHRSRd1ECSjBayqL5KWzEcWHIOpeIt0ysfHEL5CBqQV9vRpsELv+SXM6lGg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689687405; a=rsa-sha256; cv=none;
b=RstHrAP0VZQeUTpipb5g1FspPgeKaAVHYi5KM5tbfVdn5KJKuW/BYYb3dJ40oXHe9tufML
qGy0cUJXsllXFytwSwbnbhxFNvJxStQ7IW5/+ZVo/XFrLSrJ/DBwO9rf8QO58SBGQZoTrN
Zh1TcApXJ4LZr43890XSYdZrlLfM26UWul2IIdKsBFDjPmRtzlp2/lqZLri2PB4TfowZDL
Uq2s6O25CmgBZyLVzusXvBX1Qg6aftQPeZYg9XbWIprOoZNsJnh/joHo4vyY7UF+eZN6LS
qcw5cYX1cDuHW75992waVjklW9PTH/onmln0YKC3NIaAuO57DtgifiAgHmWN8A==
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 4R50NX6gdFz178v;
Tue, 18 Jul 2023 13:36:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36IDai1K049925;
Tue, 18 Jul 2023 13:36:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IDaitY049924;
Tue, 18 Jul 2023 13:36:44 GMT
(envelope-from git)
Date: Tue, 18 Jul 2023 13:36:44 GMT
Message-Id: <202307181336.36IDaitY049924@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: a710a3f13da3 - stable/13 - bhyve: Deduplicate some code in modify_bar_registration()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: a710a3f13da34aa5fd26eb9c6b33381aff6f38b8
Auto-Submitted: auto-generated
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=a710a3f13da34aa5fd26eb9c6b33381aff6f38b8
commit a710a3f13da34aa5fd26eb9c6b33381aff6f38b8
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-07-11 19:22:37 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-07-18 13:36:25 +0000
bhyve: Deduplicate some code in modify_bar_registration()
No functional change intended.
Reviewed by: corvink, jhb
MFC after: 1 week
Sponsored by: Innovate UK
Differential Revision: https://reviews.freebsd.org/D40877
(cherry picked from commit 0dea4f064dfcd0725d02b9b2d02b2494ca866857)
---
usr.sbin/bhyve/pci_emul.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index 34ce3cb7d49a..2b73d82be025 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -606,9 +606,6 @@ modify_bar_registration(struct pci_devinst *pi, int idx, int registration)
error = register_inout(&iop);
} else
error = unregister_inout(&iop);
- if (pe->pe_baraddr != NULL)
- (*pe->pe_baraddr)(pi, idx, registration,
- pi->pi_bar[idx].addr);
break;
case PCIBAR_MEM32:
case PCIBAR_MEM64:
@@ -624,21 +621,18 @@ modify_bar_registration(struct pci_devinst *pi, int idx, int registration)
error = register_mem(&mr);
} else
error = unregister_mem(&mr);
- if (pe->pe_baraddr != NULL)
- (*pe->pe_baraddr)(pi, idx, registration,
- pi->pi_bar[idx].addr);
break;
case PCIBAR_ROM:
error = 0;
- if (pe->pe_baraddr != NULL)
- (*pe->pe_baraddr)(pi, idx, registration,
- pi->pi_bar[idx].addr);
break;
default:
error = EINVAL;
break;
}
assert(error == 0);
+
+ if (pe->pe_baraddr != NULL)
+ (*pe->pe_baraddr)(pi, idx, registration, pi->pi_bar[idx].addr);
}
static void
From nobody Wed Jul 19 07:27:41 2023
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 4R5S8F5pM0z4dPgv;
Wed, 19 Jul 2023 07:27:41 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5S8F4bsSz3JR2;
Wed, 19 Jul 2023 07:27:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689751661;
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=zNRMRsZPa49mZ7zEaptyRr2ztNZgBDb+iEJt2zgPw/U=;
b=A26Nxv2iIYq+YNdAZO0kiwpjaHGkKR6gNUGXDK5HO4y79zS31g7q9p/GqAJl2FTIqAunKx
vl3h8U0gkpqfxMIB9JXH1StntIqy9iZwvyBsNysYjwl3R+zlB3zKdtKJunzMy48laeyY3c
jUWziLbdlS7MMUonRhFhndt9PrrnGb/062Vm4Y4Ar3sy1srUg8TicIFysFvJwqp4Aym4Sd
N4BGdCGwsC4KmzNzriNnXoRc/x5lFhXTN5+RYi7/rjgLsumyQ2ncK3V98YRTA35irLZa1b
zW+RyTmUFzfPsTEsOf3xbtd58dZroPfoKoqtSLxRqUGFxzk22HNEIHtvdLAnXw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689751661;
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=zNRMRsZPa49mZ7zEaptyRr2ztNZgBDb+iEJt2zgPw/U=;
b=rmMVu2K65rw+oRB825YTA928iVNdd06LI6r4QpZVqTzCzoRxTSX/43Imjf+9Qzqy/gvRqx
8L6RbDrOZRrVQdAMM2yVn8GjNHELMYohh9Y0SPP0HghEDrGGgwML9N3Vg7fg70edIvosJr
xeYp/tA/G53Cz9Aa2P2cDK4BtWNyApFA14j0PvpyqiHi1ALm6FJgykJjTgkkdvVqJS9Vw0
qfLwERgEPDbwgHjN/Du4qHMBKa+LXsS6O2So517P/D7fO8MSEgr7tmTVgPYqV5C/pTxAQq
AZgyACbb5SdBjUDMR9tdPGsuyskUTfOMe2q/ZGVmkmzxjAfjh2Fzln9ERHpAfg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689751661; a=rsa-sha256; cv=none;
b=W4NX5wQSnHVsEkQVNkrGsvvYsMeQmc3Sc7L39XsJaY0qubxcV+1506H+ZQBPu+f20ka/+3
9QdcmUkuZpPPqWqmZkNtaUfMkJ/lOH8zDn8Bj0lEgTD5/LqswRsmcj5F4x2Tf1ipqnJ4mT
oE7yW24OONu2RBvDiNLuZBtsknqiB4NCxquaxhMkxza99gv2sq44U0dZsIsHx44WQmbc6b
iGwAW5Cgh+iLzlcilJKPP/MjCuq/CLsVbmYTocz1+lZuliBC+FfDWBq0Y+ItWKrXiU2WkO
WpCozZxYvJ+jOBgEKuL9BrgUhcAwktlawRF4E3vSOp4XHn0xZZhbwxBbGdP+bg==
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 4R5S8F3G7nzf1R;
Wed, 19 Jul 2023 07:27:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36J7Rffl020753;
Wed, 19 Jul 2023 07:27:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36J7RfWi020752;
Wed, 19 Jul 2023 07:27:41 GMT
(envelope-from git)
Date: Wed, 19 Jul 2023 07:27:41 GMT
Message-Id: <202307190727.36J7RfWi020752@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 73a079021a69 - stable/13 - pf: fix pfi_kif definition in the man page
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: 73a079021a6921ac3ff8ea4b2baca5ddb13de645
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=73a079021a6921ac3ff8ea4b2baca5ddb13de645
commit 73a079021a6921ac3ff8ea4b2baca5ddb13de645
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-07-12 09:43:43 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-07-19 07:26:59 +0000
pf: fix pfi_kif definition in the man page
PR: 272455
Submitted by: alex@inferiorhumanorgans.com
MFC after: 1 week
(cherry picked from commit 64b30b7aeb6d0dc48d038b3df033328c8d8c3141)
---
share/man/man4/pf.4 | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 133e4d300043..8f25b7c7aebd 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 7, 2021
+.Dd July 12, 2023
.Dt PF 4
.Os
.Sh NAME
@@ -1094,20 +1094,18 @@ The data is returned in the
structure described below:
.Bd -literal
struct pfi_kif {
- RB_ENTRY(pfi_kif) pfik_tree;
char pfik_name[IFNAMSIZ];
+ union {
+ RB_ENTRY(pfi_kif) pfik_tree;
+ LIST_ENTRY(pfi_kif) pfik_list;
+ };
u_int64_t pfik_packets[2][2][2];
u_int64_t pfik_bytes[2][2][2];
u_int32_t pfik_tzero;
- int pfik_flags;
- struct pf_state_tree_lan_ext pfik_lan_ext;
- struct pf_state_tree_ext_gwy pfik_ext_gwy;
- TAILQ_ENTRY(pfi_kif) pfik_w_states;
- void *pfik_ah_cookie;
+ u_int pfik_flags;
struct ifnet *pfik_ifp;
struct ifg_group *pfik_group;
- int pfik_states;
- int pfik_rules;
+ u_int pfik_rulerefs;
TAILQ_HEAD(, pfi_dynaddr) pfik_dynaddrs;
};
.Ed
From nobody Wed Jul 19 07:27:41 2023
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 4R5S8G1l6Sz4dPm7;
Wed, 19 Jul 2023 07:27:42 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5S8G0KfVz3JFk;
Wed, 19 Jul 2023 07:27:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689751662;
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=rYbKQiDCW964VtqCIUjPBk+WNUuQ2ski8S+ZCVbU6fU=;
b=g9WtfFauLhHJZEPOT59yrKF1L0tws0CcLGqiRO4HI4cxPwYyr5GoOJ9+o4vDFARar6CV/b
s83CKkn9LNfbc7UcEYAtd5uceEv3RdfeCPdY0A2CEBbwLwDBJ9LPT9u//Kmv6KA3hijlAT
ueApcnQVxtAUSRv9gE1xL+bhYxpoUXLQT6Hpqz0JFe61J3LItmMbCDMAcyfUKxxoQKAbIl
uuSZPEI6JZgXOvl8gb1CDHpDhDQtMIQgv+aMFYwOM3YzLyf/dUpXIPROhay/g5S7j0uH/P
r7AwVil+/H1vm+1H01cRnSkQJYkvfKkIqEjsWOm9cJ27Hl81tA66swmFyZdcFg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689751662;
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=rYbKQiDCW964VtqCIUjPBk+WNUuQ2ski8S+ZCVbU6fU=;
b=koikn/42mFEMQghj4Ld1yKuNdBHuFCwwUiN73eOEddttRuQT4gODfgtod+2FV8KQ5pJo9i
+vqhzQ795II1h/YwL0yE7CPHbzHl0O4rdTEa68hKgCX7w/MPIbaVhgjK0KLvqUm6mmIWeg
fgyUhlj9RmtlY/h97CBdQQCgaJsKl85Db+xpoWZmD/flQ4TbNxYlj2DTrZbvu5dEYVqMJ8
r2Al7LclXVvEX8ULdviU+U//G+I0l0zkU3lb7FScpQFUl5Sq3FdGAh3dVESNDdcWGbIndH
ixWNWUq0gHgtHLYeKRUMcMTcrpHEZt2tT83xhDEfC02W5ZUShi+XbVeK78NI2A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689751662; a=rsa-sha256; cv=none;
b=wSzbvE4ebpWLnpti9geSZlhtdjHM8BEcjUxvJyNobB/ul0VJCcvscfZPaahwRM8K5LR8hS
qFL6jJTdJZMfdO146G3R6vagYESOd1Vx34lFw3pFAcjRr+i9JPZ3ZxLitvsKADrmTi1SfR
mdRUmJgsR29yV8p3FaxlEgekw29eMN/6MyIKhUw1lM8mqReCHXi+wZkbvXhRH/NQwtfSr5
SLuE57k8CoZjKfYdSAHsEFHC27B8XWKWNhNOc+q/Zn5Y5rGnrggCbBy52SJ0oGeIuMAq/k
h+DTbTDcjgAJ0qc8WGy+ko/yd/tNcy4AX5V2Wom7YNHBaYL8hqyvI4jAbiIt5A==
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 4R5S8F6VRgzdxq;
Wed, 19 Jul 2023 07:27:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36J7RfjG020834;
Wed, 19 Jul 2023 07:27:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36J7RfLR020833;
Wed, 19 Jul 2023 07:27:41 GMT
(envelope-from git)
Date: Wed, 19 Jul 2023 07:27:41 GMT
Message-Id: <202307190727.36J7RfLR020833@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: e14a1e002991 - stable/12 - pf: fix pfi_kif definition in the man page
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/12
X-Git-Reftype: branch
X-Git-Commit: e14a1e0029916cc99787ad93fe22dfe304c9d56a
Auto-Submitted: auto-generated
The branch stable/12 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=e14a1e0029916cc99787ad93fe22dfe304c9d56a
commit e14a1e0029916cc99787ad93fe22dfe304c9d56a
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-07-12 09:43:43 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-07-19 07:26:55 +0000
pf: fix pfi_kif definition in the man page
PR: 272455
Submitted by: alex@inferiorhumanorgans.com
MFC after: 1 week
(cherry picked from commit 64b30b7aeb6d0dc48d038b3df033328c8d8c3141)
---
share/man/man4/pf.4 | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 133e4d300043..8f25b7c7aebd 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -28,7 +28,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 7, 2021
+.Dd July 12, 2023
.Dt PF 4
.Os
.Sh NAME
@@ -1094,20 +1094,18 @@ The data is returned in the
structure described below:
.Bd -literal
struct pfi_kif {
- RB_ENTRY(pfi_kif) pfik_tree;
char pfik_name[IFNAMSIZ];
+ union {
+ RB_ENTRY(pfi_kif) pfik_tree;
+ LIST_ENTRY(pfi_kif) pfik_list;
+ };
u_int64_t pfik_packets[2][2][2];
u_int64_t pfik_bytes[2][2][2];
u_int32_t pfik_tzero;
- int pfik_flags;
- struct pf_state_tree_lan_ext pfik_lan_ext;
- struct pf_state_tree_ext_gwy pfik_ext_gwy;
- TAILQ_ENTRY(pfi_kif) pfik_w_states;
- void *pfik_ah_cookie;
+ u_int pfik_flags;
struct ifnet *pfik_ifp;
struct ifg_group *pfik_group;
- int pfik_states;
- int pfik_rules;
+ u_int pfik_rulerefs;
TAILQ_HEAD(, pfi_dynaddr) pfik_dynaddrs;
};
.Ed
From nobody Wed Jul 19 07:27:42 2023
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 4R5S8G5rf6z4dPdY;
Wed, 19 Jul 2023 07:27:42 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5S8G4lcfz3JFt;
Wed, 19 Jul 2023 07:27:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689751662;
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=vFLpqGcX/gu2eVLZKDq0D0FdqzHrKEWt8bLttzfF0Gc=;
b=gjceH//+VSwC5iVj+JQ8BoEY2InNHWULVokepxmjVb9Akbe7q3KMr2SXKCfZ3oQ+LzO0MZ
f4zwDa9A8t2JcYM+1sGVsqMojz+tLVKAzKnBsd+MALMPhmgoROcAHEWt1jPHTls5TT24sD
Nq+2JYaZnZ4po0iblVwncECwFVtT836P0qfPFhKjD73d0Tld3FuITrQS0N152M4pkYanzz
SXjZePVBu1c2NsXhnPtLRlcLrfDFcnszMDA97lICd6hNE1T/zOxQrZDfMxTP7vlwrDkO5h
IKvEid3wb5WN2E39+kIsNWVphHgMT+IUNBeUS36M8FIXtJ+PoIVJwk4wdfVV3w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689751662;
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=vFLpqGcX/gu2eVLZKDq0D0FdqzHrKEWt8bLttzfF0Gc=;
b=YDUHq+CJtLGwttbxmVMn2bCnB5IIaRK3gosGxKI57QSBg8es74UWY6x1pq0gGKx2Ex6kQH
P9lCizpblq1rFv1nC8B7GdN2PxqLvRpbvhyTyzEcgP1WvZF5Nav0xlt72qRcFLie+GWvIZ
EJrdF4Ai6Mn3OSJu4cHu3fM4/v1xByQ7ZvsHcYNSLJMXdp/DPPyjaxJonrIpv+FmQFA+Ny
VVKCsmAwMSqym1HlPFqmoi/5Gv7pLj9M+nwwhjJ1/d2sOlPk2z9ulkfEiEoU1unw9+V2Lj
P0giY7uUOkZGW3YIhPw7Mb6ySAQZWCDVzyG/Y2y3y/kjjB04z+P2AdyT+at2Ag==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689751662; a=rsa-sha256; cv=none;
b=QtWb1hfLzK0aQ+49L4djeTnzXc8VnpfnIAZYbciZ1ojdehC1Vj6EE/cdUGFChjfyGJy67Z
EgkMs9qXjhtViL+AWXBhk49+fNVansPYPvc5HA7WEz+w1o0/VUz937Zhx5LruMAGj97qMe
y75zgisigiFiNgkXzho0cAt8/+LatBN2eYvbpAYO2DgUVV575/UNURrQHTupvCarhCZgkI
uuNdlWzi+XegSUuj0VxWe+jtgRxpEugpBmeG2VwXOCT3y92Pymx1aC3q7TcJLBqGZAycJS
1850oQDeJNujhCHP10Dj6B5OatOKeY7CLnr1hI/Tpg60fbRrxMRUaxA8LzrPdA==
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 4R5S8G3sCkzdxr;
Wed, 19 Jul 2023 07:27:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36J7Rgc3020853;
Wed, 19 Jul 2023 07:27:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36J7Rgv4020852;
Wed, 19 Jul 2023 07:27:42 GMT
(envelope-from git)
Date: Wed, 19 Jul 2023 07:27:42 GMT
Message-Id: <202307190727.36J7Rgv4020852@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: 504ddc193214 - stable/13 - pf: fix error descriptions in the man page
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: 504ddc1932149318c094bd890229dca297a4874f
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=504ddc1932149318c094bd890229dca297a4874f
commit 504ddc1932149318c094bd890229dca297a4874f
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-07-12 11:17:14 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-07-19 07:27:06 +0000
pf: fix error descriptions in the man page
PR: 272459
Submitted by: alex@inferiorhumanorgans.com
MFC after: 1 week
(cherry picked from commit df56c8069a4c920392ac9fec0adfcc03d9607abc)
---
share/man/man4/pf.4 | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 8f25b7c7aebd..3b3237cb9295 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -302,8 +302,10 @@ calls.
Nested anchors, since they are not directly attached to the given
anchor, will not be included.
This ioctl returns
-.Er EINVAL
-if the given anchor does not exist.
+.Er ENOENT
+if the parent anchor given at
+.Va path
+does not exist.
.It Dv DIOCGETRULESET Fa "struct pfioc_ruleset *pr"
Get a ruleset (i.e., an anchor)
.Va name
@@ -315,10 +317,14 @@ the maximum number of which can be obtained from a preceding
.Dv DIOCGETRULESETS
call.
This ioctl returns
-.Er EINVAL
-if the given anchor does not exist or
+.Er ENOENT
+if the parent anchor given by
+.Va path
+does not exist or
.Er EBUSY
-if another process is concurrently updating a ruleset.
+if the index passed in by
+.Va nr
+is greater than the number of anchors.
.It Dv DIOCADDSTATE Fa "struct pfioc_state *ps"
Add a state entry.
.Bd -literal
From nobody Wed Jul 19 07:27:42 2023
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 4R5S8H2RTVz4dPq8;
Wed, 19 Jul 2023 07:27:43 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5S8H1DVkz3JTT;
Wed, 19 Jul 2023 07:27:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689751663;
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=4jcOCmWDhNMuXEzhWh/UjbGyqBTpM5GmVdbRBVSFr04=;
b=gJSRLW6CP5fYY59Jg1l4bdCgET58PHxLaQOyItFwbBTOKmTvq89YEKNrQgDugSSf69wJWe
WZcPcjBJHwcju2Fg7ovHYBF8dgo1+rR8FERaUxhAvzUPiOot9yb00plof1Rz4FIpwVx9/d
vPrV8hmnm5o7PcZbqzLizkFRJrw9NTKnTqZ4heFB9JtHMnYX7jV3eY1hhMnPgGntHxZDq/
mxSWW0iBq+OPJaVza81rqhO917N8UMAxMmNm7rk/h6B4tNrAZOYYUmgDyMtrDb6iuOrxYk
WHaCldF98hbyN1sb5RT21xnkMGF5tf7zavBaVXxrO25kQdFKPIKEbPGbf3isBw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689751663;
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=4jcOCmWDhNMuXEzhWh/UjbGyqBTpM5GmVdbRBVSFr04=;
b=ap1Fe8Om7pgKSzWW83TNf5YKUBYhbDqBZioeJKC3EweQoSNfSjZ+w0NmhXjj9gu6wOQyz7
V5ysTkuudT3dnvTzNgxwDVDshkL8NPUNG0tSh8+oT1e/C+yFSvY8CrD+AIDO3NTI9cYY8p
+GTBDfaD/vRqDXD0UtdCJkuxrdvtG1eGCrmwquwhkGuwPo5JH9VgE7Fonh2ccrvYw6LU0B
nFM9sPZcTqzZwe39oyxpBEtpYwYj0VyQ+NxCUEXQmTdtBCdsy2adCs8cECS3m+m8UjJmWz
+xGpc96oq/TW+/bQsWqflH/9sM6CLATSxzT7wqz5DRbr95sXUsuwHGPPbGY53Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689751663; a=rsa-sha256; cv=none;
b=Xmc2wR3SCGrSF5k2IwTJ8xuKi8EIiweX5CGTnMbb28FDo4cAEBHyKJfl6WWX+L/lzqcZ0j
E96uH3ftMqJrhPM5Ddm68jwWGnrx/rjtnBNDsu7cljU0wiCM0eK0nFfEFnR2Rz6mdXLKWf
0ry2okvxkMqlYc+r+AcT89OJuMTgR36ZGuE1d9CWUqqZnq3KPHRI08/1Cflwi9+d4vLfxu
ywAQ2GXMt5hQPeJ4+EEo/PLhneJ2SscRl6xbz+fFqf7dnRIHuFx+1k5N4r2LttkN4BRyd5
xqfziSFm0iz5+JJXjZzBDedHToyyd8jfzHsNhsG7b7aYh/pfsypZ3/CTpm8WWw==
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 4R5S8H06lHzdcR;
Wed, 19 Jul 2023 07:27:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36J7RgE5020872;
Wed, 19 Jul 2023 07:27:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36J7RgqI020871;
Wed, 19 Jul 2023 07:27:42 GMT
(envelope-from git)
Date: Wed, 19 Jul 2023 07:27:42 GMT
Message-Id: <202307190727.36J7RgqI020871@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kristof Provost <kp@FreeBSD.org>
Subject: git: d84a5e90185c - stable/12 - pf: fix error descriptions in the man page
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/12
X-Git-Reftype: branch
X-Git-Commit: d84a5e90185ccb06c7230381bb425a0fa8170672
Auto-Submitted: auto-generated
The branch stable/12 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=d84a5e90185ccb06c7230381bb425a0fa8170672
commit d84a5e90185ccb06c7230381bb425a0fa8170672
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-07-12 11:17:14 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-07-19 07:27:08 +0000
pf: fix error descriptions in the man page
PR: 272459
Submitted by: alex@inferiorhumanorgans.com
MFC after: 1 week
(cherry picked from commit df56c8069a4c920392ac9fec0adfcc03d9607abc)
---
share/man/man4/pf.4 | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index 8f25b7c7aebd..3b3237cb9295 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -302,8 +302,10 @@ calls.
Nested anchors, since they are not directly attached to the given
anchor, will not be included.
This ioctl returns
-.Er EINVAL
-if the given anchor does not exist.
+.Er ENOENT
+if the parent anchor given at
+.Va path
+does not exist.
.It Dv DIOCGETRULESET Fa "struct pfioc_ruleset *pr"
Get a ruleset (i.e., an anchor)
.Va name
@@ -315,10 +317,14 @@ the maximum number of which can be obtained from a preceding
.Dv DIOCGETRULESETS
call.
This ioctl returns
-.Er EINVAL
-if the given anchor does not exist or
+.Er ENOENT
+if the parent anchor given by
+.Va path
+does not exist or
.Er EBUSY
-if another process is concurrently updating a ruleset.
+if the index passed in by
+.Va nr
+is greater than the number of anchors.
.It Dv DIOCADDSTATE Fa "struct pfioc_state *ps"
Add a state entry.
.Bd -literal
From nobody Thu Jul 20 01:32:34 2023
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 4R5wD30wgSz4nVTd;
Thu, 20 Jul 2023 01:32:35 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wD25SPkz3mmR;
Thu, 20 Jul 2023 01:32:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689816754;
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=bx2s3iDPVQVQLGozjpoqWDiiOLvPI1qhQx5/DsdfamE=;
b=vZzTRPwBJApSy6EyTN6g4JidTkOtSX48QR3jF/2MuQRE7QIOzNo2DmQMwKJdl6QYwuAruB
FXJBKvfqAvccu6OSJ27wlzsIy6uXrFBimAdgveazOtxUBEfYhi8TKu8tehmZ+EGQb/rJ9p
IWOu1bDlZzlG2YVazsp9ai0PVHmgzBas2hLIsc8jM0kI70TJAXzuzwPWOg+V8yVRrnkzBK
R2ts0WHP0/pXKJL9H7ExADK3UqM8LeObD5DUDU4P4B/W28x4vYoxQbM6KcYvYLVsTiuCWf
fmMHXtnrgPyfkm6BxoB5GN4HpV4WzU0NTa3D6lcAldjRvMV21OhWl887lyoMWw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689816754;
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=bx2s3iDPVQVQLGozjpoqWDiiOLvPI1qhQx5/DsdfamE=;
b=Vf+WGxHgpyv+p33fTKKcDlrm5ckTnPq55nys206Q6M2Tkt6ZEmruHyZLaStNtEwXN+2nui
O2mOKGWbhm0Lhr8oFBswxIEAgNWFU5XhF4wmky4UAQ5UDNA89QzFHITCqBKXXMPQCGzjAe
OkgrkzM+oPHRp3SYFlb0p4eIP2LMWltYrh50jNdPt882YtepsWRM+QzlNQVpkXKFlhnrIg
7k6gC0K3FCDxY6Q6pC7+zrLDX/j2zcKg1mQu+k7Cu5au0b4B5mwR8M/2QVdy/mtNt3l+O1
ZMogpzNdBfVkdsEI1zKGrpw/wCKYPz4FHWvZ7rwokEjyaFyj6dMIn6s/46Y8aA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689816754; a=rsa-sha256; cv=none;
b=FwXrEE2PsHSXr6SRpgAi9xn2RdZdtWvRuWVfD5rGckCXwKQK7WvgDASjj/NaK2ZFcUWfXc
xKp7rA3cj4qknjJNGWMBZJqRqRaBfW4fNMPcAT9zDxstMdRKSkbllOSbo5xIz6a7xaPuGZ
UeDCsO30cpnCRKtDHSt+RCfFiAG+TKEz6dSTxLz7EnlEDojRGDBkr4f9EpanEWdsCMdb8e
M/fF+wG0wSXpIBzgTF/ith3D308w9EBO5Kt4bvTJ81DhaH2ATgvCrPTklQLQlA9N4LAP8K
yXNohz9greTSZl/+QovKzWuRX7qihrRD6AwllGmRkuxTQNaBlJ9Vv7pw4E6M8g==
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 4R5wD24YDgz1BBM;
Thu, 20 Jul 2023 01:32:34 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1WYs1028916;
Thu, 20 Jul 2023 01:32:34 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1WYm6028915;
Thu, 20 Jul 2023 01:32:34 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:32:34 GMT
Message-Id: <202307200132.36K1WYm6028915@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: af8d597af0c1 - stable/13 - release: ensure gce-check-depends installs lang/python{,3}
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: af8d597af0c12d46e80467964144d255bee7756a
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=af8d597af0c12d46e80467964144d255bee7756a
commit af8d597af0c12d46e80467964144d255bee7756a
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-12 20:08:40 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:30:20 +0000
release: ensure gce-check-depends installs lang/python{,3}
PR: 272354
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit 0ed426276fd52e917506ab87c05a61c6641ae298)
---
release/Makefile.gce | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/release/Makefile.gce b/release/Makefile.gce
index 106804de61e3..ff260726a844 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -48,7 +48,9 @@ gce-check-depends:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
. else
- make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python3 BATCH=1 all install clean
. endif
.endif
From nobody Thu Jul 20 01:32:35 2023
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 4R5wD40qV0z4nVTn;
Thu, 20 Jul 2023 01:32: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wD40Bgkz3mqJ;
Thu, 20 Jul 2023 01:32:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689816756;
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=TnUeG4SfZw20Z45LibXbH3HwTPKRGAinPLqiJEQqZHI=;
b=P1shWtK83rNC2TkIxcEV+n861E7i2m8ol4TKjQZwCH4AkvB4sZsLgZufSAZqZ0x88bh1J0
njq9OCE95bU/C6hY51YZD0N1t8DwKK1yI5fkvkRSCujXvJ1AclekWGirL0sYbF1W5A+iBe
IerLb3yW/fRJ/W6L/dTwaQwYfaRAEDDWkSwtgCNeqnGpnU7rGnwK0yEt2EcE4tCCkJy+5p
1gnTy8FJmtBUeGhzAp2LGlrWvSGyRXib/VCk0H++q95ocBqBXtyChKWXIsZEsnT6vsb12W
Wfq+pacP6KPFcatRZKa/8QKdu5lIOLLdlBNZhV6sL8/fBVmsHz13QLQpBmZ6Yg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689816756;
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=TnUeG4SfZw20Z45LibXbH3HwTPKRGAinPLqiJEQqZHI=;
b=UEAA4qch+smvgFBv8cqyvUqutSCDoWbL5C+iyq8G5ICu9SUh4V9TmdorNu87tnGpI0ay0L
qpezBTp+mM7KAGxyT5h3mKNECIDh5ISj/4T8buW794j+oBA/q/eZ4tRC/72/ryKnizBCa0
0PILNzgnhzY8s+V3D81dPP+Tlk2+lo95blaxdyM3iaDxTNjHd6+B1pXxJgODlo1I8PGeEL
0K0vijcNkGmeXkylq49IsCB8vjlSxKN+dFnt3l2liy9xWbJ37SnVu6StC1N5hbhexjesFK
fL4eJ/0yC/TH+y/+C17RIzz6DqS1G1mWG8SpMI7zobTkd0FB0QTAOuvDqeR3jw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689816756; a=rsa-sha256; cv=none;
b=T92yvjavKKh4awbSSL9dRRy0+umtU6iXVTOcTOxubCV+cHbePwx4mC1vWarV+OHqR/2SYQ
aGPKK1XNXHBvkAROqjhMyaGI5ZeOpiExVTYIboNo37ChRLL47Cenub8EDF/SdEbpEWTzFr
kShmQfeExK5+jYAo8amlKJjUgtYlRVqHl1D98NTu12cqo6dQlisyqeAlq+xvhRJRTq2O4i
i9u/B4BQoRKZoGQmOPZGocSLiliGmdjtGsdp+SGPRfvZgXnUqE5Oo7mJu5QA8+EHqsU139
ccO7woSAtPTLivklLopznchRs5Qj6Yx/+el50DhN6P3RB1phzM3Lwkry/UCpMw==
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 4R5wD35T4vz1BbJ;
Thu, 20 Jul 2023 01:32:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1WZ2w028939;
Thu, 20 Jul 2023 01:32:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1WZ1I028938;
Thu, 20 Jul 2023 01:32:35 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:32:35 GMT
Message-Id: <202307200132.36K1WZ1I028938@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 119b44c2b2f0 - stable/13 - release: follow-up to previous commit to install lang/python{,3}
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 119b44c2b2f0ea9141777fe6774e5f9a3d47a2d6
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=119b44c2b2f0ea9141777fe6774e5f9a3d47a2d6
commit 119b44c2b2f0ea9141777fe6774e5f9a3d47a2d6
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-12 20:49:53 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:30:53 +0000
release: follow-up to previous commit to install lang/python{,3}
PR: 272354
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957)
---
release/Makefile.gce | 2 ++
1 file changed, 2 insertions(+)
diff --git a/release/Makefile.gce b/release/Makefile.gce
index ff260726a844..ff364c9287c5 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -47,6 +47,8 @@ gce-check-depends:
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
+ env ASSUME_ALWAYS_YES=yes pkg install -y lang/python lang/python3 \
+ net/google-cloud-sdk
. else
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean
From nobody Thu Jul 20 01:32:36 2023
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 4R5wD50rGGz4nVjD;
Thu, 20 Jul 2023 01:32: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wD474Bsz3mcW;
Thu, 20 Jul 2023 01:32:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689816757;
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=Kosq+OMJ1VK+TJN3oz5IEoIkS/+80bNn3iEw/YERYyk=;
b=p3RbgrLPLXSCqqMdb3ev1YOm144xc7faxItVLT7IbJDKdqnGOI03KIe9428woxj/sfdvxF
mbL1wCoWnUkJHGIGpCPs9CZcvLRbgxUOJkbTpQtErs4wL+ScvJsLcBG2VJI4ef67L/+09O
nygjXYsgDf+vA4ZVNI7lkWvXN+UDzkl0uZ9/rzS23/yIZ3AJz6QN7/ymR9siVdps6Owm5F
jDXK2OFvVgdctpdcyCpcUuMFqpSiP1PiD/iRiP+81/t5Fp/xvV8epvLNewKraZ3FkIZ35H
5Z5beLLlxz0QEyLATjOjMGaLeykQK8nl21V4yD3IX+jlnQYEJTe+6edrzkou4w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689816757;
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=Kosq+OMJ1VK+TJN3oz5IEoIkS/+80bNn3iEw/YERYyk=;
b=ot5cz3rJ/8UHxiS9xSuV6xk6UmNCqJUJDU++etTtcOL+018wOxwEdCFYYigviQqnoc1N1f
uZ8l+NgSUU0rnQYQEAWpwgw6jETromrU/nisv9FT5MBBzVecRARIjJu2KoCfNwxOA2wt79
/TExGN1REhnqcsrIIGAyxfxwfjn/ACt/HyFr+DwaZwWY7PnxfkATN578HkERmFSig+hpwA
WgHb7BNtti6nx+GzAtiRVn2p+POr6zrPegTw/wZfzGa/t6aA7Ie4LfkpuZTFewGxtPylNd
DZfeFR/tBCE3b5Yfe8MFIbK+bnI9CT0P9HX28jMu1pMcRhxgEF9PGN6QJAN0BQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689816757; a=rsa-sha256; cv=none;
b=asRVhQItNMvP9puwdUL801t8B/7o/gFieGbMUJj8xhPCwqDAAyVVjt1bNunJRPsN10x5mD
ObsJovSfdIj11xiPNwuD7upo1r/1SpmGJ6rwhI/LuaX7BxfKanT1o8sZk/c7L72Qy23WkA
Hu/6daWNujvY4QV9+iorf1ZfgB4BmOtrYw7eUMURDVyQLNvomerIH/GSQN9kuJIZ3C21lt
BSZLGWC12IASlJ4qJnFX6uZQsexSaNajJuH/MSIZyowtx6x6YjQ4CFijvuHHysXymEkwGz
IyALAmcXfoNeLVYkZhImbZKeYeDeHi8SkPW62dulqVdo8HD32BAz1ZfmV6jJrg==
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 4R5wD468TNz1BVT;
Thu, 20 Jul 2023 01:32:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1WaRw028958;
Thu, 20 Jul 2023 01:32:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1WaRK028957;
Thu, 20 Jul 2023 01:32:36 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:32:36 GMT
Message-Id: <202307200132.36K1WaRK028957@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: ca7d3085f1f4 - stable/13 - release: remove a stray backslash
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: ca7d3085f1f407df504ea7216c74526bef4727b4
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=ca7d3085f1f407df504ea7216c74526bef4727b4
commit ca7d3085f1f407df504ea7216c74526bef4727b4
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-12 20:57:57 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:31:22 +0000
release: remove a stray backslash
PR: 272354 (related)
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit 510fd83138001b0a6e45b3fa6a7249377f806171)
---
release/tools/gce.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
index 725709e3f335..48f95a82b3c8 100644
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -8,7 +8,7 @@ export VMSIZE=20g
# Set to a list of packages to install.
export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \
- firstboot-pkgs \ google-cloud-sdk panicmail sudo \
+ firstboot-pkgs google-cloud-sdk panicmail sudo \
sysutils/py-google-compute-engine lang/python \
lang/python3"
From nobody Thu Jul 20 01:32:37 2023
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 4R5wD61xPXz4nVnR;
Thu, 20 Jul 2023 01:32:38 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wD61Bplz3n08;
Thu, 20 Jul 2023 01:32:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689816758;
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=jNA7Nat+7Hug3ISASE3XAQVqgAQcDhwAtYVQ4rc2eVo=;
b=LZ1kGPgW7ecqvlMXk7MZu3aiL6K7xZ3cqUs8A8BfjaYEPetLr4KGempe1zoV1kAI+ABDqS
SeMfywVSBYxtCRPG2Su/cn33ojPbiUfvYMluS7RdtnxELZcuvYzujc4mgSbmX4pQDHQy5O
T4v4bVT5PJGSSGYLiyGcSfskEtdLhf5YLYNZStRJwfObMDiic75Fl7Ik1YxRYEfWbXVq6u
8PO9YOe6XWLgCr/nESEaeaVYcQAQXn9EYuz7ohbzY2hEZolr6vcHEsH4esWgBreCbUXOH3
vf/d2uyb84jgGa4s1Mo0AOxUGrC+J8fHZscxYJqKJ51Uxw0V6X1vIv7L4BvjSg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689816758;
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=jNA7Nat+7Hug3ISASE3XAQVqgAQcDhwAtYVQ4rc2eVo=;
b=akpCWZsHYvuyVaTXcBzVbQb4YzzMtWf40/OjQWXgB1wNQ6dHlcsf96H74bY/oT1SP5i298
oiEkADNiuEkpUyfrxIzcfwxecnONJZnKXP68/zRWzyK+KIT8aJDEyBAoUTQ2RrLd4rHKha
0MRimIJztoICWNieXdAJImeazKKBrTTxZ1xbQvbalPo9Jqw1iGzZX7BTio7WGOpxl3PJHl
yc5tCci7iZYV6rw1tvkFpWMC0FUy8j6oT/EB1Ju8oA39D+7TarhVZ6I6hsyN3BhMuECaQa
NL1VCNQ9rSlxxWxHgWdZ/tz0DMOljwd5FB/XmfzoiXAm4U48kbndnfUfmwLpVg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689816758; a=rsa-sha256; cv=none;
b=j+8zn9PLIvg1+veGQfaATCO0aIBNRf7bx69bGuOLp/O6r+QQqJXnotGQjp7MK9x3jpcOM1
2ie6vSPqXxtr0DOWf4/kNM4muRetfpsuRaavGBU/FN8WwmVlVyCfWlnAXXxYtMGE0wj5jo
JUgz93u0l1R+oNJZp3z6EYdCu5RkT+5RLiq37qKzttqwIgYMhqYY4J98jlltpBiaqmmnAp
da5iJLp/9nXs2SbsfRrWPFTjAyz1/MFcso4GCjq43Nkb5V5JNlmupAlcancMFMgE+uBrxa
P3X5FMNcFKQuDS69oNXUEta9Sczl4OFVZoFHokwOKuoJrk59m2ha++tEvQCsug==
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 4R5wD60Bs9z1BKH;
Thu, 20 Jul 2023 01:32:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1WbNd028984;
Thu, 20 Jul 2023 01:32:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1WbUD028983;
Thu, 20 Jul 2023 01:32:37 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:32:37 GMT
Message-Id: <202307200132.36K1WbUD028983@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 3e94b6a23808 - stable/13 - release: adjust lang/python* dependencies for GCE
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3e94b6a238081a1178f2e6448cb9d91028784bf2
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=3e94b6a238081a1178f2e6448cb9d91028784bf2
commit 3e94b6a238081a1178f2e6448cb9d91028784bf2
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-17 20:16:46 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:31:52 +0000
release: adjust lang/python* dependencies for GCE
The lang/python3 port had failed to properly install because
it did in fact already exist and FORCE_PKG_REGISTER was not
set. So, behaviorally everything here was correct. However,
installing lang/python3 is in fact not correct and not needed,
so only install the lang/python port to provide symbolic links.
PR: 272354
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit b24c35b326dbd355070335e63d02e7c29ee58bf0)
---
release/Makefile.gce | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/release/Makefile.gce b/release/Makefile.gce
index ff364c9287c5..17f4974b1c53 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -46,13 +46,11 @@ gce-check-depends:
. if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
. endif
- env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
- env ASSUME_ALWAYS_YES=yes pkg install -y lang/python lang/python3 \
- net/google-cloud-sdk
+ env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk \
+ lang/python
. else
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean
- env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python3 BATCH=1 all install clean
. endif
.endif
From nobody Thu Jul 20 01:36:41 2023
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 4R5wJn5YRbz4nXF3;
Thu, 20 Jul 2023 01:36:41 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wJn4jGZz3pY4;
Thu, 20 Jul 2023 01:36:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689817001;
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=dhD2aSKk7Sr3K46eH8CpyOna9mpHybVptCgE1dLC7VE=;
b=cBq/SjBcfMlZyLbc5aCvYyG9U3lFxup/9XKsGqSrFsJYi6nu36dCoItlc92hieTzez7ZRy
A/FngUTG07FqqCvbr+nMZZbas75HESGFQJP1K4s9sGr222492g4NfnNk4GprH8p+WFQvu9
1Wy8ls02JFEczK1hImDMCFD6pYFzLiE8wWlcN8piBHzvHhhXRjm6SuNJUNWsh5bCChSKji
9ICJ/8ydyaMet6/ICFHJ1LVCa5dhw3JAG/FTTTxQpK9xQsRwrpUNrceG4dmrVpf/nnxkcQ
1ZYf9a66QLPvpjwNZKAiwaKmDnn2UuznvmkD5OukFNY52cJs2R2hYtg8IA1gtw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689817001;
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=dhD2aSKk7Sr3K46eH8CpyOna9mpHybVptCgE1dLC7VE=;
b=G4q92BoMWvAFVhJC+Xw+nqI9Xewwc9nyHsRlSNne2nv7t2LXZJB61YSa6idzW1Yb3Yze1Y
KJKsTyhoxY08S90MKndkvCbrMRNc+5fPaiSUftRdEWAHggHsUL6RUl5j3dczCZRVh14gQF
wBM5W1/J2TirN9YcvwVpJ3ePjtaCEmfQ3EOjabq9769dwiaxFdhsPJTQ6ONlOj+uSPy63L
0mfGtVZ/8HIze1EbCXA3Ia1EL+93awP1c7TqFDFCFEJAZhArC9q7eAFOeWzWJvCuY50DCa
tObbiseKmugP01jD/l07MbgjxibRiN4+kVS/W0sWOLUfkebT+G3MjNQd7J/oVQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689817001; a=rsa-sha256; cv=none;
b=f8D1wnZw4E1Ig0+h3Wji8FRDOAo5EJj0pfFOAuq9fxO+GVnsCkJ3zEB2Pp3DwcQrYkIPgL
CkJ99uYFTZEwmWWJD4VIDgOYCTYSux7hpAa9wTi3Eylj3370X3V/YvaeZ700d5ZOBHiopw
X+2n9ZNjWK9RBAt9uP/6655NbPrila7LL5/MzoJOnN9qFy7I9PTZ3o0VR1MRWTh6jHA4Ke
aELOQsN1s+S2boTAeLKCtLfv92imHWGmpF+1yxMu+WoRe9ICa7QjwvEJ0l3S6AmDQcxJdq
xjub1sXNFxcTKSZwDmSKYYmovrNqRrSQcC6Kf5R8WQRINSCy72Gt5tYgRHsUPQ==
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 4R5wJn3X6Pz1BBW;
Thu, 20 Jul 2023 01:36:41 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1afCp029711;
Thu, 20 Jul 2023 01:36:41 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1afG1029710;
Thu, 20 Jul 2023 01:36:41 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:36:41 GMT
Message-Id: <202307200136.36K1afG1029710@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: e7ee4c09f789 - stable/12 - release: ensure gce-check-depends installs lang/python{,3}
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: e7ee4c09f7890f2cd8ed4a0ce27d56583d6ac74f
Auto-Submitted: auto-generated
The branch stable/12 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=e7ee4c09f7890f2cd8ed4a0ce27d56583d6ac74f
commit e7ee4c09f7890f2cd8ed4a0ce27d56583d6ac74f
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-12 20:08:40 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:34:49 +0000
release: ensure gce-check-depends installs lang/python{,3}
PR: 272354
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit 0ed426276fd52e917506ab87c05a61c6641ae298)
---
release/Makefile.gce | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/release/Makefile.gce b/release/Makefile.gce
index e466f9a323bd..0d835a1cb0a2 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -49,7 +49,9 @@ gce-check-depends:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
. else
- make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python3 BATCH=1 all install clean
. endif
.endif
From nobody Thu Jul 20 01:36:42 2023
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 4R5wJq1ldCz4nXF7;
Thu, 20 Jul 2023 01:36:43 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wJp6w8bz3pQy;
Thu, 20 Jul 2023 01:36:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689817003;
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=j5C4XYKcw5DGFmQtl9th7Nc3m51UDErb1OwJPwBcBa4=;
b=iefWTv7B2h5l66FO8E6rpaTWuzuh43MqokfvC2rrsChGIZBqMBK3+uBSkJJu/68flTYUpc
3qymzvuxOVmaG4ojjDfciat6I9dO3p7khCd6UNTV7ena6/O0OfAF63rSmi0a/DoUEk9eyN
3AdSzyeKttJdCbo6Uj7Oga3UulKAqwwQ/ylN4zlJ+3bg9lANJKA3wi/Hpf6w7NYGV+auwd
Adh5QbXiIINXs4IGY08zsDNbKoqTPlfcnIJJc028wNZz+SxTTBj5riQbHid4CuqA6p7RZT
2vJgEsg3WoNKNZ6BAhiMfLNKdbMr4eJ72HpX4KaNsuN1aWyBCrNgAIEsouZnrw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689817003;
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=j5C4XYKcw5DGFmQtl9th7Nc3m51UDErb1OwJPwBcBa4=;
b=XXmzXzt2rAH/l8Lyw2JovU4DBR0i+a7KX8ke0URGKXfpiDU8NRlx5ofuB1HsT9YZ129ZEP
SotxChNH+QWUbsx8fQxp6NuszyB2b/Gs6B5QIch2YLuapQ8xAs9vTTlMpieB4teQqEEGYG
zGyyhEUT4DScdXZ/xO+srDI8Xk8Jx5WrksL26mEc8/DHnX0v7WFmDIdieXCUGlczEjaRtg
LoUMYTdC7B7nVLK3rok9vDUC1a45cc4z8j3OrxL6Xd1qOk/jdYUxAq526bqRIYB8Yorscd
396zNACGJIyul4HLplJniXOKavLzxw8xuBmw9oL7L8KYSWrLy8Mlf8nn63EjyQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689817003; a=rsa-sha256; cv=none;
b=dFfz470g0+qn9MWN4vYrYvqgnhi5rq19w9d2PZIXnzUfLUpMRXYqjET7N7LAvXX6DnMnps
vQ1SwEacV2O2DGg+mhwk1PavsAMcNUmm/64h+OMJMoFIYHl6w5F7+OI7ak7cPYZuMnPXZv
L/MKusOWbW87Dycpowo10Ga1Wzm0y9CSABmaE04UdBmyKmFmqbM16u2+axVj06llLhKEQG
eQHvBmDS1XKjeQ+Kei8aKY0B4wRrohjoGrV/vHjP0/3bpZYW94bLxcwPe9dkdv1N4TQhtS
FXPWinJ07LVtKPtZuMTp4ArZ1iDX+0dIlHPlcm9f7UJcQkH0I/OSeGgMlIpM1w==
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 4R5wJp4PxQz1B7W;
Thu, 20 Jul 2023 01:36:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1agDN029738;
Thu, 20 Jul 2023 01:36:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1agnu029737;
Thu, 20 Jul 2023 01:36:42 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:36:42 GMT
Message-Id: <202307200136.36K1agnu029737@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 7815d3738acf - stable/12 - release: follow-up to previous commit to install lang/python{,3}
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 7815d3738acfeb85f71c0ad714b5262dea5b1d53
Auto-Submitted: auto-generated
The branch stable/12 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=7815d3738acfeb85f71c0ad714b5262dea5b1d53
commit 7815d3738acfeb85f71c0ad714b5262dea5b1d53
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-12 20:49:53 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:35:14 +0000
release: follow-up to previous commit to install lang/python{,3}
PR: 272354
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957)
---
release/Makefile.gce | 2 ++
1 file changed, 2 insertions(+)
diff --git a/release/Makefile.gce b/release/Makefile.gce
index 0d835a1cb0a2..2eb6c8f46c29 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -48,6 +48,8 @@ gce-check-depends:
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
+ env ASSUME_ALWAYS_YES=yes pkg install -y lang/python lang/python3 \
+ net/google-cloud-sdk
. else
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean
From nobody Thu Jul 20 01:36:43 2023
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 4R5wJs4Vhsz4nXBv;
Thu, 20 Jul 2023 01:36:44 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wJq6bZjz3pWW;
Thu, 20 Jul 2023 01:36:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689817003;
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=HdeijKZ87Jiun8mKm7k/P0cp2JrvfIm6RFodqutC1I8=;
b=CILW9TYCaJrT34qAjr5ipvV5lMG1fv9kJomimDdjYvaNO4aXA/r8EcLcW9OLzOtD0i0fFR
5N+DHW9tHRfCwy5eI2DkkpKWes+LRy79aT5RdoIhH6kaVxgoQkcawAyIBTo2jHEOTQasYa
sIt82zdd3tctYxdxzZXU3kLlcT3mwEufWfmclWCzuZgYtpCaPpvFxfxStD5yQcfISQ7mWo
kOw6Yp+nDRXpEqFhleZ9u32U5/AE3BnGL2B4t03dCXBlDAByAq0HIM2w+KEcl4axoTcOdJ
vh9GNgqcjRT9xnRv0wdM2zL7VqzPROwe1qG3kuw7PLXbgBvza2Z4KbSRWbY9Jw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689817003;
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=HdeijKZ87Jiun8mKm7k/P0cp2JrvfIm6RFodqutC1I8=;
b=mSWHEm09ocZ4DXNGKHim+b6Zjy9o+r4tgmVr3R0ghvh0tBINUIqvIJb+bLqvWWyJ7PdJ3r
duUt6gF+4lJqWt1nVJ9/PX+zGPXrS/66Ixv6VyXqTUcMRzEtgwty3uDpZDeXK/5WIshcrm
leiJJS+KhaRHzXhzPZSXFFGxXgLt3ECWo9PskyM617AGsjsafoMb41yc0UdDoMje8ygf1S
mlHPXCO6eWes6pllAcdZeNNAXdPuinNJoEkjT8k0jHIep1r+qQzMyKLPpKwwTE3qygYAbQ
KVmU1IE1bIFfRa4eSt7jmzuJW+dzySGpLEZBbmXk475sFBuSzWHZKpvuli9hPQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689817003; a=rsa-sha256; cv=none;
b=oVqN7By0hPnPQ4ffy5TeCNxOPJzG2bMxR6F1UEIrZ8pkZZho9UbMnl/bSSo8gnPqUgV0Hy
s944MA2KCH+Vjidu20fg9oeKBW/DgZeNshQXwnGJoY3Ib9h9dJA4YLMmJuBScOQ00sUiZK
BawYPdufzSzBUxHTwITfij+XaFFDYbThA3Jj1/NGcVfk2WAoOgYyiqWBmHYHtwzk2V1+3t
k9U2iLEFPZfAwbXunzwgnFKqVS4R6uTyIG1igpziw287hHMSO2nQXBfuOxKbY0fp/T/7tF
rRHPAWIaAO/+16X6AwjtSVgUVWs0mAUAv2YFDf03RweyImrzcxUrM6ZZeGBYCg==
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 4R5wJq5Kjjz1Bdy;
Thu, 20 Jul 2023 01:36:43 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1ah4g029760;
Thu, 20 Jul 2023 01:36:43 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1ahHT029759;
Thu, 20 Jul 2023 01:36:43 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:36:43 GMT
Message-Id: <202307200136.36K1ahHT029759@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: ad6773477b56 - stable/12 - release: remove a stray backslash
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: ad6773477b566bb901a4fca31bcb004dc11b319f
Auto-Submitted: auto-generated
The branch stable/12 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=ad6773477b566bb901a4fca31bcb004dc11b319f
commit ad6773477b566bb901a4fca31bcb004dc11b319f
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-12 20:57:57 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:35:39 +0000
release: remove a stray backslash
PR: 272354 (related)
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit 510fd83138001b0a6e45b3fa6a7249377f806171)
---
release/tools/gce.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/tools/gce.conf b/release/tools/gce.conf
index cfadbaf9413b..474cf53de8be 100644
--- a/release/tools/gce.conf
+++ b/release/tools/gce.conf
@@ -8,7 +8,7 @@ export VMSIZE=20G
# Set to a list of packages to install.
export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \
- firstboot-pkgs \ google-cloud-sdk panicmail sudo \
+ firstboot-pkgs google-cloud-sdk panicmail sudo \
sysutils/py-google-compute-engine lang/python \
lang/python3"
From nobody Thu Jul 20 01:36:44 2023
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 4R5wJs4Vjhz4nX49;
Thu, 20 Jul 2023 01:36:45 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R5wJs0l9tz3pYm;
Thu, 20 Jul 2023 01:36:45 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689817005;
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=kzbYQtJKxFmfBXOQcYmpEiG5cfbBR/LOifqW9W7UBeY=;
b=mXTpC9Sfuz3gSjKFkO4q93r6wszBUoGxoLMh+7u03bEl0bhUvDwseY9VE2WxnvRBAr8Snt
XSOo6zbeF7S0XAsKDV8PbG6jqljrfcggqLMx+UDjirT0MxFupqux75lBDRs/3t+ehNJqHM
m/UjrWaiQOk5BRpNoMASXTAl9FPSwOO3jgkfDPIDYxoxXETjqIFQqd2ouSJM0IV0/2vxGJ
QkBRPRYdvfYm1QO8v3cPPFOkSHGljJzQXUOyMHY7OfMeOyzAPxe2fNiLlDk0aaSIoRYdoW
lM5rv/tkPAf8dEOVfEsGf3CGLXN43lM/oimMTyA7YK6fGhzrlHtb2hx5Ipa18A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689817005;
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=kzbYQtJKxFmfBXOQcYmpEiG5cfbBR/LOifqW9W7UBeY=;
b=KAt1z2Lmqbr4XkifoijzQKeP45i12qTwH39KzTSuwHcdwl6CnHasbmBXBwBOEvPHqavLOp
jOEe0a8tbjKt6eaw2R0urF2y6LLrp7cosM4aLrVJkMfv9+QlUmn0uTLzHN/ITfA9EyLRCs
sn6oC5p1aOPPy3f6zAMCCyQvAZzFccOmcIuaUOfNUaWYxu+NxsDhNCxake19qkN7QwBIoY
3PahZyHIXVVjoiZaRO55GQ24CQCa5QEseIMAmPpD4FgIVSp9coPTe9hpmaVxw6YAWA4+Wn
Sq8VmSMsHQR0Jt6Y0vOBNsMabZnrS3rVLiF502gj5hYKPvoPIq7sDQQqVk9Ujw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689817005; a=rsa-sha256; cv=none;
b=o5vI34AKkzW99iP3Fk38FqEPD+i1k5TxKdBFBcQuniTcHhDiP0gqIr/LUEfnjdVJJ+q1B5
x5yj3WY2l6WDZVITMWN7PZKvdaJFcLQBPLRAoCOQ3WCVF9ym224EWa2W60FovCKMRnaJzD
A1TuaPiZSur2KZ8wrImMjLcKxFAqHvjE+BwaA+JgJIonaFgp9oEV3PeBMULXXP2NYp5yg/
EzsZj76v6wYXhrtbjrt+GHu0CHS+kTCOW4rMUA3cZO8Wq7T+yJ0NVdhHtJFR226rI06vau
mDihBp6yynjWuuhSmcDrSf2jaXR116NRPGI4hxOx6yCIkAmRcCWj73QMyJ9WBg==
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 4R5wJr6PGFz1BVd;
Thu, 20 Jul 2023 01:36:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36K1ai7U029779;
Thu, 20 Jul 2023 01:36:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1aiN9029778;
Thu, 20 Jul 2023 01:36:44 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 01:36:44 GMT
Message-Id: <202307200136.36K1aiN9029778@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 58bc084de5a2 - stable/12 - release: adjust lang/python* dependencies for GCE
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 58bc084de5a2155f34ffbd5fd3812fb432e1a72e
Auto-Submitted: auto-generated
The branch stable/12 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=58bc084de5a2155f34ffbd5fd3812fb432e1a72e
commit 58bc084de5a2155f34ffbd5fd3812fb432e1a72e
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2023-07-17 20:16:46 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-20 01:36:06 +0000
release: adjust lang/python* dependencies for GCE
The lang/python3 port had failed to properly install because
it did in fact already exist and FORCE_PKG_REGISTER was not
set. So, behaviorally everything here was correct. However,
installing lang/python3 is in fact not correct and not needed,
so only install the lang/python port to provide symbolic links.
PR: 272354
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit b24c35b326dbd355070335e63d02e7c29ee58bf0)
---
release/Makefile.gce | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/release/Makefile.gce b/release/Makefile.gce
index 2eb6c8f46c29..4a574e6e26ac 100644
--- a/release/Makefile.gce
+++ b/release/Makefile.gce
@@ -47,13 +47,11 @@ gce-check-depends:
. if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
. endif
- env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
- env ASSUME_ALWAYS_YES=yes pkg install -y lang/python lang/python3 \
- net/google-cloud-sdk
+ env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk \
+ lang/python
. else
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean
- env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python3 BATCH=1 all install clean
. endif
.endif
From nobody Thu Jul 20 12:43:09 2023
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 4R6C5n2hKVz4nsbP;
Thu, 20 Jul 2023 12:43:09 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6C5n29NPz4CMJ;
Thu, 20 Jul 2023 12:43:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689856989;
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=iq5GyMkhhhfV+CzEIJ9mx6BzEJinMcC2V680VoStIME=;
b=LT3QCssP28Emq+PZS/uOu1v39OfyrXf+Ok3pNPgfsH4vbEXnMY1kwjDLb6y2HaFyO0t/t6
ID4g7kP8kXEVWSGL9+hEVN3VLjhX+RnZvTghXfUOpye3nNL2LYBaIjYGSupJgb7JGNGD0p
9beZwJSS/exZmtEO/wsm6+3ogX109xORMmZjQluD3B1kwloYbhL31yYH94ynmRcFKYYR/u
bjJZwonfDqBGT5AV7W+lFEP4IXSlYnWR9IwqmiiY2aSIPU8H+UtbD8vCSnQwYiJ0YNhJ+n
hUjRJEVC05uanG/WtaPTl/yybPiYz0U9IwRPpVtTHDZLoT/FhA10TCoRKJL5FQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689856989;
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=iq5GyMkhhhfV+CzEIJ9mx6BzEJinMcC2V680VoStIME=;
b=LfQtaHP4hqJu9cT7NoPhlzWGV9ZCyHmKMXhCtvCiOx6bl4gx6z1JermQtSNGaJVd+BIG1N
lQYbVjmNVAdr7WmPPovn0GSOhEZajBJE7g4JHHFyR9x+dSBCGZ045wGv3yafpUy56XXdnz
1oRtwRkL+XiP/RxklKB00LLHy/f+lzefjyClGvCrQBmr64BlhYvJ4yIVawhVnOgBvZUUMZ
354CpaNJ+DSjgTzYV+myQTRYl8oAHVM7kILKlaHIWZOkTMhfabhNrPFLxPAWahceMy4Icb
ZVwv4uu90zDK1FWFQ4hL2aKnPwQ/IgxeHp85JY6pht54wc4yUd3b9lloTZr3kw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689856989; a=rsa-sha256; cv=none;
b=Px99Lly0DBSPUiaUJLYPeT4tJwyd1A8Eyqo5AwKPUauAs8kusijGBl/iASffQ4U5Fjra5b
ztSwPk8HSnrVrDNPZe8op9jJhdVC14outgLZaGmUNtqUt7DX9LZFHM9AzeFElTBlXbTSjx
9ekHcH0SJZCCwlx0sJhasHqlyomkMmH37Kf/Bx3XHAMG8e3q3iDA8TQc9smKYrE1Ul22Eh
U9lT/unvgiBf23fCanpj5wSsdS50FeZCYVFODn42i9tKw9UqseGwq7QU6Y4BlYAqEGSbm8
wpwBrMvjbRTIcToNT58gMHI7Q7vyXGNNLG6jC+dq4V8KdX9Eq8fx/ApjipkdBA==
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 4R6C5n1CtVzWWQ;
Thu, 20 Jul 2023 12:43:09 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KCh99N039176;
Thu, 20 Jul 2023 12:43:09 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KCh9eY039175;
Thu, 20 Jul 2023 12:43:09 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 12:43:09 GMT
Message-Id: <202307201243.36KCh9eY039175@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 08a1dd9ad110 - stable/13 - Revert "VFS: Remove VV_READLINK flag" and "fdescfs: improve linrdlnk mount option"
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: 08a1dd9ad11090df27c4271d7205fb05b8ff62a9
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=08a1dd9ad11090df27c4271d7205fb05b8ff62a9
commit 08a1dd9ad11090df27c4271d7205fb05b8ff62a9
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-07-11 04:58:06 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-07-20 12:20:09 +0000
Revert "VFS: Remove VV_READLINK flag" and "fdescfs: improve linrdlnk mount option"
(cherry picked from commit 9c3bfe2ad07170cd7d3645a7c24f4d80a509c2b7)
---
sys/fs/fdescfs/fdesc_vnops.c | 3 +--
sys/kern/vfs_subr.c | 4 +++-
sys/kern/vfs_syscalls.c | 2 +-
sys/sys/vnode.h | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index b2ae6964551e..522009550986 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -469,8 +469,7 @@ fdesc_getattr(struct vop_getattr_args *ap)
break;
case Fdesc:
- vap->va_type = (VFSTOFDESC(vp->v_mount)->flags &
- FMNT_LINRDLNKF) == 0 ? VCHR : VLNK;
+ vap->va_type = (vp->v_vflag & VV_READLINK) == 0 ? VCHR : VLNK;
vap->va_nlink = 1;
vap->va_size = 0;
vap->va_rdev = makedev(0, vap->va_fileid);
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index dd742277a98f..21061984bcc3 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -4263,9 +4263,11 @@ vn_printf(struct vnode *vp, const char *fmt, ...)
strlcat(buf, "|VV_MD", sizeof(buf));
if (vp->v_vflag & VV_FORCEINSMQ)
strlcat(buf, "|VV_FORCEINSMQ", sizeof(buf));
+ if (vp->v_vflag & VV_READLINK)
+ strlcat(buf, "|VV_READLINK", sizeof(buf));
flags = vp->v_vflag & ~(VV_ROOT | VV_ISTTY | VV_NOSYNC | VV_ETERNALDEV |
VV_CACHEDLABEL | VV_VMSIZEVNLOCK | VV_COPYONWRITE | VV_SYSTEM |
- VV_PROCDEP | VV_NOKNOTE | VV_DELETED | VV_MD | VV_FORCEINSMQ);
+ VV_PROCDEP | VV_NOKNOTE | VV_DELETED | VV_MD | VV_FORCEINSMQ | VV_READLINK);
if (flags != 0) {
snprintf(buf2, sizeof(buf2), "|VV(0x%lx)", flags);
strlcat(buf, buf2, sizeof(buf));
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index b7cdac8540da..7f7836450811 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -2660,7 +2660,7 @@ kern_readlink_vp(struct vnode *vp, char *buf, enum uio_seg bufseg, size_t count,
if (error != 0)
return (error);
#endif
- if (vp->v_type != VLNK)
+ if (vp->v_type != VLNK && (vp->v_vflag & VV_READLINK) == 0)
return (EINVAL);
aiov.iov_base = buf;
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index e79bd1c9ddba..fdf3b8f0e5fd 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -271,7 +271,7 @@ struct xvnode {
#define VV_DELETED 0x0400 /* should be removed */
#define VV_MD 0x0800 /* vnode backs the md device */
#define VV_FORCEINSMQ 0x1000 /* force the insmntque to succeed */
-#define VV_UNUSED01 0x2000 /* was: fdescfs linux vnode */
+#define VV_READLINK 0x2000 /* fdescfs linux vnode */
#define VV_UNREF 0x4000 /* vunref, do not drop lock in inactive() */
#define VV_UNLINKED 0x8000 /* unlinked but stil open directory */
From nobody Thu Jul 20 12:43:10 2023
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 4R6C5q5M2Cz4nshj;
Thu, 20 Jul 2023 12:43:11 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6C5p3bRqz4CT6;
Thu, 20 Jul 2023 12:43:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689856990;
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=hTvzyQ6QVppoPTTyk5sxsCDO5PXrRDoLKQIYepzxlR0=;
b=gulk2iiLnuvLkBn26N0VIdVG7pYvlaWq2uUTEqXjysbAwLENFSrEKvGGB1pLJZLp49wXgD
KSqmTidahfLl5ajBTf+IAMHeMuTQ39mwejcnZhJYxbGTTm2c89Eb7eEYC8zrwLyoGjTb31
kThwnBEAgEkuuSBx4c/o+Ilxy5z8p2m7VScFfjKgPibrkS9+kc3qx3Bgt8uc2BlyDTUNmu
EAj91wWAokCOCXJBiEjY7vkksXDDl1XuF9syu2phwJ78SYcsG4OdVXEjG/OofJvuXPZXi/
sjfZ2mboXXWk2+nJxUqumbN2b4kr8epDuarxe7s2BvdCajuBqZbuN4G8V2dZZA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689856990;
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=hTvzyQ6QVppoPTTyk5sxsCDO5PXrRDoLKQIYepzxlR0=;
b=jsc7je2ybpYrV7/veQ7ulwEUaqn65KO7n2+Nil1pePhN24T/fxqz4lo2W8pAPB2J2IxlaJ
qpL8Konx33phMF9EwQjY8cH3CAilcdVJp4p2H9+AGkyaNuNsgTdthnvr+k/pRW9uK6M+5Q
DrmioSQC1vSjZA/FOtZi7M1VaCJpmZ9pYIaIqbW1HQUso7YrZuVrUs5g7z1SKmcsK0tCo/
bgVl3SU45wdlyl2MoF6Dr8z3k1mHFnEO9du9+997V6H3KzkiBj+Fl+qeDADDT5U/asa/hy
EMuCQQXT7QEKCFuetXjy7dnAV8NxSwLkm/l8XjQfMuDGl1/ou0qFWmU2eFCfNA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689856990; a=rsa-sha256; cv=none;
b=fQp4xBuGmQTb6OrevWjJ9kxOdG+jRpkfGSbebDlxDToxnKj7L46N/VBHGLaq3qnkwS3JiB
U6lx+tYa+A/2COP++2pFNI5bAWeQKxgTC6uDA+Bk37Jc8x+ZHGF5lkhHOH77NkNPVIWJ6M
hblCq8WRqwEtZYrZNUv1nZcj+VQej8rLX3mymNeKtuT61kcZZAgNBFcLUBFSySzAYHI1PP
xEA9YJM74AGdfWw29I8NU3/vPboqBW6WUFccOHt7aLmxcjHjxHEdWs0OdWf7jETL+CNZ5+
sZ74oxhFKYoxIO5l2WOkt6nXM2ANlyUQF9+95PTkUZk4VoZoeBn6t4nMpThsDA==
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 4R6C5p29NYzWH2;
Thu, 20 Jul 2023 12:43:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KChA8Z039196;
Thu, 20 Jul 2023 12:43:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KChAr7039195;
Thu, 20 Jul 2023 12:43:10 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 12:43:10 GMT
Message-Id: <202307201243.36KChAr7039195@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: da56eae4404d - stable/13 - fdescfs: add a mount option rdlnk
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: da56eae4404d4d273cc4a8b7d8f05547bb188599
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=da56eae4404d4d273cc4a8b7d8f05547bb188599
commit da56eae4404d4d273cc4a8b7d8f05547bb188599
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-07-11 05:03:49 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-07-20 12:20:09 +0000
fdescfs: add a mount option rdlnk
PR: 272127
(cherry picked from commit 3905309dfeeb89f03b09c347f7ac0a863faa3975)
---
sys/fs/fdescfs/fdesc.h | 1 +
sys/fs/fdescfs/fdesc_vfsops.c | 2 ++
sys/fs/fdescfs/fdesc_vnops.c | 16 ++++++++++------
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index 94682f42cdb3..b51ac9f32ac1 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -43,6 +43,7 @@
#define FMNT_UNMOUNTF 0x01
#define FMNT_LINRDLNKF 0x02
#define FMNT_NODUP 0x04
+#define FMNT_RDLNKF 0x08
struct fdescmount {
struct vnode *f_root; /* Root node */
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 2961c3bf6224..d0d518245e92 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -100,6 +100,8 @@ fdesc_mount(struct mount *mp)
fmp->flags = 0;
if (vfs_getopt(mp->mnt_optnew, "linrdlnk", NULL, NULL) == 0)
fmp->flags |= FMNT_LINRDLNKF;
+ if (vfs_getopt(mp->mnt_optnew, "rdlnk", NULL, NULL) == 0)
+ fmp->flags |= FMNT_RDLNKF;
if (vfs_getopt(mp->mnt_optnew, "nodup", NULL, NULL) == 0)
fmp->flags |= FMNT_NODUP;
error = fdesc_allocvp(Froot, -1, FD_ROOT, mp, &rvp);
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 522009550986..13937dcbc6b5 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -204,9 +204,12 @@ loop:
fd->fd_type = ftype;
fd->fd_fd = fd_fd;
fd->fd_ix = ix;
- /* Cannot set v_type to VCHR */
- if (ftype == Fdesc && (fmp->flags & FMNT_LINRDLNKF) != 0)
- vp->v_type = VLNK;
+ if (ftype == Fdesc) {
+ if ((fmp->flags & FMNT_RDLNKF) != 0)
+ vp->v_type = VLNK;
+ else if ((fmp->flags & FMNT_LINRDLNKF) != 0)
+ vp->v_vflag |= VV_READLINK;
+ }
error = insmntque1(vp, mp, fdesc_insmntque_dtr, NULL);
if (error != 0) {
*vpp = NULLVP;
@@ -469,7 +472,8 @@ fdesc_getattr(struct vop_getattr_args *ap)
break;
case Fdesc:
- vap->va_type = (vp->v_vflag & VV_READLINK) == 0 ? VCHR : VLNK;
+ vap->va_type = (VFSTOFDESC(vp->v_mount)->flags &
+ (FMNT_RDLNKF | FMNT_LINRDLNKF)) == 0 ? VCHR : VLNK;
vap->va_nlink = 1;
vap->va_size = 0;
vap->va_rdev = makedev(0, vap->va_fileid);
@@ -587,8 +591,8 @@ fdesc_readdir(struct vop_readdir_args *ap)
break;
dp->d_namlen = sprintf(dp->d_name, "%d", fcnt);
dp->d_reclen = UIO_MX;
- dp->d_type = (fmp->flags & FMNT_LINRDLNKF) == 0 ?
- DT_CHR : DT_LNK;
+ dp->d_type = (fmp->flags & (FMNT_RDLNKF |
+ FMNT_LINRDLNKF)) == 0 ? DT_CHR : DT_LNK;
dp->d_fileno = i + FD_DESC;
dirent_terminate(dp);
break;
From nobody Thu Jul 20 12:43:11 2023
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 4R6C5s5jj1z4nsdm;
Thu, 20 Jul 2023 12:43:12 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6C5q6rfMz4CdX;
Thu, 20 Jul 2023 12:43:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689856992;
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=X9c5KMBEiZCfA/eVcHGNvSQFbmygC2fJikz3nU2vQGU=;
b=bKQtd1HHzhStX46Hrk6Qh4DX13A1DccHPDPlRdQN+1rEn6ccA7R98HtFQYRxakro5E8jxA
xLCjtcs7dHNXgWi59L///wPWVcaEEnplmu80qIdkOc77oszHop7i8+m9Kr7r3FQ98SQ+pH
7kQx6W05BvJChymhhvHYKlDRLa252+LC8KbbgXloWYdy9ZMz7r1hq+Eom1QJN02NmqaBD8
t1oh4w9/w1ZC4gDP0LIcubDpJ6jlUSFy2CU1xlC/5ZHteLxLZ5Uxy3s+M9ZxqD94LmPd9/
l87gAVGaz9qDt/xtePL9+B/SEdnlZ0HGo7/Ydv928VqABTLJZKiLMHeqfnZooA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689856992;
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=X9c5KMBEiZCfA/eVcHGNvSQFbmygC2fJikz3nU2vQGU=;
b=obKZ8dtDaUjbB9rdhfyGWATgrnqJNbCjX3C+6CG2RKKiZoXr/neA8ncBdDy5u447ENSWoy
R9IwRKpbuo4RnIvhm/wBRc07nHS76HWdf+xGsbzQpQKQLqi985JYX2z4mYWOOWJsNahLmc
qA7R3dbJVF2QBJClbpuZcAv3ebyIJr1/tTcijsT7jaouHvuv4bUWFusrEBA3tu3BqyGwAr
TzoaiLXDUXlFLmSlY8bSwzDiq0lTXmGUaFJwbow4r+LOmRl3n6Vr/szxjwy68YkffMosqF
q9WZghScxcRiqFNEfBgxWJ0TSjmbpZtPxtXxufWh9G4rp0Tdi+nPkTluBrUdJA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689856992; a=rsa-sha256; cv=none;
b=vSqp8p/lOxSmB9FFz12z+VeZFkQSn/GKMv/EkCVj1/ZtU715ft1SYU48CWeVq4itgyK+zn
hKLzpK0txqzXcL9NIlRJ6jAWMcnuNuIEZZbUW+lE+vpt6Vu1z3Hyh6Lz+Bmy+4BivnZcas
0Hy2PjXa7sCQp+QiGyBXTavt61nvcSCEz4Q9B7IjWncMwFApsHAWTuzAHDRxzcaaAAjM4z
f/HonBu4cAypIVdQFLgsdhP0udBqs2oJdFWiJ2SjmOinrdqyLtdMG/zGzt53AuqCl/KFsa
4zJspmAGTNVi0mQZ/Bd7AIC4nI2NakwKOIDERSTw9mbMymgLbZXJqoEtNzgQ9A==
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 4R6C5q4NM5zWH3;
Thu, 20 Jul 2023 12:43:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KChBhU039222;
Thu, 20 Jul 2023 12:43:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KChB34039221;
Thu, 20 Jul 2023 12:43:11 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 12:43:11 GMT
Message-Id: <202307201243.36KChB34039221@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: c2fbdd8efdfe - stable/13 - Document fdescfs mount option "rdlnk"
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: c2fbdd8efdfe463b3d91ea403177f3b714de17fb
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=c2fbdd8efdfe463b3d91ea403177f3b714de17fb
commit c2fbdd8efdfe463b3d91ea403177f3b714de17fb
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-07-11 05:09:11 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-07-20 12:20:09 +0000
Document fdescfs mount option "rdlnk"
(cherry picked from commit 7cd7a3204153fc8ddf7d06cd0d924d5c3ef5ff35)
---
share/man/man5/fdescfs.5 | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index f2abda2bb4c2..6355951eb714 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -40,7 +40,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 17, 2021
+.Dd Jul 11, 2023
.Dt FDESCFS 5
.Os
.Sh NAME
@@ -94,6 +94,18 @@ ABI compatibility mount
volume with the
.Cm linrdlnk
option.
+.It Cm rdlnk
+Treat
+.Nm
+vnodes as symbolic links consistently, in particular, follow
+the resolved name for the name lookups.
+This option is strictly stronger than the
+.Cm linrdlnk
+option, it changes not only the type returned by
+.Xr stat 2 ,
+but also causes the
+.Nm
+files to behave as symlinks.
.El
.Pp
For
From nobody Thu Jul 20 20:44:55 2023
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 4R6Pnh0dBnz4dVgY;
Thu, 20 Jul 2023 20:44:56 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6Png5KrDz3QgF;
Thu, 20 Jul 2023 20:44:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689885895;
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=5rw2Wt08nn/MwqyRHjadRUI9aOFtw3Gtd8qLC1+zPyQ=;
b=SPVHzjFzNnWvW1X6L4RiogCFbz1938DiPhmjCqNYqJXu+JgIFu1md9/K1lXAOCWgfo+Lys
3uk6O01uZrbx8zBgrokBG+gXVI2DiiMqSprHYiMfZ1r03iZBh9vv++f0G1jZAauF3no0os
8f984QEePG0SpAcWLi6fxN9yLSHjHT/PJK7GtzDyNymmBLgBg2czrDcmQOMIJ/+NajHBRW
wZUMpu8SQongaWmAkvzXBRel6SmH9xjsSnK98QgpcWfXdHJu/4Ud2D8Os4KlVqjBERFV8Y
i9sKMLvzzi+Y0lKv0slze8D2PXgisDgmKMnBm9oqvA83mpYfLBX7vOLzc0zchg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689885895;
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=5rw2Wt08nn/MwqyRHjadRUI9aOFtw3Gtd8qLC1+zPyQ=;
b=ehIZgBgWDl+19kzDymi2wDLD8TD5EPM1J+zed7dvwwHobgB1+Ej5wtjW2+wIRf6pCr2GPf
8i8HWYKq2feZo7F5cD4A59r4COq7wR6NcgwzTC9WoQDccSAY0Isjfq186Sw1knFW/gpn56
TylfC4b4omhFrKeBh0AA5mR4k7jzST3tY3SDu8sbsbjZlT8AhdrhY274cKyVTOQwYViB/J
mN9I+mrDdOP7Z7KRNg9ZRI0AJrI+39+5sHPQJ74qKcflpAERT8+/yRN4wQdq9o4tyG9l7B
4sWJysZ2/Vf33FwvFM6fexDXsfm+M0Hp5uNXVPfxjiElmZ397HX9MxbM2+hhAg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689885895; a=rsa-sha256; cv=none;
b=ckw3akga7AH4L7vkNaqFDc27GZgIsqbYws85A4Frrx2b/0LDQnQpUTx5CmCTAjdBSnJVGh
ytVK0iV84Pm6SoRHcNdBZRJNCc1BsQLhjGi74AN7KyQr7dGnewjPKyfXOnhiYGXjWRiarm
Gf/9mahz8sm5BFJ1nhTjskRk+Tc0O+e7lOVC8i4rE2tWT/8y5XKNb2oY3mIHu1pM/XQPTm
U98V4nsJAtLTGB8UNhXDYOBvwS6nYva9wwPkAafUs5V5THGJDoBqTapSlogbX70YmohQHJ
u6sLd1ykkCG9POfO5Q6zp2d3eAvlpcErdW6Is8gEaKW0CBiCsyEXfTqtQ4WFhA==
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 4R6Png4G9gzlGv;
Thu, 20 Jul 2023 20:44:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KKitXR035770;
Thu, 20 Jul 2023 20:44:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KKitrI035769;
Thu, 20 Jul 2023 20:44:55 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 20:44:55 GMT
Message-Id: <202307202044.36KKitrI035769@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Brooks Davis <brooks@FreeBSD.org>
Subject: git: 9e752dae4ce1 - stable/13 - oce(4): Don't directly access usespace
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brooks
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9e752dae4ce125d873f12fde993e0466ed42b54c
Auto-Submitted: auto-generated
The branch stable/13 has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=9e752dae4ce125d873f12fde993e0466ed42b54c
commit 9e752dae4ce125d873f12fde993e0466ed42b54c
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-06-14 17:55:41 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-07-20 20:41:14 +0000
oce(4): Don't directly access usespace
Replace direct stores to userspace addresses (never safe and broken on
modern CPUs) with a copyout. Use a static assert on the size to ensure
we don't overflow the field.
Reviewed by: markj, jhb
Sponsored by: DARPA
Differential Revision: https://reviews.freebsd.org/D40519
(cherry picked from commit 758927a982db0ae3ebb02c05aec8a53bcc0c20cb)
---
sys/dev/oce/oce_if.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 1127565282c1..2d089344e844 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -2250,7 +2250,6 @@ oce_handle_passthrough(struct ifnet *ifp, caddr_t data)
uint32_t req_size;
struct mbx_hdr req;
OCE_DMA_MEM dma_mem;
- struct mbx_common_get_cntl_attr *fw_cmd;
if (copyin(priv_data, cookie, strlen(IOCTL_COOKIE)))
return EFAULT;
@@ -2282,17 +2281,25 @@ oce_handle_passthrough(struct ifnet *ifp, caddr_t data)
goto dma_free;
}
- if (copyout(OCE_DMAPTR(&dma_mem,char), ioctl_ptr, req_size))
+ if (copyout(OCE_DMAPTR(&dma_mem,char), ioctl_ptr, req_size)) {
rc = EFAULT;
+ goto dma_free;
+ }
/*
firmware is filling all the attributes for this ioctl except
the driver version..so fill it
*/
if(req.u0.rsp.opcode == OPCODE_COMMON_GET_CNTL_ATTRIBUTES) {
- fw_cmd = (struct mbx_common_get_cntl_attr *) ioctl_ptr;
- strncpy(fw_cmd->params.rsp.cntl_attr_info.hba_attr.drv_ver_str,
- COMPONENT_REVISION, strlen(COMPONENT_REVISION));
+ struct mbx_common_get_cntl_attr *fw_cmd =
+ (struct mbx_common_get_cntl_attr *)ioctl_ptr;
+ _Static_assert(sizeof(COMPONENT_REVISION) <=
+ sizeof(fw_cmd->params.rsp.cntl_attr_info.hba_attr.drv_ver_str),
+ "driver version string too long");
+
+ rc = copyout(COMPONENT_REVISION,
+ fw_cmd->params.rsp.cntl_attr_info.hba_attr.drv_ver_str,
+ sizeof(COMPONENT_REVISION));
}
dma_free:
From nobody Thu Jul 20 20:44:56 2023
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 4R6Pnj1Bkdz4dVRQ;
Thu, 20 Jul 2023 20:44: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6Pnh6xd4z3QSQ;
Thu, 20 Jul 2023 20:44:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689885897;
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=3jZlZ4FZabi1UANpekMZzwBMF5/CC4E4CF3pY9QwiKk=;
b=eDfhsAqMliaAkmmGH+LEZO2CdLhhb0Cj+k+ak6r600dA7iJVPST/QXZpH9ZAyUHQz1cU47
RwRGEI/KsSWjE9MhFI5sED24VlbpjM+qUnwLrNiVgdAlw0CN5EAAPn8Ivv26xUdXych5L9
cwVXP4yiUwDQSNuldujlVXgEwimB8viKE0D3sffuTYoSNvKE3wWtXdHzVDOpHBJd5/Obc3
I3V6ChG6AR7LbHy+udrZE0FtYpnifWQYiZoC1NIKBXZP5+6OGghn5EL3Gg0z59QBHJ6ul/
xGQQaeTJrICPxIuHZ7uSzIGsIhDFx0J6wzlPX9HDhAvl8w+ulnnaylSs1/MRfQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689885897;
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=3jZlZ4FZabi1UANpekMZzwBMF5/CC4E4CF3pY9QwiKk=;
b=LcwVnStosfb3J+pcEFayZXRfR+PB7ynht7VeIB63MTdb1Rc79eTemMtDrhi0RarnW9gVPl
Lxnu3dThQ0gPYP6/cab86/cwAfBeyZVHCkRSz498ugBkD/0sg84YiMlnMONeGSu9HHIZYk
HbCw47GS3RS5akC1HFO4WFNLop+rQ44GJn++gMJMJbq8F4tgMH6IvdLb/ezn0LJfcXiJ6K
I50CvL7U3XAQDMYmZwPgJF2nsUttHKJVSftiPjB0DUakWiHknRjBe0nzluYm0/mao2fTja
6eL1r64jAAYcmwgP5Y2nDo4fTfxcShO32Z3zZiXL+0mi2oopYpxWYV9GZqHdzg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689885897; a=rsa-sha256; cv=none;
b=fyS087rHHRrBxs5eU44ZwD5zgz4ufIhUOHentggfCc6r8gKFhE2V+goh8Y4vB7lfSiY52x
OEZkTSaCzD9PWh2u7ox9UTqxZFXEaZ8TEMokYLiOL44SWh1BQnt998oDO9CnzloATAQmuB
bgdJiC91Q5OMKF4b2l+P565mIUKqIOu4fGi/ap13ZvT7gASNjDROEXs4kfSl+OERLB+xJ1
pySBFZCkHjzl+JsRTVQJpvz0wbu/oeI3rXiamy4z6XFY78H4EhjcVhx1I5YvmDDpaMMFMc
0GfAKHjvIOBdSW7hy5W3nHwzaxtn/iWyY+gtV8htCvqiAJpap9dJ/Czd2yod+Q==
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 4R6Pnh51hKzlZ1;
Thu, 20 Jul 2023 20:44:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KKiuiM035789;
Thu, 20 Jul 2023 20:44:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KKiuQW035788;
Thu, 20 Jul 2023 20:44:56 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 20:44:56 GMT
Message-Id: <202307202044.36KKiuQW035788@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Brooks Davis <brooks@FreeBSD.org>
Subject: git: 84019c6c0052 - stable/13 - oce(4): deprecate
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brooks
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 84019c6c005255851bdb7f5e71ad0da3d50ce0f1
Auto-Submitted: auto-generated
The branch stable/13 has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=84019c6c005255851bdb7f5e71ad0da3d50ce0f1
commit 84019c6c005255851bdb7f5e71ad0da3d50ce0f1
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-06-14 17:55:54 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-07-20 20:41:18 +0000
oce(4): deprecate
The Emulex OneConnect NIC driver hasn't seen any commits other than ioctl
bug fixes (some severe) and sweeping commits since 2016. There is no
indication of new parts since 2014 or earlier. As such, deprecate the
driver with the aim of removing it prior to FreeBSD 15.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D40531
(cherry picked from commit 4591322980a37d6ee38a3ed70569366e16ca71f6)
---
share/man/man4/oce.4 | 8 +++++++-
sys/dev/oce/oce_if.c | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4
index c5022833e8b5..4dfa8e15aaaf 100644
--- a/share/man/man4/oce.4
+++ b/share/man/man4/oce.4
@@ -36,7 +36,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 19, 2012
+.Dd June 13, 2023
.Dt OCE 4
.Os
.Sh NAME
@@ -57,6 +57,12 @@ module at boot time, place the following line in
.Bd -literal -offset indent
if_oce_load="YES"
.Ed
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver may not be present in
+.Fx 15.0
+and later.
.Sh DESCRIPTION
Emulex OneConnect adapters come in various skews and with
different combinations of NIC, FCoE and iSCSI functions.
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 2d089344e844..3385546cf1a6 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -375,6 +375,8 @@ oce_attach(device_t dev)
}
softc_tail = sc;
+ gone_in_dev(dev, 15, "relatively uncommon 10GbE NIC");
+
return 0;
stats_free:
From nobody Thu Jul 20 20:44:57 2023
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 4R6Pnk00WPz4dVcZ;
Thu, 20 Jul 2023 20:44: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6Pnj6ZDtz3QbG;
Thu, 20 Jul 2023 20:44:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689885897;
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=VJNbvMOoxU2tGVHyhi+TzGKQ9FCbRyB7EyPWkRXnUSY=;
b=tc4oYriueVv571qqQ++MFX0djpdvgyj524a8KCxXS93bqkQ8JSxCKKLr9YDBiCcJ7zEAEl
Bct4+TWAPhrHiDPYmPdHQE3LNpLi+NC1DroBFIegvSX9EuQUcM5X0gj0vplfxUX5bDmsgV
O2jhtm9M0q9DMuWqhFRxu1itJzfm4BDFxpi0vfq9NIZJ03mG90g3KPoIqw3iCiNp3aWrgn
+/ROtR4CzAVY6Nae1eWN7PRvJoZgIYqjacdSaOQRh11PfLGwkzahadMh73D+BvSqjV5Q+E
Q9V4gLyVrITHtIx7ffvNVCP2us2IDjZd8wDii6ER40h8k0EA4TvKK1QKOiT/4g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689885897;
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=VJNbvMOoxU2tGVHyhi+TzGKQ9FCbRyB7EyPWkRXnUSY=;
b=dOM59vCucTKaQD2YZam6mnbD5CLSYDb3tUxI9ZzgzE/JsuEbbxX0fsgfB18fbgjbq9AHgp
mBujeha9BXXD0fw7Gz92Fi6RRsJGPkq+dn7DZS7qaEaKXHqe7TxYAk2ow4VTTgb7eAt0pa
KIgu9u9wxOdh96dNlvHDY5iw1oLr5UxSxEMMOkaEx1X3h9LSf7kmPi4lX4DV3jde+qxWMK
+/kVsWwmVGOXOsuV5X0IzCKif5m64HOONZI92GHbzmrVUd0bjYi01ZayyqjdcqQALejH4z
0UcDFy+WVQMgiDLzKD2PwHw4oUWV1bRO3K1Qn4XzFgKiL0FWY3TUGOjVjLSLQA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689885897; a=rsa-sha256; cv=none;
b=bbBb2iW40TjVp1a3r/5+ZEnQJS/wkxcHKLc/FBdsKbDgMjG6+WNbUWgfm0PNMdAhi9Y3Sh
LjL4T/cpcsGmpauMng75cpsSQaSRuOwkczi3tiR/czgq2fccJvdz9mVELCSmvLHnCKCdwe
JOv1ciFo5Un1U4I4CGJljgyl9CmpfY6Kc3iG6gmimA1mam9hOyeIop+W61NayURfHVx0mn
1eDEsjFaHX2YG4FCKk7ri6INlkzO2LWLAqGa5WgiwS2Jx7TnIOxi5/hittf0lKVYOa7+lu
HRwqFac3mDTgLj0w9Cd6UPGT0zeonGXFqlc9KxAzFb+pNJlo8tLezlzQmiyLng==
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 4R6Pnj5VhBzlnW;
Thu, 20 Jul 2023 20:44:57 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KKivSI035820;
Thu, 20 Jul 2023 20:44:57 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KKivoo035819;
Thu, 20 Jul 2023 20:44:57 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 20:44:57 GMT
Message-Id: <202307202044.36KKivoo035819@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Brooks Davis <brooks@FreeBSD.org>
Subject: git: 67835f14aa68 - stable/13 - le(4): deprecate and mark for removal before 15.0
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brooks
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 67835f14aa6839b3bc321ecbbfa2e74e389b2879
Auto-Submitted: auto-generated
The branch stable/13 has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=67835f14aa6839b3bc321ecbbfa2e74e389b2879
commit 67835f14aa6839b3bc321ecbbfa2e74e389b2879
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-06-21 23:50:12 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-07-20 20:41:24 +0000
le(4): deprecate and mark for removal before 15.0
We kept le(4) in the pre-12.0 purge because it was needed for Qemu/MIPS
(virtio networking didn't work) but the MIPS port has been removed.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D40683
(cherry picked from commit b95d2237af403049d48c23229aa8bace3594970e)
---
share/man/man4/le.4 | 8 +++++++-
sys/dev/le/lance.c | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/share/man/man4/le.4 b/share/man/man4/le.4
index 2c7f9cc3e55e..58a6826bb03f 100644
--- a/share/man/man4/le.4
+++ b/share/man/man4/le.4
@@ -36,7 +36,7 @@
.\" from: @(#)le.4 8.1 (Berkeley) 6/9/93
.\" $FreeBSD$
.\"
-.Dd December 26, 2020
+.Dd June 21, 2023
.Dt LE 4
.Os
.Sh NAME
@@ -64,6 +64,12 @@ numbers have to be specified in
.Cd hint.le.0.port="0x280"
.Cd hint.le.0.irq="10"
.Cd hint.le.0.drq="0"
+.Sh DEPRECATION NOTICE
+The
+.Nm
+driver may not be present in
+.Fx 15.0
+and later.
.Sh DESCRIPTION
The
.Nm
diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c
index e4ff97b824e2..18786dd919a0 100644
--- a/sys/dev/le/lance.c
+++ b/sys/dev/le/lance.c
@@ -202,6 +202,8 @@ lance_attach(struct lance_softc *sc)
ifp->if_hdrlen = sizeof(struct ether_vlan_header);
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable |= IFCAP_VLAN_MTU;
+
+ gone_in(15, "le: 10/100 NIC no longer needed for Qemu/MIPS");
}
void
From nobody Thu Jul 20 22:48:16 2023
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 4R6SX05Ks6z4nMCy;
Thu, 20 Jul 2023 22:48: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6SX04RFkz4JRF;
Thu, 20 Jul 2023 22:48:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689893296;
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=hS8tBplio4u4/blk02KWGHgVtjPTeIURkTcPkiMHtew=;
b=aeXcjPsW9CqPLHcPVkL9d1YtDmb6UwZ4JZtJrXPa2XjQjUV2o4dU9jnWeM/hOzY4fihd9G
xmwpXB2hSHbY/40aIHDZ/JoJ79CAYfsuFoHmBLW/gBZ1mbHW/HYz5x3OTX9LycE4wZBy7n
J/W7k6jFU1TDj96nagc+mYq1vueNE7MWr/ypRNxHQgTdAQxQ1PWr3rPJMO+dtu2JBTLO2p
WhIWwpgKB/ujKsvC7v+QmPooKFC98wvaUUJkprx6e1Z6oqcqfV+gOZmOatclSJlVFdcbTb
YfLprs6s+1dlOHFRPFGhEfHbGpoTspXTzsPrIJiRXSmOY/n7qk20gfrW6ZYVTQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689893296;
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=hS8tBplio4u4/blk02KWGHgVtjPTeIURkTcPkiMHtew=;
b=Uke/J0KNHGluN/KAygTjZ8t//SJmZNJNLkBgY9ijGHQxAM5IITJwiPaTvsJC76lHSYerVy
ShS2nQF29Hcgu0W/3/qRKOL/V21j0i8rwsD905hUe183HpzQJgHZLyYMOdZtu0076EluQp
qm1zeeaSlIbrdrGLTMfR9tFGMcB4BZUuxiHIRpKU/h52AJvyWEW/ysF49ni0VdBWr+ZLsw
PpBqYTK2UAhSnGkAOMfoL/ZGd5332aDomCrOJfwm9gPBNR6tmeBz1IQM9/NiqI4sg+LFkV
e5fO/G0lGVCfrKrgUl3LMepXp+L92Zgmh+zvj4cPtJOq7XroyyMTvSWCFjSs/A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689893296; a=rsa-sha256; cv=none;
b=OWsO4j37ygs7/WqlzQC1DouUFbn5NFD1oKp9iwDhWvdvku7BQvIRodLsGjNyc3HZHV3nLg
nwNSW3mXf/j7Aknw3o3F1czU/TokNnEejW/5sTBESlYYHGNPMEXzmdlqAg958zM7kNCGb1
ndZTFvlxNMRA4H/22kOjWFD5Zwwzkgcx8Q1cTsDDbV82R7bvOYarMrAfPGjH3+cfexS/EB
p1LEwRSWu7KHU9W1HCzcnrw2kdY80dpOArE0M7RAIziDyuDYK4FQIj4W2xF55DDSdFNpTs
pbbOO7Gir/PS9iowny/S/14Q0ZLCL1jbQuVKi1CqTATU7ICStqraI8A9OW0QTA==
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 4R6SX03Pg7zpQ7;
Thu, 20 Jul 2023 22:48:16 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KMmGcZ035257;
Thu, 20 Jul 2023 22:48:16 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KMmGEW035256;
Thu, 20 Jul 2023 22:48:16 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 22:48:16 GMT
Message-Id: <202307202248.36KMmGEW035256@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eric Joyner <erj@FreeBSD.org>
Subject: git: 93f39b467586 - stable/13 - iflib: Unlock ctx lock around call to ether_ifattach()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: erj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 93f39b4675865094b298e1fca5bcfa788348dd36
Auto-Submitted: auto-generated
The branch stable/13 has been updated by erj:
URL: https://cgit.FreeBSD.org/src/commit/?id=93f39b4675865094b298e1fca5bcfa788348dd36
commit 93f39b4675865094b298e1fca5bcfa788348dd36
Author: Przemyslaw Lewandowski <przemyslawx.lewandowski@intel.com>
AuthorDate: 2023-07-19 22:40:46 +0000
Commit: Eric Joyner <erj@FreeBSD.org>
CommitDate: 2023-07-20 22:42:22 +0000
iflib: Unlock ctx lock around call to ether_ifattach()
Panic occurs during loading driver using kldload. It exists since netlink is
enabled. There is problem with double locking ctx. This fix allows to call
ether_ifattach() without locked ctx.
Signed-off-by: Eric Joyner <erj@FreeBSD.org>
PR: 271768
Reviewed by: erj@, jhb@
Sponsored by: Intel Corporation
Differential Revision: https://reviews.freebsd.org/D40557
(cherry picked from commit a52f23f4c49e4766fb9eb0bf460cc83c5f63f17d)
---
sys/net/iflib.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sys/net/iflib.c b/sys/net/iflib.c
index 748970a58f3f..cba931f1b2a7 100644
--- a/sys/net/iflib.c
+++ b/sys/net/iflib.c
@@ -5349,7 +5349,13 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct
goto fail_queues;
}
+ /*
+ * It prevents a double-locking panic with iflib_media_status when
+ * the driver loads.
+ */
+ CTX_UNLOCK(ctx);
ether_ifattach(ctx->ifc_ifp, ctx->ifc_mac.octet);
+ CTX_LOCK(ctx);
if ((err = IFDI_ATTACH_POST(ctx)) != 0) {
device_printf(dev, "IFDI_ATTACH_POST failed %d\n", err);
From nobody Thu Jul 20 22:57:04 2023
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 4R6Sk870KYz4nSMn;
Thu, 20 Jul 2023 22:57:04 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6Sk85QVZz4MVZ;
Thu, 20 Jul 2023 22:57:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689893824;
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=OSsIJ/Oxp3ejbjueSTSEByzC6kR5zpgkh0CD6dbFT0w=;
b=AnrjmpAZ6NOk7HFfwWB9hvgK4r6J1fobSWYnRBUypr799QMZXFwma/iKNya2FYoSKf2VUs
cOFHbSUEIIFX+GMLL5SDtRSvB1G1YV83DcO+Jo5D32f4VgLeC177/ym7ydvQkql83LvlA4
SZd1C9pLK1mxu6DeTm1QlFbx3lBERcewEcdzYvKU6u2H8n6dezFctv013x120QApQat85z
N2/5Tnm9BRKgmk8TpyHka3kDR893VtLanWYVkFp6ouwxbEz2rCxWssRFyxNmBfcFoje0xG
h5VXLLFp0x0WqpkyE1hxpJ/wtdscXlOTZU3kIvVeDZprOh5yoV4WNOVbcfyDmA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689893824;
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=OSsIJ/Oxp3ejbjueSTSEByzC6kR5zpgkh0CD6dbFT0w=;
b=JschjQPjlpVELdZFx+omD17avXmbZkMuW0Ykke/h/1F+HeO48qGbPvHlId8o7LlkHsiysO
eXgVpWksfh+gfwoZOhqYUa15ibeRx7DyCf1MhRrsmssNvc7QKYyAn40eYqKQsZ4/kRtrls
5TF7yBLvU6zqtvU8R8GQ9Torusa9LPVK+lzet5ZkYbC4hZvORFTIu/ssDJTIOl1WNY6Uek
WTBGrJ1oO6jGYgiuMjgauxIK4+Ib5v8343isuF4++5jE95yuDHuKJJXnbUcJUfjXDk/GY0
hd4TpXOJB7kDsBdzucYdRDp+DiEYGhQKH8IeMORrzQgKFSERFmr3ABDbtmSz0Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689893824; a=rsa-sha256; cv=none;
b=Ruf5wOpNMHpYOpmL93Dqo/HWZBNSylWG1/uhj89d0Ua5lpLP/QX9vtPd3ygOlkpjzQWNYM
Y9fPsGcG3WfJUKJWuO5lmjCILwFNpq9Iu1B5eu7rx5VZTMo6BoUz+RfQrwiftmpTcqxaOh
2ivF82PsHYeiJyJCkJCwYh+rto9mxTkrOD7FZtbK3rkvJnO2et88POvb9e+tMP9CyXW8rr
vT3+3nHUz+AqOm4MWvvUUv3x4wAtkdXhxHzqPnSSEnJuj+buAs6cUMCY2Lc2STKnpzbWZ5
UqDA+UK1U7r1ZOU5f+bDV/oU+90usUHJkBDBnfSv6KzyGnmxBPbh4wWKGArQ3w==
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 4R6Sk84VGDzpR6;
Thu, 20 Jul 2023 22:57:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36KMv4Mw051042;
Thu, 20 Jul 2023 22:57:04 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KMv4Aq051041;
Thu, 20 Jul 2023 22:57:04 GMT
(envelope-from git)
Date: Thu, 20 Jul 2023 22:57:04 GMT
Message-Id: <202307202257.36KMv4Aq051041@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Eric Joyner <erj@FreeBSD.org>
Subject: git: 2617bca5a8c9 - stable/12 - iflib: Unlock ctx lock around call to ether_ifattach()
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: erj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 2617bca5a8c98e9e84fba3f2ebd9302e8e893b8f
Auto-Submitted: auto-generated
The branch stable/12 has been updated by erj:
URL: https://cgit.FreeBSD.org/src/commit/?id=2617bca5a8c98e9e84fba3f2ebd9302e8e893b8f
commit 2617bca5a8c98e9e84fba3f2ebd9302e8e893b8f
Author: Przemyslaw Lewandowski <przemyslawx.lewandowski@intel.com>
AuthorDate: 2023-07-19 22:40:46 +0000
Commit: Eric Joyner <erj@FreeBSD.org>
CommitDate: 2023-07-20 22:56:41 +0000
iflib: Unlock ctx lock around call to ether_ifattach()
Panic occurs during loading driver using kldload. It exists since netlink is
enabled. There is problem with double locking ctx. This fix allows to call
ether_ifattach() without locked ctx.
Signed-off-by: Eric Joyner <erj@FreeBSD.org>
PR: 271768
Reviewed by: erj@, jhb@
Sponsored by: Intel Corporation
Differential Revision: https://reviews.freebsd.org/D40557
(cherry picked from commit a52f23f4c49e4766fb9eb0bf460cc83c5f63f17d)
---
sys/net/iflib.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sys/net/iflib.c b/sys/net/iflib.c
index 3690be2b2a77..da4cc9addbe9 100644
--- a/sys/net/iflib.c
+++ b/sys/net/iflib.c
@@ -5196,7 +5196,13 @@ iflib_device_register(device_t dev, void *sc, if_shared_ctx_t sctx, if_ctx_t *ct
goto fail_queues;
}
+ /*
+ * It prevents a double-locking panic with iflib_media_status when
+ * the driver loads.
+ */
+ CTX_UNLOCK(ctx);
ether_ifattach(ctx->ifc_ifp, ctx->ifc_mac);
+ CTX_LOCK(ctx);
if ((err = IFDI_ATTACH_POST(ctx)) != 0) {
device_printf(dev, "IFDI_ATTACH_POST failed %d\n", err);
From nobody Fri Jul 21 08:56:20 2023
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 4R6k1c328nz4dNDK;
Fri, 21 Jul 2023 08:56: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6k1c2S3hz4HD9;
Fri, 21 Jul 2023 08:56:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689929780;
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=0cbWRxy3WEPtm9lCQbZjXRCZAwOf4em95zK1jZK8bAI=;
b=vmKfBj50XBg67+uyEvug1Z690qcZxSb7BsIAYDnNxYsS/7DbgbC1pmx1goFjlW6PjmV70o
+Be3FEct6RVA3hYd72l6+IFtEIu2N7agefGIFwt4EgpYdUA/msp6xXtsA190uCI1F/jzo1
fAWYSrzpNjfS7eAkt2MkyKI1JI5SMi7V3ZlLdsAoRe+0eUw9UfAGzA7Q5xK/GJahicJgDU
Gih9mZhgsqJUEiWscrLf9KfoCsvSdFajjah+4m5gqQ49k/zPZUnDPT3+8nKmZXOD9IhHJP
DX/T+DXv8MwQAQOgPYSPeXq+2fahn4ReK0CFYMvAmj8uIyhTGtZPEPXVIIEMEA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689929780;
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=0cbWRxy3WEPtm9lCQbZjXRCZAwOf4em95zK1jZK8bAI=;
b=xKPVq3xoSktpQ2CXlVn2ExeNOsm+w9unSfuSb8f+40bOEPjPHWYz7WJF360WpDBKTvIEcV
6ko5aIS37Jo8Q3bQJ82IQM3UIFRhuxhQ2k301T5Y3HGt/OQ4U9gFpXyYjUDwpeRT1RuHrg
BqWpkC2afs/fQnQOmtWXszaVKKiZooZkDB96nUURPz2D74F7ouHAl+uVGAKU5bQhcl7kuA
9FrVp520Cze96VetvwE0sQdVdsNzEeeHD9Qs1kA0D09siHDJ/uNFhBBVeMxP3Epk/+3pak
uC3dKC6nwJCoFUzx1kpdLhT1FS2KCDK9iqgkWUHUIbcI3bqY0/mq1MGG/3M4xQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689929780; a=rsa-sha256; cv=none;
b=HGGTabOtyJ8Kftyl8xfMtLFGJ7tcdQoE2OvIxaHBKOdksQnX3AkyN2MeLsV8Or9cgcdlVp
uL+CHgKlI9+OxYbB2/HyPYOBg5y/OBigmPgAd5JkqKbyOEu2vMSqdFXNozq2e4JqFpZTRH
O5PTi0zGNji6Qp/H3VoNz1pHXFfQyU6X6GXQDQ9crNYkyOyVC6A/X4nVhiAA/U0WV//WwU
KQaf6u7iQw+es5FaC9YPSGVELJH2ZbW5ExCFzBAr71jQBDWFZX5pY54Y3Jj8q0cZzmVhUp
USAFTdLc4ar3w38KcrPVJQwRRhUPKIqVm66uxFa20KG0GKTdOTdgENZWsKAE3w==
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 4R6k1c0x7Dz166t;
Fri, 21 Jul 2023 08:56:20 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L8uKNa045621;
Fri, 21 Jul 2023 08:56:20 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L8uKvA045620;
Fri, 21 Jul 2023 08:56:20 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 08:56:20 GMT
Message-Id: <202307210856.36L8uKvA045620@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Robert Clausecker <fuz@FreeBSD.org>
Subject: git: 65b618794f68 - stable/13 - lib/libc/tests/string: add unit tests for ffs, ffsl, ffsll, fls, flsl, and flsll
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: fuz
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 65b618794f68aadbebbca11de99278c9ec1b2992
Auto-Submitted: auto-generated
The branch stable/13 has been updated by fuz:
URL: https://cgit.FreeBSD.org/src/commit/?id=65b618794f68aadbebbca11de99278c9ec1b2992
commit 65b618794f68aadbebbca11de99278c9ec1b2992
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-06-23 17:26:44 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-07-21 08:51:54 +0000
lib/libc/tests/string: add unit tests for ffs, ffsl, ffsll, fls, flsl, and flsll
Also supply CFLAGS+=-fno-builtin to ensure our unit tests
actually test libc functions and not clang's builtins.
Sponsored by: FreeBSD Foundation
Approved by: kevans
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D40729
(cherry picked from commit 49390697b9265d08d3f831cf38cdc2f79e216c48)
---
lib/libc/tests/string/Makefile | 9 ++++
lib/libc/tests/string/ffs_test.c | 88 ++++++++++++++++++++++++++++++++++++++
lib/libc/tests/string/ffsl_test.c | 32 ++++++++++++++
lib/libc/tests/string/ffsll_test.c | 32 ++++++++++++++
lib/libc/tests/string/fls_test.c | 88 ++++++++++++++++++++++++++++++++++++++
lib/libc/tests/string/flsl_test.c | 32 ++++++++++++++
lib/libc/tests/string/flsll_test.c | 32 ++++++++++++++
7 files changed, 313 insertions(+)
diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index 5d1944113a1a..e0b2db711682 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -1,5 +1,14 @@
# $FreeBSD$
+# ensure libc functions are tested, not clang's builtins
+CFLAGS+= -fno-builtin
+
+ATF_TESTS_C+= ffs_test
+ATF_TESTS_C+= ffsl_test
+ATF_TESTS_C+= ffsll_test
+ATF_TESTS_C+= fls_test
+ATF_TESTS_C+= flsl_test
+ATF_TESTS_C+= flsll_test
ATF_TESTS_C+= memcmp_test
ATF_TESTS_C+= memset_s_test
ATF_TESTS_C+= stpncpy_test
diff --git a/lib/libc/tests/string/ffs_test.c b/lib/libc/tests/string/ffs_test.c
new file mode 100644
index 000000000000..aea61254482e
--- /dev/null
+++ b/lib/libc/tests/string/ffs_test.c
@@ -0,0 +1,88 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE
+ */
+#include <sys/cdefs.h>
+
+#include <atf-c.h>
+#include <limits.h>
+#include <stdint.h>
+#include <strings.h>
+
+#ifndef FFS
+# define FFS ffs
+# define TYPE int
+# define TYPE_MIN INT_MIN
+#endif
+
+ATF_TC_WITHOUT_HEAD(zero);
+ATF_TC_BODY(zero, tc)
+{
+ ATF_CHECK_EQ((TYPE)0, FFS(0));
+}
+
+ATF_TC_WITHOUT_HEAD(twobit);
+ATF_TC_BODY(twobit, tc)
+{
+ const TYPE one = 1;
+ TYPE x;
+ const int n = sizeof(TYPE) * CHAR_BIT;
+ int i, j;
+
+ for (i = 0; i < n - 1; i++)
+ for (j = 0; j <= i; j++) {
+ x = one << i | one << j;
+ ATF_CHECK_EQ_MSG(j + 1, FFS(x),
+ "%s(%#jx) == %d != %d", __STRING(FFS), (intmax_t)x, FFS(x), j + 1);
+ }
+}
+
+ATF_TC_WITHOUT_HEAD(twobitneg);
+ATF_TC_BODY(twobitneg, tc)
+{
+ const TYPE one = 1;
+ TYPE x;
+ const int n = sizeof(TYPE) * CHAR_BIT;
+ int i, j;
+
+ for (i = 0; i < n - 1; i++)
+ for (j = 0; j <= i; j++) {
+ x = one << i | one << j | TYPE_MIN;
+ ATF_CHECK_EQ_MSG(j + 1, FFS(x),
+ "%s(%#jx) == %d != %d", __STRING(FFS), (intmax_t)x, FFS(x), j + 1);
+ }
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, zero);
+ ATF_TP_ADD_TC(tp, twobit);
+ ATF_TP_ADD_TC(tp, twobitneg);
+
+ return (atf_no_error());
+}
diff --git a/lib/libc/tests/string/ffsl_test.c b/lib/libc/tests/string/ffsl_test.c
new file mode 100644
index 000000000000..809cea3d3a93
--- /dev/null
+++ b/lib/libc/tests/string/ffsl_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE
+ */
+#define FFS ffsl
+#define TYPE long
+#define TYPE_MIN LONG_MIN
+
+#include "ffs_test.c"
diff --git a/lib/libc/tests/string/ffsll_test.c b/lib/libc/tests/string/ffsll_test.c
new file mode 100644
index 000000000000..1a620cbf9aba
--- /dev/null
+++ b/lib/libc/tests/string/ffsll_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE
+ */
+#define FFS ffsll
+#define TYPE long long
+#define TYPE_MIN LLONG_MIN
+
+#include "ffs_test.c"
diff --git a/lib/libc/tests/string/fls_test.c b/lib/libc/tests/string/fls_test.c
new file mode 100644
index 000000000000..847977d260c9
--- /dev/null
+++ b/lib/libc/tests/string/fls_test.c
@@ -0,0 +1,88 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE
+ */
+#include <sys/cdefs.h>
+
+#include <atf-c.h>
+#include <limits.h>
+#include <stdint.h>
+#include <strings.h>
+
+#ifndef FLS
+# define FLS fls
+# define TYPE int
+# define TYPE_MIN INT_MIN
+#endif
+
+ATF_TC_WITHOUT_HEAD(zero);
+ATF_TC_BODY(zero, tc)
+{
+ ATF_CHECK_EQ((TYPE)0, FLS(0));
+}
+
+ATF_TC_WITHOUT_HEAD(twobit);
+ATF_TC_BODY(twobit, tc)
+{
+ const TYPE one = 1;
+ TYPE x;
+ const int n = sizeof(TYPE) * CHAR_BIT;
+ int i, j;
+
+ for (i = 0; i < n - 1; i++)
+ for (j = 0; j <= i; j++) {
+ x = one << i | one << j;
+ ATF_CHECK_EQ_MSG(i + 1, FLS(x),
+ "%s(%#jx) == %d != %d", __STRING(FLS), (intmax_t)x, FLS(x), i + 1);
+ }
+}
+
+ATF_TC_WITHOUT_HEAD(twobitneg);
+ATF_TC_BODY(twobitneg, tc)
+{
+ const TYPE one = 1;
+ TYPE x;
+ const int n = sizeof(TYPE) * CHAR_BIT;
+ int i, j;
+
+ for (i = 0; i < n - 1; i++)
+ for (j = 0; j <= i; j++) {
+ x = one << i | one << j | TYPE_MIN;
+ ATF_CHECK_EQ_MSG(n, FLS(x),
+ "%s(%#jx) == %d != %d", __STRING(FLS), (intmax_t)x, FLS(x), n);
+ }
+}
+
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, zero);
+ ATF_TP_ADD_TC(tp, twobit);
+ ATF_TP_ADD_TC(tp, twobitneg);
+
+ return (atf_no_error());
+}
diff --git a/lib/libc/tests/string/flsl_test.c b/lib/libc/tests/string/flsl_test.c
new file mode 100644
index 000000000000..4b1e330d4564
--- /dev/null
+++ b/lib/libc/tests/string/flsl_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE
+ */
+#define FLS flsl
+#define TYPE long
+#define TYPE_MIN LONG_MIN
+
+#include "fls_test.c"
diff --git a/lib/libc/tests/string/flsll_test.c b/lib/libc/tests/string/flsll_test.c
new file mode 100644
index 000000000000..23f469b7b5de
--- /dev/null
+++ b/lib/libc/tests/string/flsll_test.c
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * This software was developed by Robert Clausecker <fuz@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE
+ */
+#define FLS flsll
+#define TYPE long long
+#define TYPE_MIN LLONG_MIN
+
+#include "fls_test.c"
From nobody Fri Jul 21 08:56:21 2023
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 4R6k1d469kz4dNfS;
Fri, 21 Jul 2023 08:56: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6k1d2zTnz4H3x;
Fri, 21 Jul 2023 08:56:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689929781;
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=ZxRbRuW+7AEi0Avf2kUCDjxoBRlIzfMWkATP2e0yZTQ=;
b=MoL9cZQAfl/jvX9e5doxfsuaWMFd+boIsSw7afRQxfwID0yeIKVMwSWWNDEpIjihTfith+
xeSD9+8DIhA2bKwgo/mdWLX0blvGkkp+51qLCmdiNKMiIA5CrZQGaM810+J0mdrFvEwzTx
NXdG3cCcram8YanydPZVh0kiSDOshwguk770rTripnVyjik6e2QHnTnOBP7l0NqIbABzMS
eS+hOOmcFhYHgwS+aMl59MtiTiEKn0PiM8jyDBARocyGxpG6fNzNQ6QCWVL4tNB73ne6zu
nnSrkdrES3fHGN8oxjDNLoFm2vS4uEeLjN6ZKQKf6NG6DhGnv34bNS6xKqf1TQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689929781;
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=ZxRbRuW+7AEi0Avf2kUCDjxoBRlIzfMWkATP2e0yZTQ=;
b=yKI24ZZ7lr7oRazTPtuuoyv2urzBfkVTghRgFd2RCQ046gwANSikYs5jZzNt7vsqkmptyl
SYFkB7+TZjtbShaJ5DjnbqKMkU9thkmO4bXkP9hpCVfTpcwHkIb/8iULLbOECUAGxPPzpF
Uxm8havVClhsJr5B8TPg6XsNM9BF4CWhZrw43Yv5tZTK/f7y2BJj/PGUXVxd2VlXVjgVEb
GPxB9yjTj/8PLgHXhXLaTU6nQDx8BK1ExHQ1j+kSjGTJk5fPedQRxqOFqcdUu6DOYGZ3Ek
D4eSXSBTEzTA3eTw8qS/aaBUBtlttSgH/HI/aMKMa0drgf+meSQckAFsCXiLCA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689929781; a=rsa-sha256; cv=none;
b=eHcNQZ1bDrjmUYQ060l1+jU1qFOgmyNJtHtEzhTgEGyy3937plC/DjB6X5HjWg2X3lWsO9
5Cx8uqpTfA9E8WQP9IDDTXEPNToJKwjcdd+j15RZWMrd3dmDYb3sQqFgA0U1fFJLe+3xzE
Iaszpn31VFbgjzUiK14lJaQQMMWQqX8cmL0HuPOoN4f7ImExFkxRybvihOSzkwaJJc9YcZ
eNK7uyTQwugzt66Q+zPviGTaCo1y/ZXqEE+HD2nrCqmFAM/5nD4Y7RtS4v079EapKd+TC+
5kfvMSUW8zp/dQco9+fMuViGkO+nNJ3YoDeu87P+hoPHr4+Wbj8Ok2R6Bz3WwA==
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 4R6k1d1cS6z166v;
Fri, 21 Jul 2023 08:56:21 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L8uLqe045643;
Fri, 21 Jul 2023 08:56:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L8uL3Z045642;
Fri, 21 Jul 2023 08:56:21 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 08:56:21 GMT
Message-Id: <202307210856.36L8uL3Z045642@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Robert Clausecker <fuz@FreeBSD.org>
Subject: git: 2c03221cce0b - stable/13 - lib/libc/string: replace ffs/fls implementations with clang builtins
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: fuz
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 2c03221cce0b7446cb681de0179349d2ee72c252
Auto-Submitted: auto-generated
The branch stable/13 has been updated by fuz:
URL: https://cgit.FreeBSD.org/src/commit/?id=2c03221cce0b7446cb681de0179349d2ee72c252
commit 2c03221cce0b7446cb681de0179349d2ee72c252
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-06-23 16:22:54 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-07-21 08:52:37 +0000
lib/libc/string: replace ffs/fls implementations with clang builtins
Most architectures we support (except for riscv64) have instructions
to compute these functions very quickly. Replace old code with the
ftz and clz builtin functions, allowing clang to generate good code
for all architectures.
We cannot use the ffs builtins as gcc uses ffs() to implement these on
some platforms, potentially causing an infinite loop.
As a consequence, toss out arm and i386 ffs() implementations.
Sponsored by: The FreeBSD Foundation
Reported by: jlduran@gmail.com, jhb
Approved by: mhorne, jhb
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D40730
Differential Revision: https://reviews.freebsd.org/D40966
(cherry picked from commit ee8b0c436d7221c25e8be3c3fe1f9da78b9d5b16)
(cherry picked from commit 3f5788e0ed8e85567f651ad360596b8c330af5a9)
---
lib/libc/arm/string/Makefile.inc | 1 -
lib/libc/arm/string/ffs.S | 57 ---------------------------------------
lib/libc/i386/string/Makefile.inc | 1 -
lib/libc/i386/string/ffs.S | 56 --------------------------------------
lib/libc/string/ffs.c | 12 ++++-----
lib/libc/string/ffsl.c | 12 ++++-----
lib/libc/string/ffsll.c | 12 ++++-----
lib/libc/string/fls.c | 13 +++++----
lib/libc/string/flsl.c | 14 +++++-----
lib/libc/string/flsll.c | 13 +++++----
10 files changed, 34 insertions(+), 157 deletions(-)
diff --git a/lib/libc/arm/string/Makefile.inc b/lib/libc/arm/string/Makefile.inc
index cf3175ea4e8c..550de34adb0e 100644
--- a/lib/libc/arm/string/Makefile.inc
+++ b/lib/libc/arm/string/Makefile.inc
@@ -3,7 +3,6 @@
MDSRCS+= \
bcopy.S \
bzero.S \
- ffs.S \
memcmp.S \
memcpy.S \
memmove.S \
diff --git a/lib/libc/arm/string/ffs.S b/lib/libc/arm/string/ffs.S
deleted file mode 100644
index 5756dd81d21d..000000000000
--- a/lib/libc/arm/string/ffs.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $NetBSD: ffs.S,v 1.5 2003/04/05 23:08:52 bjh21 Exp $ */
-/*
- * Copyright (c) 2001 Christopher Gilbert
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
-
-.syntax unified
-
-/*
- * ffs - find first set bit, this algorithm isolates the first set
- * bit, then multiplies the number by 0x0450fbaf which leaves the top
- * 6 bits as an index into the table. This algorithm should be a win
- * over the checking each bit in turn as per the C compiled version.
- *
- * This is the ffs algorithm devised by d.seal and posted to comp.sys.arm on
- * 16 Feb 1994.
- */
-
-ENTRY(ffs)
- /* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */
- rsb r1, r0, #0
- ands r0, r0, r1
- itt ne
- clzne r0, r0
- rsbne r0, r0, #32
- RET
-END(ffs)
-
- .section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc
index a8c50a285cbd..f3678b93bec3 100644
--- a/lib/libc/i386/string/Makefile.inc
+++ b/lib/libc/i386/string/Makefile.inc
@@ -4,7 +4,6 @@ MDSRCS+= \
bcmp.S \
bcopy.S \
bzero.S \
- ffs.S \
memcmp.S \
memcpy.S \
memmove.S \
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
deleted file mode 100644
index 3a0431c6a845..000000000000
--- a/lib/libc/i386/string/ffs.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Winning Strategies, Inc.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * ffs(value)
- * finds the first bit set in value and returns the index of
- * that bit. Bits are numbered starting from 1, starting at the
- * rightmost bit. A return value of 0 means that the argument
- * was zero.
- *
- * Written by:
- * J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(ffs)
- bsfl 4(%esp),%eax
- jz L1 /* ZF is set if all bits are 0 */
- incl %eax /* bits numbered from 1, not 0 */
- ret
-
- .align 2
-L1: xorl %eax,%eax /* clear result */
- ret
-END(ffs)
-
- .section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 738ef90ce091..34140e3e4d85 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -3,6 +3,10 @@
*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * Portions of this software were developed by Robert Clausecker
+ * <fuz@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -43,11 +47,5 @@ __FBSDID("$FreeBSD$");
int
ffs(int mask)
{
- int bit;
-
- if (mask == 0)
- return(0);
- for (bit = 1; !(mask & 1); bit++)
- mask = (unsigned int)mask >> 1;
- return (bit);
+ return (mask == 0 ? 0 : __builtin_ctz(mask) + 1);
}
diff --git a/lib/libc/string/ffsl.c b/lib/libc/string/ffsl.c
index dbd894b9655b..701e23cdf8f4 100644
--- a/lib/libc/string/ffsl.c
+++ b/lib/libc/string/ffsl.c
@@ -3,6 +3,10 @@
*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * Portions of this software were developed by Robert Clausecker
+ * <fuz@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -40,11 +44,5 @@ __FBSDID("$FreeBSD$");
int
ffsl(long mask)
{
- int bit;
-
- if (mask == 0)
- return (0);
- for (bit = 1; !(mask & 1); bit++)
- mask = (unsigned long)mask >> 1;
- return (bit);
+ return (mask == 0 ? 0 : __builtin_ctzl(mask) + 1);
}
diff --git a/lib/libc/string/ffsll.c b/lib/libc/string/ffsll.c
index 91886de2f127..e94fb518eb03 100644
--- a/lib/libc/string/ffsll.c
+++ b/lib/libc/string/ffsll.c
@@ -3,6 +3,10 @@
*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * Portions of this software were developed by Robert Clausecker
+ * <fuz@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -40,11 +44,5 @@ __FBSDID("$FreeBSD$");
int
ffsll(long long mask)
{
- int bit;
-
- if (mask == 0)
- return (0);
- for (bit = 1; !(mask & 1); bit++)
- mask = (unsigned long long)mask >> 1;
- return (bit);
+ return (mask == 0 ? 0 : __builtin_ctzll(mask) + 1);
}
diff --git a/lib/libc/string/fls.c b/lib/libc/string/fls.c
index d9edc41f9599..3c4719776778 100644
--- a/lib/libc/string/fls.c
+++ b/lib/libc/string/fls.c
@@ -3,6 +3,10 @@
*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * Portions of this software were developed by Robert Clausecker
+ * <fuz@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,6 +36,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <limits.h>
#include <strings.h>
/*
@@ -40,11 +45,5 @@ __FBSDID("$FreeBSD$");
int
fls(int mask)
{
- int bit;
-
- if (mask == 0)
- return (0);
- for (bit = 1; mask != 1; bit++)
- mask = (unsigned int)mask >> 1;
- return (bit);
+ return (mask == 0 ? 0 : CHAR_BIT * sizeof(mask) - __builtin_clz(mask));
}
diff --git a/lib/libc/string/flsl.c b/lib/libc/string/flsl.c
index 60370cf7d832..f5280b77a4e2 100644
--- a/lib/libc/string/flsl.c
+++ b/lib/libc/string/flsl.c
@@ -3,6 +3,11 @@
*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2023 The FreeBSD Foundation
+
+ *
+ * Portions of this software were developed by Robert Clausecker
+ * <fuz@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,6 +37,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <limits.h>
#include <strings.h>
/*
@@ -40,11 +46,5 @@ __FBSDID("$FreeBSD$");
int
flsl(long mask)
{
- int bit;
-
- if (mask == 0)
- return (0);
- for (bit = 1; mask != 1; bit++)
- mask = (unsigned long)mask >> 1;
- return (bit);
+ return (mask == 0 ? 0 : CHAR_BIT * sizeof(mask) - __builtin_clzl(mask));
}
diff --git a/lib/libc/string/flsll.c b/lib/libc/string/flsll.c
index 275aaa0e2e15..ab504b8e592f 100644
--- a/lib/libc/string/flsll.c
+++ b/lib/libc/string/flsll.c
@@ -3,6 +3,10 @@
*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 2023 The FreeBSD Foundation
+ *
+ * Portions of this software were developed by Robert Clausecker
+ * <fuz@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,6 +36,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <limits.h>
#include <strings.h>
/*
@@ -40,11 +45,5 @@ __FBSDID("$FreeBSD$");
int
flsll(long long mask)
{
- int bit;
-
- if (mask == 0)
- return (0);
- for (bit = 1; mask != 1; bit++)
- mask = (unsigned long long)mask >> 1;
- return (bit);
+ return (mask == 0 ? 0 : CHAR_BIT * sizeof(mask) - __builtin_clzll(mask));
}
From nobody Fri Jul 21 08:56:22 2023
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 4R6k1f4tmvz4dNvf;
Fri, 21 Jul 2023 08:56: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6k1f3t2Xz4HKS;
Fri, 21 Jul 2023 08:56:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689929782;
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=DnUs1ocCBoaIOJ/S0d0YpiYijKkPOYPimhcmW058ZxE=;
b=s7jcOX1WpICBCd98fbFqhQ97Y7H6asb4yKsLItQ04oWvt/LZ9dy50wgEupbBa6skYsVaMe
Kh3LG4Df1EPnhtJOIlAHqeiQC2gEJx4aYwM95zk88ughrn7P/vg//BNpB1sEomxmdDDWVu
urUp+fFpmgh4PrNop/Z8J/g2PFt2B7X9SJnwKgvmIM1mw/ybmj3nf1bnbhmMAmbzoPLg6E
C8d8u0tSiKFkmu/rvJw4katjRGBmg11s8HKHwWR8/Ki9by5sG3swZptd2m4RKTDiSuT9MO
TTqZCVGH9AZ6OCCxwlOaaeAT0f/QoFm4w8BuRm6RkgdmdmtS8Xd6ipFwmNSeUg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689929782;
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=DnUs1ocCBoaIOJ/S0d0YpiYijKkPOYPimhcmW058ZxE=;
b=liUsoE/HADgKt7Q6irHITeCQS9apZdRhj4jfxg2l3fcP2Bdt3sYxTPW+m0EK1utFbUAqqa
DvlX1AwIyuzN9U+w6pKGSsrtkRcgKpNSVOT5xB6rDQfJ3nFxtmgCSzk8lGxGeg8kv8wM82
xd9ZfglIr3cPaga3DTBsCuAkkM7qK8HRHxn92CR05PCnG0dkeELKR7l9o+Bd6nfsi5OT2R
7GtIrITbxkaofo0NwwFnV9DIlSauNYu6g3Vn3CIQ+RZx+IvDJoYJb0M0L/SQ8RWBScHL/D
Nm0q/0RgzpHapcTBOXnkkPX8jQTe6NRLB8XjerX60taR14J40cQJuHZ5sWVUyw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689929782; a=rsa-sha256; cv=none;
b=h3wvbx5LsfNVH5ZhFePkhq22QSS8ev8fYWYLAVhaTKrm2ApyW+1RQcnVmBEIGk77rekhUo
yycUKcWKwnw7m5LYzTQiTVR6P5ozeqLDNPec0bMii6y2ymKwBiJS4LBGM4aMjU8JevR/8D
f6wUAJcznizZpZ53r49HgSj4T5G78w1z0jxTgrB5jxNbo5Hp2fhZfrWiOea90ZleTDaroD
k6j1o8GLG+fvXkFtyaLtzCfiCKGnYhqoDcKkIjFBysEAYOWlWXT5TINUQM1N1/GXWUgchr
mydbkDvyCxBhQS6dJOANyzvx6YWP4PFM4prPZMW6O/quXVY57l4YutElGXFo8A==
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 4R6k1f2mQvz162Q;
Fri, 21 Jul 2023 08:56:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L8uMaw045664;
Fri, 21 Jul 2023 08:56:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L8uM31045663;
Fri, 21 Jul 2023 08:56:22 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 08:56:22 GMT
Message-Id: <202307210856.36L8uM31045663@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Robert Clausecker <fuz@FreeBSD.org>
Subject: git: 3b0dacf6fd13 - stable/13 - lib/libc/string/bcmp.c: fix integer overflow bug
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: fuz
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3b0dacf6fd13cf8688402561192899507f46c276
Auto-Submitted: auto-generated
The branch stable/13 has been updated by fuz:
URL: https://cgit.FreeBSD.org/src/commit/?id=3b0dacf6fd13cf8688402561192899507f46c276
commit 3b0dacf6fd13cf8688402561192899507f46c276
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-07-12 18:23:21 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-07-21 08:54:08 +0000
lib/libc/string/bcmp.c: fix integer overflow bug
bcmp() returned the number of remaining bytes when the main loop exits.
In case of a match, this is zero, else a positive integer. On systems
where SIZE_MAX > INT_MAX, the implicit conversion from size_t to int in
the return value may cause the number of remaining bytes to overflow,
becoming zero and falsely indicating a successful comparison.
Fix the bug by always returning 0 on equality, 1 otherwise.
PR: 272474
Approved by: emaste
Reviewed by: imp
MFC After: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41011
(cherry picked from commit 4da7282a1882fc03c99591c27d44a2e6dfda364b)
---
lib/libc/string/bcmp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 96cd49039eee..c42fe79ddb2f 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -51,7 +51,7 @@ bcmp(const void *b1, const void *b2, size_t length)
p2 = (char *)b2;
do
if (*p1++ != *p2++)
- break;
+ return (1);
while (--length);
- return (length);
+ return (0);
}
From nobody Fri Jul 21 08:57:44 2023
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 4R6k3D53mlz4dPfs;
Fri, 21 Jul 2023 08:57:44 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6k3D3DJHz4JSg;
Fri, 21 Jul 2023 08:57:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689929864;
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=i3DiT7zmZVUbyoh/bz/LN0EYuFGaUFxWc63xQ4Tqu+Y=;
b=Xln9LGJpYK1vhTg+mvCLLyWM2nBRvhyQsjb6DM24qTrZano1ZHj+CtuCwsGZGORHhW0n8D
kSlltpDldU1UbBFeM20zDL369Km3FWU8sx7HR6m+EDGcyHEZ/ByC+rshK2r5QJbXTnTkeP
bo5vf7MFVzzqDKtFEA8fNq74DTU3Nt+6x6rHf1zk3ry/wyiBL4l1hvVC/8xQqQZczSd4cw
8PwKeTX4Pa4xlD34UKOgPhhZNMxeADemF5Zk/SABnpCPnoECsucCcn2BDpt2l/8E2Vm+W2
7vSJWgCexr3cRB8fUVA2DRJSYUgvdsHOsuX1F8I4Z4fbTxM7W0ucCmxJIe/CUg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689929864;
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=i3DiT7zmZVUbyoh/bz/LN0EYuFGaUFxWc63xQ4Tqu+Y=;
b=Z3PALfWEkX2kd1psOTcR/bD0L2zps14K0+KzN+EbQKRUmcvHxiKFC8uMk5lhxYGgEw3IzB
05o5ux3KTZar9+wctdgk1KpFEf33LSH4AocR++rGiSb3CQYYsdv5FFBY9Y12+afEIG6u4S
RuDMDxKIm+s5QyPrWwTWAYrmEcpSww1QFe9RSiF6nX032hAN8DUGsrtcEhLQdyG6oVEwxz
4m2lX/RB/r7AZScs+CH1kczZraif6eeEnjUgMl74F2tt52+jb/X+uqb0kgr4h2QgNLYQ4o
X80fU6cHZs6kIfNZsPNZtjdwW6rV7Vz3qi9Cov21B8xuCS+rKCh6n823kDiL/A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689929864; a=rsa-sha256; cv=none;
b=xtJGP7TwEAiMYrY7B3UCoMwL6OVGAhj+CW8KloPwpE9qLVqmBmVlKyU2lZBcoGJ8V38Crz
XE9LXChOksmSnZrcu++rCFxImXO2AQEPPOMDreP1F/0Jly5QOLYF2XQ7/n+iGCb065L+s8
5o4N/Xglrf5N8JJlBOxEUT6xHrO53WXVzJ8xHCtuPiuHJfbOSZudJpiRetgHefzcY+BWz3
eL6oEb1B6NkymqujNL+n61wCAIXsotA5ZFVVa+7PZAScmdo9TzqH2kZcbfDSA40X06htS6
nYFjBDnMws1MMLlD9oTkvqIXbZ3dad9z0FOwzUtI6BCbpPQBeUOUxArFP7WEMw==
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 4R6k3D201Zz166y;
Fri, 21 Jul 2023 08:57:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L8vi1p045994;
Fri, 21 Jul 2023 08:57:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L8viuA045993;
Fri, 21 Jul 2023 08:57:44 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 08:57:44 GMT
Message-Id: <202307210857.36L8viuA045993@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Robert Clausecker <fuz@FreeBSD.org>
Subject: git: 99544e13eec1 - stable/12 - lib/libc/string/bcmp.c: fix integer overflow bug
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: fuz
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 99544e13eec1586552470bd9d5f3b24038891401
Auto-Submitted: auto-generated
The branch stable/12 has been updated by fuz:
URL: https://cgit.FreeBSD.org/src/commit/?id=99544e13eec1586552470bd9d5f3b24038891401
commit 99544e13eec1586552470bd9d5f3b24038891401
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-07-12 18:23:21 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-07-21 08:57:32 +0000
lib/libc/string/bcmp.c: fix integer overflow bug
bcmp() returned the number of remaining bytes when the main loop exits.
In case of a match, this is zero, else a positive integer. On systems
where SIZE_MAX > INT_MAX, the implicit conversion from size_t to int in
the return value may cause the number of remaining bytes to overflow,
becoming zero and falsely indicating a successful comparison.
Fix the bug by always returning 0 on equality, 1 otherwise.
PR: 272474
Approved by: emaste
Reviewed by: imp
MFC After: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D41011
(cherry picked from commit 4da7282a1882fc03c99591c27d44a2e6dfda364b)
---
lib/libc/string/bcmp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 96cd49039eee..c42fe79ddb2f 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -51,7 +51,7 @@ bcmp(const void *b1, const void *b2, size_t length)
p2 = (char *)b2;
do
if (*p1++ != *p2++)
- break;
+ return (1);
while (--length);
- return (length);
+ return (0);
}
From nobody Fri Jul 21 09:22:10 2023
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 4R6kbR00BMz4nblK;
Fri, 21 Jul 2023 09:22:11 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6kbQ6b1Cz3DrY;
Fri, 21 Jul 2023 09:22:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689931330;
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=2BC/EQSpQgnmJgqq4/rhTvdVBP3I7JvsrFX7yqQBeew=;
b=AUs8eNbstTN+SoZLNtL4cX04ypvIV2ZdUqRRnvdlRLBanqvLG1RW6n6CFXZCprKT/eAfWK
BkqGkU+FEfDXMCLts4mrygswQbpEuLllxPuB1ONMcAYZ1Gf6QLMNmLvAb/JRMoq0/U6maW
F5bVF1Zw2UKaOn7uaQstQtSny+rr96CFWNIlJTYdVxwjKBc+h1d7NG3Z0Kb8M7qESZxJsj
IxYdv/S7exccVAhTrJ6ystHUnH00OXcdiWHCvPEX1ugn8N695Av4hqnLw+rsby1UMr75BB
UXo81TgPsKfRWxCN1w37uxktadBL+n+L+BlxsjniFZbEBBh/kycfUXlsRPA5dQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689931330;
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=2BC/EQSpQgnmJgqq4/rhTvdVBP3I7JvsrFX7yqQBeew=;
b=JCrfIKiAXD8MXahg949OVgbfiwEnBkIb/l/D4+ts71t+b7Htg3w+W3tkQ+PG+E/jeyQSzc
WJ5qKvTxTOfG8VBeAJ7ZNrco7m3SIDFLPZlGjbiuIMYui7ZiOGu1LAafuASuoRcL8yuoqE
KQonBbizLI0xxrCdopQhHFR7beoM8Ooy5jzV0AAmdz4TBCT1S6ST7d1igqtfss8vLXV5Nr
VfTodLACe1vO6pWOVmJWmGJE4pZa4aCobynkm/ukGvSb6TAyJb/AsFq3ObIi8FzeO2Fohi
6E5rLIA8tB8f7PCx+D7RBwMKqJ6kQKsiW3IZEfkmUudajdX94BkXVZW3T4o4Wg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689931330; a=rsa-sha256; cv=none;
b=H06rvr1IXw/OpM3PfOJ9J7ChhMOvoropSImS/wRUG+YKyuLnuEqx0bf+5wn5gv9ZadCUSU
F/dsN46zSS3waI6mGtTHne6XOZkm2EfJI1wz9bhstCEYF+VYj1K5m0quT/CaYIuzTFxRcB
ajIYpcIIrJ0UgrN3QgZXazmK4eg/Z9LRmgSZ4HIjHqQyh138Yth2lyOmhnU9he2Og9zHmZ
CvIVZeeuq3SXw9/cVUIwCMDLJZx6uparezEl+MnGQddNSzsGjGsraGmR3bcpes8V9LzIDT
s0fTBwmwg80MgXH7JfxI34rH9njKl5/G0P+zjoz+cMlomxVuHUgUDau+PdOUIg==
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 4R6kbQ5NTjz16mF;
Fri, 21 Jul 2023 09:22:10 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L9MAAi094453;
Fri, 21 Jul 2023 09:22:10 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L9MAOp094452;
Fri, 21 Jul 2023 09:22:10 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 09:22:10 GMT
Message-Id: <202307210922.36L9MAOp094452@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 2238fb423031 - stable/13 - vn_lock_pair(): Support passing LK_NODDLKTREAT
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: 2238fb423031ff7cccdf733a89f9d26198e39af0
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=2238fb423031ff7cccdf733a89f9d26198e39af0
commit 2238fb423031ff7cccdf733a89f9d26198e39af0
Author: Olivier Certner <olce.freebsd@certner.fr>
AuthorDate: 2023-07-09 17:12:52 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-07-21 09:21:38 +0000
vn_lock_pair(): Support passing LK_NODDLKTREAT
(cherry picked from commit f58378393fb00f1683bc15f1ae7cbb83e047b9fb)
---
sys/kern/vfs_vnops.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index e314739fa0ad..628e3aecc864 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -3878,6 +3878,9 @@ vn_lock_pair_pause(const char *wmesg)
* Both vnodes could be unlocked temporary (and reclaimed).
*
* If requesting shared locking, locked vnode lock must not be recursed.
+ *
+ * Only one of LK_SHARED and LK_EXCLUSIVE must be specified.
+ * LK_NODDLKTREAT can be optionally passed.
*/
void
vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1,
@@ -3885,19 +3888,21 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1,
{
int error;
- MPASS(lkflags1 == LK_SHARED || lkflags1 == LK_EXCLUSIVE);
- MPASS(lkflags2 == LK_SHARED || lkflags2 == LK_EXCLUSIVE);
+ MPASS((lkflags1 & LK_SHARED) != 0 ^ (lkflags1 & LK_EXCLUSIVE) != 0);
+ MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0);
+ MPASS((lkflags2 & LK_SHARED) != 0 ^ (lkflags2 & LK_EXCLUSIVE) != 0);
+ MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0);
if (vp1 == NULL && vp2 == NULL)
return;
if (vp1 != NULL) {
- if (lkflags1 == LK_SHARED &&
+ if ((lkflags1 & LK_SHARED) != 0 &&
(vp1->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0)
- lkflags1 = LK_EXCLUSIVE;
+ lkflags1 = (lkflags1 & ~LK_SHARED) | LK_EXCLUSIVE;
if (vp1_locked && VOP_ISLOCKED(vp1) != LK_EXCLUSIVE) {
ASSERT_VOP_LOCKED(vp1, "vp1");
- if (lkflags1 == LK_EXCLUSIVE) {
+ if ((lkflags1 & LK_EXCLUSIVE) != 0) {
VOP_UNLOCK(vp1);
ASSERT_VOP_UNLOCKED(vp1,
"vp1 shared recursed");
@@ -3910,12 +3915,12 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1,
}
if (vp2 != NULL) {
- if (lkflags2 == LK_SHARED &&
+ if ((lkflags2 & LK_SHARED) != 0 &&
(vp2->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0)
- lkflags2 = LK_EXCLUSIVE;
+ lkflags2 = (lkflags2 & ~LK_SHARED) | LK_EXCLUSIVE;
if (vp2_locked && VOP_ISLOCKED(vp2) != LK_EXCLUSIVE) {
ASSERT_VOP_LOCKED(vp2, "vp2");
- if (lkflags2 == LK_EXCLUSIVE) {
+ if ((lkflags2 & LK_EXCLUSIVE) != 0) {
VOP_UNLOCK(vp2);
ASSERT_VOP_UNLOCKED(vp2,
"vp2 shared recursed");
From nobody Fri Jul 21 09:22:11 2023
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 4R6kbS0sZYz4nbvL;
Fri, 21 Jul 2023 09:22:12 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6kbS0B6Rz3DfM;
Fri, 21 Jul 2023 09:22:12 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689931332;
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=CpSb9bxvFh/lUnYn56/l4QTqj4hv9ry54NwtFL77DyQ=;
b=MSoBkABVoypZ6b2blVJOfRKVWRt5dvP0rnjt1AnPu0znVNwM3ukMQI/uu99LResYrdMgr5
bwzhzMRtjKG3ICtIoRAL1TOMw3axo0NAMqNLsu28L3u1i9+18TI2eixVw1aM3GkBYh+Q+P
65mTCffqnErSwmTBi/NmTTd5hV+pcEI7oH6Hp9wZUvv6XMsjFclihlM1LziiIJ040G8OQa
dGNkEO2gGLgJRpfU3EZWscXcTl+leAv5oW2aCrkQoPJR45YMtp8paRz1j7hosRP+VeKcbV
ExyNiLubCAo4EdKCFzjjP0WrKxdbHaLLalRCRb2Hv7S6pdD6AYABRAk/Fn4ZPA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689931332;
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=CpSb9bxvFh/lUnYn56/l4QTqj4hv9ry54NwtFL77DyQ=;
b=qB/a5gSDVOL+0cPDloztSwfMe2n6GD0Lu/yWw1LNYU+l0YBKS6IK1Gc5GOMAuHEogwLIYP
1bWpBD6cIyM5/1kjgcYKOcCzhCXMlwfxA2ZiVoG5kLR/RAph5plozvThONMUuOeBu6SgSR
T8Kdi12ratKC0Goyryvd+WjS2vrlA55EqPwsmIbUmd2J4yrE8JxtsD1RZ79UmuC+XvTOP3
CmbpZ7/+y+NJY53xu1vAL10TLQlTHLxG6eLOB19Pj03BHilTXLS+/2o1nx9T1PvZ+QyCFw
rTPIejSTnCdEEVN9c2YZB5clkTpf71UbqaTkdBLgQbk/TjA8bWEaczowBIGLTA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689931332; a=rsa-sha256; cv=none;
b=wPHkOFHf89+/Igd9A/Vhrsh2AtrsmY2y8SUi08zEVWp47yaxPTxK0ykYz7xeony1i1/WN4
tX3X7PfpalZWFHk1sPmG9K71zRhds/Ex9J1y9KgySrUIC0SUlzmylAP8SoZbf2P5mt9x4G
vw8nJIpBcGaCv+KbPozBW2BmnmYiv+FGVnkeXoq2yWkX+gtsJasC9lrs00jY8rgaSsA8hs
G3t3yP+DjhicUZDjqWOYe2LtRGjFo0ADKcBzP4Mh9Bgpyim3L1BJ80Oy1eBahyOnYpqX7b
AYO1x5HV/h+sDUfwidT7E5zvoB/wGjo5Gr1HMqtYlOX3H1LWz0Ncldthb27P/A==
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 4R6kbR6LnBz16rh;
Fri, 21 Jul 2023 09:22:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L9MBFG094472;
Fri, 21 Jul 2023 09:22:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L9MB54094471;
Fri, 21 Jul 2023 09:22:11 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 09:22:11 GMT
Message-Id: <202307210922.36L9MB54094471@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: d6fedc3f2d37 - stable/13 - vfs: Add a parenthese to vn_lock_pair() asserts to silence gcc
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: 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/13
X-Git-Reftype: branch
X-Git-Commit: d6fedc3f2d37a640fa39575a9e5e69d9840a6b68
Auto-Submitted: auto-generated
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=d6fedc3f2d37a640fa39575a9e5e69d9840a6b68
commit d6fedc3f2d37a640fa39575a9e5e69d9840a6b68
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-07-19 13:51:07 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-07-21 09:21:38 +0000
vfs: Add a parenthese to vn_lock_pair() asserts to silence gcc
(cherry picked from commit e38c634b77dec76c03613bd84b37ae22d3bb5699)
---
sys/kern/vfs_vnops.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 628e3aecc864..8f618a9ad46d 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -3888,9 +3888,9 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1,
{
int error;
- MPASS((lkflags1 & LK_SHARED) != 0 ^ (lkflags1 & LK_EXCLUSIVE) != 0);
+ MPASS(((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0));
MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0);
- MPASS((lkflags2 & LK_SHARED) != 0 ^ (lkflags2 & LK_EXCLUSIVE) != 0);
+ MPASS(((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0));
MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0);
if (vp1 == NULL && vp2 == NULL)
From nobody Fri Jul 21 14:41:54 2023
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 4R6shL5sD8z4db39;
Fri, 21 Jul 2023 14:41:54 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6shL5PHxz42XQ;
Fri, 21 Jul 2023 14:41:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689950514;
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=HbiETvy1hYHOVMQqksJ/iJ9GfFB5LsLIKp9o5n+NrmA=;
b=cjcQQVOfAC2a6+BswR3rCXTXZoQHmrDOSnsydtfCfv0uz4l4BVrO/qaEEG9/ce2ebvYbHO
7QuFKw5HAozsrHKHVrw1ueQT2g1vdzjLdhDjo5NioaZiGw+hoPA1FgEf7UAxE4No+EW2tW
HxbIAKrDJImKINmhmqk+kf94CwzgbkJVAskvYxGnTuqV63dQDxWWfKr7KJYdwmIknGuI2d
KXevw+1lQawZzUG3L7GNcqAnnD1HjP22fppIFrfjcxmpKVJozfFFjaCvBE4xQ1QYdw+CaW
+Xhi32AMMlhnkYppLih1iXu0+Jwk/Hv2C31fDwfROuSV55xzNI4oYN2/VQr56g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689950514;
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=HbiETvy1hYHOVMQqksJ/iJ9GfFB5LsLIKp9o5n+NrmA=;
b=XgrUNhcUUwECqDH8W+ETeMNEZlHRgLro74kb3+8bRbQbN6vkoumi9HGhoGiFxPhO81MjTT
YnjuPve/Mu32lgk3UsHKQmkv2/Is7KAYT4+YIeQ1p4mSXXw7FKiqZm77avsU1KNRjds0SX
zS1iygtXC3jGrZIqrnn1cC/gpThSsOqd91hIjbPfTU/xLEIAJ3jnLU2oox2BD/5kOYBvTN
hyukC816ABif/vCybD518DHLYN19NjiKes6xf3wQ4Q35diwXmPxUjbXgMhslQyIvTDAX+e
BB87/1ya7Qx36rM3nEjPSEmZ/IvVOhX8JoNQHrjctKRLooUoBa3S1oQjl+fSSQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689950514; a=rsa-sha256; cv=none;
b=tEhFIoAFZl+tiwyKArb4h5JTgjWIMC5mIr08AfDIhA+uZ1fR5/hfnC7NFJ42tNrIFK3S1H
2eGoewk55DrWNnnVYGe9n8QRnIoIen5IpPThgsx05nKzj3EFInQQFzUxb5EmAwJIv4jm/n
TtxzjvRRQaVTdmcnYUSUaB9NUQxwQUAax8KaZK8QUAfshn1jj2qFxx3aBZqG5Vz4CVNDqi
XZwZdiZEOtQH1Qu6uGZdlqrfZnqOA+UziQO0eKi7CVtLonQNzOIgxGskG9aMesz0lPBA6J
q1cu6BBIthTr4oGplaQarpYvPcZJsNOkD0fsbv0UuvMVlZHdH/g2lJsaYmMvXw==
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 4R6shL4TRqzGJ8;
Fri, 21 Jul 2023 14:41:54 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LEfs85023846;
Fri, 21 Jul 2023 14:41:54 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LEfsWt023845;
Fri, 21 Jul 2023 14:41:54 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 14:41:54 GMT
Message-Id: <202307211441.36LEfsWt023845@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: d578a19e2cd3 - stable/13 - ssh: Update to OpenSSH 9.3p2
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d578a19e2cd312ef0ec842c9f16f97d66caea22a
Auto-Submitted: auto-generated
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=d578a19e2cd312ef0ec842c9f16f97d66caea22a
commit d578a19e2cd312ef0ec842c9f16f97d66caea22a
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-07-19 17:02:33 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-21 14:41:41 +0000
ssh: Update to OpenSSH 9.3p2
From the release notes:
Changes since OpenSSH 9.3
=========================
This release fixes a security bug.
Security
========
Fix CVE-2023-38408 - a condition where specific libaries loaded via
ssh-agent(1)'s PKCS#11 support could be abused to achieve remote
code execution via a forwarded agent socket if the following
conditions are met:
* Exploitation requires the presence of specific libraries on
the victim system.
* Remote exploitation requires that the agent was forwarded
to an attacker-controlled system.
Exploitation can also be prevented by starting ssh-agent(1) with an
empty PKCS#11/FIDO allowlist (ssh-agent -P '') or by configuring
an allowlist that contains only specific provider libraries.
This vulnerability was discovered and demonstrated to be exploitable
by the Qualys Security Advisory team.
In addition to removing the main precondition for exploitation,
this release removes the ability for remote ssh-agent(1) clients
to load PKCS#11 modules by default (see below).
Potentially-incompatible changes
--------------------------------
* ssh-agent(8): the agent will now refuse requests to load PKCS#11
modules issued by remote clients by default. A flag has been added
to restore the previous behaviour "-Oallow-remote-pkcs11".
Note that ssh-agent(8) depends on the SSH client to identify
requests that are remote. The OpenSSH >=8.9 ssh(1) client does
this, but forwarding access to an agent socket using other tools
may circumvent this restriction.
Security: CVE-2023-38408
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 66fd12cf4896eb08ad8e7a2627537f84ead84dd3)
---
crypto/openssh/ChangeLog | 1867 +---------------------------
crypto/openssh/README | 2 +-
crypto/openssh/contrib/redhat/openssh.spec | 2 +-
crypto/openssh/contrib/suse/openssh.spec | 2 +-
crypto/openssh/ssh-agent.1 | 22 +-
crypto/openssh/ssh-agent.c | 21 +-
crypto/openssh/ssh-pkcs11.c | 6 +-
crypto/openssh/sshd_config | 2 +-
crypto/openssh/sshd_config.5 | 2 +-
crypto/openssh/version.h | 4 +-
10 files changed, 82 insertions(+), 1848 deletions(-)
diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog
index f1d1b37d583c..40ca976a61b3 100644
--- a/crypto/openssh/ChangeLog
+++ b/crypto/openssh/ChangeLog
@@ -1,3 +1,36 @@
+commit 9795c4016ae35162072144df032c8b262433b462
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Jul 19 16:27:12 2023 +1000
+
+ OpenSSH 9.3p2
+
+commit bde3635f3c9324bad132cf9ed917813d6abb599e
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Jul 19 16:31:09 2023 +1000
+
+ update version in README
+
+commit f673f2f3e5f67099018fc281a6b5fb918142472e
+Author: Damien Miller <djm@mindrot.org>
+Date: Wed Jul 19 16:31:00 2023 +1000
+
+ update RPM spec versions
+
+commit d7790cdce72a1b6982795baa2b4d6f0bdbb0100d
+Author: Damien Miller <djm@mindrot.org>
+Date: Fri Jul 7 13:30:15 2023 +1000
+
+ disallow remote addition of FIDO/PKCS11 keys
+
+ Depends on the local client performing the session-bind@openssh.com
+ operation, so non-OpenSSH local client may circumvent this.
+
+commit b23fe83f06ee7e721033769cfa03ae840476d280
+Author: Damien Miller <djm@mindrot.org>
+Date: Thu Jul 13 12:09:34 2023 +1000
+
+ terminate pkcs11 process for bad libraries
+
commit cb30fbdbee869f1ce11f06aa97e1cb8717a0b645
Author: Damien Miller <djm@mindrot.org>
Date: Thu Mar 16 08:28:19 2023 +1100
@@ -9402,1837 +9435,3 @@ Date: Mon Jul 19 05:08:54 2021 +0000
reliability on very heavily loaded hosts.
OpenBSD-Regress-ID: 4c28a0fce3ea89ebde441d7091464176e9730533
-
-commit 7953e1bfce9e76bec41c1331a29bc6cff9d416b8
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Jul 19 13:47:51 2021 +1000
-
- Add sshfp-connect.sh file missed in previous.
-
-commit b75a80fa8369864916d4c93a50576155cad4df03
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 19 03:13:28 2021 +0000
-
- upstream: Ensure that all returned SSHFP records for the specified host
-
- name and hostkey type match instead of only one. While there, simplify the
- code somewhat and add some debugging. Based on discussion in bz#3322, ok
- djm@.
-
- OpenBSD-Commit-ID: 0a6a0a476eb7f9dfe8fe2c05a1a395e3e9b22ee4
-
-commit 1cc1fd095393663cd72ddac927d82c6384c622ba
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 19 02:21:50 2021 +0000
-
- upstream: Id sync only, -portable already has this.
-
- Put dh_set_moduli_file call inside ifdef WITH_OPENSSL. Fixes
- build with OPENSSL=no.
-
- OpenBSD-Commit-ID: af54abbebfb12bcde6219a44d544e18204defb15
-
-commit 33abbe2f4153f5ca5c874582f6a7cc91ae167485
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 19 02:46:34 2021 +0000
-
- upstream: Add test for host key verification via SSHFP records. This
-
- requires some external setup to operate so is disabled by default (see
- comments in sshfp-connect.sh).
-
- OpenBSD-Regress-ID: c52c461bd1df3a803d17498917d156ef64512fd9
-
-commit f0cd000d8e3afeb0416dce1c711c3d7c28d89bdd
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 19 02:29:28 2021 +0000
-
- upstream: Add ed25519 key and test SSHFP export of it. Only test
-
- RSA SSHFP export if we have RSA functionality compiled in.
-
- OpenBSD-Regress-ID: b4ff5181b8c9a5862e7f0ecdd96108622333a9af
-
-commit 0075511e27e5394faa28edca02bfbf13b9a6693e
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 19 00:16:26 2021 +0000
-
- upstream: Group keygen tests together.
-
- OpenBSD-Regress-ID: 07e2d25c527bb44f03b7c329d893a1f2d6c5c40c
-
-commit 034828820c7e62652e7c48f9ee6b67fb7ba6fa26
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Sun Jul 18 23:10:10 2021 +0000
-
- upstream: Add test for ssh-keygen printing of SSHFP records.
-
- OpenBSD-Regress-ID: fde9566b56eeb980e149bbe157a884838507c46b
-
-commit 52c3b6985ef1d5dadb4c4fe212f8b3a78ca96812
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sat Jul 17 00:38:11 2021 +0000
-
- upstream: wrap some long lines
-
- OpenBSD-Commit-ID: 4f5186b1466656762dae37d3e569438d900c350d
-
-commit 43ec991a782791d0b3f42898cd789f99a07bfaa4
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sat Jul 17 00:36:53 2021 +0000
-
- upstream: fix sftp on ControlPersist connections, broken by recent
-
- SessionType change; spotted by sthen@
-
- OpenBSD-Commit-ID: 4c5ddc5698790ae6ff50d2a4f8f832f0eeeaa234
-
-commit 073f45c236550f158c9a94003e4611c07dea5279
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jul 16 09:00:23 2021 +0000
-
- upstream: Explicitly check for and start time-based rekeying in the
-
- client and server mainloops.
-
- Previously the rekey timeout could expire but rekeying would not start
- until a packet was sent or received. This could cause us to spin in
- select() on the rekey timeout if the connection was quiet.
-
- ok markus@
-
- OpenBSD-Commit-ID: 4356cf50d7900f3df0a8f2117d9e07c91b9ff987
-
-commit ef7c4e52d5d840607f9ca3a302a4cbb81053eccf
-Author: jmc@openbsd.org <jmc@openbsd.org>
-Date: Wed Jul 14 06:46:38 2021 +0000
-
- upstream: reorder SessionType; ok djm
-
- OpenBSD-Commit-ID: c7dd0b39e942b1caf4976a0b1cf0fed33d05418c
-
-commit 8aa2f9aeb56506dca996d68ab90ab9c0bebd7ec3
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jul 14 11:26:50 2021 +1000
-
- Make whitespace consistent.
-
-commit 4f4297ee9b8a39f4dfd243a74c5f51f9e7a05723
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jul 14 11:26:12 2021 +1000
-
- Add ARM64 Linux self-hosted runner.
-
-commit eda8909d1b0a85b9c3804a04d03ec6738fd9dc7f
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jul 13 23:48:36 2021 +0000
-
- upstream: add a SessionType directive to ssh_config, allowing the
-
- configuration file to offer equivalent control to the -N (no session) and -s
- (subsystem) command-line flags.
-
- Part of GHPR#231 by Volker Diels-Grabsch with some minor tweaks;
- feedback and ok dtucker@
-
- OpenBSD-Commit-ID: 726ee931dd4c5cc7f1d7a187b26f41257f9a2d12
-
-commit 7ae69f2628e338ba6e0eae7ee8a63bcf8fea7538
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Jul 12 02:12:22 2021 +0000
-
- upstream: fix some broken tests; clean up output
-
- OpenBSD-Regress-ID: 1d5038edb511dc4ce1622344c1e724626a253566
-
-commit f5fc6a4c3404bbf65c21ca6361853b33d78aa87e
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Jul 12 18:00:05 2021 +1000
-
- Add configure-time detection for SSH_TIME_T_MAX.
-
- Should fix printing cert times exceeding INT_MAX (bz#3329) on platforms
- were time_t is a long long. The limit used is for the signed type, so if
- some system has a 32bit unsigned time_t then the lower limit will still
- be imposed and we would need to add some way to detect this. Anyone using
- an unsigned 64bit can let us know when it starts being a problem.
-
-commit fd2d06ae4442820429d634c0a8bae11c8e40c174
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 12 06:22:57 2021 +0000
-
- upstream: Make limit for time_t test unconditional in the
-
- format_absolute_time fix for bz#3329 that allows printing of timestamps past
- INT_MAX. This was incorrectly included with the previous commit. Based on
- discussion with djm@.
-
- OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e
-
-commit 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 12 06:08:57 2021 +0000
-
- upstream: Use existing format_absolute_time() function when
-
- printing cert validity instead of doing it inline. Part of bz#3329.
-
- OpenBSD-Commit-ID: a13d4e3c4f59644c23745eb02a09b2a4e717c00c
-
-commit 99981d5f8bfa383791afea03f6bce8454e96e323
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jul 9 09:55:56 2021 +0000
-
- upstream: silence redundant error message; reported by Fabian Stelzer
-
- OpenBSD-Commit-ID: 9349a703016579a60557dafd03af2fe1d44e6aa2
-
-commit e86097813419b49d5bff5c4b51d1c3a5d4d2d804
-Author: John Ericson <John.Ericson@Obsidian.Systems>
-Date: Sat Dec 26 11:40:49 2020 -0500
-
- Re-indent krb5 section after pkg-config addition.
-
-commit 32dd2daa56c294e40ff7efea482c9eac536d8cbb
-Author: John Ericson <John.Ericson@Obsidian.Systems>
-Date: Sat Dec 26 11:40:49 2020 -0500
-
- Support finding Kerberos via pkg-config
-
- This makes cross compilation easier.
-
-commit def7a72234d7e4f684d72d33a0f7229f9eee0aa4
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 9 14:34:06 2021 +1000
-
- Update comments about EGD to include prngd.
-
-commit b5d23150b4e3368f4983fd169d432c07afeee45a
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 5 01:21:07 2021 +0000
-
- upstream: Fix a couple of whitespace things. Portable already has
-
- these so this removes two diffs between the two.
-
- OpenBSD-Commit-ID: 769f017ebafd8e741e337b3e9e89eb5ac73c9c56
-
-commit 8f57be9f279b8e905f9883066aa633c7e67b31cf
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 5 01:16:46 2021 +0000
-
- upstream: Order includes as per style(9). Portable already has
-
- these so this removes a handful of diffs between the two.
-
- OpenBSD-Commit-ID: 8bd7452d809b199c19bfc49511a798f414eb4a77
-
-commit b75624f8733b3ed9e240f86cac5d4a39dae11848
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Mon Jul 5 00:50:25 2021 +0000
-
- upstream: Remove comment referencing now-removed
-
- RhostsRSAAuthentication. ok djm@
-
- OpenBSD-Commit-ID: 3d864bfbd99a1d4429a58e301688f3be464827a9
-
-commit b67eb12f013c5441bb4f0893a97533582ad4eb13
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Jul 5 00:25:42 2021 +0000
-
- upstream: allow spaces to appear in usernames for local to remote,
-
- and scp -3 remote to remote copies. with & ok dtucker bz#1164
-
- OpenBSD-Commit-ID: e9b550f3a85ffbb079b6720833da31317901d6dd
-
-commit 8c4ef0943e574f614fc7c6c7e427fd81ee64ab87
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jul 2 07:20:44 2021 +0000
-
- upstream: Remove obsolete comments about SSHv1 auth methods. ok
-
- djm@
-
- OpenBSD-Commit-ID: 6060f70966f362d8eb4bec3da2f6c4712fbfb98f
-
-commit 88908c9b61bcb99f16e8d398fc41e2b3b4be2003
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 23:00:19 2021 +1000
-
- Remove reference to ChallengeResponse.
-
- challenge_response_authentication was removed from the struct, keeping
- kbd_interactive_authentication.
-
-commit 321874416d610ad2158ce6112f094a4862c2e37f
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 20:38:09 2021 +1000
-
- Move signal.h up include order to match upstream.
-
-commit 4fa83e2d0e32c2dd758653e0359984bbf1334f32
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 20:36:06 2021 +1000
-
- Remove old OpenBSD version marker.
-
- Looks like an accidental leftover from a sync.
-
-commit 9d5e31f55d5f3899b72645bac41a932d298ad73b
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 20:34:19 2021 +1000
-
- Remove duplicate error on error path.
-
- There's an extra error() call on the listen error path, it looks like
- its removal was missed during an upstream sync.
-
-commit 888c459925c7478ce22ff206c9ac1fb812a40caf
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 20:32:46 2021 +1000
-
- Remove some whitespace not in upstream.
-
- Reduces diff vs OpenBSD by a small amount.
-
-commit 4d2d4d47a18d93f3e0a91a241a6fdb545bbf7dc2
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 19:27:43 2021 +1000
-
- Replace remaining references to ChallengeResponse.
-
- Portable had a few additional references to ChallengeResponse related to
- UsePAM, replaces these with equivalent keyboard-interactive ones.
-
-commit 53237ac789183946dac6dcb8838bc3b6b9b43be1
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 19:23:28 2021 +1000
-
- Sync remaining ChallengeResponse removal.
-
- These were omitted from commit 88868fd131.
-
-commit 2c9e4b319f7e98744b188b0f58859d431def343b
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Sat Jul 3 19:17:31 2021 +1000
-
- Disable rocky84 to figure out why agent test fails
-
-commit bfe19197a92b7916f64a121fbd3c179abf15e218
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 2 15:43:28 2021 +1000
-
- Remove now-unused SSHv1 enums.
-
- sRhostsRSAAuthentication and sRSAAuthentication are protocol 1 options
- and are no longer used.
-
-commit c73b02d92d72458a5312bd098f32ce88868fd131
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jul 2 05:11:20 2021 +0000
-
- upstream: Remove references to ChallengeResponseAuthentication in
-
- favour of KbdInteractiveAuthentication. The former is what was in SSHv1, the
- latter is what is in SSHv2 (RFC4256) and they were treated as somewhat but
- not entirely equivalent. We retain the old name as deprecated alias so
- config files continue to work and a reference in the man page for people
- looking for it.
-
- Prompted by bz#3303 which pointed out the discrepancy between the two
- when used with Match. Man page help & ok jmc@, with & ok djm@
-
- OpenBSD-Commit-ID: 2c1bff8e5c9852cfcdab1f3ea94dfef5a22f3b7e
-
-commit f841fc9c8c7568a3b5d84a4cc0cefacb7dbc16b9
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jul 2 15:20:32 2021 +1000
-
- Fix ifdefs around get_random_bytes_prngd.
-
- get_random_bytes_prngd() is used if either of PRNGD_PORT or PRNGD_SOCKET
- are defined, so adjust ifdef accordingly.
-
-commit 0767627cf66574484b9c0834500b42ea04fe528a
-Author: Damien Miller <djm@mindrot.org>
-Date: Fri Jul 2 14:30:23 2021 +1000
-
- wrap get_random_bytes_prngd() in ifdef
-
- avoid unused static function warning
-
-commit f93fdc4de158386efe1116bd44c5b3f4a7a82c25
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Jun 28 13:06:37 2021 +1000
-
- Add rocky84 test target.
-
-commit d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 25 06:30:22 2021 +0000
-
- upstream: fix decoding of X.509 subject name; from Leif Thuresson
-
- via bz3327 ok markus@
-
- OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8
-
-commit 2a5704ec142202d387fda2d6872fd4715ab81347
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 25 06:20:39 2021 +0000
-
- upstream: Use better language to refer to the user. From l1ving
-
- via github PR#250, ok jmc@
-
- OpenBSD-Commit-ID: 07ca3526626996613e128aeddf7748c93c4d6bbf
-
-commit 4bdf7a04797a0ea1c431a9d54588417c29177d19
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 25 03:38:17 2021 +0000
-
- upstream: Replace SIGCHLD/notify_pipe kludge with pselect.
-
- Previously sshd's SIGCHLD handler would wake up select() by writing a
- byte to notify_pipe. We can remove this by blocking SIGCHLD, checking
- for child terminations then passing the original signal mask through
- to pselect. This ensures that the pselect will immediately wake up if
- a child terminates between wait()ing on them and the pselect.
-
- In -portable, for platforms that do not have pselect the kludge is still
- there but is hidden behind a pselect interface.
-
- Based on other changes for bz#2158, ok djm@
-
- OpenBSD-Commit-ID: 202c85de0b3bdf1744fe53529a05404c5480d813
-
-commit c9f7bba2e6f70b7ac1f5ea190d890cb5162ce127
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jun 25 15:08:18 2021 +1000
-
- Move closefrom() to before first malloc.
-
- When built against tcmalloc, tcmalloc allocates a descriptor for its
- internal use, so calling closefrom() afterward causes the descriptor
- number to be reused resulting in a corrupted connection. Moving the
- closefrom a little earlier should resolve this. From kircherlike at
- outlook.com via bz#3321, ok djm@
-
-commit 7ebfe4e439853b88997c9cfc2ff703408a1cca92
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jun 18 20:41:45 2021 +1000
-
- Put second -lssh in link line for sftp-server.
-
- When building --without-openssl the recent port-prngd.c change adds
- a dependency on atomicio, but since nothing else in sftp-server uses
- it, the linker may not find it. Add a second -lssh similar to other
- binaries.
-
-commit e409d7966785cfd9f5970e66a820685c42169717
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jun 18 18:34:08 2021 +1000
-
- Try EGD/PRNGD if random device fails.
-
- When built --without-openssl, try EGD/PRGGD (if configured) as a last
- resort before failing.
-
-commit e43a898043faa3a965dbaa1193cc60e0b479033d
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jun 18 18:32:51 2021 +1000
-
- Split EGD/PRNGD interface into its own file.
-
- This will allow us to use it when building --without-openssl.
-
-commit acb2887a769a1b1912cfd7067f3ce04fad240260
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Thu Jun 17 21:03:19 2021 +1000
-
- Handle GIDs > 2^31 in getgrouplist.
-
- When compiled in 32bit mode, the getgrouplist implementation may fail
- for GIDs greater than LONG_MAX. Analysis and change from ralf.winkel
- at tui.com.
-
-commit 31fac20c941126281b527605b73bff30a8f02edd
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Thu Jun 10 09:46:28 2021 +0000
-
- upstream: Use $SUDO when reading sshd's pidfile here too.
-
- OpenBSD-Regress-ID: 6bfb0d455d493f24839034a629c5306f84dbd409
-
-commit a3a58acffc8cc527f8fc6729486d34e4c3d27643
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Thu Jun 10 09:43:51 2021 +0000
-
- upstream: Use $SUDO when reading sshd's pidfile in case it was
-
- created with a very restrictive umask. This resyncs with -portable.
-
- OpenBSD-Regress-ID: 07fd2af06df759d4f64b82c59094accca1076a5d
-
-commit 249ad4ae51cd3bc235e75a4846eccdf8b1416611
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Thu Jun 10 09:37:59 2021 +0000
-
- upstream: Set umask when creating hostkeys to prevent excessive
-
- permissions warning.
-
- OpenBSD-Regress-ID: 382841db0ee28dfef7f7bffbd511803e1b8ab0ef
-
-commit 9d0892153c005cc65897e9372b01fa66fcbe2842
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Thu Jun 10 03:45:31 2021 +0000
-
- upstream: Add regress test for SIGHUP restart
-
- while handling active and unauthenticated clients. Should catch anything
- similar to the pselect bug just fixed in sshd.c.
-
- OpenBSD-Regress-ID: 3b3c19b5e75e43af1ebcb9586875b3ae3a4cac73
-
-commit 73f6f191f44440ca3049b9d3c8e5401d10b55097
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Thu Jun 10 03:14:14 2021 +0000
-
- upstream: Continue accept loop when pselect
-
- returns -1, eg if it was interrupted by a signal. This should prevent
- the hang discovered by sthen@ wherein sshd receives a SIGHUP while it has
- an unauthenticated child and goes on to a blocking read on a notify_pipe.
- feedback deraadt@, ok djm@
-
- OpenBSD-Commit-ID: 0243c1c5544fca0974dae92cd4079543a3fceaa0
-
-commit c785c0ae134a8e8b5c82b2193f64c632a98159e4
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 22:30:27 2021 +0000
-
- upstream: test that UserKnownHostsFile correctly accepts multiple
-
- arguments; would have caught readconf.c r1.356 regression
-
- OpenBSD-Regress-ID: 71ca54e66c2a0211b04999263e56390b1f323a6a
-
-commit 1a6f6b08e62c78906a3032e8d9a83e721c84574e
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 22:06:12 2021 +0000
-
- upstream: fix regression in r1.356: for ssh_config options that
-
- accepted multiple string arguments, ssh was only recording the first.
- Reported by Lucas via bugs@
-
- OpenBSD-Commit-ID: 7cbf182f7449bf1cb7c5b4452667dc2b41170d6d
-
-commit 78e30af3e2b2dd540a341cc827c6b98dd8b0a6de
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 07:40:12 2021 +0000
-
- upstream: test argv_split() optional termination on comments
-
- OpenBSD-Regress-ID: 9fd1c4a27a409897437c010cfd79c54b639a059c
-
-commit a023138957ea2becf1c7f93fcc42b0aaac6f2b03
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Tue Jun 8 07:05:27 2021 +0000
-
- upstream: Add testcases from bz#3319 for IPQoS and TunnelDevice
-
- being overridden on the command line.
-
- OpenBSD-Regress-ID: 801674d5d2d02abd58274a78cab2711f11de14a8
-
-commit 660cea10b2cdc11f13ba99c89b1bbb368a4d9ff2
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 06:52:43 2021 +0000
-
- upstream: sprinkle some "# comment" at end of configuration lines
-
- to test comment handling
-
- OpenBSD-Regress-ID: cb82fbf40bda5c257a9f742c63b1798e5a8fdda7
-
-commit acc9c32dcb6def6c7d3688bceb4c0e59bd26b411
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 06:51:47 2021 +0000
-
- upstream: more descriptive failure message
-
- OpenBSD-Regress-ID: 5300f6faf1d9e99c0cd10827b51756c5510e3509
-
-commit ce04dd4eae23d1c9cf7c424a702f48ee78573bc1
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Jun 7 01:16:34 2021 +0000
-
- upstream: test AuthenticationMethods inside a Match block as well
-
- as in the main config section
-
- OpenBSD-Regress-ID: ebe0a686621b7cb8bb003ac520975279c28747f7
-
-commit 9018bd821fca17e26e92f7a7e51d9b24cd62f2db
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Jun 7 00:00:50 2021 +0000
-
- upstream: prepare for stricter sshd_config parsing that will refuse
-
- a config that has {Allow,Deny}{Users,Groups} on a line with no subsequent
- arguments. Such lines are permitted but are nonsensical noops ATM
-
- OpenBSD-Regress-ID: ef65463fcbc0bd044e27f3fe400ea56eb4b8f650
-
-commit a10f929d1ce80640129fc5b6bc1acd9bf689169e
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 07:09:42 2021 +0000
-
- upstream: switch sshd_config parsing to argv_split()
-
- similar to the previous commit, this switches sshd_config parsing to
- the newer tokeniser. Config parsing will be a little stricter wrt
- quote correctness and directives appearing without arguments.
-
- feedback and ok markus@
-
- tested in snaps for the last five or so days - thanks Theo and those who
- caught bugs
-
- OpenBSD-Commit-ID: 9c4305631d20c2d194661504ce11e1f68b20d93e
-
-commit ea9e45c89a4822d74a9d97fef8480707d584da4d
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 07:07:15 2021 +0000
-
- upstream: Switch ssh_config parsing to use argv_split()
-
- This fixes a couple of problems with the previous tokeniser,
- strdelim()
-
- 1. strdelim() is permissive wrt accepting '=' characters. This is
- intended to allow it to tokenise "Option=value" but because it
- cannot keep state, it will incorrectly split "Opt=val=val2".
- 2. strdelim() has rudimentry handling of quoted strings, but it
- is incomplete and inconsistent. E.g. it doesn't handle escaped
- quotes inside a quoted string.
- 3. It has no support for stopping on a (unquoted) comment. Because
- of this readconf.c r1.343 added chopping of lines at '#', but
- this caused a regression because these characters may legitimately
- appear inside quoted strings.
-
- The new tokeniser is stricter is a number of cases, including #1 above
- but previously it was also possible for some directives to appear
- without arguments. AFAIK these were nonsensical in all cases, and the
- new tokeniser refuses to accept them.
-
- The new code handles quotes much better, permitting quoted space as
- well as escaped closing quotes. Finally, comment handling should be
- fixed - the tokeniser will terminate only on unquoted # characters.
-
- feedback & ok markus@
-
- tested in snaps for the last five or so days - thanks Theo and those who
- caught bugs
-
- OpenBSD-Commit-ID: dc72fd12af9d5398f4d9e159d671f9269c5b14d5
-
-commit d786424986c04d1d375f231fda177c8408e05c3e
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Tue Jun 8 07:02:46 2021 +0000
-
- upstream: Check if IPQoS or TunnelDevice are already set before
-
- overriding. Prevents values in config files from overriding values supplied
- on the command line. bz#3319, ok markus.
-
- OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74
-
-commit aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Tue Jun 8 06:54:40 2021 +0000
-
- upstream: Allow argv_split() to optionally terminate tokenisation
-
- when it encounters an unquoted comment.
-
- Add some additional utility function for working with argument
- vectors, since we'll be switching to using them to parse
- ssh/sshd_config shortly.
-
- ok markus@ as part of a larger diff; tested in snaps
-
- OpenBSD-Commit-ID: fd9c108cef2f713f24e3bc5848861d221bb3a1ac
-
-commit da9f9acaac5bab95dca642b48e0c8182b246ab69
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Jun 7 19:19:23 2021 +1000
-
- Save logs on failure for upstream test
-
-commit 76883c60161e5f3808787085a27a8c37f8cc4e08
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Mon Jun 7 14:36:32 2021 +1000
-
- Add obsdsnap-i386 upstream test target.
-
-commit d45b9c63f947ec5ec314696e70281f6afddc0ac3
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Mon Jun 7 03:38:38 2021 +0000
-
- upstream: fix debug message when finding a private key to match a
-
- certificate being attempted for user authentication. Previously it would
- print the certificate's path, whereas it was supposed to be showing the
- private key's path. Patch from Alex Sherwin via GHPR247
-
- OpenBSD-Commit-ID: d5af3be66d0f22c371dc1fe6195e774a18b2327b
-
-commit 530739d42f6102668aecd699be0ce59815c1eceb
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun Jun 6 11:34:16 2021 +0000
-
- upstream: Match host certificates against host public keys, not private
-
- keys. Allows use of certificates with private keys held in a ssh-agent.
- Reported by Miles Zhou in bz3524; ok dtucker@
-
- OpenBSD-Commit-ID: 25f5bf70003126d19162862d9eb380bf34bac22a
-
-commit 4265215d7300901fd7097061c7517688ade82f8e
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun Jun 6 03:40:39 2021 +0000
-
- upstream: Client-side workaround for a bug in OpenSSH 7.4: this release
-
- allows RSA/SHA2 signatures for public key authentication but fails to
- advertise this correctly via SSH2_MSG_EXT_INFO. This causes clients of these
- server to incorrectly match PubkeyAcceptedAlgorithms and potentially refuse
- to offer valid keys.
-
- Reported by and based on patch from Gordon Messmer via bz3213, thanks
- also for additional analysis by Jakub Jelen. ok dtucker
-
- OpenBSD-Commit-ID: d6d0b7351d5d44c45f3daaa26efac65847a564f7
-
-commit bda270d7fb8522d43c21a79a4b02a052d7c64de8
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun Jun 6 03:17:02 2021 +0000
-
- upstream: degrade gracefully if a sftp-server offers the
-
- limits@openssh.com extension but fails when the client tries to invoke it.
- Reported by Hector Martin via bz3318
-
- OpenBSD-Commit-ID: bd9d1839c41811616ede4da467e25746fcd9b967
-
-commit d345d5811afdc2d6923019b653cdd93c4cc95f76
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Sun Jun 6 03:15:39 2021 +0000
-
- upstream: the limits@openssh.com extension was incorrectly marked
-
- as an operation that writes to the filesystem, which made it unavailable in
- sftp-server read-only mode. Spotted by Hector Martin via bz3318
-
- OpenBSD-Commit-ID: f054465230787e37516c4b57098fc7975e00f067
-
-commit 2b71010d9b43d7b8c9ec1bf010beb00d98fa765a
-Author: naddy@openbsd.org <naddy@openbsd.org>
-Date: Sat Jun 5 13:47:00 2021 +0000
-
- upstream: PROTOCOL.certkeys: update reference from IETF draft to
-
- RFC
-
- Also fix some typos.
- ok djm@
-
- OpenBSD-Commit-ID: 5e855b6c5a22b5b13f8ffa3897a868e40d349b44
-
-commit aa99b2d9a3e45b943196914e8d8bf086646fdb54
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jun 4 23:41:29 2021 +1000
-
- Clear notify_pipe from readset if present.
-
- Prevents leaking an implementation detail to the caller.
-
-commit 6de8dadf6b4d0627d35bca0667ca44b1d61c2c6b
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jun 4 23:24:25 2021 +1000
-
- space->tabs.
-
-commit c8677065070ee34c05c7582a9c2f58d8642e552d
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Fri Jun 4 18:39:48 2021 +1000
-
- Add pselect implementation for platforms without.
-
- This is basically the existing notify_pipe kludge from serverloop.c
- moved behind a pselect interface. It works by installing a signal
- handler that writes to a pipe that the select is watching, then calls
- the original handler.
-
- The select call in serverloop will become pselect soon, at which point the
- kludge will be removed from thereand will only exist in the compat layer.
- Original code by markus, help from djm.
-
-commit 7cd7f302d3a072748299f362f9e241d81fcecd26
-Author: Vincent Brillault <vincent.brillault@cern.ch>
-Date: Sun May 24 09:15:06 2020 +0200
-
- auth_log: dont log partial successes as failures
-
- By design, 'partial' logins are successful logins, so initially with
- authenticated set to 1, for which another authentication is required. As
- a result, authenticated is always reset to 0 when partial is set to 1.
- However, even if authenticated is 0, those are not failed login
- attempts, similarly to attempts with authctxt->postponed set to 1.
-
-commit e7606919180661edc7f698e6a1b4ef2cfb363ebf
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 4 06:19:07 2021 +0000
-
- upstream: The RB_GENERATE_STATIC(3) macro expands to a series of
-
- function definitions and not a statement, so there should be no semicolon
- following them. Patch from Michael Forney
-
- OpenBSD-Commit-ID: c975dd180580f0bdc0a4d5b7d41ab1f5e9b7bedd
-
-commit c298c4da574ab92df2f051561aeb3e106b0ec954
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 4 05:59:18 2021 +0000
-
- upstream: rework authorized_keys example section, removing irrelevant
-
- stuff, de-wrapping the example lines and better aligning the examples with
- common usage and FAQs; ok jmc
-
- OpenBSD-Commit-ID: d59f1c9281f828148e2a2e49eb9629266803b75c
-
-commit d9cb35bbec5f623589d7c58fc094817b33030f35
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 4 05:10:03 2021 +0000
-
- upstream: adjust SetEnv description to clarify $TERM handling
-
- OpenBSD-Commit-ID: 8b8cc0124856bc1094949d55615e5c44390bcb22
-
-commit 771f57a8626709f2ad207058efd68fbf30d31553
-Author: dtucker@openbsd.org <dtucker@openbsd.org>
-Date: Fri Jun 4 05:09:08 2021 +0000
-
- upstream: Switch the listening select loop from select() to
-
- pselect() and mask signals while checking signal flags, umasking for pselect
- and restoring afterwards. Also restore signals before sighup_restart so they
- don't remain blocked after restart.
-
- This prevents a race where a SIGTERM or SIGHUP can arrive between
- checking the flag and calling select (eg if sshd is processing a
- new connection) resulting in sshd not shutting down until the next
- time it receives a new connection. bz#2158, with & ok djm@
-
- OpenBSD-Commit-ID: bf85bf880fd78e00d7478657644fcda97b9a936f
-
-commit f64f8c00d158acc1359b8a096835849b23aa2e86
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 4 05:02:40 2021 +0000
-
- upstream: allow ssh_config SetEnv to override $TERM, which is otherwise
-
- handled specially by the protocol. Useful in ~/.ssh/config to set TERM to
- something generic (e.g. "xterm" instead of "xterm-256color") for destinations
- that lack terminfo entries. feedback and ok dtucker@
-
- OpenBSD-Commit-ID: 38b1ef4d5bc159c7d9d589d05e3017433e2d5758
-
-commit 60107677dc0ce1e93c61f23c433ad54687fcd9f5
-Author: djm@openbsd.org <djm@openbsd.org>
-Date: Fri Jun 4 04:02:21 2021 +0000
-
- upstream: correct extension name "no-presence-required" =>
-
- "no-touch-required"
-
- document "verify-required" option
-
- OpenBSD-Commit-ID: 1879ff4062cf61d79b515e433aff0bf49a6c55c5
-
-commit ecc186e46e3e30f27539b4311366dfda502f0a08
-Author: Darren Tucker <dtucker@dtucker.net>
-Date: Wed Jun 2 13:54:11 2021 +1000
-
- Retire fbsd7 test target.
-
*** 1141 LINES SKIPPED ***
From nobody Fri Jul 21 14:52:13 2023
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 4R6swF4835z4nbgY;
Fri, 21 Jul 2023 14:52:13 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6swF3brDz45YL;
Fri, 21 Jul 2023 14:52:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689951133;
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=dfvrt9SFMZfvbVNtQ28GeTcwyhNCd5PGqU1Gig0Bikc=;
b=Ti1NB6xDZrSK0y9vSMDliJ0nYTZI4d1woYjij5TZj+XuBwr/tGn333VgOZDgj7K3HA5UqU
eA15xNRGOD+G3Pmvp9m4WPnUqsKFJKgpb4ch3jk7KeRFVimhob7lXcwTqNEex1PJUbMEdX
nU/++lEpZO0/+5HEE7KgPPjxAk6yLnkb09ZEEPv0Y2KXC84TPdF3k036tI8tXNxyJnS+od
JXat0LG0iYXVuDEyQvWZfSnyVutF4O9CRn7HiKwwyCz32+IW80pBEKImX+o3aTubOVgSQ4
mGgsJxtm7CGCaPVZfrtKTkLqkT2Le3/MRo2Pg8SmpZpR1WyBRWwXhCNZYs0cCQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689951133;
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=dfvrt9SFMZfvbVNtQ28GeTcwyhNCd5PGqU1Gig0Bikc=;
b=F9UdzcCP2iXl12H8LeonUvTl2LdtignFLnsctgmUIvWDLGRfgAoUaKObALppzlcQsLFY6u
JkTEE7Z/ZxVAFQvkjeaoJWRdS9hcntu2zZmBQf7w6l2zb0xkCSr3AKDcOhxWiK9uflu43+
Nja+Dyy5/fV6QICC/ojxet7l6+2Wc5C9SDYlWHw9ERUOEQUnJAi2c3yyhzvoO8NJf7xDCs
p+0JCdty+hwJcpJ0fN5c3zaWN0MoNu9gzdTJ15zDWB3Kyhe+It+g+xlj8XpXW815z7KegB
+zOJ3TmJ3nKvN3Bb18Kssq2jlSD8CfE4TAjthol+mlwXNwKdRdzwPeYeCE1pOA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689951133; a=rsa-sha256; cv=none;
b=IzvKKrll8pyqlSdYtj4N4M0BxNg++RGh0qjmfjmzC207zNhjphtQTgnoueMLSiZ7kuRakx
prcbfTjaxnlST0EtHZFbTz8opHTErl0a4N768dntmc8mzBDz6nekjR8CiSc+YUUQMmrrUw
sYxxntMnX8xOD4qMLGeLPy31bqYefL0DUoRONcTHqMaifVMP7cZ9A3mF9gN5eMzEGOb7n+
TLKz40sxNUiSL2sOmo3bHlliQRdl621fGDoDqUvVJE0Nei85hj2eC5xwXPfOam76P1N/cG
AxiYxIOMV6GuG8ybSB2bsdS5CmkEULmFKrA8eVvWDeUJ6amkHe3mN5kP3c2Onw==
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 4R6swF2BmDzHRN;
Fri, 21 Jul 2023 14:52:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LEqDVU041187;
Fri, 21 Jul 2023 14:52:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LEqDvU041186;
Fri, 21 Jul 2023 14:52:13 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 14:52:13 GMT
Message-Id: <202307211452.36LEqDvU041186@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: abf778208f10 - stable/12 - ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: abf778208f101f57ecf402230c69222641f0a032
Auto-Submitted: auto-generated
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=abf778208f101f57ecf402230c69222641f0a032
commit abf778208f101f57ecf402230c69222641f0a032
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-07-19 17:02:33 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-21 14:46:53 +0000
ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2
OpenSSH 9.3p2 provides a fix CVE-2023-38408 - a condition where specific
libaries loaded via ssh-agent(1)'s PKCS#11 support could be abused to
achieve remote code execution via a forwarded agent socket if the
following conditions are met:
* Exploitation requires the presence of specific libraries on
the victim system.
* Remote exploitation requires that the agent was forwarded
to an attacker-controlled system.
This commit is the primary part of the fix in 9.3p2, applied to the
OpenSSH version in FreeBSD 12.x.
Security: CVE-2023-38408
Sponsored by: The FreeBSD Foundation
---
crypto/openssh/ssh-pkcs11.c | 6 ++----
crypto/openssh/sshd_config | 2 +-
crypto/openssh/sshd_config.5 | 2 +-
crypto/openssh/version.h | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/crypto/openssh/ssh-pkcs11.c b/crypto/openssh/ssh-pkcs11.c
index b2e2b32a5078..9e48c134e411 100644
--- a/crypto/openssh/ssh-pkcs11.c
+++ b/crypto/openssh/ssh-pkcs11.c
@@ -1537,10 +1537,8 @@ pkcs11_register_provider(char *provider_id, char *pin,
error("dlopen %s failed: %s", provider_id, dlerror());
goto fail;
}
- if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) {
- error("dlsym(C_GetFunctionList) failed: %s", dlerror());
- goto fail;
- }
+ if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL)
+ fatal("dlsym(C_GetFunctionList) failed: %s", dlerror());
p = xcalloc(1, sizeof(*p));
p->name = xstrdup(provider_id);
p->handle = handle;
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 33c6e9a3b130..14a58ef4ddbb 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -106,7 +106,7 @@ AuthorizedKeysFile .ssh/authorized_keys
#PermitTunnel no
#ChrootDirectory none
#UseBlacklist no
-#VersionAddendum FreeBSD-20221019
+#VersionAddendum FreeBSD-20230719
# no default banner path
#Banner none
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 34dc3648ed26..dd8623d9b4dd 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -1822,7 +1822,7 @@ The default is
Optionally specifies additional text to append to the SSH protocol banner
sent by the server upon connection.
The default is
-.Qq FreeBSD-20221019 .
+.Qq FreeBSD-20230719 .
The value
.Cm none
may be used to disable this.
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 30539ed442ca..3f7069aba20f 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -6,4 +6,4 @@
#define SSH_PORTABLE "p1"
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
-#define SSH_VERSION_FREEBSD "FreeBSD-20221019"
+#define SSH_VERSION_FREEBSD "FreeBSD-20230719"
From nobody Fri Jul 21 15:38:36 2023
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 4R6txn0JWGz4p513;
Fri, 21 Jul 2023 15:38: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6txm72ntz4LSj;
Fri, 21 Jul 2023 15:38:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689953917;
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=TPhYrn88wYxhuyEMEcT22sdtGbG9q6HOcGpGsk7Dd/A=;
b=fRZsN9DVmMu/6C+ssRSfcKcdDSecQkG/p+dgzaxJv63o91bYfWL8rOTlP3576e0j0vuMRD
L0Gn2qe0AJdkz1IQdXGcuIFvTlfi2FkdP3DtTLOLV9ivYzCBFGlrJu191QxcHhyPtQmhoY
OwedpEEXBEMt694lDSKniPuPCqjd7hKDiJ2JGUMlb0GY7g9V9IBAOg+2C1BIZ91IT/5O/k
mc1upBgrvTEPnubt0TwDpeLd9E96v/04BrCR8kh+6fDG/UlMT4Wuq6zL3P0kZdGfI4uFsX
K5xjnXLRvIZxG0uAEdHxVhj3FGHkTPzrkZnrOUTAoRzCd5rny0iTLb+tVDyuqQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689953917;
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=TPhYrn88wYxhuyEMEcT22sdtGbG9q6HOcGpGsk7Dd/A=;
b=eQQy3VS39lQGr0Ymkk8XgpjkONHKfDDu7eqUs57HZpW8PyPK7Dj6/xIBRoZk21R+6/2FyI
/O5rh/yGT+d4iy0NLWNV3adlkGXPA0GsCvah1T3BCj4+VBDhdip8PPQuQcmrKEr6EiGCCl
BnuYoieO+5KoSBuSi4Pm3fulwcc43f2uAgAbdbEkW+61wr+Lry9IoXPY2CcZxHmDj90dE8
bL1klu21nKFCDfTz7i98zwr3aOZbQeTi93B2mR5TmWT1d4sqYpbT/7k1wA9FhrdQTiDCXm
/xffS/RyarRrnUD/lmVrUUnlXfEZu4q/qx/mk8wfZSHiMjQuSn0+9Gj+JlW1lg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689953917; a=rsa-sha256; cv=none;
b=n/zsGXxoKQMQQJIb4zngFFug3UKSS5xtnOGn7aj2wdBEsvZMC3mnFnyDQQNLVAQGDOUtD6
EvTAeGRyblBocdfy29iEu+Zgj1AcgUjs/lxRC9fkVoBXlj6rqSXYrRqAjknldEvZVrb+k7
2D5tsVcBaNFUInZ94yZ84yVhk0OGt0hmWBbgl250fYhYrUaFE3Np6EIE8jmBpHAZVQTvme
rpWNztgMT1kGfydZEN+5ekDe2iiyD39irBIFxmwRwhvSM+h33q8lNs2LbxTWLdJmjUaqEf
o/hQ6YV57lNibbXDGRZrjAZJFqFzz7kGzeulogDzeOFU0e9iBl1xHKg1e5RLDw==
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 4R6txm5vFczHg7;
Fri, 21 Jul 2023 15:38:36 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LFcatg009133;
Fri, 21 Jul 2023 15:38:36 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LFcaPV009132;
Fri, 21 Jul 2023 15:38:36 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 15:38:36 GMT
Message-Id: <202307211538.36LFcaPV009132@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 5300b2093424 - stable/13 - libcbor: update to 0.10.2
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 5300b2093424826ea82a7d07574f584e0b9613ff
Auto-Submitted: auto-generated
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=5300b2093424826ea82a7d07574f584e0b9613ff
commit 5300b2093424826ea82a7d07574f584e0b9613ff
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-04-21 20:09:03 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-21 14:41:41 +0000
libcbor: update to 0.10.2
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 5d3e7166f6a0187fa3f8831b16a06bd9955c21ff)
---
contrib/libcbor/.circleci/config.yml | 224 ++++++
.../libcbor/.github/ISSUE_TEMPLATE/bug_report.md | 20 +
contrib/libcbor/.github/PULL_REQUEST_TEMPLATE | 15 +
contrib/libcbor/.github/workflows/fuzz-pr.yml | 25 +
contrib/libcbor/.github/workflows/fuzz.yml | 6 +-
contrib/libcbor/.gitignore | 8 +
contrib/libcbor/.travis.yml | 66 --
contrib/libcbor/Bazel.md | 100 +++
contrib/libcbor/CHANGELOG.md | 47 ++
contrib/libcbor/CMakeLists.txt | 54 +-
contrib/libcbor/CMakeModules/FindCMocka.cmake | 8 +
contrib/libcbor/CMakeModules/JoinPaths.cmake | 23 +
contrib/libcbor/CONTRIBUTING.md | 35 +
contrib/libcbor/Doxyfile | 778 ++++++++++++++-------
contrib/libcbor/README.md | 54 +-
contrib/libcbor/appveyor.yml | 19 +-
contrib/libcbor/clang-format.sh | 9 +-
contrib/libcbor/codecov.yml | 9 +-
contrib/libcbor/doc/source/api.rst | 4 +-
contrib/libcbor/doc/source/api/encoding.rst | 4 +
.../doc/source/api/item_reference_counting.rst | 19 +-
.../decoding.rst => api/streaming_decoding.rst} | 14 +-
.../libcbor/doc/source/api/streaming_encoding.rst | 65 ++
contrib/libcbor/doc/source/api/type_2.rst | 5 -
contrib/libcbor/doc/source/api/type_3.rst | 6 +-
contrib/libcbor/doc/source/api/type_4.rst | 9 +-
contrib/libcbor/doc/source/api/type_5.rst | 26 +-
contrib/libcbor/doc/source/api/type_7.rst | 9 +-
contrib/libcbor/doc/source/conf.py | 4 +-
contrib/libcbor/doc/source/getting_started.rst | 7 +-
contrib/libcbor/doc/source/index.rst | 1 -
contrib/libcbor/doc/source/requirements.txt | 60 +-
contrib/libcbor/doc/source/rfc_conformance.rst | 4 +-
contrib/libcbor/doc/source/streaming.rst | 13 -
contrib/libcbor/doc/source/streaming/encoding.rst | 4 -
contrib/libcbor/doc/source/using.rst | 11 +-
contrib/libcbor/examples/CMakeLists.txt | 3 +
contrib/libcbor/examples/bazel/README.md | 33 +
contrib/libcbor/examples/bazel/WORKSPACE | 19 +
contrib/libcbor/examples/bazel/src/BUILD | 46 ++
contrib/libcbor/examples/bazel/src/hello.cc | 7 +
contrib/libcbor/examples/bazel/src/hello.h | 8 +
contrib/libcbor/examples/bazel/src/hello_test.cc | 10 +
contrib/libcbor/examples/bazel/src/main.cc | 10 +
contrib/libcbor/examples/bazel/third_party/BUILD | 1 +
.../examples/bazel/third_party/libcbor.BUILD | 21 +
.../examples/bazel/third_party/libcbor/BUILD | 11 +
.../bazel/third_party/libcbor/cbor/cbor_export.h | 42 ++
.../bazel/third_party/libcbor/cbor/configuration.h | 15 +
contrib/libcbor/examples/cjson2cbor.c | 8 +-
contrib/libcbor/examples/create_items.c | 25 +-
contrib/libcbor/examples/hello.c | 3 +-
contrib/libcbor/examples/readfile.c | 3 +-
contrib/libcbor/examples/sort.c | 15 +-
contrib/libcbor/examples/streaming_array.c | 47 ++
contrib/libcbor/examples/streaming_parser.c | 10 +-
contrib/libcbor/misc/update_version.py | 29 +-
contrib/libcbor/oss-fuzz/build.sh | 2 +-
contrib/libcbor/oss-fuzz/cbor_load_fuzzer.cc | 54 +-
contrib/libcbor/release.sh | 8 +-
contrib/libcbor/src/CMakeLists.txt | 18 +-
contrib/libcbor/src/cbor.c | 144 ++--
contrib/libcbor/src/cbor.h | 26 +-
contrib/libcbor/src/cbor/arrays.c | 22 +-
contrib/libcbor/src/cbor/arrays.h | 71 +-
contrib/libcbor/src/cbor/bytestrings.c | 40 +-
contrib/libcbor/src/cbor/bytestrings.h | 54 +-
contrib/libcbor/src/cbor/callbacks.c | 153 ++--
contrib/libcbor/src/cbor/callbacks.h | 14 +-
contrib/libcbor/src/cbor/common.c | 29 +-
contrib/libcbor/src/cbor/common.h | 152 ++--
contrib/libcbor/src/cbor/configuration.h.in | 1 -
contrib/libcbor/src/cbor/data.h | 11 +-
contrib/libcbor/src/cbor/encoding.c | 20 +-
contrib/libcbor/src/cbor/encoding.h | 103 ++-
contrib/libcbor/src/cbor/floats_ctrls.c | 64 +-
contrib/libcbor/src/cbor/floats_ctrls.h | 114 +--
.../libcbor/src/cbor/internal/builder_callbacks.c | 230 +++---
.../libcbor/src/cbor/internal/builder_callbacks.h | 12 +-
contrib/libcbor/src/cbor/internal/encoders.c | 28 +-
contrib/libcbor/src/cbor/internal/encoders.h | 5 +
contrib/libcbor/src/cbor/internal/loaders.c | 2 +-
contrib/libcbor/src/cbor/internal/loaders.h | 9 +-
contrib/libcbor/src/cbor/internal/memory_utils.c | 17 +-
contrib/libcbor/src/cbor/internal/memory_utils.h | 13 +-
contrib/libcbor/src/cbor/internal/stack.c | 6 +-
contrib/libcbor/src/cbor/internal/stack.h | 14 +-
contrib/libcbor/src/cbor/internal/unicode.c | 9 +-
contrib/libcbor/src/cbor/internal/unicode.h | 7 +-
contrib/libcbor/src/cbor/ints.c | 59 +-
contrib/libcbor/src/cbor/ints.h | 61 +-
contrib/libcbor/src/cbor/maps.c | 21 +-
contrib/libcbor/src/cbor/maps.h | 65 +-
contrib/libcbor/src/cbor/serialization.c | 276 +++++---
contrib/libcbor/src/cbor/serialization.h | 135 ++--
contrib/libcbor/src/cbor/streaming.c | 181 ++---
contrib/libcbor/src/cbor/streaming.h | 10 +-
contrib/libcbor/src/cbor/strings.c | 39 +-
contrib/libcbor/src/cbor/strings.h | 87 ++-
contrib/libcbor/src/cbor/tags.c | 11 +-
contrib/libcbor/src/cbor/tags.h | 35 +-
contrib/libcbor/src/libcbor.pc.in | 4 +-
contrib/libcbor/test/CMakeLists.txt | 14 +-
...ype_4_encoders_test.c => array_encoders_test.c} | 31 +-
contrib/libcbor/test/array_test.c | 222 ++++++
contrib/libcbor/test/assertions.c | 32 +-
contrib/libcbor/test/assertions.h | 20 +-
contrib/libcbor/test/bad_inputs_test.c | 43 +-
..._encoders_test.c => bytestring_encoders_test.c} | 20 +-
.../test/{type_2_test.c => bytestring_test.c} | 122 +++-
contrib/libcbor/test/callbacks_test.c | 374 +++++++++-
contrib/libcbor/test/cbor_serialize_test.c | 490 +++++++++++--
contrib/libcbor/test/cbor_stream_decode_test.c | 274 ++++++--
contrib/libcbor/test/copy_test.c | 346 +++++++--
contrib/libcbor/test/float_ctrl_encoders_test.c | 213 ++++++
.../test/{type_7_test.c => float_ctrl_test.c} | 80 ++-
contrib/libcbor/test/fuzz_test.c | 15 +-
...{type_5_encoders_test.c => map_encoders_test.c} | 21 +-
contrib/libcbor/test/{type_5_test.c => map_test.c} | 120 +++-
contrib/libcbor/test/memory_allocation_test.c | 277 --------
contrib/libcbor/test/memory_utils_test.c | 59 ++
...pe_1_encoders_test.c => negint_encoders_test.c} | 49 +-
.../libcbor/test/{type_1_test.c => negint_test.c} | 40 +-
contrib/libcbor/test/pretty_printer_test.c | 9 +-
contrib/libcbor/test/stack_over_limit_test.c | 15 +-
contrib/libcbor/test/stream_expectations.c | 107 +--
contrib/libcbor/test/stream_expectations.h | 71 +-
...pe_3_encoders_test.c => string_encoders_test.c} | 21 +-
.../libcbor/test/{type_3_test.c => string_test.c} | 112 ++-
...{type_6_encoders_test.c => tag_encoders_test.c} | 15 +-
contrib/libcbor/test/{type_6_test.c => tag_test.c} | 59 +-
contrib/libcbor/test/test_allocator.c | 89 +++
contrib/libcbor/test/test_allocator.h | 35 +
contrib/libcbor/test/type_4_test.c | 127 ----
contrib/libcbor/test/type_7_encoders_test.c | 109 ---
...type_0_encoders_test.c => uint_encoders_test.c} | 46 +-
.../libcbor/test/{type_0_test.c => uint_test.c} | 58 +-
contrib/libcbor/test/unicode_test.c | 23 +-
lib/libcbor/Makefile | 3 +-
139 files changed, 5668 insertions(+), 2660 deletions(-)
diff --git a/contrib/libcbor/.circleci/config.yml b/contrib/libcbor/.circleci/config.yml
new file mode 100644
index 000000000000..69371b67d624
--- /dev/null
+++ b/contrib/libcbor/.circleci/config.yml
@@ -0,0 +1,224 @@
+version: 2.1
+
+commands:
+ linux-setup:
+ steps:
+ - run: sudo apt-get update
+ - run: sudo apt-get install -y cmake ${TOOLCHAIN_PACKAGES}
+ - run: sudo apt install libcmocka-dev
+ build:
+ steps:
+ - run: >
+ cmake -DWITH_TESTS=ON \
+ -DCMAKE_BUILD_TYPE=Debug \
+ -DSANITIZE=OFF \
+ -DCOVERAGE="${CMAKE_COVERAGE:='OFF'}" \
+ .
+ - run: make -j 16 VERBOSE=1
+ build-release:
+ steps:
+ - run: >
+ cmake -DWITH_TESTS=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ .
+ - run: make -j 16 VERBOSE=1
+ test:
+ steps:
+ - run: ctest -VV
+
+orbs:
+ codecov: codecov/codecov@3.2.2
+
+jobs:
+ static-test:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ environment:
+ TOOLCHAIN_PACKAGES: g++
+ steps:
+ - checkout
+ - linux-setup
+ - run: sudo apt-get install -y clang-format doxygen cppcheck
+ - run: cppcheck --inline-suppr --error-exitcode=1 .
+ - run: bash clang-format.sh --verbose
+ - run: >
+ if ! $(git diff-index --quiet HEAD); then
+ echo "Code formatting doesn't conform to clang-format"
+ echo "Please run clang-format.sh, commit the diff, and push to re-run CI"
+ echo "Excerpt of the diff follows"
+ git diff | head -n 20
+ fi
+ - run: >
+ if doxygen Doxyfile | grep 'warning: '; then
+ echo "Doxygen warning (see above) -- misformatted docs?"
+ exit 1
+ fi
+ - run: >
+ cd doc &&
+ pip3 install -r source/requirements.txt &&
+ make html
+
+ build-and-test:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ environment:
+ TOOLCHAIN_PACKAGES: g++
+ CMAKE_COVERAGE: ON
+ steps:
+ - checkout
+ - linux-setup
+ - run: sudo apt-get install -y valgrind
+ - build
+ - test
+ - run: ctest -T Coverage
+ - codecov/upload
+ - run: ctest --output-on-failure -T memcheck | tee memcheck.out
+ - run: >
+ if grep -q 'Memory Leak\|IPW\|Uninitialized Memory Conditional\|Uninitialized Memory Read' memcheck.out; then
+ cat Testing/Temporary/MemoryChecker*
+ exit 1
+ fi;
+
+ build-and-test-clang:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ environment:
+ TOOLCHAIN_PACKAGES: clang
+ CC: clang
+ CXX: clang++
+ steps:
+ - checkout
+ - linux-setup
+ - build
+ - test
+
+ build-and-test-32b:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ steps:
+ - checkout
+ - run: sudo apt-get update
+ - run: sudo apt-get install -y cmake gcc-multilib g++-multilib libc6-dev-i386
+ # Make cmocka from source w/ 32b setup
+ - run: git clone https://git.cryptomilk.org/projects/cmocka.git ~/cmocka
+ - run: >
+ cd $(mktemp -d /tmp/build.XXXX) &&
+ cmake ~/cmocka -DCMAKE_TOOLCHAIN_FILE=~/cmocka/cmake/Toolchain-cross-m32.cmake &&
+ make &&
+ sudo make install
+ # Piggyback on the cmocka 32b toolchain
+ - run: >
+ cmake -DWITH_TESTS=ON \
+ -DCMAKE_BUILD_TYPE=Debug \
+ -DCMAKE_TOOLCHAIN_FILE=~/cmocka/cmake/Toolchain-cross-m32.cmake \
+ .
+ - run: make -j 16 VERBOSE=1
+ - test
+
+ build-and-test-release-clang:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ environment:
+ TOOLCHAIN_PACKAGES: clang
+ CC: clang
+ CXX: clang++
+ steps:
+ - checkout
+ - linux-setup
+ - build-release
+ - test
+
+ llvm-coverage:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ environment:
+ TOOLCHAIN_PACKAGES: clang
+ CC: clang
+ CXX: clang++
+ CMAKE_COVERAGE: ON
+ steps:
+ - checkout
+ - linux-setup
+ - build
+ - run: make llvm-coverage
+
+
+ build-and-test-arm:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ environment:
+ TOOLCHAIN_PACKAGES: g++
+ resource_class: arm.medium
+ steps:
+ - checkout
+ - linux-setup
+ - build
+ - test
+
+ build-bazel:
+ machine:
+ image: ubuntu-2204:2022.10.2
+ environment:
+ TOOLCHAIN_PACKAGES: g++
+ steps:
+ - checkout
+ - linux-setup
+ - run: sudo apt install apt-transport-https curl gnupg
+ - run: curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
+ - run: sudo mv bazel.gpg /etc/apt/trusted.gpg.d/
+ - run: echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
+ - run: sudo apt update
+ - run: sudo apt install bazel
+ - run: bazel --version
+ - run: >
+ pushd examples/bazel &&
+ bazel run -s src:hello
+
+ build-and-test-osx:
+ macos:
+ xcode: 12.5.1
+ steps:
+ - checkout
+ - run: bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+ - run: brew install cmocka cmake
+ - build
+ - test
+
+
+ build-and-test-win:
+ resource_class: 'windows.medium'
+ machine:
+ image: 'windows-server-2022-gui:current'
+ shell: 'bash.exe'
+ steps:
+ - checkout
+ - run: choco install cmake -y
+ - run: git clone https://git.cryptomilk.org/projects/cmocka.git
+ - run: cd cmocka && git checkout tags/cmocka-1.1.5
+ - run: /c/Program\ Files/Cmake/bin/cmake -S cmocka -B cmocka_build
+ - run: /c/Program\ Files/Cmake/bin/cmake --build cmocka_build
+ - run: /c/Program\ Files/Cmake/bin/cmake -S . -B libcbor_build -DWITH_TESTS=ON -DCMOCKA_INCLUDE_DIR=cmocka/include -DCMOCKA_LIBRARIES=$(pwd)/cmocka_build/src/Debug/cmocka.lib
+ - run: /c/Program\ Files/Cmake/bin/cmake --build libcbor_build
+ - run: >
+ export PATH="$(pwd)/cmocka_build/src/Debug/:$PATH" &&
+ /c/Program\ Files/Cmake/bin/ctest.exe --test-dir libcbor_build --output-on-failure
+
+workflows:
+ build-and-test:
+ jobs:
+ - static-test
+ - build-and-test
+ - build-and-test-clang
+ - build-and-test-32b
+ - build-and-test-release-clang
+ - build-and-test-arm
+ - build-and-test-win
+ - build-bazel
+ - llvm-coverage
+ # OSX builds are expensive, run only on master
+ - build-and-test-osx:
+ requires:
+ - build-and-test
+ filters:
+ branches:
+ only: [master]
diff --git a/contrib/libcbor/.github/ISSUE_TEMPLATE/bug_report.md b/contrib/libcbor/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000000..75997d8424cc
--- /dev/null
+++ b/contrib/libcbor/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: PJK
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior. If possible, please attach a runnable code snippet.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment**
+libcbor version and build configuration flags (or source package version if using a package manager).
diff --git a/contrib/libcbor/.github/PULL_REQUEST_TEMPLATE b/contrib/libcbor/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 000000000000..1174d56f9c7a
--- /dev/null
+++ b/contrib/libcbor/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,15 @@
+## Description
+
+What changes and why
+
+## Checklist
+
+- [ ] I have read followed [CONTRIBUTING.md](https://github.com/PJK/libcbor/blob/master/CONTRIBUTING.md)
+ - [ ] I have added tests
+ - [ ] I have updated the documentation
+ - [ ] I have updated the CHANGELOG
+- [ ] Are there any breaking changes?
+ - [ ] If yes: I have marked them in the CHANGELOG ([example](https://github.com/PJK/libcbor/blob/87e2d48a127968d39f158cbfc2b79d6285bd039d/CHANGELOG.md?plain=1#L16))
+- [ ] Does this PR introduce any platform specific code?
+- [ ] Security: Does this PR potentially affect security?
+- [ ] Performance: Does this PR potentially affect performance?
diff --git a/contrib/libcbor/.github/workflows/fuzz-pr.yml b/contrib/libcbor/.github/workflows/fuzz-pr.yml
new file mode 100644
index 000000000000..0e3c4fde4e02
--- /dev/null
+++ b/contrib/libcbor/.github/workflows/fuzz-pr.yml
@@ -0,0 +1,25 @@
+# A quick CIFuzz sanity check. Fuzzing time is kept low provide fast feedback
+# on PRs; fuzz.yml schedules a daily long-running fuzzing job.
+name: CIFuzz PR check
+on: [pull_request]
+jobs:
+ Fuzzing:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Build Fuzzers
+ uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'libcbor'
+ dry-run: false
+ - name: Smoke Test Fuzzers
+ uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+ with:
+ oss-fuzz-project-name: 'libcbor'
+ fuzz-seconds: 10
+ dry-run: false
+ - name: Upload Crash
+ uses: actions/upload-artifact@v1
+ if: failure()
+ with:
+ name: artifacts
+ path: ./out/artifacts
diff --git a/contrib/libcbor/.github/workflows/fuzz.yml b/contrib/libcbor/.github/workflows/fuzz.yml
index c5275121868f..8603cc2f338e 100644
--- a/contrib/libcbor/.github/workflows/fuzz.yml
+++ b/contrib/libcbor/.github/workflows/fuzz.yml
@@ -1,5 +1,7 @@
name: CIFuzz
-on: [pull_request]
+on:
+ schedule:
+ - cron: '0 4 * * *'
jobs:
Fuzzing:
runs-on: ubuntu-latest
@@ -13,7 +15,7 @@ jobs:
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
with:
oss-fuzz-project-name: 'libcbor'
- fuzz-seconds: 600
+ fuzz-seconds: 14400 # 4 hours
dry-run: false
- name: Upload Crash
uses: actions/upload-artifact@v1
diff --git a/contrib/libcbor/.gitignore b/contrib/libcbor/.gitignore
index b6fe00f938ad..61f88a874965 100644
--- a/contrib/libcbor/.gitignore
+++ b/contrib/libcbor/.gitignore
@@ -6,3 +6,11 @@ doxygen_docs
*/*.out
cmake-build-debug
venv
+**.DS_Store
+.vscode
+# No top-level requirements, see doc/source
+requirements.txt
+examples/bazel/bazel-bazel
+examples/bazel/bazel-bin
+examples/bazel/bazel-out
+examples/bazel/bazel-testlogs
diff --git a/contrib/libcbor/.travis.yml b/contrib/libcbor/.travis.yml
deleted file mode 100644
index 288de2903399..000000000000
--- a/contrib/libcbor/.travis.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-language: c
-
-matrix:
- include:
- - arch: amd64
- os: linux
- dist: bionic
- compiler: clang
- env: TRAVIS_ARCH="amd64"
- - arch: amd64
- os: linux
- dist: bionic
- compiler: gcc
- env: TRAVIS_ARCH="amd64"
- - arch: arm64
- os: linux
- dist: bionic
- compiler: gcc
- env: TRAVIS_ARCH="arm64"
- - arch: ppc64le
- os: linux
- dist: bionic
- compiler: gcc
- env: TRAVIS_ARCH="ppc64le"
- - arch: amd64
- os: osx
- compiler: gcc
- env: TRAVIS_ARCH="amd64"
-
-before_install:
- - pushd ${HOME}
- - git clone https://gitlab.com/cmocka/cmocka.git
- - cd cmocka && mkdir build && cd build
- - cmake .. && make -j2 && sudo make install
- - cd .. && popd
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y clang-format-8 cppcheck; fi
- - if [ "$TRAVIS_OS_NAME" = "linux" -a "$CC" = "gcc" -a "$TRAVIS_ARCH" = "amd64" ]; then pip install --user codecov; export CFLAGS="-coverage"; fi
-
-script:
- - >
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
- cppcheck . --error-exitcode=1
- # Fail if re-formatting creates diffs (implying bad formatting)
- /clang-format.sh --verbose
- git diff-index --quiet HEAD
- fi;
- - mkdir build && cd build
- - cmake -DWITH_TESTS=ON
- -DCBOR_CUSTOM_ALLOC=ON
- -DCMAKE_BUILD_TYPE=Debug
- -DSANITIZE=OFF
- ..
- - make VERBOSE=1
- - ctest -VV
- - ctest -T memcheck | tee memcheck.out
- - >
- if grep -q 'Memory Leak\|IPW\|Uninitialized Memory Conditional\|Uninitialized Memory Read' memcheck.out; then
- exit 1
- fi;
-
-
-after_success:
- - if [ "$TRAVIS_OS_NAME" = "linux" -a "$CC" = "gcc" -a "$TRAVIS_ARCH" = "amd64" ]; then codecov; fi
-
-notifications:
- email: false
diff --git a/contrib/libcbor/Bazel.md b/contrib/libcbor/Bazel.md
new file mode 100644
index 000000000000..9fa2081f58fc
--- /dev/null
+++ b/contrib/libcbor/Bazel.md
@@ -0,0 +1,100 @@
+# Use as a Bazel Dependency
+
+To use libcbor in your
+[Baze](https://bazel.build/)
+project, first add the following section to your project's `WORKSPACE` file.
+Note the location of the `third_party/libcbor.BUILD` file - you may use a
+different location if you wish, but you the file must be make available to
+`WORKSPACE`.
+
+## WORKSPACE
+
+Note, this imports version `0.8.0` - you may need to update the version and
+the sha256 hash.
+
+```python
+# libcbor
+http_archive(
+ name = "libcbor",
+ build_file = "//third_party:libcbor.BUILD",
+ sha256 = "dd04ea1a7df484217058d389e027e7a0143a4f245aa18a9f89a5dd3e1a4fcc9a",
+ strip_prefix = "libcbor-0.8.0",
+ urls = ["https://github.com/PJK/libcbor/archive/refs/tags/v0.8.0.zip"],
+)
+```
+
+## third_party/libcbor.BUILD
+
+Bazel will unzip the libcbor zip file, then copy this file in as `BUILD`.
+Bazel will then use this file to compile libcbor.
+[Cmake](https://cmake.org/)
+is used in two passes: to create the Makefiles, and then to invoke Make to build
+the `libcbor.a` static library. `libcbor.a` and the `.h` files are then made
+available for other packages to use.
+
+```python
+genrule(
+ name = "cbor_cmake",
+ srcs = glob(["**"]),
+ outs = ["libcbor.a", "cbor.h", "cbor/arrays.h", "cbor/bytestrings.h",
+ "cbor/callbacks.h", "cbor/cbor_export.h", "cbor/common.h", "cbor/configuration.h", "cbor/data.h",
+ "cbor/encoding.h", "cbor/floats_ctrls.h", "cbor/ints.h", "cbor/maps.h",
+ "cbor/serialization.h", "cbor/streaming.h", "cbor/strings.h", "cbor/tags.h"],
+ cmd = " && ".join([
+ # Remember where output should go.
+ "INITIAL_WD=`pwd`",
+ # Build libcbor library.
+ "cd `dirname $(location CMakeLists.txt)`",
+ "cmake -DCMAKE_BUILD_TYPE=Release .",
+ "cmake --build .",
+ # Export the .a and .h files for cbor rule, below.
+ "cp src/libcbor.a src/cbor.h $$INITIAL_WD/$(RULEDIR)",
+ "cp src/cbor/*h cbor/configuration.h $$INITIAL_WD/$(RULEDIR)/cbor"]),
+ visibility = ["//visibility:private"],
+)
+
+cc_import(
+ name = "cbor",
+ hdrs = ["cbor.h", "cbor/arrays.h", "cbor/bytestrings.h",
+ "cbor/callbacks.h", "cbor/cbor_export.h", "cbor/common.h", "cbor/configuration.h", "cbor/data.h",
+ "cbor/encoding.h", "cbor/floats_ctrls.h", "cbor/ints.h", "cbor/maps.h",
+ "cbor/serialization.h", "cbor/streaming.h", "cbor/strings.h", "cbor/tags.h"],
+ static_library = "libcbor.a",
+ visibility = ["//visibility:public"],
+)
+```
+
+## third_party/BUILD
+
+The `libcbor.BUILD` file must be make available to the top-level `WORKSPACE`
+file:
+
+```python
+exports_files(["libcbor.BUILD"]))
+```
+
+## Your BUILD File
+
+Add libcbor dependency to your package's `BUILD` file like so:
+
+```python
+cc_library(
+ name = "...",
+ srcs = [ ... ],
+ hdrs = [ ... ],
+ deps = [
+ ...
+ "@libcbor//:cbor",
+ ],
+)
+```
+
+## Your C File
+
+Now you may simply include `cbor.h`:
+
+```c
+#include "cbor.h"
+
+static const uint8_t version = cbor_major_version;
+```
diff --git a/contrib/libcbor/CHANGELOG.md b/contrib/libcbor/CHANGELOG.md
index 0f13a45d6b24..f2475f308c7a 100644
--- a/contrib/libcbor/CHANGELOG.md
+++ b/contrib/libcbor/CHANGELOG.md
@@ -1,6 +1,53 @@
+Template:
+- [Fix issue X in feature Y](https://github.com/PJK/libcbor/pull/XXX) (by [YYY](https://github.com/YYY))
+
Next
---------------------
+0.10.2 (2023-01-31)
+---------------------
+- [Fixed minor test bug causing failures for x86 Linux](https://github.com/PJK/libcbor/pull/266) (discovered by [trofi](https://github.com/PJK/libcbor/issues/263))
+ - Actual libcbor functionality not affected, bug was in the test suite
+- [Made tests platform-independent](https://github.com/PJK/libcbor/pull/272)
+
+0.10.1 (2022-12-30)
+---------------------
+- [Fix a regression in `cbor_serialize_alloc` that caused serialization of zero-length strings and bytestrings or byte/strings with zero-length chunks to fail](https://github.com/PJK/libcbor/pull/260) (discovered by [martelletto](https://github.com/martelletto))
+
+0.10.0 (2022-12-29)
+---------------------
+- Make the buffer_size optional in `cbor_serialize_alloc` [[#205]](https://github.com/PJK/libcbor/pull/205) (by [hughsie](https://github.com/hughsie))
+- BREAKING: Improved half-float encoding for denormalized numbers. [[#208]](https://github.com/PJK/libcbor/pull/208) (by [ranvis](https://github.com/ranvis))
+ - Denormalized half-floats will now preserve data in the mantissa
+ - Note: Half-float NaNs still lose data (https://github.com/PJK/libcbor/issues/215)
+- BUILD BREAKING: Minimum CMake version is 3.0 [[#201]](https://github.com/PJK/libcbor/pull/201) (by [thewtex@](https://github.com/thewtex))
+ - See https://repology.org/project/cmake/versions for support; the vast majority of users should not be affected.
+- Fix a potential memory leak when the allocator fails during array or map decoding [[#224]](https://github.com/PJK/libcbor/pull/224) (by [James-ZHANG](https://github.com/James-ZHANG))
+- [Fix a memory leak when the allocator fails when adding chunks to indefinite bytestrings.](https://github.com/PJK/libcbor/pull/242) ([discovered](https://github.com/PJK/libcbor/pull/228) by [James-ZHANG](https://github.com/James-ZHANG))
+- [Fix a memory leak when the allocator fails when adding chunks to indefinite strings](https://github.com/PJK/libcbor/pull/246)
+- Potentially BUILD BREAKING: [Add nodiscard attributes to most functions](https://github.com/PJK/libcbor/pull/248)
+ - **Warning**: This may cause new build warnings and (in rare cases, depending on your configuration) errors
+- BREAKING: [Fix `cbor_copy` leaking memory and creating invalid items when the allocator fails](https://github.com/PJK/libcbor/pull/249).
+ - Previously, the failures were not handled in the interface. Now, `cbor_copy` may return `NULL` upon failure; clients should check the return value
+- [Fix `cbor_build_tag` illegal memory behavior when the allocator fails](https://github.com/PJK/libcbor/pull/249)
+- [Add a new `cbor_serialized_size` API](https://github.com/PJK/libcbor/pull/250)
+- [Reworked `cbor_serialize_alloc` to allocate the exact amount of memory necessary upfront](https://github.com/PJK/libcbor/pull/251)
+ - This should significantly speed up `cbor_serialize_alloc` for large items by avoiding multiple reallocation iterations
+ - Clients should not use the return value of `cbor_serialize_alloc`. It may be removed in the future.
+- BUILD BREAKING: [Deprecate CBOR_CUSTOM_ALLOC](https://github.com/PJK/libcbor/pull/237)
+ - `cbor_set_allocs` will always be enabled from now on
+ - Note: The flag will be kept as a no-op triggering a warning when used for one version and then removed completely
+
+0.9.0 (2021-11-14)
+---------------------
+- Improved pkg-config paths handling [[#164]](https://github.com/PJK/libcbor/pull/164) (by [jtojnar@](https://github.com/jtojnar))
+- Use explicit math.h linkage [[#170]](https://github.com/PJK/libcbor/pull/170)
+- BREAKING: Fixed handling of items that exceed the host size_t range [[#186]](https://github.com/PJK/libcbor/pull/186hg)
+ - Callbacks for bytestrings, strings, arrays, and maps use uint64_t instead of size_t to allow handling of large items that exceed size_t even if size_t < uint64_t
+ - cbor_decode explicitly checks size to avoid overflows (previously broken, potentially resulting in erroneous decoding on affected systems)
+ - The change should be a noop for 64b systems
+- Added a [Bazel](https://bazel.build/) build example [[#196]](https://github.com/PJK/libcbor/pull/196) (by [andyjgf@](https://github.com/andyjgf))
+
0.8.0 (2020-09-20)
---------------------
- BUILD BREAKING: Use BUILD_SHARED_LIBS to determine how to build libraries (fixed Windows linkage) [[#148]](https://github.com/PJK/libcbor/pull/148) (by [intelligide@](https://github.com/intelligide))
diff --git a/contrib/libcbor/CMakeLists.txt b/contrib/libcbor/CMakeLists.txt
index edba03720d2f..5c0a7846cfa3 100644
--- a/contrib/libcbor/CMakeLists.txt
+++ b/contrib/libcbor/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
project(libcbor)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/")
include(CTest)
SET(CBOR_VERSION_MAJOR "0")
-SET(CBOR_VERSION_MINOR "8")
-SET(CBOR_VERSION_PATCH "0")
+SET(CBOR_VERSION_MINOR "10")
+SET(CBOR_VERSION_PATCH "2")
SET(CBOR_VERSION ${CBOR_VERSION_MAJOR}.${CBOR_VERSION_MINOR}.${CBOR_VERSION_PATCH})
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
@@ -18,6 +18,13 @@ if(BIG_ENDIAN)
endif()
option(CBOR_CUSTOM_ALLOC "Custom, dynamically defined allocator support" OFF)
+if(CBOR_CUSTOM_ALLOC)
+ message(WARNING
+ "CBOR_CUSTOM_ALLOC has been deprecated. Custom allocators are now enabled by default."
+ "The flag is a no-op and will be removed in the next version. "
+ "Please remove CBOR_CUSTOM_ALLOC from your build configuation.")
+endif(CBOR_CUSTOM_ALLOC)
+
option(CBOR_PRETTY_PRINTER "Include a pretty-printing routine" ON)
set(CBOR_BUFFER_GROWTH "2" CACHE STRING "Factor for buffer growth & shrinking")
set(CBOR_MAX_STACK_SIZE "2048" CACHE STRING "maximum size for decoding context stack")
@@ -85,7 +92,7 @@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g")
include(CheckTypeSize)
check_type_size("size_t" SIZEOF_SIZE_T)
if(SIZEOF_SIZE_T LESS 8)
- message(WARNING "Your size_t is less than 8 bytes. Long items with 64b length specifiers might not work as expected. Make sure to run the tests!")
+ message(WARNING "Your size_t is less than 8 bytes. Decoding of huge items that would exceed the memory address space will always fail. Consider implementing a custom streaming decoder if you need to deal with huge items.")
else()
add_definitions(-DEIGHT_BYTE_SIZE_T)
endif()
@@ -99,19 +106,36 @@ add_custom_target(coverage
COMMAND ctest
COMMAND lcov --capture --directory . --output-file coverage.info
COMMAND genhtml coverage.info --highlight --legend --output-directory coverage_html
- COMMAND echo "Coverage report ready: file://${CMAKE_CURRENT_BINARY_DIR}/coverage_html/index.html")
+ COMMAND echo "Coverage report ready: ${CMAKE_CURRENT_BINARY_DIR}/coverage_html/index.html")
+
+add_custom_target(llvm-coverage
+ COMMAND make -j 16
+ COMMAND rm -rf coverage_profiles
+ COMMAND mkdir coverage_profiles
+ COMMAND bash -c [[ for TEST in $(ls test/*_test); do LLVM_PROFILE_FILE="coverage_profiles/$(basename -- ${TEST}).profraw" ./${TEST}; done ]]
+ # VERBATIM makes escaping working, but breaks shell expansions, so we need to explicitly use bash
+ COMMAND bash -c [[ llvm-profdata merge -sparse $(ls coverage_profiles/*.profraw) -o coverage_profiles/combined.profdata ]]
+ COMMAND bash -c [[ llvm-cov show -instr-profile=coverage_profiles/combined.profdata test/*_test -format=html > coverage_profiles/report.html ]]
+ COMMAND bash -c [[ llvm-cov report -instr-profile=coverage_profiles/combined.profdata test/*_test ]]
+ COMMAND echo "Coverage report ready: ${CMAKE_CURRENT_BINARY_DIR}/coverage_profiles/report.html"
+ VERBATIM)
+
include_directories(src)
-option(COVERAGE "Enable code coverage instrumentation" OFF)
+option(c "Enable code coverage instrumentation" OFF)
if (COVERAGE)
message("Configuring code coverage instrumentation")
- if(NOT CMAKE_C_COMPILER MATCHES "gcc")
- message(WARNING "Gcov instrumentation only works with GCC")
+ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+ # https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage --coverage")
+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -g -fprofile-arcs -ftest-coverage --coverage")
+ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-instr-generate")
+ else()
+ message(WARNING "Code coverage build not implemented for compiler ${CMAKE_C_COMPILER_ID}")
endif()
- # https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage --coverage")
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -g -fprofile-arcs -ftest-coverage --coverage")
endif (COVERAGE)
@@ -139,20 +163,20 @@ else()
message(STATUS "LTO is not enabled")
endif(use_lto)
-subdirs(src)
+add_subdirectory(src)
if(use_lto)
set_property(DIRECTORY src PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif(use_lto)
if (WITH_TESTS)
- subdirs(test)
+ add_subdirectory(test)
if(use_lto)
set_property(DIRECTORY test PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif(use_lto)
endif (WITH_TESTS)
if (WITH_EXAMPLES)
- subdirs(examples)
+ add_subdirectory(examples)
if(use_lto)
set_property(DIRECTORY examples PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
endif(use_lto)
diff --git a/contrib/libcbor/CMakeModules/FindCMocka.cmake b/contrib/libcbor/CMakeModules/FindCMocka.cmake
index 770b44afc426..29e57ae87f1b 100644
--- a/contrib/libcbor/CMakeModules/FindCMocka.cmake
+++ b/contrib/libcbor/CMakeModules/FindCMocka.cmake
@@ -21,7 +21,14 @@
#=============================================================================
#
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_CMOCKA QUIET cmocka)
+ set(CMOCKA_DEFINITIONS ${PC_CMOCKA_CFLAGS_OTHER})
+endif()
+
find_path(CMOCKA_INCLUDE_DIR
+ HINTS ${PC_CMOCKA_INCLUDEDIR} ${PC_CMOCKA_INCLUDE_DIRS}
NAMES
cmocka.h
PATHS
@@ -29,6 +36,7 @@ find_path(CMOCKA_INCLUDE_DIR
)
find_library(CMOCKA_LIBRARY
+ HINTS ${PC_CMOCKA_LIBDIR} ${PC_CMOCKA_LIBRARY_DIRS}
NAMES
cmocka cmocka_shared
PATHS
diff --git a/contrib/libcbor/CMakeModules/JoinPaths.cmake b/contrib/libcbor/CMakeModules/JoinPaths.cmake
new file mode 100644
index 000000000000..c68d91b84dbc
--- /dev/null
+++ b/contrib/libcbor/CMakeModules/JoinPaths.cmake
@@ -0,0 +1,23 @@
+# This module provides function for joining paths
+# known from most languages
+#
+# SPDX-License-Identifier: (MIT OR CC0-1.0)
+# Copyright 2020 Jan Tojnar
+# https://github.com/jtojnar/cmake-snips
+#
+# Modelled after Python’s os.path.join
+# https://docs.python.org/3.7/library/os.path.html#os.path.join
+# Windows not supported
+function(join_paths joined_path first_path_segment)
+ set(temp_path "${first_path_segment}")
+ foreach(current_segment IN LISTS ARGN)
+ if(NOT ("${current_segment}" STREQUAL ""))
+ if(IS_ABSOLUTE "${current_segment}")
+ set(temp_path "${current_segment}")
+ else()
+ set(temp_path "${temp_path}/${current_segment}")
+ endif()
+ endif()
+ endforeach()
+ set(${joined_path} "${temp_path}" PARENT_SCOPE)
+endfunction()
diff --git a/contrib/libcbor/CONTRIBUTING.md b/contrib/libcbor/CONTRIBUTING.md
new file mode 100644
index 000000000000..cc834d21a46b
--- /dev/null
+++ b/contrib/libcbor/CONTRIBUTING.md
@@ -0,0 +1,35 @@
+# Contributing to libcbor
+
+libcbor is maintained by [@PJK](https://github.com/PJK) in his spare time on a best-effort basis.
+
+Community contributions are welcome as long as they align with the [project priorities](https://github.com/PJK/libcbor#main-features) and [goals](https://libcbor.readthedocs.io/en/latest/development.html#goals) and follow the guidelines described belows.
+
+## Principles
+
+**Bug reports and questions:** Bug reports and specific technical questions are always welcome. Feel free to open an [issue](https://github.com/PJK/libcbor/issues).
+
+**Incremental improvements:** Bug fixes (including build scripts, examples, test, typos, CI/CD config, etc.) and documentation improvements (fixes of typos, inaccuracies, out of date content, etc.) are always welcome. Feel free to open a [PR](https://github.com/PJK/libcbor/pulls).
+
+**New features:** I am looking to keep the scope of libcbor small. If you would like to add a feature, please open an issue with your proposal (or reach out to me privately) to discuss if the feature fits into libcbor before opening a PR.
+
+**Major changes:** Please open an issue with your proposal (or reach out to me privately) to discuss if the improvement fits into cbor before opening a PR.
+
+## Pull Request Process
+
+1. Ensure that all CI checks pass
+2. Check that the PR is complete and of good quality
+ - Include a descriptive summary of the change. If the PR addresses an open issue, please link it.
+ - Code changes: Add tests
+ - If necessary: Update documentation, including any links
+3. Code changes: Update [the changelog](https://github.com/PJK/libcbor/blob/master/CHANGELOG.md). Do *not* change the version number.
+
+## Interactions
+
+I work on libcbor on a best effort basis. The typical response time is a few days.
+
+If you do not receive a response in a few weeks, feel free to ping the PR or issue.
+
+## Resources
+
+- [Development documentation](https://libcbor.readthedocs.io/en/latest/development.html)
+
diff --git a/contrib/libcbor/Doxyfile b/contrib/libcbor/Doxyfile
index b197d2bcdedc..2571057646d7 100644
--- a/contrib/libcbor/Doxyfile
+++ b/contrib/libcbor/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.12
+# Doxyfile 1.9.6
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
@@ -12,16 +12,26 @@
# For lists, items can also be appended using:
# TAG += value [value, ...]
# Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
# The default value is: UTF-8.
*** 13659 LINES SKIPPED ***
From nobody Fri Jul 21 15:38:37 2023
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 4R6txp1y5gz4p5HD;
Fri, 21 Jul 2023 15:38:38 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6txp1Pzhz4LYJ;
Fri, 21 Jul 2023 15:38:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689953918;
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=sD/EB1NbyyqAA10Yx2+EmGBf7naiSCmJpmhkc8dq6RQ=;
b=cRjsSIkicos+OR0sJaU8R9xrS7NBIhF3umWBe66ZTmFBM+5J/XnqHX72fhvHVxlgB1tKJj
lOt8iLceNjNN1yIbgmyL/31xN1mIUXCnYK1AK7GkzeR3/nepd0anlT56QwaOmXKvoqPOAR
cSSHgBPlNrhyTRzihD/2g/sBGUUI/LNlWByx/KmX+C+QR4NBi+uGrkMkLsxijM85D5q3Qu
Ue3YLY0mk7QSYNsjYXMFwIWj9QtjtXvYUf7+wahv/T7tWL/N64uAJrINmGO4MLypoOqa13
7AglzlX+Za4hJ6848wT8lk7Lqc+APgDR3eP+KO/t3orxqBq8alZT/X3/WcTEsA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689953918;
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=sD/EB1NbyyqAA10Yx2+EmGBf7naiSCmJpmhkc8dq6RQ=;
b=KvQkcOqClR21YwLteqJrkt06QJkr/UQo6AJJOKtqrT3bPcHakvF9sIZfhc0Xan3FYOW1DZ
HT5sclIfz1Imo3/HomzPssHjIVenC6ysEED32kWmnl3x7V4PecHsEudU0U6JrGEXlpoI/R
YhVhZvO0QtwtP/VWgqNxkC6wMAp1NPY5inZeEUW3SUPL2S7dSHffNPMWfq0IrdqKHn7tdr
SUOV/r+VznAKt3MOmnXfdxf2zZ5MLC44q9taXOCJYFoatBh7XtyEn/nMA64LU9x/PIbVcf
sga0eSPR+p6vuq1FaDNzJif4uxIlR/SxxUodWrtCJvnQVVg44pFD0slNXscPug==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689953918; a=rsa-sha256; cv=none;
b=aURP7JL7CzVmz1VtdvqRCRo3v13uAGgqZg8eNCMCa50Ob+ItchVM3A+iGi1rI+blOwiwxF
NbbOPRSs59Cr5AZ1QxftF39uxBp/CJe5xWkLPNIemXw0iHZSFeiTEifB8umia3c6toHg0Y
QYQLrjCakFv3oF6W+yVqHL1+WTz3O8nwAq0zyy+zWTxjEphf7YdB3dcAX1Tiy94IoXHAhD
271jzLzSRRdz5Ih0xExNHpEebA3KkO4d0/MqesrTxLddejm+TS0kDUKrGdWzgJX6Qumvsp
IPIkIzffNTwbxo9tcyn4pAReO/V3I0cMtEJByriXNG0SjlM5gse2mROIY3QHfA==
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 4R6txp0C4HzJZt;
Fri, 21 Jul 2023 15:38:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LFcbh2009152;
Fri, 21 Jul 2023 15:38:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LFcbZC009151;
Fri, 21 Jul 2023 15:38:37 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 15:38:37 GMT
Message-Id: <202307211538.36LFcbZC009151@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: b27bad1e0373 - stable/13 - libfido2: update to 1.9.0
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: b27bad1e0373832af03cf2c4f84006899baa81e1
Auto-Submitted: auto-generated
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=b27bad1e0373832af03cf2c4f84006899baa81e1
commit b27bad1e0373832af03cf2c4f84006899baa81e1
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-05-05 23:11:52 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-21 14:41:42 +0000
libfido2: update to 1.9.0
Some highlights from NEWS:
** Added OpenSSL 3.0 compatibility.
** Removed OpenSSL 1.0 compatibility.
** Support for FIDO 2.1 "minPinLength" extension.
** Support for COSE_EDDSA, COSE_ES256, and COSE_RS1 attestation.
** Support for TPM 2.0 attestation.
** Support for device timeouts; see fido_dev_set_timeout().
** New API calls:
- es256_pk_from_EVP_PKEY;
- fido_cred_attstmt_len;
- fido_cred_attstmt_ptr;
- fido_cred_pin_minlen;
- fido_cred_set_attstmt;
- fido_cred_set_pin_minlen;
- fido_dev_set_pin_minlen_rpid;
- fido_dev_set_timeout;
- rs256_pk_from_EVP_PKEY.
** Reliability and portability fixes.
** Better handling of HID devices without identification strings; gh#381.
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
(cherry picked from commit f540a43052c12c76d3453ead881248d5467a1ab0)
---
contrib/libfido2/CMakeLists.txt | 59 +-
contrib/libfido2/NEWS | 22 +
contrib/libfido2/README.adoc | 9 +-
contrib/libfido2/examples/assert.c | 44 +-
contrib/libfido2/examples/cred.c | 110 +-
contrib/libfido2/examples/extern.h | 8 -
contrib/libfido2/examples/reset.c | 13 +-
contrib/libfido2/examples/util.c | 28 -
contrib/libfido2/fuzz/Dockerfile | 6 +-
contrib/libfido2/fuzz/Makefile | 16 +-
contrib/libfido2/fuzz/clock.c | 79 ++
contrib/libfido2/fuzz/dummy.h | 83 ++
contrib/libfido2/fuzz/export.gnu | 12 +
contrib/libfido2/fuzz/functions.txt | 1165 ++++++++++++----------
contrib/libfido2/fuzz/fuzz_assert.c | 48 +-
contrib/libfido2/fuzz/fuzz_bio.c | 1 +
contrib/libfido2/fuzz/fuzz_cred.c | 39 +-
contrib/libfido2/fuzz/fuzz_credman.c | 1 +
contrib/libfido2/fuzz/fuzz_hid.c | 30 +-
contrib/libfido2/fuzz/fuzz_largeblob.c | 1 +
contrib/libfido2/fuzz/fuzz_mgmt.c | 28 +
contrib/libfido2/fuzz/fuzz_netlink.c | 94 +-
contrib/libfido2/fuzz/mutator_aux.c | 5 +-
contrib/libfido2/fuzz/mutator_aux.h | 5 +-
contrib/libfido2/fuzz/report.tgz | Bin 303082 -> 320981 bytes
contrib/libfido2/fuzz/summary.txt | 86 +-
contrib/libfido2/fuzz/wrap.c | 201 ++--
contrib/libfido2/fuzz/wrapped.sym | 25 +-
contrib/libfido2/man/CMakeLists.txt | 17 +-
contrib/libfido2/man/es256_pk_new.3 | 18 +-
contrib/libfido2/man/fido2-token.1 | 12 +
contrib/libfido2/man/fido_cred_new.3 | 50 +-
contrib/libfido2/man/fido_cred_set_authdata.3 | 57 +-
contrib/libfido2/man/fido_cred_verify.3 | 12 +-
contrib/libfido2/man/fido_dev_enable_entattest.3 | 27 +-
contrib/libfido2/man/fido_dev_info_manifest.3 | 10 +
contrib/libfido2/man/fido_dev_set_io_functions.3 | 35 +-
contrib/libfido2/man/rs256_pk_new.3 | 18 +-
contrib/libfido2/openbsd-compat/hkdf.c | 124 ---
contrib/libfido2/openbsd-compat/hkdf.h | 65 --
contrib/libfido2/openbsd-compat/openbsd-compat.h | 17 +-
contrib/libfido2/openbsd-compat/strsep.c | 79 ++
contrib/libfido2/regress/CMakeLists.txt | 10 +-
contrib/libfido2/regress/assert.c | 88 +-
contrib/libfido2/regress/cred.c | 646 +++++++++++-
contrib/libfido2/regress/dev.c | 154 ++-
contrib/libfido2/src/CMakeLists.txt | 15 +-
contrib/libfido2/src/assert.c | 168 +---
contrib/libfido2/src/authkey.c | 16 +-
contrib/libfido2/src/bio.c | 77 +-
contrib/libfido2/src/cbor.c | 107 +-
contrib/libfido2/src/config.c | 74 +-
contrib/libfido2/src/cred.c | 245 +++--
contrib/libfido2/src/credman.c | 62 +-
contrib/libfido2/src/dev.c | 63 +-
contrib/libfido2/src/ecdh.c | 12 +-
contrib/libfido2/src/eddsa.c | 82 +-
contrib/libfido2/src/es256.c | 62 +-
contrib/libfido2/src/export.gnu | 9 +
contrib/libfido2/src/export.llvm | 9 +
contrib/libfido2/src/export.msvc | 9 +
contrib/libfido2/src/extern.h | 55 +-
contrib/libfido2/src/fido.h | 18 +-
contrib/libfido2/src/fido/config.h | 2 +
contrib/libfido2/src/fido/eddsa.h | 9 +-
contrib/libfido2/src/fido/es256.h | 3 +-
contrib/libfido2/src/fido/param.h | 8 +-
contrib/libfido2/src/fido/rs256.h | 3 +-
contrib/libfido2/src/fido/types.h | 14 +-
contrib/libfido2/src/hid_freebsd.c | 8 +-
contrib/libfido2/src/hid_linux.c | 4 +-
contrib/libfido2/src/hid_openbsd.c | 17 +-
contrib/libfido2/src/hid_osx.c | 32 +-
contrib/libfido2/src/hid_unix.c | 3 +-
contrib/libfido2/src/hid_win.c | 48 +-
contrib/libfido2/src/info.c | 81 +-
contrib/libfido2/src/io.c | 104 +-
contrib/libfido2/src/largeblob.c | 65 +-
contrib/libfido2/src/netlink.c | 4 +-
contrib/libfido2/src/nfc_linux.c | 44 +-
contrib/libfido2/src/pin.c | 72 +-
contrib/libfido2/src/reset.c | 12 +-
contrib/libfido2/src/rs1.c | 99 ++
contrib/libfido2/src/rs256.c | 127 ++-
contrib/libfido2/src/time.c | 74 ++
contrib/libfido2/src/tpm.c | 286 ++++++
contrib/libfido2/src/types.c | 76 ++
contrib/libfido2/src/u2f.c | 158 ++-
contrib/libfido2/src/webauthn.h | 839 ++++++++++++++++
contrib/libfido2/src/winhello.c | 387 +++----
contrib/libfido2/tools/CMakeLists.txt | 3 +
contrib/libfido2/tools/config.c | 48 +
contrib/libfido2/tools/extern.h | 3 +-
contrib/libfido2/tools/fido2-token.c | 2 +
contrib/libfido2/tools/token.c | 6 +
contrib/libfido2/windows/build.ps1 | 390 ++++----
contrib/libfido2/windows/const.ps1 | 42 +
contrib/libfido2/windows/release.ps1 | 84 ++
lib/libfido2/Makefile | 4 +
99 files changed, 5599 insertions(+), 2302 deletions(-)
diff --git a/contrib/libfido2/CMakeLists.txt b/contrib/libfido2/CMakeLists.txt
index 101b7b33e2fc..d775a98c5b48 100644
--- a/contrib/libfido2/CMakeLists.txt
+++ b/contrib/libfido2/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Yubico AB. All rights reserved.
+# Copyright (c) 2018-2021 Yubico AB. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
@@ -28,7 +28,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_COLOR_MAKEFILE OFF)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(FIDO_MAJOR "1")
-set(FIDO_MINOR "8")
+set(FIDO_MINOR "9")
set(FIDO_PATCH "0")
set(FIDO_VERSION ${FIDO_MAJOR}.${FIDO_MINOR}.${FIDO_PATCH})
@@ -68,10 +68,11 @@ if(NOT MSVC)
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DARWIN_C_SOURCE")
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D__STDC_WANT_LIB_EXT1__=1")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- set(NFC_LINUX OFF)
+ set(NFC_LINUX ON)
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_GNU_SOURCE")
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DEFAULT_SOURCE")
- elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
+ CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D__BSD_VISIBLE=1")
endif()
set(FIDO_CFLAGS "${FIDO_CFLAGS} -std=c99")
@@ -79,7 +80,7 @@ if(NOT MSVC)
endif()
check_c_compiler_flag("-Wshorten-64-to-32" HAVE_SHORTEN_64_TO_32)
-check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
+check_c_compiler_flag("-Werror -fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
check_include_files(cbor.h HAVE_CBOR_H)
check_include_files(endian.h HAVE_ENDIAN_H)
@@ -88,7 +89,6 @@ check_include_files(openssl/opensslv.h HAVE_OPENSSLV_H)
check_include_files(signal.h HAVE_SIGNAL_H)
check_include_files(sys/random.h HAVE_SYS_RANDOM_H)
check_include_files(unistd.h HAVE_UNISTD_H)
-check_include_files("windows.h;webauthn.h" HAVE_WEBAUTHN_H)
check_symbol_exists(arc4random_buf stdlib.h HAVE_ARC4RANDOM_BUF)
check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
@@ -101,17 +101,13 @@ check_symbol_exists(getrandom sys/random.h HAVE_GETRANDOM)
check_symbol_exists(memset_s string.h HAVE_MEMSET_S)
check_symbol_exists(readpassphrase readpassphrase.h HAVE_READPASSPHRASE)
check_symbol_exists(recallocarray stdlib.h HAVE_RECALLOCARRAY)
-check_symbol_exists(sigaction signal.h HAVE_SIGACTION)
check_symbol_exists(strlcat string.h HAVE_STRLCAT)
check_symbol_exists(strlcpy string.h HAVE_STRLCPY)
+check_symbol_exists(strsep string.h HAVE_STRSEP)
check_symbol_exists(sysconf unistd.h HAVE_SYSCONF)
check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB)
check_symbol_exists(timingsafe_bcmp string.h HAVE_TIMINGSAFE_BCMP)
-set(CMAKE_EXTRA_INCLUDE_FILES signal.h)
-check_type_size("sig_atomic_t" HAVE_SIG_ATOMIC_T)
-set(CMAKE_EXTRA_INCLUDE_FILES)
-
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
try_compile(HAVE_POSIX_IOCTL
"${CMAKE_CURRENT_BINARY_DIR}/posix_ioctl_check.o"
@@ -134,16 +130,15 @@ list(APPEND CHECK_VARIABLES
HAVE_POSIX_IOCTL
HAVE_READPASSPHRASE
HAVE_RECALLOCARRAY
- HAVE_SIGACTION
HAVE_SIGNAL_H
HAVE_STRLCAT
HAVE_STRLCPY
+ HAVE_STRSEP
HAVE_SYSCONF
HAVE_SYS_RANDOM_H
HAVE_TIMESPECSUB
HAVE_TIMINGSAFE_BCMP
HAVE_UNISTD_H
- HAVE_WEBAUTHN_H
)
foreach(v ${CHECK_VARIABLES})
@@ -156,26 +151,26 @@ if(HAVE_EXPLICIT_BZERO AND NOT LIBFUZZER)
add_definitions(-DHAVE_EXPLICIT_BZERO)
endif()
-if(HAVE_SIGACTION AND (NOT HAVE_SIG_ATOMIC_T STREQUAL ""))
- add_definitions(-DSIGNAL_EXAMPLE)
-endif()
-
if(UNIX)
add_definitions(-DHAVE_DEV_URANDOM)
endif()
if(MSVC)
if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR
- (NOT CRYPTO_INCLUDE_DIRS) OR (NOT CRYPTO_LIBRARY_DIRS) OR
- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS))
- message(FATAL_ERROR "please provide definitions for "
- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY}_DIRS when building "
- "under msvc")
+ (NOT CBOR_BIN_DIRS) OR (NOT CRYPTO_INCLUDE_DIRS) OR
+ (NOT CRYPTO_LIBRARY_DIRS) OR (NOT CRYPTO_BIN_DIRS) OR
+ (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS) OR
+ (NOT ZLIB_BIN_DIRS))
+ message(FATAL_ERROR "please define "
+ "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY,BIN}_DIRS when "
+ "building under msvc")
endif()
set(CBOR_LIBRARIES cbor)
set(ZLIB_LIBRARIES zlib)
set(CRYPTO_LIBRARIES crypto-46)
set(MSVC_DISABLED_WARNINGS_LIST
+ "C4152" # nonstandard extension used: function/data pointer
+ # conversion in expression;
"C4200" # nonstandard extension used: zero-sized array in
# struct/union;
"C4204" # nonstandard extension used: non-constant aggregate
@@ -191,12 +186,10 @@ if(MSVC)
${MSVC_DISABLED_WARNINGS_LIST})
string(REGEX REPLACE "[/-]W[1234][ ]?" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MP -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Z7 /guard:cf /sdl /RTCcsu")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Z7 /guard:cf /sdl /RTCcsu")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi /guard:cf /sdl")
- if (HAVE_WEBAUTHN_H)
- add_definitions(-DUSE_WINHELLO)
- set(USE_WINHELLO ON)
- endif()
+ add_definitions(-DUSE_WINHELLO)
+ set(USE_WINHELLO ON)
else()
include(FindPkgConfig)
pkg_search_module(CBOR libcbor)
@@ -275,9 +268,14 @@ else()
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2")
+ if(CRYPTO_VERSION VERSION_GREATER_EQUAL 3.0)
+ add_definitions(-DOPENSSL_API_COMPAT=0x10100000L)
+ endif()
+
if(FUZZ)
add_definitions(-DFIDO_FUZZ)
endif()
+
if(LIBFUZZER)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=fuzzer-no-link")
endif()
@@ -404,10 +402,9 @@ if(BUILD_MANPAGES)
endif()
if(NOT WIN32)
- if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- if(NOT LIBFUZZER AND NOT FUZZ)
- subdirs(regress)
- endif()
+ if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT FUZZ)
+ enable_testing()
+ subdirs(regress)
endif()
if(FUZZ)
subdirs(fuzz)
diff --git a/contrib/libfido2/NEWS b/contrib/libfido2/NEWS
index a89766b72e89..04cda4e0e83a 100644
--- a/contrib/libfido2/NEWS
+++ b/contrib/libfido2/NEWS
@@ -1,3 +1,25 @@
+* Version 1.9.0 (2021-10-27)
+ ** Enabled NFC support on Linux.
+ ** Added OpenSSL 3.0 compatibility.
+ ** Removed OpenSSL 1.0 compatibility.
+ ** Support for FIDO 2.1 "minPinLength" extension.
+ ** Support for COSE_EDDSA, COSE_ES256, and COSE_RS1 attestation.
+ ** Support for TPM 2.0 attestation.
+ ** Support for device timeouts; see fido_dev_set_timeout().
+ ** New API calls:
+ - es256_pk_from_EVP_PKEY;
+ - fido_cred_attstmt_len;
+ - fido_cred_attstmt_ptr;
+ - fido_cred_pin_minlen;
+ - fido_cred_set_attstmt;
+ - fido_cred_set_pin_minlen;
+ - fido_dev_set_pin_minlen_rpid;
+ - fido_dev_set_timeout;
+ - rs256_pk_from_EVP_PKEY.
+ ** Reliability and portability fixes.
+ ** Better handling of HID devices without identification strings; gh#381.
+ ** Fixed detection of Windows's native webauthn API; gh#382.
+
* Version 1.8.0 (2021-07-22)
** Dropped 'Requires.private' entry from pkg-config file.
** Better support for FIDO 2.1 authenticators.
diff --git a/contrib/libfido2/README.adoc b/contrib/libfido2/README.adoc
index f5ffa7e4e602..a0e188bf8774 100644
--- a/contrib/libfido2/README.adoc
+++ b/contrib/libfido2/README.adoc
@@ -23,6 +23,8 @@ file for the full license text.
*libfido2* is known to work on Linux, macOS, Windows, OpenBSD, and FreeBSD.
+NFC support is available on Linux and Windows.
+
=== Documentation
Documentation is available in troff and HTML formats. An
@@ -40,7 +42,7 @@ is also available.
==== Releases
-The current release of *libfido2* is 1.8.0. Please consult Yubico's
+The current release of *libfido2* is 1.9.0. Please consult Yubico's
https://developers.yubico.com/libfido2/Releases[release page] for source
and binary releases.
@@ -66,7 +68,7 @@ Follow the instructions for Ubuntu 18.04 (Bionic) below.
Or from source, on UNIX-like systems:
- $ (rm -rf build && mkdir build && cd build && cmake ..)
+ $ cmake -B build
$ make -C build
$ sudo make -C build install
@@ -75,7 +77,8 @@ https://www.freedesktop.org/wiki/Software/pkg-config/[pkg-config] may need to
be installed, or the PKG_CONFIG_PATH environment variable set.
*libfido2* depends on https://github.com/pjk/libcbor[libcbor],
-https://www.openssl.org[OpenSSL], and https://zlib.net[zlib]. On Linux, libudev
+https://www.openssl.org[OpenSSL] 1.1 or newer, and https://zlib.net[zlib].
+On Linux, libudev
(part of https://www.freedesktop.org/wiki/Software/systemd[systemd]) is also
required.
diff --git a/contrib/libfido2/examples/assert.c b/contrib/libfido2/examples/assert.c
index dc3fda3ac447..8b0dbd9f6eb2 100644
--- a/contrib/libfido2/examples/assert.c
+++ b/contrib/libfido2/examples/assert.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Copyright (c) 2018-2021 Yubico AB. All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the LICENSE file.
*/
@@ -20,7 +20,7 @@
#include "../openbsd-compat/openbsd-compat.h"
#include "extern.h"
-static const unsigned char cdh[32] = {
+static const unsigned char cd[32] = {
0xec, 0x8d, 0x8f, 0x78, 0x42, 0x4a, 0x2b, 0xb7,
0x82, 0x34, 0xaa, 0xca, 0x07, 0xa1, 0xf6, 0x56,
0x42, 0x1c, 0xb6, 0xf6, 0xb3, 0x00, 0x86, 0x52,
@@ -106,10 +106,9 @@ verify_assert(int type, const unsigned char *authdata_ptr, size_t authdata_len,
errx(1, "fido_assert_new");
/* client data hash */
- r = fido_assert_set_clientdata_hash(assert, cdh, sizeof(cdh));
+ r = fido_assert_set_clientdata(assert, cd, sizeof(cd));
if (r != FIDO_OK)
- errx(1, "fido_assert_set_clientdata_hash: %s (0x%x)",
- fido_strerr(r), r);
+ errx(1, "fido_assert_set_clientdata: %s (0x%x)", fido_strerr(r), r);
/* relying party */
r = fido_assert_set_rp(assert, "localhost");
@@ -166,7 +165,7 @@ main(int argc, char **argv)
const char *blobkey_out = NULL;
const char *hmac_out = NULL;
unsigned char *body = NULL;
- long long seconds = 0;
+ long long ms = 0;
size_t len;
int type = COSE_ES256;
int ext = 0;
@@ -182,16 +181,12 @@ main(int argc, char **argv)
pin = optarg;
break;
case 'T':
-#ifndef SIGNAL_EXAMPLE
- (void)seconds;
- errx(1, "-T not supported");
-#else
- if (base10(optarg, &seconds) < 0)
+ if (base10(optarg, &ms) < 0)
errx(1, "base10: %s", optarg);
- if (seconds <= 0 || seconds > 30)
+ if (ms <= 0 || ms > 30)
errx(1, "-T: %s must be in (0,30]", optarg);
+ ms *= 1000; /* seconds to milliseconds */
break;
-#endif
case 'a':
if (read_blob(optarg, &body, &len) < 0)
errx(1, "read_blob: %s", optarg);
@@ -262,10 +257,9 @@ main(int argc, char **argv)
fido_dev_force_u2f(dev);
/* client data hash */
- r = fido_assert_set_clientdata_hash(assert, cdh, sizeof(cdh));
+ r = fido_assert_set_clientdata(assert, cd, sizeof(cd));
if (r != FIDO_OK)
- errx(1, "fido_assert_set_clientdata_hash: %s (0x%x)",
- fido_strerr(r), r);
+ errx(1, "fido_assert_set_clientdata: %s (0x%x)", fido_strerr(r), r);
/* relying party */
r = fido_assert_set_rp(assert, "localhost");
@@ -286,20 +280,12 @@ main(int argc, char **argv)
if (uv && (r = fido_assert_set_uv(assert, FIDO_OPT_TRUE)) != FIDO_OK)
errx(1, "fido_assert_set_uv: %s (0x%x)", fido_strerr(r), r);
-#ifdef SIGNAL_EXAMPLE
- prepare_signal_handler(SIGINT);
- if (seconds) {
- prepare_signal_handler(SIGALRM);
- alarm((unsigned)seconds);
- }
-#endif
+ /* timeout */
+ if (ms != 0 && (r = fido_dev_set_timeout(dev, (int)ms)) != FIDO_OK)
+ errx(1, "fido_dev_set_timeout: %s (0x%x)", fido_strerr(r), r);
- r = fido_dev_get_assert(dev, assert, pin);
- if (r != FIDO_OK) {
-#ifdef SIGNAL_EXAMPLE
- if (got_signal)
- fido_dev_cancel(dev);
-#endif
+ if ((r = fido_dev_get_assert(dev, assert, pin)) != FIDO_OK) {
+ fido_dev_cancel(dev);
errx(1, "fido_dev_get_assert: %s (0x%x)", fido_strerr(r), r);
}
diff --git a/contrib/libfido2/examples/cred.c b/contrib/libfido2/examples/cred.c
index 74145c761380..4a9d8bf4b25a 100644
--- a/contrib/libfido2/examples/cred.c
+++ b/contrib/libfido2/examples/cred.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Copyright (c) 2018-2021 Yubico AB. All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the LICENSE file.
*/
@@ -17,7 +17,7 @@
#include "../openbsd-compat/openbsd-compat.h"
#include "extern.h"
-static const unsigned char cdh[32] = {
+static const unsigned char cd[32] = {
0xf9, 0x64, 0x57, 0xe7, 0x2d, 0x97, 0xf6, 0xbb,
0xdd, 0xd7, 0xfb, 0x06, 0x37, 0x62, 0xea, 0x26,
0x20, 0x44, 0x8e, 0x69, 0x7c, 0x03, 0xf2, 0x31,
@@ -42,9 +42,8 @@ usage(void)
static void
verify_cred(int type, const char *fmt, const unsigned char *authdata_ptr,
- size_t authdata_len, const unsigned char *x509_ptr, size_t x509_len,
- const unsigned char *sig_ptr, size_t sig_len, bool rk, bool uv, int ext,
- const char *key_out, const char *id_out)
+ size_t authdata_len, const unsigned char *attstmt_ptr, size_t attstmt_len,
+ bool rk, bool uv, int ext, const char *key_out, const char *id_out)
{
fido_cred_t *cred;
int r;
@@ -57,11 +56,10 @@ verify_cred(int type, const char *fmt, const unsigned char *authdata_ptr,
if (r != FIDO_OK)
errx(1, "fido_cred_set_type: %s (0x%x)", fido_strerr(r), r);
- /* client data hash */
- r = fido_cred_set_clientdata_hash(cred, cdh, sizeof(cdh));
+ /* client data */
+ r = fido_cred_set_clientdata(cred, cd, sizeof(cd));
if (r != FIDO_OK)
- errx(1, "fido_cred_set_clientdata_hash: %s (0x%x)",
- fido_strerr(r), r);
+ errx(1, "fido_cred_set_clientdata: %s (0x%x)", fido_strerr(r), r);
/* relying party */
r = fido_cred_set_rp(cred, "localhost", "sweet home localhost");
@@ -96,15 +94,10 @@ verify_cred(int type, const char *fmt, const unsigned char *authdata_ptr,
goto out;
}
- /* x509 */
- r = fido_cred_set_x509(cred, x509_ptr, x509_len);
+ /* attestation statement */
+ r = fido_cred_set_attstmt(cred, attstmt_ptr, attstmt_len);
if (r != FIDO_OK)
- errx(1, "fido_cred_set_x509: %s (0x%x)", fido_strerr(r), r);
-
- /* sig */
- r = fido_cred_set_sig(cred, sig_ptr, sig_len);
- if (r != FIDO_OK)
- errx(1, "fido_cred_set_sig: %s (0x%x)", fido_strerr(r), r);
+ errx(1, "fido_cred_set_attstmt: %s (0x%x)", fido_strerr(r), r);
r = fido_cred_verify(cred);
if (r != FIDO_OK)
@@ -138,27 +131,6 @@ out:
fido_cred_free(&cred);
}
-static fido_dev_t *
-open_from_manifest(const fido_dev_info_t *dev_infos, size_t len,
- const char *path)
-{
- size_t i;
- fido_dev_t *dev;
-
- for (i = 0; i < len; i++) {
- const fido_dev_info_t *curr = fido_dev_info_ptr(dev_infos, i);
- if (path == NULL ||
- strcmp(path, fido_dev_info_path(curr)) == 0) {
- dev = fido_dev_new_with_info(curr);
- if (fido_dev_open_with_info(dev) == FIDO_OK)
- return (dev);
- fido_dev_free(&dev);
- }
- }
-
- return (NULL);
-}
-
int
main(int argc, char **argv)
{
@@ -171,16 +143,13 @@ main(int argc, char **argv)
const char *blobkey_out = NULL;
const char *key_out = NULL;
const char *id_out = NULL;
- const char *path = NULL;
unsigned char *body = NULL;
- long long seconds = 0;
+ long long ms = 0;
size_t len;
int type = COSE_ES256;
int ext = 0;
int ch;
int r;
- fido_dev_info_t *dev_infos = NULL;
- size_t dev_infos_len = 0;
if ((cred = fido_cred_new()) == NULL)
errx(1, "fido_cred_new");
@@ -191,16 +160,12 @@ main(int argc, char **argv)
pin = optarg;
break;
case 'T':
-#ifndef SIGNAL_EXAMPLE
- (void)seconds;
- errx(1, "-T not supported");
-#else
- if (base10(optarg, &seconds) < 0)
+ if (base10(optarg, &ms) < 0)
errx(1, "base10: %s", optarg);
- if (seconds <= 0 || seconds > 30)
+ if (ms <= 0 || ms > 30)
errx(1, "-T: %s must be in (0,30]", optarg);
+ ms *= 1000; /* seconds to milliseconds */
break;
-#endif
case 'b':
ext |= FIDO_EXT_LARGEBLOB_KEY;
blobkey_out = optarg;
@@ -248,21 +213,20 @@ main(int argc, char **argv)
}
}
- fido_init(0);
-
argc -= optind;
argv += optind;
- if (argc > 1)
+ if (argc != 1)
usage();
- dev_infos = fido_dev_info_new(16);
- fido_dev_info_manifest(dev_infos, 16, &dev_infos_len);
- if (argc == 1)
- path = argv[0];
- if ((dev = open_from_manifest(dev_infos, dev_infos_len, path)) == NULL)
- errx(1, "open_from_manifest");
+ fido_init(0);
+
+ if ((dev = fido_dev_new()) == NULL)
+ errx(1, "fido_dev_new");
+ r = fido_dev_open(dev, argv[0]);
+ if (r != FIDO_OK)
+ errx(1, "fido_dev_open: %s (0x%x)", fido_strerr(r), r);
if (u2f)
fido_dev_force_u2f(dev);
@@ -271,11 +235,10 @@ main(int argc, char **argv)
if (r != FIDO_OK)
errx(1, "fido_cred_set_type: %s (0x%x)", fido_strerr(r), r);
- /* client data hash */
- r = fido_cred_set_clientdata_hash(cred, cdh, sizeof(cdh));
+ /* client data */
+ r = fido_cred_set_clientdata(cred, cd, sizeof(cd));
if (r != FIDO_OK)
- errx(1, "fido_cred_set_clientdata_hash: %s (0x%x)",
- fido_strerr(r), r);
+ errx(1, "fido_cred_set_clientdata: %s (0x%x)", fido_strerr(r), r);
/* relying party */
r = fido_cred_set_rp(cred, "localhost", "sweet home localhost");
@@ -301,20 +264,12 @@ main(int argc, char **argv)
if (uv && (r = fido_cred_set_uv(cred, FIDO_OPT_TRUE)) != FIDO_OK)
errx(1, "fido_cred_set_uv: %s (0x%x)", fido_strerr(r), r);
-#ifdef SIGNAL_EXAMPLE
- prepare_signal_handler(SIGINT);
- if (seconds) {
- prepare_signal_handler(SIGALRM);
- alarm((unsigned)seconds);
- }
-#endif
+ /* timeout */
+ if (ms != 0 && (r = fido_dev_set_timeout(dev, (int)ms)) != FIDO_OK)
+ errx(1, "fido_dev_set_timeout: %s (0x%x)", fido_strerr(r), r);
- r = fido_dev_make_cred(dev, cred, pin);
- if (r != FIDO_OK) {
-#ifdef SIGNAL_EXAMPLE
- if (got_signal)
- fido_dev_cancel(dev);
-#endif
+ if ((r = fido_dev_make_cred(dev, cred, pin)) != FIDO_OK) {
+ fido_dev_cancel(dev);
errx(1, "fido_makecred: %s (0x%x)", fido_strerr(r), r);
}
@@ -329,9 +284,8 @@ main(int argc, char **argv)
uv = true;
verify_cred(type, fido_cred_fmt(cred), fido_cred_authdata_ptr(cred),
- fido_cred_authdata_len(cred), fido_cred_x5c_ptr(cred),
- fido_cred_x5c_len(cred), fido_cred_sig_ptr(cred),
- fido_cred_sig_len(cred), rk, uv, ext, key_out, id_out);
+ fido_cred_authdata_len(cred), fido_cred_attstmt_ptr(cred),
+ fido_cred_attstmt_len(cred), rk, uv, ext, key_out, id_out);
if (blobkey_out != NULL) {
/* extract the "largeBlob" key */
diff --git a/contrib/libfido2/examples/extern.h b/contrib/libfido2/examples/extern.h
index 0ea68c4fb585..5633b23d2003 100644
--- a/contrib/libfido2/examples/extern.h
+++ b/contrib/libfido2/examples/extern.h
@@ -11,10 +11,6 @@
#include <openssl/evp.h>
#include <openssl/rsa.h>
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
/* util.c */
EC_KEY *read_ec_pubkey(const char *);
RSA *read_rsa_pubkey(const char *);
@@ -25,9 +21,5 @@ int write_blob(const char *, const unsigned char *, size_t);
int write_ec_pubkey(const char *, const void *, size_t);
int write_rsa_pubkey(const char *, const void *, size_t);
int write_eddsa_pubkey(const char *, const void *, size_t);
-#ifdef SIGNAL_EXAMPLE
-void prepare_signal_handler(int);
-extern volatile sig_atomic_t got_signal;
-#endif
#endif /* _EXTERN_H_ */
diff --git a/contrib/libfido2/examples/reset.c b/contrib/libfido2/examples/reset.c
index eb341c26c0cd..b429d05f0fe4 100644
--- a/contrib/libfido2/examples/reset.c
+++ b/contrib/libfido2/examples/reset.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Copyright (c) 2018-2021 Yubico AB. All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the LICENSE file.
*/
@@ -34,16 +34,9 @@ main(int argc, char **argv)
if ((r = fido_dev_open(dev, argv[1])) != FIDO_OK)
errx(1, "fido_dev_open: %s (0x%x)", fido_strerr(r), r);
-#ifdef SIGNAL_EXAMPLE
- prepare_signal_handler(SIGINT);
-#endif
-
if ((r = fido_dev_reset(dev)) != FIDO_OK) {
-#ifdef SIGNAL_EXAMPLE
- if (got_signal)
- fido_dev_cancel(dev);
-#endif
- errx(1, "fido_reset: %s (0x%x)", fido_strerr(r), r);
+ fido_dev_cancel(dev);
+ errx(1, "fido_dev_reset: %s (0x%x)", fido_strerr(r), r);
}
if ((r = fido_dev_close(dev)) != FIDO_OK)
diff --git a/contrib/libfido2/examples/util.c b/contrib/libfido2/examples/util.c
index caa68aa880ee..8b360af21c7a 100644
--- a/contrib/libfido2/examples/util.c
+++ b/contrib/libfido2/examples/util.c
@@ -21,9 +21,6 @@
#include <limits.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -33,31 +30,6 @@
#include "../openbsd-compat/openbsd-compat.h"
#include "extern.h"
-#ifdef SIGNAL_EXAMPLE
-volatile sig_atomic_t got_signal = 0;
-
-static void
-signal_handler(int signo)
-{
- (void)signo;
- got_signal = 1;
-}
-
-void
-prepare_signal_handler(int signo)
-{
- struct sigaction sa;
-
- memset(&sa, 0, sizeof(sa));
-
- sigemptyset(&sa.sa_mask);
- sa.sa_handler = signal_handler;
-
- if (sigaction(signo, &sa, NULL) < 0)
- err(1, "sigaction");
-}
-#endif
-
int
base10(const char *str, long long *ll)
{
diff --git a/contrib/libfido2/fuzz/Dockerfile b/contrib/libfido2/fuzz/Dockerfile
index 895da69e4c4c..f175991d0462 100644
--- a/contrib/libfido2/fuzz/Dockerfile
+++ b/contrib/libfido2/fuzz/Dockerfile
@@ -1,12 +1,12 @@
-# Copyright (c) 2019 Yubico AB. All rights reserved.
+# Copyright (c) 2019-2021 Yubico AB. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
FROM ubuntu:focal
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
-RUN apt-get install -y clang-11 cmake git libssl-dev libudev-dev make pkg-config
+RUN apt-get install -y clang-12 cmake git libssl-dev libudev-dev make pkg-config
RUN apt-get install -y zlib1g-dev
RUN git clone --branch v0.8.0 https://github.com/PJK/libcbor
RUN git clone https://github.com/yubico/libfido2
-RUN CC=clang-11 CXX=clang++-11 /libfido2/fuzz/build-coverage /libcbor /libfido2
+RUN CC=clang-12 CXX=clang++-12 /libfido2/fuzz/build-coverage /libcbor /libfido2
diff --git a/contrib/libfido2/fuzz/Makefile b/contrib/libfido2/fuzz/Makefile
index 4b067c23aac2..1a974a2bf557 100644
--- a/contrib/libfido2/fuzz/Makefile
+++ b/contrib/libfido2/fuzz/Makefile
@@ -1,11 +1,11 @@
-# Copyright (c) 2019 Yubico AB. All rights reserved.
+# Copyright (c) 2019-2021 Yubico AB. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-IMAGE := libfido2-coverage:1.8.0
+IMAGE := libfido2-coverage:1.9.1
RUNNER := libfido2-runner
-PROFDATA := llvm-profdata-11
-COV := llvm-cov-11
+PROFDATA := llvm-profdata-12
+COV := llvm-cov-12
TARGETS := fuzz_assert fuzz_bio fuzz_cred fuzz_credman fuzz_hid \
fuzz_largeblob fuzz_netlink fuzz_mgmt
CORPORA := $(foreach f,${TARGETS},${f}/corpus)
@@ -50,16 +50,18 @@ profdata: run
report.tgz: profdata
docker exec ${RUNNER} /bin/sh -c 'rm -rf /report && mkdir /report && \
${COV} show -format=html -tab-size=8 -instr-profile=/$< \
- -output-dir=/report /libfido2/build/src/libfido2.so'
+ --show-branch-summary=false -output-dir=/report \
+ /libfido2/build/src/libfido2.so'
docker exec -i ${RUNNER} tar Czcf / - report > $@
summary.txt: profdata
docker exec ${RUNNER} ${COV} report -use-color=false \
- /libfido2/build/src/libfido2.so -instr-profile=/$< > $@
+ --show-branch-summary=false /libfido2/build/src/libfido2.so \
+ -instr-profile=/$< > $@
functions.txt: profdata
docker exec ${RUNNER} /bin/sh -c '${COV} report -use-color=false \
- -show-functions -instr-profile=/$< \
+ -show-functions --show-branch-summary=false -instr-profile=/$< \
/libfido2/build/src/libfido2.so /libfido2/src/*.[ch]' > $@
clean: run
diff --git a/contrib/libfido2/fuzz/clock.c b/contrib/libfido2/fuzz/clock.c
new file mode 100644
index 000000000000..23803c2ee3e5
--- /dev/null
+++ b/contrib/libfido2/fuzz/clock.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2021 Yubico AB. All rights reserved.
+ * Use of this source code is governed by a BSD-style
+ * license that can be found in the LICENSE file.
+ */
+
+#include <stdint.h>
+#include <time.h>
+
+#include "mutator_aux.h"
+
+/*
+ * A pseudo-random monotonic clock with a probabilistic discontinuity to
+ * the end of time (as measured by struct timespec).
+ */
+
+extern int prng_up;
+extern int __wrap_clock_gettime(clockid_t, struct timespec *);
+extern int __real_clock_gettime(clockid_t, struct timespec *);
+extern int __wrap_usleep(unsigned int);
+static TLS struct timespec fuzz_clock;
+
+static void
+tick(unsigned int usec)
+{
+ long long drift;
+
+ /*
+ * Simulate a jump to the end of time with 0.125% probability.
+ * This condition should be gracefully handled by callers of
+ * clock_gettime().
+ */
+ if (uniform_random(800) < 1) {
+ fuzz_clock.tv_sec = LLONG_MAX;
+ fuzz_clock.tv_nsec = LONG_MAX;
+ return;
+ }
+
+ drift = usec * 1000LL + (long long)uniform_random(10000000); /* 10ms */
+ if (LLONG_MAX - drift < (long long)fuzz_clock.tv_nsec) {
+ fuzz_clock_reset(); /* Not much we can do here. */
+ } else if (drift + (long long)fuzz_clock.tv_nsec < 1000000000) {
+ fuzz_clock.tv_nsec += (long)(drift);
+ } else {
+ fuzz_clock.tv_sec += (long)(drift / 1000000000);
+ fuzz_clock.tv_nsec += (long)(drift % 1000000000);
+ }
+}
+
+int
+__wrap_clock_gettime(clockid_t clk_id, struct timespec *tp)
+{
+ if (!prng_up || clk_id != CLOCK_MONOTONIC)
+ return __real_clock_gettime(clk_id, tp);
+ if (uniform_random(400) < 1)
+ return -1;
+
+ tick(0);
+ *tp = fuzz_clock;
+
+ return 0;
+}
+
+int
+__wrap_usleep(unsigned int usec)
+{
+ if (uniform_random(400) < 1)
+ return -1;
+
+ tick(usec);
+
+ return 0;
+}
+
+void
+fuzz_clock_reset(void)
+{
+ memset(&fuzz_clock, 0, sizeof(fuzz_clock));
+}
diff --git a/contrib/libfido2/fuzz/dummy.h b/contrib/libfido2/fuzz/dummy.h
index 981cceec37b5..95744eba634b 100644
--- a/contrib/libfido2/fuzz/dummy.h
+++ b/contrib/libfido2/fuzz/dummy.h
@@ -93,4 +93,87 @@ const uint8_t dummy_eddsa[] = {
0xe2, 0x39, 0xdf, 0x2f, 0x87, 0x19, 0xb3, 0x02,
};
+const uint8_t dummy_netlink_wiredata[] = {
+ 0xd8, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x9d, 0x2e, 0x00, 0x00,
+ 0x01, 0x02, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x6e, 0x66, 0x63, 0x00, 0x06, 0x00, 0x01, 0x00,
+ 0x1e, 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x05, 0x00,
+ 0x1f, 0x00, 0x00, 0x00, 0x80, 0x01, 0x06, 0x00,
+ 0x14, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x02, 0x00,
+ 0x08, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x02, 0x00, 0x0a, 0x00, 0x00, 0x00,
+ 0x14, 0x00, 0x03, 0x00, 0x08, 0x00, 0x01, 0x00,
+ 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x04, 0x00,
+ 0x08, 0x00, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x02, 0x00, 0x0a, 0x00, 0x00, 0x00,
+ 0x14, 0x00, 0x05, 0x00, 0x08, 0x00, 0x01, 0x00,
+ 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x06, 0x00,
+ 0x08, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x02, 0x00, 0x0a, 0x00, 0x00, 0x00,
+ 0x14, 0x00, 0x07, 0x00, 0x08, 0x00, 0x01, 0x00,
+ 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x08, 0x00,
+ 0x08, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00,
+ 0x14, 0x00, 0x09, 0x00, 0x08, 0x00, 0x01, 0x00,
+ 0x0f, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x0a, 0x00,
+ 0x08, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00,
+ 0x08, 0x00, 0x02, 0x00, 0x0a, 0x00, 0x00, 0x00,
+ 0x14, 0x00, 0x0b, 0x00, 0x08, 0x00, 0x01, 0x00,
+ 0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00,
+ 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x0c, 0x00,
*** 12268 LINES SKIPPED ***
From nobody Fri Jul 21 15:38:39 2023
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 4R6txq3PjPz4p5HN;
Fri, 21 Jul 2023 15:38:39 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6txq20RVz4LfF;
Fri, 21 Jul 2023 15:38:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689953919;
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=5jjaeU2OGW9CY4s0dp/jmxcNrvYecuF0P4nhR/qmdOM=;
b=EnvvTgGMocvB1eADPHsgj7sg5+tN2xeZMzG5UA6iglc2XKmV9igY4azVRbbvLH6dWJQJy6
uYeXVNsO+zUjwpyNt73OkoTEcz2cntKxhOxs+Bl/Y+epNQEsCR4uzGwkIvTo/s0OaxkNjs
u/8LIbFre8pMXdGxVt+mq961hO+3LViZtrEmYvzKAkre8jPxZ77qHMs1aCxFBFatTzkGJK
cqZLrYDjXIEMxZIyhzxsRY/nJBIscGJ+YJR6MC+UdeoPd9dBtj+Xn1mQaA+pPAGaPBPNAw
v7+KYEhLUNF6q8OCuho5PKLkwVRD5R3CSV96dsUvWrYAY7lprxg80sr8Gxt3jw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689953919;
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=5jjaeU2OGW9CY4s0dp/jmxcNrvYecuF0P4nhR/qmdOM=;
b=WrePcKN4l7SPDGuEUnuYqk1vyhLiz8/ZXLq53ZCkiWeGXY3drokz9lSfqy5HrypGQtTZl+
lVNK/0VCL3TON/fCvnVMZjvR/PlamFdxg1O6Jj/jUDKL5li9DNhvmHIao6ucOfNq7zYy3r
mHubl7zXCagKNA75YErekcxI7WwPmoyT8MMOS5vj5LiqKvXKLI2TnWJdsam8bYAvHFCbEl
mt1BBoadlJmrngxXN0MWOTCDyU81KfUeu+InAPjN+TNWSqW8e83gFoqrbwFq6EIeMcijzY
FMA2r6R5nnOd2wuw2+QqJ3FQzSj/8PhUMADBIiW36bDg5DlH3KX72KAuF287pA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689953919; a=rsa-sha256; cv=none;
b=Z+vcmPX0JY8XwOjUBhwPWnnBCN7eUhHSmbnxJVmjN5z7OETvN+d9sh37xRD78r7S8d/ubj
qxETrP2ordmWLOXGiJ+oBG8wFCxORPFiF4wQvfu1/W73HZJazfWExYAPL8N6RKHTtcHxOv
whNQqRu9vNg03fYQyOPn00JChhR6X8i+Z0J5qp9ADa9XxsabYLQ5Gy8vs63UGm5b91fEbt
zZ5+CeVYp/uluvi1hIIIFS3tTBFHlz1j/cdNIdblKaYIm2QAuaj0ETZwTvrVjBtw4UQpQ9
Jtorg4ULPDDHRzT6/9N0IJOJWlCxLKCLMgPoPc2iOngI/hCo3IZALALKtt/HWg==
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 4R6txq0yT0zJcR;
Fri, 21 Jul 2023 15:38:39 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LFcdfF009173;
Fri, 21 Jul 2023 15:38:39 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LFcdMf009172;
Fri, 21 Jul 2023 15:38:39 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 15:38:39 GMT
Message-Id: <202307211538.36LFcdMf009172@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 079a1c2059e7 - stable/13 - libfido2: update to 1.10.0
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 079a1c2059e7cc19360ff6840317efefdff876a1
Auto-Submitted: auto-generated
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=079a1c2059e7cc19360ff6840317efefdff876a1
commit 079a1c2059e7cc19360ff6840317efefdff876a1
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-05-05 23:57:34 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-21 14:41:42 +0000
libfido2: update to 1.10.0
Some highlights from NEWS:
** bio: fix CTAP2 canonical CBOR encoding in fido_bio_dev_enroll_*();
gh#480.
** New API calls:
- fido_dev_info_set;
- fido_dev_io_handle;
- fido_dev_new_with_info;
- fido_dev_open_with_info.
** Documentation and reliability fixes.
** Support for TPM 2.0 attestation of COSE_ES256 credentials.
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 3e696dfb7009cd8ffa12e36f48f4339bb7a2048d)
---
contrib/libfido2/CMakeLists.txt | 47 +-
contrib/libfido2/LICENSE | 2 +-
contrib/libfido2/NEWS | 14 +
contrib/libfido2/README.adoc | 4 +-
contrib/libfido2/SECURITY.md | 5 +
contrib/libfido2/examples/README.adoc | 2 +-
contrib/libfido2/fuzz/Dockerfile | 2 +-
contrib/libfido2/fuzz/Makefile | 2 +-
contrib/libfido2/fuzz/export.gnu | 1 +
contrib/libfido2/fuzz/functions.txt | 35 +-
contrib/libfido2/fuzz/fuzz_hid.c | 11 +-
contrib/libfido2/fuzz/report.tgz | Bin 320981 -> 323706 bytes
contrib/libfido2/fuzz/summary.txt | 14 +-
contrib/libfido2/man/CMakeLists.txt | 17 +-
contrib/libfido2/man/check.sh | 42 ++
contrib/libfido2/man/eddsa_pk_new.3 | 4 +-
contrib/libfido2/man/es256_pk_new.3 | 8 +-
contrib/libfido2/man/fido2-assert.1 | 6 +-
contrib/libfido2/man/fido2-cred.1 | 6 +-
contrib/libfido2/man/fido2-token.1 | 24 +-
contrib/libfido2/man/fido_assert_allow_cred.3 | 4 +-
contrib/libfido2/man/fido_assert_new.3 | 95 ++--
contrib/libfido2/man/fido_assert_set_authdata.3 | 57 ++-
contrib/libfido2/man/fido_assert_verify.3 | 6 +-
contrib/libfido2/man/fido_bio_dev_get_info.3 | 2 +-
contrib/libfido2/man/fido_bio_enroll_new.3 | 4 +-
contrib/libfido2/man/fido_bio_info_new.3 | 2 +-
contrib/libfido2/man/fido_bio_template.3 | 4 +-
contrib/libfido2/man/fido_cbor_info_new.3 | 3 +-
contrib/libfido2/man/fido_cred_exclude.3 | 2 +-
contrib/libfido2/man/fido_cred_new.3 | 10 +-
contrib/libfido2/man/fido_cred_set_authdata.3 | 20 +-
contrib/libfido2/man/fido_cred_verify.3 | 44 +-
contrib/libfido2/man/fido_credman_metadata_new.3 | 6 +-
contrib/libfido2/man/fido_dev_enable_entattest.3 | 6 +-
contrib/libfido2/man/fido_dev_get_assert.3 | 6 +-
contrib/libfido2/man/fido_dev_get_touch_begin.3 | 4 +-
contrib/libfido2/man/fido_dev_info_manifest.3 | 41 +-
contrib/libfido2/man/fido_dev_largeblob_get.3 | 10 +-
contrib/libfido2/man/fido_dev_make_cred.3 | 6 +-
contrib/libfido2/man/fido_dev_open.3 | 71 ++-
contrib/libfido2/man/fido_dev_set_io_functions.3 | 81 +++-
contrib/libfido2/man/fido_dev_set_pin.3 | 2 +-
contrib/libfido2/man/fido_init.3 | 28 +-
contrib/libfido2/man/fido_strerr.3 | 2 +-
contrib/libfido2/man/rs256_pk_new.3 | 4 +-
contrib/libfido2/regress/cred.c | 576 ++++++++++++++++++++++-
contrib/libfido2/src/CMakeLists.txt | 2 +-
contrib/libfido2/src/bio.c | 4 +-
contrib/libfido2/src/cbor.c | 1 -
contrib/libfido2/src/dev.c | 7 +
contrib/libfido2/src/eddsa.c | 6 +-
contrib/libfido2/src/export.gnu | 4 +
contrib/libfido2/src/export.llvm | 4 +
contrib/libfido2/src/export.msvc | 4 +
contrib/libfido2/src/extern.h | 1 -
contrib/libfido2/src/fido.h | 8 +-
contrib/libfido2/src/fido/types.h | 4 +-
contrib/libfido2/src/hid.c | 56 ++-
contrib/libfido2/src/hid_osx.c | 62 ++-
contrib/libfido2/src/hid_win.c | 2 +-
contrib/libfido2/src/tpm.c | 144 +++++-
contrib/libfido2/src/webauthn.h | 88 +++-
contrib/libfido2/src/winhello.c | 171 ++++---
contrib/libfido2/tools/test.sh | 6 +-
contrib/libfido2/windows/build.ps1 | 2 +-
contrib/libfido2/windows/const.ps1 | 6 +-
contrib/libfido2/windows/cygwin.gpg | Bin 0 -> 2193 bytes
contrib/libfido2/windows/cygwin.ps1 | 68 +++
contrib/libfido2/windows/release.ps1 | 19 +-
lib/libfido2/Makefile | 2 +-
71 files changed, 1639 insertions(+), 374 deletions(-)
diff --git a/contrib/libfido2/CMakeLists.txt b/contrib/libfido2/CMakeLists.txt
index d775a98c5b48..11a51ac5a645 100644
--- a/contrib/libfido2/CMakeLists.txt
+++ b/contrib/libfido2/CMakeLists.txt
@@ -9,7 +9,7 @@ project(libfido2 C)
cmake_minimum_required(VERSION 3.0)
# Set PIE flags for POSITION_INDEPENDENT_CODE targets, added in CMake 3.14.
if(POLICY CMP0083)
- cmake_policy(SET CMP0083 NEW)
+ cmake_policy(SET CMP0083 NEW)
endif()
include(CheckCCompilerFlag)
@@ -21,14 +21,14 @@ include(CheckTypeSize)
include(GNUInstallDirs)
include(CheckPIESupported OPTIONAL RESULT_VARIABLE CHECK_PIE_SUPPORTED)
if(CHECK_PIE_SUPPORTED)
- check_pie_supported(LANGUAGES C)
+ check_pie_supported(LANGUAGES C)
endif()
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_COLOR_MAKEFILE OFF)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(FIDO_MAJOR "1")
-set(FIDO_MINOR "9")
+set(FIDO_MINOR "10")
set(FIDO_PATCH "0")
set(FIDO_VERSION ${FIDO_MAJOR}.${FIDO_MINOR}.${FIDO_PATCH})
@@ -40,16 +40,15 @@ option(BUILD_TOOLS "Build tool programs" ON)
option(FUZZ "Enable fuzzing instrumentation" OFF)
option(LIBFUZZER "Build libfuzzer harnesses" OFF)
option(USE_HIDAPI "Use hidapi as the HID backend" OFF)
-option(USE_WINHELLO "Abstract Windows Hello as a FIDO device" OFF)
-option(NFC_LINUX "Experimental NFC support on Linux" OFF)
+option(USE_WINHELLO "Abstract Windows Hello as a FIDO device" ON)
+option(NFC_LINUX "Enable NFC support on Linux" ON)
add_definitions(-D_FIDO_MAJOR=${FIDO_MAJOR})
add_definitions(-D_FIDO_MINOR=${FIDO_MINOR})
add_definitions(-D_FIDO_PATCH=${FIDO_PATCH})
-if(CYGWIN OR MSYS)
+if(CYGWIN OR MSYS OR MINGW)
set(WIN32 1)
- add_definitions(-DWINVER=0x0a00)
endif()
if(WIN32)
@@ -68,12 +67,13 @@ if(NOT MSVC)
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DARWIN_C_SOURCE")
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D__STDC_WANT_LIB_EXT1__=1")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- set(NFC_LINUX ON)
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_GNU_SOURCE")
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_DEFAULT_SOURCE")
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
set(FIDO_CFLAGS "${FIDO_CFLAGS} -D__BSD_VISIBLE=1")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+ set(FIDO_CFLAGS "${FIDO_CFLAGS} -D_NETBSD_SOURCE")
endif()
set(FIDO_CFLAGS "${FIDO_CFLAGS} -std=c99")
set(CMAKE_C_FLAGS "${FIDO_CFLAGS} ${CMAKE_C_FLAGS}")
@@ -167,12 +167,13 @@ if(MSVC)
endif()
set(CBOR_LIBRARIES cbor)
set(ZLIB_LIBRARIES zlib)
- set(CRYPTO_LIBRARIES crypto-46)
+ set(CRYPTO_LIBRARIES crypto-47)
set(MSVC_DISABLED_WARNINGS_LIST
"C4152" # nonstandard extension used: function/data pointer
# conversion in expression;
"C4200" # nonstandard extension used: zero-sized array in
# struct/union;
+ "C4201" # nonstandard extension used: nameless struct/union;
"C4204" # nonstandard extension used: non-constant aggregate
# initializer;
"C4706" # assignment within conditional expression;
@@ -188,8 +189,10 @@ if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MP -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Z7 /guard:cf /sdl /RTCcsu")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi /guard:cf /sdl")
- add_definitions(-DUSE_WINHELLO)
- set(USE_WINHELLO ON)
+ if(USE_WINHELLO)
+ add_definitions(-DUSE_WINHELLO)
+ endif()
+ set(NFC_LINUX OFF)
else()
include(FindPkgConfig)
pkg_search_module(CBOR libcbor)
@@ -223,6 +226,8 @@ else()
set(BASE_LIBRARIES ${BASE_LIBRARIES} rt)
endif()
endif()
+ else()
+ set(NFC_LINUX OFF)
endif()
if(MINGW)
@@ -238,14 +243,18 @@ else()
set(HIDAPI_LIBRARIES hidapi${HIDAPI_SUFFIX})
endif()
- if(FUZZ)
- set(NFC_LINUX ON)
- endif()
-
if(NFC_LINUX)
add_definitions(-DNFC_LINUX)
endif()
+ if(WIN32)
+ if(USE_WINHELLO)
+ add_definitions(-DUSE_WINHELLO)
+ endif()
+ else()
+ set(USE_WINHELLO OFF)
+ endif()
+
add_compile_options(-Wall)
add_compile_options(-Wextra)
add_compile_options(-Werror)
@@ -257,6 +266,10 @@ else()
add_compile_options(-pedantic)
add_compile_options(-pedantic-errors)
+ if(WIN32)
+ add_compile_options(-Wno-type-limits)
+ add_compile_options(-Wno-cast-function-type)
+ endif()
if(HAVE_SHORTEN_64_TO_32)
add_compile_options(-Wshorten-64-to-32)
endif()
@@ -306,10 +319,10 @@ elseif(NOT MSVC)
# clang/gcc + gnu ld
if(FUZZ)
string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
- " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/fuzz/export.gnu")
+ " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/fuzz/export.gnu")
else()
string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
- " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/src/export.gnu")
+ " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/src/export.gnu")
endif()
if(NOT WIN32)
string(CONCAT CMAKE_SHARED_LINKER_FLAGS
diff --git a/contrib/libfido2/LICENSE b/contrib/libfido2/LICENSE
index 4224f20992c0..75a03f87e3af 100644
--- a/contrib/libfido2/LICENSE
+++ b/contrib/libfido2/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2021 Yubico AB. All rights reserved.
+Copyright (c) 2018-2022 Yubico AB. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/contrib/libfido2/NEWS b/contrib/libfido2/NEWS
index 04cda4e0e83a..a48b685156c1 100644
--- a/contrib/libfido2/NEWS
+++ b/contrib/libfido2/NEWS
@@ -1,3 +1,17 @@
+* Version 1.10.0 (2022-01-17)
+ ** hid_osx: handle devices with paths > 511 bytes; gh#462.
+ ** bio: fix CTAP2 canonical CBOR encoding in fido_bio_dev_enroll_*(); gh#480.
+ ** winhello: fallback to GetTopWindow() if GetForegroundWindow() fails.
+ ** winhello: fallback to hid_win.c if webauthn.dll isn't available.
+ ** New API calls:
+ - fido_dev_info_set;
+ - fido_dev_io_handle;
+ - fido_dev_new_with_info;
+ - fido_dev_open_with_info.
+ ** Cygwin and NetBSD build fixes.
+ ** Documentation and reliability fixes.
+ ** Support for TPM 2.0 attestation of COSE_ES256 credentials.
+
* Version 1.9.0 (2021-10-27)
** Enabled NFC support on Linux.
** Added OpenSSL 3.0 compatibility.
diff --git a/contrib/libfido2/README.adoc b/contrib/libfido2/README.adoc
index a0e188bf8774..114cc5eed762 100644
--- a/contrib/libfido2/README.adoc
+++ b/contrib/libfido2/README.adoc
@@ -10,7 +10,7 @@ image:https://oss-fuzz-build-logs.storage.googleapis.com/badges/libfido2.svg["Fu
communicate with a FIDO device over USB, and to verify attestation and
assertion signatures.
-*libfido2* supports the FIDO U2F (CTAP 1) and FIDO 2.0 (CTAP 2) protocols.
+*libfido2* supports the FIDO U2F (CTAP 1) and FIDO2 (CTAP 2) protocols.
For usage, see the `examples/` directory.
@@ -42,7 +42,7 @@ is also available.
==== Releases
-The current release of *libfido2* is 1.9.0. Please consult Yubico's
+The current release of *libfido2* is 1.10.0. Please consult Yubico's
https://developers.yubico.com/libfido2/Releases[release page] for source
and binary releases.
diff --git a/contrib/libfido2/SECURITY.md b/contrib/libfido2/SECURITY.md
new file mode 100644
index 000000000000..e12a48a847ba
--- /dev/null
+++ b/contrib/libfido2/SECURITY.md
@@ -0,0 +1,5 @@
+# Reporting libfido2 Security Issues
+
+To report security issues in libfido2, please contact security@yubico.com.
+A PGP public key can be found at
+https://www.yubico.com/support/security-advisories/issue-rating-system/.
diff --git a/contrib/libfido2/examples/README.adoc b/contrib/libfido2/examples/README.adoc
index bcecb22f5258..44ee52743a0d 100644
--- a/contrib/libfido2/examples/README.adoc
+++ b/contrib/libfido2/examples/README.adoc
@@ -25,7 +25,7 @@ The following definitions are used in the description below:
- <blobkey>
- A credential's associated FIDO 2.1 "largeBlob" symmetric key.
+ A credential's associated CTAP 2.1 "largeBlob" symmetric key.
=== Description
diff --git a/contrib/libfido2/fuzz/Dockerfile b/contrib/libfido2/fuzz/Dockerfile
index f175991d0462..aefe1980ada4 100644
--- a/contrib/libfido2/fuzz/Dockerfile
+++ b/contrib/libfido2/fuzz/Dockerfile
@@ -7,6 +7,6 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
RUN apt-get install -y clang-12 cmake git libssl-dev libudev-dev make pkg-config
RUN apt-get install -y zlib1g-dev
-RUN git clone --branch v0.8.0 https://github.com/PJK/libcbor
+RUN git clone --branch v0.9.0 https://github.com/PJK/libcbor
RUN git clone https://github.com/yubico/libfido2
RUN CC=clang-12 CXX=clang++-12 /libfido2/fuzz/build-coverage /libcbor /libfido2
diff --git a/contrib/libfido2/fuzz/Makefile b/contrib/libfido2/fuzz/Makefile
index 1a974a2bf557..ce3fee73c69c 100644
--- a/contrib/libfido2/fuzz/Makefile
+++ b/contrib/libfido2/fuzz/Makefile
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-IMAGE := libfido2-coverage:1.9.1
+IMAGE := libfido2-coverage:1.10.0
RUNNER := libfido2-runner
PROFDATA := llvm-profdata-12
COV := llvm-cov-12
diff --git a/contrib/libfido2/fuzz/export.gnu b/contrib/libfido2/fuzz/export.gnu
index 0c712b30a429..cac142ae970e 100644
--- a/contrib/libfido2/fuzz/export.gnu
+++ b/contrib/libfido2/fuzz/export.gnu
@@ -201,6 +201,7 @@
fido_dev_info_product;
fido_dev_info_product_string;
fido_dev_info_ptr;
+ fido_dev_info_set;
fido_dev_info_vendor;
fido_dev_is_fido2;
fido_dev_major;
diff --git a/contrib/libfido2/fuzz/functions.txt b/contrib/libfido2/fuzz/functions.txt
index 886893b1d11d..946682d07d00 100644
--- a/contrib/libfido2/fuzz/functions.txt
+++ b/contrib/libfido2/fuzz/functions.txt
@@ -172,7 +172,7 @@ cbor_array_iter 12 0 100.00% 16 0
cbor_parse_reply 27 0 100.00% 36 0 100.00%
cbor_vector_free 6 0 100.00% 5 0 100.00%
cbor_bytestring_copy 14 0 100.00% 18 0 100.00%
-cbor_string_copy 14 1 92.86% 18 3 83.33%
+cbor_string_copy 14 0 100.00% 18 0 100.00%
cbor_add_bytestring 14 0 100.00% 21 0 100.00%
cbor_add_string 14 0 100.00% 21 0 100.00%
cbor_add_bool 14 0 100.00% 21 0 100.00%
@@ -200,7 +200,7 @@ cbor_decode_uint64 4 0 100.00% 8 0
cbor_decode_cred_id 8 0 100.00% 9 0 100.00%
cbor_decode_user 8 0 100.00% 9 0 100.00%
cbor_decode_rp_entity 8 0 100.00% 9 0 100.00%
-cbor_build_uint 10 4 60.00% 9 4 55.56%
+cbor_build_uint 10 1 90.00% 9 2 77.78%
cbor_array_append 17 0 100.00% 21 0 100.00%
cbor_array_drop 18 2 88.89% 17 3 82.35%
cbor.c:ctap_check_cbor 28 0 100.00% 26 0 100.00%
@@ -209,7 +209,7 @@ cbor.c:cbor_add_arg 13 0 100.00% 21 0
cbor.c:cbor_add_uint8 14 0 100.00% 21 0 100.00%
cbor.c:cbor_encode_largeblob_key_ext 6 0 100.00% 6 0 100.00%
cbor.c:cbor_encode_hmac_secret_param 59 4 93.22% 66 8 87.88%
-cbor.c:get_cose_alg 36 1 97.22% 38 3 92.11%
+cbor.c:get_cose_alg 36 0 100.00% 38 0 100.00%
cbor.c:find_cose_alg 35 0 100.00% 33 0 100.00%
cbor.c:decode_attcred 25 0 100.00% 44 0 100.00%
cbor.c:decode_cred_extensions 14 0 100.00% 24 0 100.00%
@@ -222,7 +222,7 @@ cbor.c:decode_cred_id_entry 10 0 100.00% 19 0
cbor.c:decode_user_entry 25 0 100.00% 35 0 100.00%
cbor.c:decode_rp_entity_entry 15 0 100.00% 25 0 100.00%
------------------------------------------------------------------------------------------------------------------
-TOTAL 1047 28 97.33% 1237 54 95.63%
+TOTAL 1047 23 97.80% 1237 46 96.28%
File '/libfido2/src/compress.c':
Name Regions Miss Cover Lines Miss Cover
@@ -386,6 +386,7 @@ fido_dev_get_touch_begin 50 0 100.00% 59
fido_dev_get_touch_status 17 0 100.00% 20 0 100.00%
fido_dev_set_io_functions 18 4 77.78% 14 6 57.14%
fido_dev_set_transport_functions 6 2 66.67% 9 3 66.67%
+fido_dev_io_handle 1 1 0.00% 3 3 0.00%
fido_init 8 1 87.50% 5 0 100.00%
fido_dev_new 5 0 100.00% 14 0 100.00%
fido_dev_new_with_info 10 10 0.00% 16 16 0.00%
@@ -419,7 +420,7 @@ dev.c:fido_dev_set_extension_flags 7 0 100.00% 7
dev.c:fido_dev_set_option_flags 29 0 100.00% 18 0 100.00%
dev.c:fido_dev_set_protocol_flags 11 0 100.00% 17 0 100.00%
-------------------------------------------------------------------------------------------------------------------
-TOTAL 420 78 81.43% 488 102 79.10%
+TOTAL 421 79 81.24% 491 105 78.62%
File '/libfido2/src/ecdh.c':
Name Regions Miss Cover Lines Miss Cover
@@ -493,8 +494,9 @@ Name Regions Miss Cover Lines Mis
fido_hid_get_usage 13 0 100.00% 22 0 100.00%
fido_hid_get_report_len 19 0 100.00% 27 0 100.00%
fido_dev_info_new 1 0 100.00% 3 0 100.00%
-fido_dev_info_free 9 0 100.00% 14 0 100.00%
+fido_dev_info_free 9 0 100.00% 9 0 100.00%
fido_dev_info_ptr 1 0 100.00% 3 0 100.00%
+fido_dev_info_set 26 2 92.31% 30 3 90.00%
fido_dev_info_path 1 0 100.00% 3 0 100.00%
fido_dev_info_vendor 1 0 100.00% 3 0 100.00%
fido_dev_info_product 1 0 100.00% 3 0 100.00%
@@ -502,8 +504,9 @@ fido_dev_info_manufacturer_string 1 0 100.00% 3
fido_dev_info_product_string 1 0 100.00% 3 0 100.00%
hid.c:get_key_len 6 0 100.00% 12 0 100.00%
hid.c:get_key_val 6 0 100.00% 18 0 100.00%
+hid.c:fido_dev_info_reset 1 0 100.00% 6 0 100.00%
-------------------------------------------------------------------------------------------------------------------
-TOTAL 60 0 100.00% 114 0 100.00%
+TOTAL 87 2 97.70% 145 3 97.93%
File '/libfido2/src/hid_linux.c':
Name Regions Miss Cover Lines Miss Cover
@@ -612,7 +615,7 @@ File '/libfido2/src/largeblob.c':
Name Regions Miss Cover Lines Miss Cover
-------------------------------------------------------------------------------------------------------------------
fido_dev_largeblob_get 26 2 92.31% 38 4 89.47%
-fido_dev_largeblob_set 27 2 92.59% 36 4 88.89%
+fido_dev_largeblob_set 27 0 100.00% 36 0 100.00%
fido_dev_largeblob_remove 12 0 100.00% 18 0 100.00%
fido_dev_largeblob_get_array 15 2 86.67% 27 4 85.19%
fido_dev_largeblob_set_array 14 0 100.00% 19 0 100.00%
@@ -642,7 +645,7 @@ largeblob.c:largeblob_get_uv_token 19 0 100.00% 23
largeblob.c:largeblob_set_tx 35 0 100.00% 36 0 100.00%
largeblob.c:prepare_hmac 13 2 84.62% 23 7 69.57%
-------------------------------------------------------------------------------------------------------------------
-TOTAL 513 21 95.91% 684 47 93.13%
+TOTAL 513 19 96.30% 684 43 93.71%
File '/libfido2/src/log.c':
Name Regions Miss Cover Lines Miss Cover
@@ -783,11 +786,11 @@ TOTAL 24 0 100.00% 23
File '/libfido2/src/rs1.c':
Name Regions Miss Cover Lines Miss Cover
---------------------------------------------------------------------------------------------------------------------
-rs1_verify_sig 20 1 95.00% 30 3 90.00%
+rs1_verify_sig 20 0 100.00% 30 0 100.00%
rs1.c:rs1_get_EVP_MD 4 0 100.00% 6 0 100.00%
rs1.c:rs1_free_EVP_MD 1 0 100.00% 3 0 100.00%
---------------------------------------------------------------------------------------------------------------------
-TOTAL 25 1 96.00% 39 3 92.31%
+TOTAL 25 0 100.00% 39 0 100.00%
File '/libfido2/src/rs256.c':
Name Regions Miss Cover Lines Miss Cover
@@ -820,15 +823,17 @@ TOTAL 43 3 93.02% 43
File '/libfido2/src/tpm.c':
Name Regions Miss Cover Lines Miss Cover
---------------------------------------------------------------------------------------------------------------------
-fido_get_signed_hash_tpm 20 0 100.00% 25 0 100.00%
-tpm.c:check_rsa2048_pubarea 16 0 100.00% 28 0 100.00%
-tpm.c:bswap_rsa2048_pubarea 1 0 100.00% 10 0 100.00%
+fido_get_signed_hash_tpm 25 0 100.00% 39 0 100.00%
+tpm.c:check_es256_pubarea 18 0 100.00% 30 0 100.00%
+tpm.c:bswap_es256_pubarea 1 0 100.00% 12 0 100.00%
+tpm.c:check_rs256_pubarea 16 0 100.00% 28 0 100.00%
+tpm.c:bswap_rs256_pubarea 1 0 100.00% 10 0 100.00%
tpm.c:check_sha1_certinfo 14 0 100.00% 38 0 100.00%
tpm.c:get_signed_sha1 17 0 100.00% 19 0 100.00%
tpm.c:get_signed_name 7 0 100.00% 10 0 100.00%
tpm.c:bswap_sha1_certinfo 1 0 100.00% 8 0 100.00%
---------------------------------------------------------------------------------------------------------------------
-TOTAL 76 0 100.00% 138 0 100.00%
+TOTAL 100 0 100.00% 194 0 100.00%
File '/libfido2/src/types.c':
Name Regions Miss Cover Lines Miss Cover
diff --git a/contrib/libfido2/fuzz/fuzz_hid.c b/contrib/libfido2/fuzz/fuzz_hid.c
index 556e62ac4cd3..eaf00dc92de8 100644
--- a/contrib/libfido2/fuzz/fuzz_hid.c
+++ b/contrib/libfido2/fuzz/fuzz_hid.c
@@ -175,15 +175,20 @@ static void
manifest(const struct param *p)
{
size_t ndevs, nfound;
- fido_dev_info_t *devlist;
+ fido_dev_info_t *devlist = NULL, *devlist_set = NULL;
int16_t vendor_id, product_id;
+ fido_dev_io_t io;
+ fido_dev_transport_t t;
+ memset(&io, 0, sizeof(io));
+ memset(&t, 0, sizeof(t));
set_netlink_io_functions(fd_read, fd_write);
set_wire_data(p->netlink_wiredata.body, p->netlink_wiredata.len);
set_udev_parameters(p->uevent, &p->report_descriptor);
ndevs = uniform_random(64);
if ((devlist = fido_dev_info_new(ndevs)) == NULL ||
+ (devlist_set = fido_dev_info_new(1)) == NULL ||
fido_dev_info_manifest(devlist, ndevs, &nfound) != FIDO_OK)
goto out;
for (size_t i = 0; i < nfound; i++) {
@@ -195,9 +200,13 @@ manifest(const struct param *p)
product_id = fido_dev_info_product(di);
consume(&vendor_id, sizeof(vendor_id));
consume(&product_id, sizeof(product_id));
+ fido_dev_info_set(devlist_set, 0, fido_dev_info_path(di),
+ fido_dev_info_manufacturer_string(di),
+ fido_dev_info_product_string(di), &io, &t);
}
out:
fido_dev_info_free(&devlist, ndevs);
+ fido_dev_info_free(&devlist_set, 1);
}
void
diff --git a/contrib/libfido2/fuzz/report.tgz b/contrib/libfido2/fuzz/report.tgz
index cf74f315cb80..d78f4628de59 100644
Binary files a/contrib/libfido2/fuzz/report.tgz and b/contrib/libfido2/fuzz/report.tgz differ
diff --git a/contrib/libfido2/fuzz/summary.txt b/contrib/libfido2/fuzz/summary.txt
index 298c8377379f..05c000aa7757 100644
--- a/contrib/libfido2/fuzz/summary.txt
+++ b/contrib/libfido2/fuzz/summary.txt
@@ -16,33 +16,33 @@ src/authkey.c 44 0 100.00%
src/bio.c 419 20 95.23% 49 2 95.92% 559 21 96.24%
src/blob.c 53 2 96.23% 10 0 100.00% 83 4 95.18%
src/buf.c 8 1 87.50% 2 0 100.00% 16 1 93.75%
-src/cbor.c 1047 28 97.33% 54 0 100.00% 1237 54 95.63%
+src/cbor.c 1047 23 97.80% 54 0 100.00% 1237 46 96.28%
src/compress.c 34 4 88.24% 3 0 100.00% 28 3 89.29%
src/config.c 108 0 100.00% 11 0 100.00% 151 0 100.00%
src/cred.c 632 34 94.62% 69 2 97.10% 830 36 95.66%
src/credman.c 382 10 97.38% 40 0 100.00% 518 15 97.10%
-src/dev.c 420 78 81.43% 44 6 86.36% 488 102 79.10%
+src/dev.c 421 79 81.24% 45 7 84.44% 491 105 78.62%
src/ecdh.c 117 2 98.29% 4 0 100.00% 146 5 96.58%
src/eddsa.c 80 3 96.25% 10 0 100.00% 106 8 92.45%
src/err.c 122 10 91.80% 1 0 100.00% 126 10 92.06%
src/es256.c 306 5 98.37% 19 0 100.00% 358 7 98.04%
-src/hid.c 60 0 100.00% 12 0 100.00% 114 0 100.00%
+src/hid.c 87 2 97.70% 14 0 100.00% 145 3 97.93%
src/hid_linux.c 173 68 60.69% 14 7 50.00% 250 104 58.40%
src/hid_unix.c 28 20 28.57% 2 0 100.00% 43 24 44.19%
src/info.c 184 0 100.00% 39 0 100.00% 316 0 100.00%
src/io.c 182 7 96.15% 13 0 100.00% 221 11 95.02%
src/iso7816.c 18 1 94.44% 5 0 100.00% 38 0 100.00%
-src/largeblob.c 513 21 95.91% 30 0 100.00% 684 47 93.13%
+src/largeblob.c 513 19 96.30% 30 0 100.00% 684 43 93.71%
src/log.c 39 5 87.18% 7 1 85.71% 63 4 93.65%
src/netlink.c 328 14 95.73% 40 0 100.00% 498 32 93.57%
src/nfc_linux.c 327 73 77.68% 23 5 78.26% 458 124 72.93%
src/pin.c 403 3 99.26% 26 0 100.00% 495 3 99.39%
src/random.c 6 1 83.33% 1 0 100.00% 6 1 83.33%
src/reset.c 24 0 100.00% 3 0 100.00% 23 0 100.00%
-src/rs1.c 25 1 96.00% 3 0 100.00% 39 3 92.31%
+src/rs1.c 25 0 100.00% 3 0 100.00% 39 0 100.00%
src/rs256.c 141 8 94.33% 13 0 100.00% 172 10 94.19%
src/time.c 43 3 93.02% 3 0 100.00% 43 1 97.67%
-src/tpm.c 76 0 100.00% 7 0 100.00% 138 0 100.00%
+src/tpm.c 100 0 100.00% 9 0 100.00% 194 0 100.00%
src/types.c 25 0 100.00% 6 0 100.00% 46 0 100.00%
src/u2f.c 528 4 99.24% 17 0 100.00% 685 12 98.25%
@@ -54,4 +54,4 @@ src/fido.h 0 0 -
src/fido/err.h 0 0 - 0 0 - 0 0 -
src/fido/param.h 0 0 - 0 0 - 0 0 -
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-TOTAL 7809 481 93.84% 679 26 96.17% 10180 708 93.05%
+TOTAL 7861 476 93.94% 684 27 96.05% 10270 699 93.19%
diff --git a/contrib/libfido2/man/CMakeLists.txt b/contrib/libfido2/man/CMakeLists.txt
index 3e50c50d37a0..5ce2fc7b83ed 100644
--- a/contrib/libfido2/man/CMakeLists.txt
+++ b/contrib/libfido2/man/CMakeLists.txt
@@ -44,6 +44,7 @@ list(APPEND MAN_SOURCES
list(APPEND MAN_ALIAS
eddsa_pk_new eddsa_pk_free
+ eddsa_pk_new eddsa_pk_from_EVP_PKEY
eddsa_pk_new eddsa_pk_from_ptr
eddsa_pk_new eddsa_pk_to_EVP_PKEY
es256_pk_new es256_pk_free
@@ -75,6 +76,7 @@ list(APPEND MAN_ALIAS
fido_assert_new fido_assert_user_id_len
fido_assert_new fido_assert_user_id_ptr
fido_assert_new fido_assert_user_name
+ fido_assert_set_authdata fido_assert_set_authdata_raw
fido_assert_set_authdata fido_assert_set_clientdata
fido_assert_set_authdata fido_assert_set_clientdata_hash
fido_assert_set_authdata fido_assert_set_count
@@ -117,8 +119,8 @@ list(APPEND MAN_ALIAS
fido_cbor_info_new fido_cbor_info_free
fido_cbor_info_new fido_cbor_info_maxmsgsiz
fido_cbor_info_new fido_cbor_info_maxcredbloblen
- fido_cbor_info_new fido_cbor_info_maxcredcntlst;
- fido_cbor_info_new fido_cbor_info_maxcredidlen;
+ fido_cbor_info_new fido_cbor_info_maxcredcntlst
+ fido_cbor_info_new fido_cbor_info_maxcredidlen
fido_cbor_info_new fido_cbor_info_fwversion
fido_cbor_info_new fido_cbor_info_options_len
fido_cbor_info_new fido_cbor_info_options_name_ptr
@@ -163,6 +165,7 @@ list(APPEND MAN_ALIAS
fido_cred_new fido_cred_user_name
fido_cred_new fido_cred_x5c_len
fido_cred_new fido_cred_x5c_ptr
+ fido_cred_verify fido_cred_verify_self
fido_credman_metadata_new fido_credman_del_dev_rk
fido_credman_metadata_new fido_credman_get_dev_metadata
fido_credman_metadata_new fido_credman_get_dev_rk
@@ -211,6 +214,7 @@ list(APPEND MAN_ALIAS
fido_dev_info_manifest fido_dev_info_product
fido_dev_info_manifest fido_dev_info_product_string
fido_dev_info_manifest fido_dev_info_ptr
+ fido_dev_info_manifest fido_dev_info_set
fido_dev_info_manifest fido_dev_info_vendor
fido_dev_open fido_dev_build
fido_dev_open fido_dev_cancel
@@ -219,26 +223,33 @@ list(APPEND MAN_ALIAS
fido_dev_open fido_dev_force_fido2
fido_dev_open fido_dev_force_u2f
fido_dev_open fido_dev_free
+ fido_dev_open fido_dev_has_pin
+ fido_dev_open fido_dev_has_uv
fido_dev_open fido_dev_is_fido2
fido_dev_open fido_dev_is_winhello
fido_dev_open fido_dev_major
fido_dev_open fido_dev_minor
fido_dev_open fido_dev_new
+ fido_dev_open fido_dev_new_with_info
+ fido_dev_open fido_dev_open_with_info
fido_dev_open fido_dev_protocol
fido_dev_open fido_dev_supports_cred_prot
fido_dev_open fido_dev_supports_credman
+ fido_dev_open fido_dev_supports_permissions
fido_dev_open fido_dev_supports_pin
fido_dev_open fido_dev_supports_uv
- fido_dev_open fido_dev_has_uv
fido_dev_set_pin fido_dev_get_retry_count
fido_dev_set_pin fido_dev_get_uv_retry_count
fido_dev_set_pin fido_dev_reset
+ fido_dev_set_io_functions fido_dev_io_handle
fido_dev_set_io_functions fido_dev_set_sigmask
fido_dev_set_io_functions fido_dev_set_timeout
+ fido_dev_set_io_functions fido_dev_set_transport_functions
fido_dev_largeblob_get fido_dev_largeblob_set
fido_dev_largeblob_get fido_dev_largeblob_remove
fido_dev_largeblob_get fido_dev_largeblob_get_array
fido_dev_largeblob_get fido_dev_largeblob_set_array
+ fido_init fido_set_log_handler
rs256_pk_new rs256_pk_free
rs256_pk_new rs256_pk_from_ptr
rs256_pk_new rs256_pk_from_EVP_PKEY
diff --git a/contrib/libfido2/man/check.sh b/contrib/libfido2/man/check.sh
new file mode 100755
index 000000000000..951afeb88e0b
--- /dev/null
+++ b/contrib/libfido2/man/check.sh
@@ -0,0 +1,42 @@
+#!/bin/sh -u
+
+# Copyright (c) 2022 Yubico AB. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+T=$(mktemp -d) || exit 1
+find . -maxdepth 1 -type f -name '*.3' -print0 > "$T/files"
+
+xargs -0 awk '/^.Sh NAME/,/^.Nd/' < "$T/files" | \
+ awk '/^.Nm/ { print $2 }' | sort -u > "$T/Nm"
+xargs -0 awk '/^.Fn/ { print $2 }' < "$T/files" | sort -u > "$T/Fn"
+(cd "$T" && diff -u Nm Fn)
+
+cut -c2- ../src/export.llvm | sort > "$T/exports"
+(cd "$T" && diff -u Nm exports)
+
+awk '/^list\(APPEND MAN_SOURCES/,/^\)/' CMakeLists.txt | \
+ awk '/.3$/ { print $1 }' | sort > "$T/listed_sources"
+xargs -0 -n1 basename < "$T/files" | sort > "$T/actual_sources"
+(cd "$T" && diff -u listed_sources actual_sources)
+
+awk '/^list\(APPEND MAN_ALIAS/,/^\)/' CMakeLists.txt | \
+ sed '1d;$d' | awk '{ print $1, $2 }' | sort > "$T/listed_aliases"
+xargs -0 grep -o "^.Fn [A-Za-z0-9_]* \"" < "$T/files" | \
+ cut -c3- | sed 's/\.3:\.Fn//;s/ "//' | awk '$1 != $2' | \
+ sort > "$T/actual_aliases"
+(cd "$T" && diff -u listed_aliases actual_aliases)
+
+xargs -0 grep -hB1 "^.Fn [A-Za-z0-9_]* \"" < "$T/files" | \
+ sed -E 's/^.F[tn] //;s/\*[^"\*]+"/\*"/g;s/ [^" \*]+"/"/g;/^--$/d' | \
+ paste -d " " - - | sed 's/\* /\*/' | sort > "$T/documented_prototypes"
+while read -r f; do
+ awk "/\/\*/ { next } /$f\(/,/;/" ../src/fido.h ../src/fido/*.h | \
+ sed -E 's/^[ ]+//;s/[ ]+/ /' | tr '\n' ' ' | \
+ sed 's/(/ "/;s/, /" "/g;s/);/"/;s/ $/\n/'
+done < "$T/exports" | sort > "$T/actual_prototypes"
+(cd "$T" && diff -u documented_prototypes actual_prototypes)
+
+(cd "$T" && rm files Nm Fn exports listed_sources actual_sources \
+ listed_aliases actual_aliases documented_prototypes actual_prototypes)
+rmdir -- "$T"
diff --git a/contrib/libfido2/man/eddsa_pk_new.3 b/contrib/libfido2/man/eddsa_pk_new.3
index 65bf9a9f753d..998def484790 100644
--- a/contrib/libfido2/man/eddsa_pk_new.3
+++ b/contrib/libfido2/man/eddsa_pk_new.3
@@ -11,7 +11,7 @@
.Nm eddsa_pk_from_EVP_PKEY ,
.Nm eddsa_pk_from_ptr ,
.Nm eddsa_pk_to_EVP_PKEY
-.Nd FIDO 2 COSE EDDSA API
+.Nd FIDO2 COSE EDDSA API
.Sh SYNOPSIS
.In openssl/evp.h
.In fido/eddsa.h
@@ -106,7 +106,7 @@ If an error occurs,
returns NULL.
.Sh RETURN VALUES
The
-.Fn eddsa_pk_from_EC_KEY
+.Fn eddsa_pk_from_EVP_PKEY
and
.Fn eddsa_pk_from_ptr
functions return
diff --git a/contrib/libfido2/man/es256_pk_new.3 b/contrib/libfido2/man/es256_pk_new.3
index 6c1bac0f57f9..5e184340a575 100644
--- a/contrib/libfido2/man/es256_pk_new.3
+++ b/contrib/libfido2/man/es256_pk_new.3
@@ -9,10 +9,10 @@
.Nm es256_pk_new ,
.Nm es256_pk_free ,
.Nm es256_pk_from_EC_KEY ,
-.Nm es256_pk_from_EVP_KEY ,
+.Nm es256_pk_from_EVP_PKEY ,
.Nm es256_pk_from_ptr ,
.Nm es256_pk_to_EVP_PKEY
-.Nd FIDO 2 COSE ES256 API
+.Nd FIDO2 COSE ES256 API
.Sh SYNOPSIS
.In openssl/ec.h
.In fido/es256.h
@@ -82,7 +82,7 @@ No references to
are kept.
.Pp
The
-.Fn es256_pk_from_EVP_KEY
+.Fn es256_pk_from_EVP_PKEY
function fills
.Fa pk
with the contents of
@@ -124,7 +124,7 @@ returns NULL.
.Sh RETURN VALUES
The
.Fn es256_pk_from_EC_KEY ,
-.Fn es256_pk_from_EVP_KEY ,
+.Fn es256_pk_from_EVP_PKEY ,
and
.Fn es256_pk_from_ptr
functions return
diff --git a/contrib/libfido2/man/fido2-assert.1 b/contrib/libfido2/man/fido2-assert.1
index da47d6f19dd3..ee8135c18483 100644
--- a/contrib/libfido2/man/fido2-assert.1
+++ b/contrib/libfido2/man/fido2-assert.1
@@ -7,7 +7,7 @@
.Os
.Sh NAME
.Nm fido2-assert
-.Nd get/verify a FIDO 2 assertion
+.Nd get/verify a FIDO2 assertion
.Sh SYNOPSIS
.Nm
.Fl G
@@ -24,7 +24,7 @@
.Op Ar type
.Sh DESCRIPTION
.Nm
-gets or verifies a FIDO 2 assertion.
+gets or verifies a FIDO2 assertion.
.Pp
The input of
.Nm
@@ -117,7 +117,7 @@ will not expect a credential id in its input, and may output
multiple assertions.
Resident credentials are called
.Dq discoverable credentials
-in FIDO 2.1.
+in CTAP 2.1.
.It Fl t Ar option
Toggles a key/value
.Ar option ,
diff --git a/contrib/libfido2/man/fido2-cred.1 b/contrib/libfido2/man/fido2-cred.1
index 301564d688e5..0b10e74a0507 100644
--- a/contrib/libfido2/man/fido2-cred.1
+++ b/contrib/libfido2/man/fido2-cred.1
@@ -7,7 +7,7 @@
.Os
.Sh NAME
.Nm fido2-cred
-.Nd make/verify a FIDO 2 credential
+.Nd make/verify a FIDO2 credential
.Sh SYNOPSIS
.Nm
.Fl M
@@ -26,7 +26,7 @@
.Op Ar type
.Sh DESCRIPTION
.Nm
-makes or verifies a FIDO 2 credential.
+makes or verifies a FIDO2 credential.
.Pp
A credential
.Ar type
@@ -143,7 +143,7 @@ will fail.
Create a resident credential.
Resident credentials are called
.Dq discoverable credentials
-in FIDO 2.1.
+in CTAP 2.1.
.It Fl u
Create a U2F credential.
By default,
diff --git a/contrib/libfido2/man/fido2-token.1 b/contrib/libfido2/man/fido2-token.1
index fd82c23cffb7..1aa2feb86859 100644
--- a/contrib/libfido2/man/fido2-token.1
+++ b/contrib/libfido2/man/fido2-token.1
@@ -7,7 +7,7 @@
.Os
.Sh NAME
.Nm fido2-token
-.Nd find and manage a FIDO 2 authenticator
+.Nd find and manage a FIDO2 authenticator
.Sh SYNOPSIS
.Nm
.Fl C
@@ -121,7 +121,7 @@
.Fl V
.Sh DESCRIPTION
.Nm
-manages a FIDO 2 authenticator.
+manages a FIDO2 authenticator.
.Pp
The options are as follows:
.Bl -tag -width Ds
@@ -176,12 +176,12 @@ where
is the enrollment's template base64-encoded id.
The user will be prompted for the PIN.
.It Fl D Fl u Ar device
-Disables the FIDO 2.1
+Disables the CTAP 2.1
.Dq user verification always
feature on
.Ar device .
.It Fl G Fl b Fl k Ar key_path Ar blob_path Ar device
-Gets a FIDO 2.1
+Gets a CTAP 2.1
.Dq largeBlob
encrypted with
.Ar key_path
@@ -194,7 +194,7 @@ The blob is written to
.Ar blob_path .
A PIN or equivalent user-verification gesture is required.
.It Fl G Fl b Fl n Ar rp_id Oo Fl i Ar cred_id Oc Ar blob_path Ar device
-Gets a FIDO 2.1
+Gets a CTAP 2.1
.Dq largeBlob
associated with
.Ar rp_id
@@ -234,7 +234,7 @@ The user will be prompted for the PIN.
.It Fl L
Produces a list of authenticators found by the operating system.
.It Fl L Fl b Ar device
-Produces a list of FIDO 2.1
+Produces a list of CTAP 2.1
.Dq largeBlobs
on
.Ar device .
@@ -264,12 +264,12 @@ Sets the PIN of
.Ar device .
The user will be prompted for the PIN.
.It Fl S Fl a Ar device
-Enables FIDO 2.1 Enterprise Attestation on
+Enables CTAP 2.1 Enterprise Attestation on
.Ar device .
.It Fl S Fl b Fl k Ar key_path Ar blob_path Ar device
Sets
.Ar blob_path
-as a FIDO 2.1
+as a CTAP 2.1
.Dq largeBlob
encrypted with
.Ar key_path
@@ -284,7 +284,7 @@ A PIN or equivalent user-verification gesture is required.
.It Fl S Fl b Fl n Ar rp_id Oo Fl i Ar cred_id Oc Ar blob_path Ar device
Sets
.Ar blob_path
-as a FIDO 2.1
+as a CTAP 2.1
.Dq largeBlob
associated with
.Ar rp_id
@@ -353,7 +353,7 @@ the minimum PIN length of
Multiple IDs may be specified, separated by commas.
The user will be prompted for the PIN.
.It Fl S Fl u Ar device
-Enables the FIDO 2.1
+Enables the CTAP 2.1
.Dq user verification always
feature on
.Ar device .
@@ -392,9 +392,9 @@ An authenticator's path may contain spaces.
.Pp
Resident credentials are called
.Dq discoverable credentials
-in FIDO 2.1.
+in CTAP 2.1.
.Pp
-Whether the FIDO 2.1
+Whether the CTAP 2.1
.Dq user verification always
feature is activated or deactivated after an authenticator reset
is vendor-specific.
diff --git a/contrib/libfido2/man/fido_assert_allow_cred.3 b/contrib/libfido2/man/fido_assert_allow_cred.3
index bbe6e4d8929a..7fd730c3f63c 100644
--- a/contrib/libfido2/man/fido_assert_allow_cred.3
+++ b/contrib/libfido2/man/fido_assert_allow_cred.3
@@ -7,7 +7,7 @@
.Os
.Sh NAME
.Nm fido_assert_allow_cred
-.Nd appends a credential ID to the list of credentials allowed in an assertion
+.Nd allow a credential in a FIDO2 assertion
.Sh SYNOPSIS
.In fido.h
.Ft int
@@ -31,7 +31,7 @@ If
.Fn fido_assert_allow_cred
fails, the existing list of allowed credentials is preserved.
.Pp
-For the format of a FIDO 2 credential ID, please refer to the
+For the format of a FIDO2 credential ID, please refer to the
Web Authentication (webauthn) standard.
.Sh RETURN VALUES
The error codes returned by
diff --git a/contrib/libfido2/man/fido_assert_new.3 b/contrib/libfido2/man/fido_assert_new.3
index 16f4e3a6e46d..a1a3c101ba33 100644
--- a/contrib/libfido2/man/fido_assert_new.3
+++ b/contrib/libfido2/man/fido_assert_new.3
@@ -31,7 +31,7 @@
.Nm fido_assert_id_len ,
.Nm fido_assert_sigcount ,
.Nm fido_assert_flags
-.Nd FIDO 2 assertion API
+.Nd FIDO2 assertion API
.Sh SYNOPSIS
.In fido.h
.Ft fido_assert_t *
@@ -85,9 +85,12 @@
.Ft uint8_t
.Fn fido_assert_flags "const fido_assert_t *assert" "size_t idx"
.Sh DESCRIPTION
-FIDO 2 assertions are abstracted in
-.Em libfido2
-by the
+A FIDO2 assertion is a collection of statements, each statement a
+map between a challenge, a credential, a signature, and ancillary
+attributes.
+In
*** 3261 LINES SKIPPED ***
From nobody Fri Jul 21 16:15:55 2023
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 4R6vmr2dRmz4pQgR;
Fri, 21 Jul 2023 16:15:56 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6vmr1dL6z4XlB;
Fri, 21 Jul 2023 16:15:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689956156;
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=xZhdbxwRMnZsubAcRlBQirj75BV1fX3yIjDvylhUJlc=;
b=pmgazkqbObSaxPPEwno8Tugrao+52KeCestQ3NQHVrmN/0EmmRWYKkZvAPHzmMUqAcYXhv
DZyI4/tCP4ABSw7dsq54BQ8cJtUJQN034QL35nH4G4/nLydL58bB4N4NV1Vbp34v8Yrwsn
sWJaf49jZ6DmBOy1whuKlqxL7WZtsEY77hSXI32aH0Ny7Ys6Jw/asX8Iv6VfrYTsVJVL1I
nFgeQ5uGo5ydJER44c/TVJxBuwfG5GgC5oR/7cN8uZ6rIZEU66vX3pyMqPEKa3C8n/qYgl
uLrttQe3zXp9X7WArVDZ6cb7tEXmccvXDisClx1ROZiEvwZbncc/sJqPYJOVdw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689956156;
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=xZhdbxwRMnZsubAcRlBQirj75BV1fX3yIjDvylhUJlc=;
b=WxQBvSM1lD32zASgH2ME0GPSULjJPUAY1jjvhx7RnpQqR0AjVkO4qn3oy6rYFE8MlO/Ukl
mI0M0bcbxtV5sdKIZAzp05232vm2uNd3dBbErWjuI74eIb914Xbt4jJkjoTI6FJvGm7iNF
n85R1kCi36Oktw1NAax3LmnEw2WyPvjFORM0TQjl7fvADqzgJYyYXCxwrrE2E7svBojMZx
dNwwDoTgl6dnbSwn4nna3yjdog3J3Fc5lJRagYR1KhWx2V6rkfpqBpIigtywRwtktiHYZR
dnILArlD6AfYuIFlnfKbOD/as5CIZK6RM6Iaht7rt3jG33xXHbVw02ncaX79GQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689956156; a=rsa-sha256; cv=none;
b=Ni4aLCukdVhU+r5DCgDKtPH76J4jyI1YaZ0aqoXCPatwq7HrA68hmCpnC0ds0iYGSDiPWm
wc6wvWw9pj7ncuYO7Gcr6UpQPwKK3wjUIBN+KVigWAliY3yCpYrT+RimBXG+NN8oUIcnow
VsnWUIzrJcfjuSvtxdJ+gnxE1rC6rOVomSOzJ69haONBrYGR/C0CteHNwROCzRWKOHuxOK
5uw4gvlhNZSrJXvlYEfZYrk+ulnYY0nfZ3p6FfwyWMg/Ji2JV3SYifp1qQ34OhPabD3Zzi
JfVfXUFuGhpDSrv+flM799DGMi8QCmlvnrjDpD1pyBOB1SNdoRqhSLO5YhqxVA==
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 4R6vmr0T7HzK7c;
Fri, 21 Jul 2023 16:15:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LGFtuS075653;
Fri, 21 Jul 2023 16:15:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LGFtTl075652;
Fri, 21 Jul 2023 16:15:55 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 16:15:55 GMT
Message-Id: <202307211615.36LGFtTl075652@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 039d7ad8ee6b - stable/12 - ssh-agent: document "-O no-restrict-websafe"
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 039d7ad8ee6b6c40044123a118b037179ac7c203
Auto-Submitted: auto-generated
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=039d7ad8ee6b6c40044123a118b037179ac7c203
commit 039d7ad8ee6b6c40044123a118b037179ac7c203
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-07-21 15:59:09 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-21 16:08:12 +0000
ssh-agent: document "-O no-restrict-websafe"
OpenSSH commits 9fd2441113fc and 4a4883664d6b, which are part of
OpenSSH 9.2p1.
Sponsored by: The FreeBSD Foundation
---
crypto/openssh/ssh-agent.1 | 27 +++++++++++++++++++++++++--
crypto/openssh/ssh-agent.c | 8 ++++----
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/crypto/openssh/ssh-agent.1 b/crypto/openssh/ssh-agent.1
index 8844b2eb45e8..b9d28b8e103e 100644
--- a/crypto/openssh/ssh-agent.1
+++ b/crypto/openssh/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.73 2022/03/31 17:27:27 naddy Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.75 2022/10/07 06:00:58 jmc Exp $
.\" $FreeBSD$
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: October 7 2022 $
.Dt SSH-AGENT 1
.Os
.Sh NAME
@@ -47,11 +47,13 @@
.Op Fl \&Ddx
.Op Fl a Ar bind_address
.Op Fl E Ar fingerprint_hash
+.Op Fl O Ar option
.Op Fl P Ar allowed_providers
.Op Fl t Ar life
.Nm ssh-agent
.Op Fl a Ar bind_address
.Op Fl E Ar fingerprint_hash
+.Op Fl O Ar option
.Op Fl P Ar allowed_providers
.Op Fl t Ar life
.Ar command Op Ar arg ...
@@ -103,6 +105,27 @@ The default is
Kill the current agent (given by the
.Ev SSH_AGENT_PID
environment variable).
+.It Fl O Ar option
+Specify an option when starting
+.Nm .
+Currently only one option is supported:
+.Cm no-restrict-websafe .
+This instructs
+.Nm
+to permit signatures using FIDO keys that might be web authentication
+requests.
+By default,
+.Nm
+refuses signature requests for FIDO keys where the key application string
+does not start with
+.Dq ssh:
+and when the data to be signed does not appear to be a
+.Xr ssh 1
+user authentication request or a
+.Xr ssh-keygen 1
+signature.
+The default behaviour prevents forwarded access to a FIDO key from also
+implicitly forwarding the ability to authenticate to websites.
.It Fl P Ar allowed_providers
Specify a pattern-list of acceptable paths for PKCS#11 provider and FIDO
authenticator middleware shared libraries that may be used with the
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c
index 2c2c7a639907..9f376f83a798 100644
--- a/crypto/openssh/ssh-agent.c
+++ b/crypto/openssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.292 2022/09/17 10:11:29 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.293 2022/10/07 06:00:58 jmc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2015,9 +2015,9 @@ usage(void)
{
fprintf(stderr,
"usage: ssh-agent [-c | -s] [-Ddx] [-a bind_address] [-E fingerprint_hash]\n"
- " [-P allowed_providers] [-t life]\n"
- " ssh-agent [-a bind_address] [-E fingerprint_hash] [-P allowed_providers]\n"
- " [-t life] command [arg ...]\n"
+ " [-O option] [-P allowed_providers] [-t life]\n"
+ " ssh-agent [-a bind_address] [-E fingerprint_hash] [-O option]\n"
+ " [-P allowed_providers] [-t life] command [arg ...]\n"
" ssh-agent [-c | -s] -k\n");
exit(1);
}
From nobody Fri Jul 21 16:36:52 2023
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 4R6wF05xMkz4dX6X;
Fri, 21 Jul 2023 16:36:52 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R6wF05W9Cz4kqL;
Fri, 21 Jul 2023 16:36:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689957412;
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=E2t7R/uumZ2+dp8VBlwnUSU55JkN7IQLbiEbq7uxe4A=;
b=WBZzo8yKLRVPlZwAwEYeJN9/nx7pIcY6vmwJV08VGeDEVT/FpJRnfGHp+4mCSptB7IR6By
04L78C6d5Y013Ug0IJpc9IChkUBv//jdhayTl0gtqAhdKiXFSAtmdUxU2Qk/8SabZBfe8Q
JDUmz6V0ypvcfFVpYbmZSQT786dS4mGwSkZ5t76e1+f4TSRGtRY6fX4IjUXderhiWc3InC
YrGF2yY0/vZ+guciiHlQNuez21KmCl+S+aDtV1X5ARf52DPJ/r3SyNMurjpjgEQBFPJX/k
juBGuHhPU/gRAuxv6wCNtaCOhYFgxsREPxkgbWKszruxrfxVmXFZyiHRiz74xg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689957412;
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=E2t7R/uumZ2+dp8VBlwnUSU55JkN7IQLbiEbq7uxe4A=;
b=YdX/Z8gCJFfYPqAQUUF362g6nGBIsZWXjsR9L0OY9KDkrpdAtJwKjAqVVtmZPPjmSbulf8
AdV3Ek4TwEsmv1wSYQADTNsYN+PmrtcgaaNkTA/u9bLl2gcpzqgrcnammdMJ3PHQ+j3EMV
vCA4Jknekqye7heXYlCZ7aKBpTBL+DArgDLdcHR1s/7jkPRR3FwjFq/zUhq+rh2xGcMSYz
x4GRsctUhNBHAXqFZg2uh8j4+ZTsbcETf3mFOZsPndPG2T5AImEgiscsBr9TkYR0jKFUJB
8O/FK2XfrQiS1ztWGMf+emjzrlgQfQcEPFSGQtpZiTJc3TvBKUokRC8UJ5K2nA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689957412; a=rsa-sha256; cv=none;
b=m+87yPqs4Bhvmw9DOe+SOsdcfidxG05Pc4TlL2zgZbEk03mTTIdIgwh3I1t3fTgjovNbWF
5UDmF3hvkXz887LGDAfywci0lx4x/PKEZP4ExeQV494QJmgsgGFcdO2UW56/7DTpbZPAYa
mzUYJM5Mieaf7ZJk9mUwmn8RmD/ZNP0x2QpKri9zvD+QNqejP92+ZHIdEaH960Qxxyiwqt
qVFtWxS4Wm5GoEMPguXKB3rTDCrFOU7pEez4lzPmxnUC3YTk+csrHgfkyVpdSilXT/Ct0k
fms25DyAFIjbCZ9rlRxDLcNHJPHrIXzJ8Mt1YDL2azdE+oDA/h3456lt4QjXgA==
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 4R6wF04XBbzKZc;
Fri, 21 Jul 2023 16:36:52 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LGaqbP008637;
Fri, 21 Jul 2023 16:36:52 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LGaqd6008636;
Fri, 21 Jul 2023 16:36:52 GMT
(envelope-from git)
Date: Fri, 21 Jul 2023 16:36:52 GMT
Message-Id: <202307211636.36LGaqd6008636@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 56749f05dbfd - stable/12 - ssh: disallow loading PKCS#11 modules by default
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 56749f05dbfdb003aeb5639ef5f9b8af8f5e65ba
Auto-Submitted: auto-generated
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=56749f05dbfdb003aeb5639ef5f9b8af8f5e65ba
commit 56749f05dbfdb003aeb5639ef5f9b8af8f5e65ba
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-07-19 17:02:33 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-07-21 16:25:51 +0000
ssh: disallow loading PKCS#11 modules by default
This is the rest of the OpenSSH 9.3p2 change to address CVE-2023-38408.
From the release notes:
* ssh-agent(8): the agent will now refuse requests to load PKCS#11
modules issued by remote clients by default. A flag has been added
to restore the previous behaviour "-Oallow-remote-pkcs11".
Note that ssh-agent(8) depends on the SSH client to identify
requests that are remote. The OpenSSH >=8.9 ssh(1) client does
this, but forwarding access to an agent socket using other tools
may circumvent this restriction.
Security: CVE-2023-38408
Sponsored by: The FreeBSD Foundation
---
crypto/openssh/ssh-agent.1 | 22 ++++++++++++++++++++--
crypto/openssh/ssh-agent.c | 21 ++++++++++++++++++++-
2 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/crypto/openssh/ssh-agent.1 b/crypto/openssh/ssh-agent.1
index b9d28b8e103e..a0ea506bdc93 100644
--- a/crypto/openssh/ssh-agent.1
+++ b/crypto/openssh/ssh-agent.1
@@ -108,9 +108,27 @@ environment variable).
.It Fl O Ar option
Specify an option when starting
.Nm .
-Currently only one option is supported:
+Currently two options are supported:
+.Cm allow-remote-pkcs11
+and
.Cm no-restrict-websafe .
-This instructs
+.Pp
+The
+.Cm allow-remote-pkcs11
+option allows clients of a forwarded
+.Nm
+to load PKCS#11 or FIDO provider libraries.
+By default only local clients may perform this operation.
+Note that signalling that a
+.Nm
+client remote is performed by
+.Xr ssh 1 ,
+and use of other tools to forward access to the agent socket may circumvent
+this restriction.
+.Pp
+The
+.Cm no-restrict-websafe ,
+instructs
.Nm
to permit signatures using FIDO keys that might be web authentication
requests.
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c
index 9f376f83a798..0e218390a21c 100644
--- a/crypto/openssh/ssh-agent.c
+++ b/crypto/openssh/ssh-agent.c
@@ -172,6 +172,12 @@ char socket_dir[PATH_MAX];
/* Pattern-list of allowed PKCS#11/Security key paths */
static char *allowed_providers;
+/*
+ * Allows PKCS11 providers or SK keys that use non-internal providers to
+ * be added over a remote connection (identified by session-bind@openssh.com).
+ */
+static int remote_add_provider;
+
/* locking */
#define LOCK_SIZE 32
#define LOCK_SALT_SIZE 16
@@ -1249,6 +1255,12 @@ process_add_identity(SocketEntry *e)
if (strcasecmp(sk_provider, "internal") == 0) {
debug_f("internal provider");
} else {
+ if (e->nsession_ids != 0 && !remote_add_provider) {
+ verbose("failed add of SK provider \"%.100s\": "
+ "remote addition of providers is disabled",
+ sk_provider);
+ goto out;
+ }
if (realpath(sk_provider, canonical_provider) == NULL) {
verbose("failed provider \"%.100s\": "
"realpath: %s", sk_provider,
@@ -1412,6 +1424,11 @@ process_add_smartcard_key(SocketEntry *e)
error_f("failed to parse constraints");
goto send;
}
+ if (e->nsession_ids != 0 && !remote_add_provider) {
+ verbose("failed PKCS#11 add of \"%.100s\": remote addition of "
+ "providers is disabled", provider);
+ goto send;
+ }
if (realpath(provider, canonical_provider) == NULL) {
verbose("failed PKCS#11 add of \"%.100s\": realpath: %s",
provider, strerror(errno));
@@ -2077,7 +2094,9 @@ main(int ac, char **av)
break;
case 'O':
if (strcmp(optarg, "no-restrict-websafe") == 0)
- restrict_websafe = 0;
+ restrict_websafe = 0;
+ else if (strcmp(optarg, "allow-remote-pkcs11") == 0)
+ remote_add_provider = 1;
else
fatal("Unknown -O option");
break;
From nobody Sat Jul 22 00:22:44 2023
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 4R76ZX4DHlz4p3Np;
Sat, 22 Jul 2023 00:22:44 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R76ZX3prSz3pnH;
Sat, 22 Jul 2023 00:22:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689985364;
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=RD5kcqUm5P8FfJklEYjHIukDlicyH1Z87osc/Dd0u/A=;
b=Yf+pSEzKYUshyMTJDrKnJaDov6/fqlgOAfIdlazRWr20fSwUNMu++WwxWPx9nrFoq1enYH
BnYyrrbSjNu9niuscB4eoTT1xZZBrqkJ7kAdUnMXuc5JuPz7AT6lJw9wqHgPx/MkltfkX2
Jf/7RwQ95fafLuwGDXC2MR/DDqyjLmBixmR0YD0acfs1p+bV070V0D8x49kgxP7jOnK4R1
jGubYxJXmQnj08wYQYx2kyFCbgmDCmxs4CXMieCK2kL5J4PV1fBn/uwVrLg5c+ipxVSO+R
sdZRPXi9iVwck/RNgo76cR6lI8tLhBX31KRCXcWQr1riJnM0j1shhr9/RHXi0Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689985364;
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=RD5kcqUm5P8FfJklEYjHIukDlicyH1Z87osc/Dd0u/A=;
b=REWgrgTIs53OD/ARo7EVABBgoIqEHrv0sJnBJuGuMQhS0m1b2vZu0gmwYijrboSW4Yz/j8
OyvbrKWTUSgQ53thTC5NbsL35s9Ul9YeUu/N0htV34UqBfiPxeCqIqKUUIuRe9S8wkRf/4
3otd4ggCaqL9DmsWheKxvdeTXGKDcWOrjzpzDRYXrVDKXahg74yTyc1CcxTMx6lnWx5iTE
d48yq3P5k0UNllWbmZkflc1IApYZyaUd2E9KmLu+pVq8am/FHqTOYoQ0ZrHJkdW8Xe6Swe
81CPf2/him99mHHcqKnWx2oaVqjj67ZVYFsp4u8C9HXBwfvTvpsREhfv2O30Tw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689985364; a=rsa-sha256; cv=none;
b=d+Derfa6rAocSnDpedESv8qBMQxJyxAA8yoLpnbEV8B6E/r338CP8VYvPzOlterznCoyy1
JwqfXsCwJLWC5ntAeQq2n3uh7yyqOrNRQSQl3EtijxVgdLhoSXkpKGwVWiNNoipuF8PZHt
Iht+JDmhwM6E++inDyTJtR4+wGReaWtQ6Og2DCb+BHDtdF/SJ/9DT7LqifU71v3Dnd+/WF
cZNqd/CuTRFKFbGLLSMso4DGyEtu+IfUQwvMkoPV4pL6O+LcMJcEg3qKqGY3n1Ttai7Jx1
BNBSbBx7YfjQEGFaPb3QsMYiMsPlPDG9JOPvLOGszHF9jyV7OdaC65+4stXDTQ==
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 4R76ZX2t0dzY6D;
Sat, 22 Jul 2023 00:22:44 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36M0MioH086386;
Sat, 22 Jul 2023 00:22:44 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M0MiJS086385;
Sat, 22 Jul 2023 00:22:44 GMT
(envelope-from git)
Date: Sat, 22 Jul 2023 00:22:44 GMT
Message-Id: <202307220022.36M0MiJS086385@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Kirk McKusick <mckusick@FreeBSD.org>
Subject: git: 17207eae668b - stable/13 - Write out corrected superblock when creating a UFS/FFS snapshot.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mckusick
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 17207eae668b80561c98fe18a9a5e18409d47c58
Auto-Submitted: auto-generated
The branch stable/13 has been updated by mckusick:
URL: https://cgit.FreeBSD.org/src/commit/?id=17207eae668b80561c98fe18a9a5e18409d47c58
commit 17207eae668b80561c98fe18a9a5e18409d47c58
Author: Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2023-06-13 07:21:43 +0000
Commit: Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2023-07-22 00:22:10 +0000
Write out corrected superblock when creating a UFS/FFS snapshot.
PR: 271352
Tested-by: Peter Holm
Sponsored-by: The FreeBSD Foundation
(cherry picked from commit f1549d7d522995bf5d821ae08cc2f500ba545285)
---
sys/ufs/ffs/ffs_snapshot.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index 709038db071f..a23f0ad502a9 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -207,7 +207,7 @@ ffs_snapshot(struct mount *mp, char *snapfile)
long snaplistsize = 0;
int32_t *lp;
void *space;
- struct fs *copy_fs = NULL, *fs;
+ struct fs *copy_fs = NULL, *fs, *bpfs;
struct thread *td = curthread;
struct inode *ip, *xp;
struct buf *bp, *nbp, *ibp;
@@ -828,8 +828,10 @@ resumefs:
} else {
loc = blkoff(fs, fs->fs_sblockloc);
copy_fs->fs_fmod = 0;
- copy_fs->fs_ckhash = ffs_calc_sbhash(copy_fs);
- bcopy((char *)copy_fs, &nbp->b_data[loc], (u_int)fs->fs_sbsize);
+ bpfs = (struct fs *)&nbp->b_data[loc];
+ bcopy((caddr_t)copy_fs, (caddr_t)bpfs, (u_int)fs->fs_sbsize);
+ ffs_oldfscompat_write(bpfs, ump);
+ bpfs->fs_ckhash = ffs_calc_sbhash(bpfs);
bawrite(nbp);
}
/*
From nobody Sat Jul 22 03:24:30 2023
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 4R7BcG2shdz4nlc2;
Sat, 22 Jul 2023 03:24:30 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R7BcG2R6Jz3FcS;
Sat, 22 Jul 2023 03:24:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689996270;
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=giYxzGtrkA231XYRh5ELRtaaBnQC4rSePZK97nWzwJk=;
b=WLjBBY9SWil0fvL0zXhFLa6ki7orXJTNkslW1llvqZxR7CjaOndPxuk4JnD+JEOJ7wjR87
8sOIE4vbCPzvno6PYWBHdD7iGKR1GKbYcWKo98WAWv/NIdRNpnrumvRa6j3k7fCuu7yrtx
vXYn9t4nSvpsc9mq0jtpzF7dYrZyljZHTyfxrnhcAr5AdWYOAi9XlXgWYGF67LslEN/1rx
AmOYilf870xtUCqpFuHyF7TWrRsdIWUftXntcJrtzES10UTWrapyrs+O9oLLcq81J4O0tn
snNeiIDnzojBdoVeXjIcSbRovhycxrw0Ywj1KOTREAL6SG0QRCLBTz8CwiN+cQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689996270;
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=giYxzGtrkA231XYRh5ELRtaaBnQC4rSePZK97nWzwJk=;
b=xlYYIg9AHGZEwKOEICM8X7UflTkrirqZl9N6zqhCzGmO3LKsnyoLGJBRFgOYtVsycZPENp
7w7wkKaoNVczmm9FulNYd1uNPQ++F9CUlycB32cWzQAyBElm27/HCfxmXZ5w3c315GAxxf
wjtIzvwWWiOthuhiIwaA03X7JLajhbkUbupVvQcdMwB6v2rhLdlfjtPo6gcCo+qMDCcK5l
6ebFBKPW1rFmZFQ9PHifif4az7x/yCh/G4Qx0TSY7abO6QeIM9bMJ2fxgfeu9tAuc0I6vv
BfT8rJ9A8NT/uJAs/p2UxcjmxIi3mFWsfPqCQ2kU7aHUKLDse01REam2woI87Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996270; a=rsa-sha256; cv=none;
b=E+gHh00Esbn7ARWxo9UL6AnuHU4IWG0oRTTktrTlgTRP5kfyxaWFH4vR/hoZkp+Sv0yW9w
nW4XGF/DLDU+lEgBBsDIHTsZYEANqR5JgyI+TmGV5X2sMGgPThFi7QNcvGXkYrFQ+ISyTL
hKt2xmYU+cOW/D9Cj08z9/V3Dv6GUDW7xjflX9QOEZFZjve83zsMCSyY4zV/y1nBN79fY+
eW0H5dYMcfk7fwDabtj0ZtVzJoudMUtst9ZW2WPV1ZLdHq2lz3O4C6IaMkNV+iX+SYZ1iv
HXEWePFFagj5vkXrriB+iLQKOfiLPrqAbVngjA5912EvHkx2Ke3a0qTtXWTYoA==
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 4R7BcG1Cy7zfFx;
Sat, 22 Jul 2023 03:24:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36M3OUiH085844;
Sat, 22 Jul 2023 03:24:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M3OUdk085843;
Sat, 22 Jul 2023 03:24:30 GMT
(envelope-from git)
Date: Sat, 22 Jul 2023 03:24:30 GMT
Message-Id: <202307220324.36M3OUdk085843@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 1feb6f1cbe06 - stable/13 - release: sprinkle UNAME_r hacks following c883b6fd8ccd
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 1feb6f1cbe06c0b6dbbb96b4d195813e129c634b
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=1feb6f1cbe06c0b6dbbb96b4d195813e129c634b
commit 1feb6f1cbe06c0b6dbbb96b4d195813e129c634b
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-03-04 14:22:45 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-22 03:18:43 +0000
release: sprinkle UNAME_r hacks following c883b6fd8ccd
Pass UNAME_r override to make(1) for ports builds when building
ports for another branch.
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit 63749bfe96b792b3a435f84ad81a47888cae1dea)
---
release/Makefile.azure | 2 +-
release/Makefile.ec2 | 2 +-
release/Makefile.vagrant | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/release/Makefile.azure b/release/Makefile.azure
index de95a944f9c7..32e91833b766 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -39,7 +39,7 @@ azure-check-depends:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y www/npm
. else
- make -C ${PORTSDIR}/www/npm BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install clean
. endif
. endif
npm install -g azure-cli
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 035137e61d53..e26f4f705cc6 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -45,7 +45,7 @@ CW_EC2_PORTINSTALL=
cw-ec2-portinstall:
.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
- env - PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
+ env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
.else
. if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant
index 4abcaa891ed3..d49eedacb6c9 100644
--- a/release/Makefile.vagrant
+++ b/release/Makefile.vagrant
@@ -58,7 +58,7 @@ vagrant-check-depends:
. endif
env ASSUME_ALWAYS_YES=yes pkg install -y curl
. else
- make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean
+ env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean
. endif
.endif
From nobody Sat Jul 22 03:24:31 2023
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 4R7BcH3ThSz4nlff;
Sat, 22 Jul 2023 03:24: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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R7BcH2vh0z3FRV;
Sat, 22 Jul 2023 03:24:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689996271;
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=N/Fg05YV+s92iSx6D8bPiMN8gJpV5zmbKyEZ8Hds5oA=;
b=Or7g/eZ3DjpW7RvfzRp2n/ddBqV1DV787zH2mCoDap293TiEoKozjcCUt9n+nPi89iMyvx
9IulKKAqoB4e5loIIjzgG0qqVz97WpSQxxHRfpzodTcTEbvRgkIbcsCycOBibDAz2k/TEg
rbt0UYeMVy6fnk3PX0L6NV63rnqwB8SFAKmF/nqUSAN0N+U6PNkRX869RvGFByQbK+9/p7
LNzC80G8NStTdUO6MJRF7MC+Gmu7K8aC4q3HqN0X/62MIpf+jvFsMEuIiA4/G2TlpPDLBG
8kFODaPL9NadtUpD3HRHzwMV2Jm3jPTvnYTwpyoqwsl+RFiEfZSu6Ed6AOoMfg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689996271;
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=N/Fg05YV+s92iSx6D8bPiMN8gJpV5zmbKyEZ8Hds5oA=;
b=Kr7HwdqZt5CJHktlR/jwoNVeIG9qgz+w1pPV9rnsvXTOH6UKzG6Bo86990SGqhpnZe4GEM
emIk/BvZxMSN+fDcpN5n0HIx5K07yiUBzkg9zaF01oX21tQP0pAPyp7lKzoUoiLrE98D4j
cQQ7A5VFmFHFoIeF5p/4HkVah0apW5zkDwLf7jENa16t9E+tnt8K9zilmzntpqt44D7EJN
ZeHaFkd4pa1yjX/KAjpCQiWYevSOKXblj0yQ/EgsPIjJgimF/t6NJfAgKnyejoD7D9pesA
fut4EIQjWIN1DuQSxSpYT3TJv7/+POJe8TcycUZyY1vQHTzTrvHFS9fdILsFdw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996271; a=rsa-sha256; cv=none;
b=DwTsZTavx9RCDkaZ+h+Vx4yjtvYgwqOPgIcmngP3+Px5QHNqCGj+Ucra6r1tRVOaksY1nd
DM1J1rlHLJGcudaR6npZXEBtH7N2PhbqzbRPQRafy9fcoFaENpPnEUutGvzgDn3k7Gr4L0
edYj6cIJTuHArs8U5y7RQLerUxkwbfDD4Lfn83yhJ8xtnJGgIKLlSiROdRkRLYzDJ6R+eF
5MoC0HE/PmzemAt8KoGNwLfZd5RudKMuaFdddJikw/nWDZJV1UMezFmawKHNvfX6iWL0z+
oJaMtE86FQvBlpU3gTcWmC7y2oaFEQcH+kAvDuhBFeGfuO5qPDKxKul/AykUKQ==
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 4R7BcH1sLtzf3s;
Sat, 22 Jul 2023 03:24:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36M3OVGS085863;
Sat, 22 Jul 2023 03:24:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M3OVUh085862;
Sat, 22 Jul 2023 03:24:31 GMT
(envelope-from git)
Date: Sat, 22 Jul 2023 03:24:31 GMT
Message-Id: <202307220324.36M3OVUh085862@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 9265ff1fe357 - stable/13 - release: Include Makefile.inc1 in Makefile.vm
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 9265ff1fe3571d2a28f16007e55fc1f32da1b3bb
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=9265ff1fe3571d2a28f16007e55fc1f32da1b3bb
commit 9265ff1fe3571d2a28f16007e55fc1f32da1b3bb
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-03-02 15:19:59 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-22 03:19:28 +0000
release: Include Makefile.inc1 in Makefile.vm
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit c883b6fd8ccd8d9c50b3f8fbb04da20ac0dec1c4)
---
release/Makefile.vm | 1 +
1 file changed, 1 insertion(+)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 5ce0ffafd69c..c652d393d64a 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -182,3 +182,4 @@ cloudware-release:
.include "${.CURDIR}/Makefile.azure"
.include "${.CURDIR}/Makefile.gce"
.include "${.CURDIR}/Makefile.vagrant"
+.include "${.CURDIR}/Makefile.inc1"
From nobody Sat Jul 22 03:24:32 2023
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 4R7BcK186wz4nlYR;
Sat, 22 Jul 2023 03:24:33 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R7BcJ4Z6Dz3FbD;
Sat, 22 Jul 2023 03:24:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689996272;
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=fXKJGUJ2ng3cw0Rvm59JY78rvIBX5XUO9m41WKYmwO0=;
b=i70Rxz6ubpncQ7tJez9CunzshrydGEiDJQxjpHmKgDhxUAgJC1FKASGsV/H8BfzQ3kHb9L
SQIIkwxkSCimY7PKv+UnFfzDw10Ezh8dE+8/jkWT2Fc2VyHjLZ5MiFUglDCumHjPf1dHpj
iPTnGjfJ5sshdC7TtrgL6u51+YpMKIstXtrmbc3aHQ/4ES3ffvwQVVVgKEaltT9ywAFpQX
BkKT2WniwAenUwSjQLjRmdOAamRoXnTzDyPj7sZ4FdP+xGrhJYdV7jB+TYWiqPifBiIOvu
Bmn11lcofher1DEKa/ofSMwDcFjFuxGWpMl2+A4745SIgNhz3wxTtgi3r6gmng==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689996272;
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=fXKJGUJ2ng3cw0Rvm59JY78rvIBX5XUO9m41WKYmwO0=;
b=fEeMnjlQ5PcfP0ec7iWxImdTPP+SEa+m0hOvoluZydFDYLruvV/GmcuxvE2Y5lsiP9EWJy
6GerCJDaklYGtZ9+mhX7rQnUhMpPOBSsILcxNJDOogKmSnOvKxCtn5dF5cF7LZ6VF7c0s+
L2fFjs3Z99IKyYa2trZkguEXmjKGwxmKvyqkt6XtE5xhbP3xzcZ38D7UY03nsbcv7wt6EP
C4IlNpLkt2q2ZX43eUJTxdCH4tiks3KARkD0zyZLfi9bN6HNj9IRC8kPhjKhFS+2LEwrTG
wg+PJ3IT8vk/FeGJeYSbw4/tDYWZYFUWszXT+oV1g6bPlDajzpvRCUbkR2EdZg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996272; a=rsa-sha256; cv=none;
b=bDoAhybG2TkMSCuPmfduEw+fEnR4a4Amx32Ff3FOsrUq9OznkwXAsBk3Loqpr17AUqdJcp
F+Nm+tCReQMOWRmizaUXcRNaTSjsy28nHM8c0zPLZ1B+/4nOv8x9R5x04Brqq59EnWO4iV
/zcSLjsI2UA1tb1mv2x8uhotSNTDh/Hxy9RWM+yZMvE6qTm8WNLpxLyYTgP4c80qk8ZSaU
quPv73SgrxPLZlRMc0jeb0LnZx15SUegyXft49qqu9xoq/h4EKuc+AZDnV9oCPekul1sx/
68LU2hkcnDn/QKzgZygbBf/tah97VQT/A/BOb+bOWM71F5V6kRalOvseuJcBzQ==
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 4R7BcJ32pMzf66;
Sat, 22 Jul 2023 03:24:32 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36M3OWb6085882;
Sat, 22 Jul 2023 03:24:32 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M3OWK9085881;
Sat, 22 Jul 2023 03:24:32 GMT
(envelope-from git)
Date: Sat, 22 Jul 2023 03:24:32 GMT
Message-Id: <202307220324.36M3OWK9085881@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: 638dd626370e - stable/13 - release: Adjust where UNAME_r is defined for ports builds
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 638dd626370e43e06ed0dfdb7e167290300fc01e
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=638dd626370e43e06ed0dfdb7e167290300fc01e
commit 638dd626370e43e06ed0dfdb7e167290300fc01e
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-03-02 15:11:04 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-22 03:20:13 +0000
release: Adjust where UNAME_r is defined for ports builds
In followup to 80ab50e1de19ca125f05a13937c796d48c4edd4a,
export UNAME_r in Makefile.inc1 instead of Makefile.vm.
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit 0be274d3737972532c042d06c53b5807e95aa845)
---
release/Makefile.inc1 | 3 +++
release/Makefile.vm | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/release/Makefile.inc1 b/release/Makefile.inc1
index da7226dfa890..99d61a45e700 100644
--- a/release/Makefile.inc1
+++ b/release/Makefile.inc1
@@ -40,3 +40,6 @@ BUILDDATE!= date +%Y%m%d
.export BUILDDATE
.endif
+# Override UNAME_r to allow building ports for a different branch.
+UNAME_r= ${REVISION}-${BRANCH}
+.export UNAME_r
diff --git a/release/Makefile.vm b/release/Makefile.vm
index c652d393d64a..abd5f4c5de00 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -58,7 +58,7 @@ emulator-portinstall:
.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
.if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static)
.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile)
- env - UNAME_r="${REVISION}-${BRANCH}" PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
+ env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
.else
.if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
From nobody Sat Jul 22 03:24:33 2023
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 4R7BcK5gJwz4nlYd;
Sat, 22 Jul 2023 03:24:33 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R7BcK4swdz3Fh1;
Sat, 22 Jul 2023 03:24:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689996273;
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=F7MJY7tkqqVwuDZ0Khhw2XRUZ3bVOCgQj5tBNkEa4HQ=;
b=yoziQyeQTTRQmsOGAkcVVSMiMBOXorR26xa4QcazkeWPqmoyQuePq09ZnUCH081ciLiCu1
Ka/Xx6NnnsN3j8argoh2f3AYYvx05W+Pl0sar5o/2BGBeGMpqy1lyypE3byG/qfDIBdEqm
2ixtVmo3monzI77qCq4J+PsI8vrn5AYN+bJm2VwTR2Z7llSb0yY3MtpdPe32ffxvunaScl
iSph4Rq5bHiNygfR4/0LgjRmgL5aLb5Az+suZpHSEXmR9Vjez0WqzhezZkRtSpIM9l/RqX
GmqAbpWQ814kuO0kXRSpWmXMxlaROtsnkfpjE01IzE3SSD9QomoBe5JooK7iDQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689996273;
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=F7MJY7tkqqVwuDZ0Khhw2XRUZ3bVOCgQj5tBNkEa4HQ=;
b=F3bWO5sI1IvZTOIpuE8qxgFjtERBl0L2pJHFkLPiUjY7YYkok7OqCmEGU1SNBJiYbY5MBZ
IycAzLYq3FHnGBCR6byvVXKps62mSliSK4Sx58rXaqF142Fjm/XkyOMMM2tqC785Pg2hXi
1SAXhzMzh9VQY1lkpDFG8uM4mOCy79ibi6MS/GJc/GimlhtejwlZVad0U1dNHY6Bn4urDU
t7RhT/WFFfol+8d0FMf0fgJeqDMYNPtk5SPFeBE7FKIdcDG+L4CqzeYVuRzBdXcuMQC+Wu
jv935AH5xj3n0eUnZbPf+tQ6WdOD6zy46763eUPlRL6gXF/Ak/Lem6YEnnU97w==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996273; a=rsa-sha256; cv=none;
b=CEJueaKEoUbG35OY9Ujf9XCQ7wMZDS+LNWGDwpXlf0fEvkRultrfKb2pe7YE4wIA5HH0Oo
5fmPCYmEcanS6bq3EisOdT9h5+lgrhkz389awIcSN3OmPY05y1NnDT6McPxa+c3jlnIBRA
J9QWK0AjzrddRyk9UlPKue3tALGTOTajQavFmE8wrjABbeOZiEEFgGlL5rr4aoPl5NdPnd
SiOqVnjFQaD/+5F8KfQjrNKQePhFXoxWmj34FiARt4yvyz70gyVVMR/qbhjB6eDGmH+IWY
pKMSI11tjKk+cG7CLM54/LLode9g2yRh6/kRPHdI1hg/NlRxST6cfxMlLg0YZA==
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 4R7BcK3zK9zdkT;
Sat, 22 Jul 2023 03:24:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36M3OXQr085902;
Sat, 22 Jul 2023 03:24:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36M3OXFu085901;
Sat, 22 Jul 2023 03:24:33 GMT
(envelope-from git)
Date: Sat, 22 Jul 2023 03:24:33 GMT
Message-Id: <202307220324.36M3OXFu085901@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Glen Barber <gjb@FreeBSD.org>
Subject: git: a1e58f1f630f - stable/13 - release: pass UNAME_r to fix building 14.x ports on 13.x
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: gjb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: a1e58f1f630ffa2de1d54d9d59a7d0ab2a178695
Auto-Submitted: auto-generated
The branch stable/13 has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=a1e58f1f630ffa2de1d54d9d59a7d0ab2a178695
commit a1e58f1f630ffa2de1d54d9d59a7d0ab2a178695
Author: Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-02-18 23:52:39 +0000
Commit: Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-22 03:23:06 +0000
release: pass UNAME_r to fix building 14.x ports on 13.x
Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
Sponsored by: PayPal https://paypal.me/gjbbsd
(cherry picked from commit 80ab50e1de19ca125f05a13937c796d48c4edd4a)
From nobody Sat Jul 22 03:31:50 2023
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 4R7Bmn4cCCz4nqQB;
Sat, 22 Jul 2023 03:31:53 +0000 (UTC)
(envelope-from gjb@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84])
(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 "freefall.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R7Bmn3cLGz3J1b;
Sat, 22 Jul 2023 03:31:53 +0000 (UTC)
(envelope-from gjb@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1689996713;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=V0BL8B92wPOczwEaFCP7EGD9SI3Ap5PCEwLxrv4wBic=;
b=liG2xrqczOYE0R1UcgFog7fyXF2WFsEWuSxpSzjmf2w7Z3BpJ7pOcU/r2yZ7vogn+zsiYl
3ombH7IOcPqKNDY3wpop/6FwKpVsy30Ngb5B/7Q3RqyqbeuAZLSgAc+4TYYAYIK1nWnMNA
2FfmS15gwa4uc/5UCnm51W/FiUNQjgOmSsyqTXNcMcEar+41GfCGpNDoeHOuHxNHATxy0K
y18dSp29xE8GXrFpECQSpmp+OcQwxsCwQHmKYKY3lId7Jv9HZMrhGiYyXLB3dqTbUQPiPB
FulvrHjLFJ+h+tZW9hR/10l2QRfZFCPlcBY1T90YV2iuyq/UdXAnpPgcz41N9A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1689996713;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=V0BL8B92wPOczwEaFCP7EGD9SI3Ap5PCEwLxrv4wBic=;
b=HQCYeiasMN2ve81dAGV/Z3BteTFLaCHYqDZvtPVYWSeRsM0p9E24w+NI/wZPMZqkVR3U5w
Lfb/fowIcvaRtAlHJrF6QVsIez6v09OZoR5kB3Vr+yTgsAycFbdUsngopjdQC43J+1JMPI
H/OYtyPEQFTr0cu23LG9PrxVvVOeqvcI9GB4St6+Bmfi/YnipTnRrIDPTYuFkwSG1LM6+3
pwMoipeYb8Od1tptULe9dgCncpDZiB3dviSYFTRC3dQaZCzIgJF3wULwUEX1eaWeBR/xso
ddNFsay2QkCzBGaarVGBre5Yo0hqqGYOt1gq2Txe3k3ZfIYpQOeGgZA5WnO76A==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689996713; a=rsa-sha256; cv=none;
b=Zmi4ICU99tk7wiy/8KsXputj3lbSOy+qoKYVdHpoyoB6r80eJc1IBbPAF52gA/UdrD0csK
gqp8lJGklv1MOnnuj4XAIRJG67tF0m9/J7RHJXqU0V/mnyahIKPOQoo6Ptx+Lj41btWLEG
neGWjZq29MJogGwBLOkaXleAuavbnUiGQCo5rZADlB9+qK0XdYvwXD5IaaGA0H1tDRvRx3
iZpIWX0oCwdalHFiuxJzfkPqCbZLyikaHKLAxINYv6uGPqZ0fxwgov10aMgLBpnXIriFVV
EQlrzRGf9MS+y3UgWgVsBCpUrJJNKYu1HCttGmDExCfP/MUGIy6M2vzhj98MUA==
Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84])
(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by freefall.freebsd.org (Postfix) with ESMTPS id 1504716336;
Sat, 22 Jul 2023 03:31:53 +0000 (UTC)
(envelope-from gjb@freebsd.org)
Date: Sat, 22 Jul 2023 03:31:50 +0000
From: Glen Barber <gjb@freebsd.org>
To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org,
dev-commits-src-branches@freebsd.org
Subject: Re: git: a1e58f1f630f - stable/13 - release: pass UNAME_r to fix
building 14.x ports on 13.x
Message-ID: <20230722033150.GX1219@FreeBSD.org>
References: <202307220324.36M3OXFu085901@gitrepo.freebsd.org>
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature"; boundary="wQ8ANTl3uYPVjUZt"
Content-Disposition: inline
In-Reply-To: <202307220324.36M3OXFu085901@gitrepo.freebsd.org>
--wQ8ANTl3uYPVjUZt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sat, Jul 22, 2023 at 03:24:33AM +0000, Glen Barber wrote:
> The branch stable/13 has been updated by gjb:
>=20
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Da1e58f1f630ffa2de1d54d9d59=
a7d0ab2a178695
>=20
> commit a1e58f1f630ffa2de1d54d9d59a7d0ab2a178695
> Author: Glen Barber <gjb@FreeBSD.org>
> AuthorDate: 2021-02-18 23:52:39 +0000
> Commit: Glen Barber <gjb@FreeBSD.org>
> CommitDate: 2023-07-22 03:23:06 +0000
>=20
> release: pass UNAME_r to fix building 14.x ports on 13.x
> =20
> Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd
> Sponsored by: PayPal https://paypal.me/gjbbsd
> =20
> (cherry picked from commit 80ab50e1de19ca125f05a13937c796d48c4edd4a)
>=20
This indeed was an empty commit. The conflict resolved here was fixed
in a previous commit where UNAME_r was adjusted, so this cherry-pick is
empty as result of that former resolution.
Glen
--wQ8ANTl3uYPVjUZt
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmS7TaAACgkQAxRYpUeP
4pPY3A//VJiPQ8UeP/L35owCvDUTsCxTlcrODLLv95ExuV67kPAnz1WjrFZUcXKy
Z9/RWL4XJZ+MJQMCb4rxoeTmHGJpoX/RSAI7hcQp1s9+Ba1HvqmKuhAc2xfK1sek
UPNeVS079JXOx3aANcMmnxowgWYgxHoou+KA6d6irq6Eus/4MQp7utO0dXfUbwup
Xnn0Rymw+sSIxPqrOmiPGl6NKwXUpOBTSR75LC07+V3T28itful60dsjyeCZFMgs
xqT5hrC5LhGOaF/9+J2V9y45cQ8ZW+zAl9eSdBw3lLCFbtJZY3tQT8Akll3PDb4Q
6qo2nvwM8cpevqolFwe7Z22oveuZ9WItMkAIG3ganNnLZRbOw0BTp5k/5nFIlqyg
/V+14yCXErk3+VjZTQ6eevwueSZDyORaQBNcwNynGmbadFl5IsMvm+fqfag1o0eq
LYwSuF1HAbnL6AJpmJIcdJb/NG20TY+yi7NwI7twLeFThwxsQSPiK15yEZYZ4VqB
+RJ3dRL+AA/gYSfDw7nl+EBQhhiylpAimtDwwoiYc8dci34WdlmtWXFzq3CK3Zkl
wUHK7VX23R/B6YkE8x51rpORiTQMs7yUbJLBVNWAwcDUWON3hyA6S8MyG3/hxnuc
lGb/0Zfpqvv1X0mbxBvkOVQa3RLYUmO62tppnfTRetGBqodpn1o=
=DOaz
-----END PGP SIGNATURE-----
--wQ8ANTl3uYPVjUZt--
From nobody Sat Jul 22 18:23:13 2023
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 4R7ZYF5RyPz4nt8h;
Sat, 22 Jul 2023 18:23:13 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4R7ZYF4WFJz3Qfp;
Sat, 22 Jul 2023 18:23:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1690050193;
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=kCmri2LmiVI4FZWvFFzi+9NrA3kj9LY6F9CxCIUZ1LM=;
b=ezIEqNm+51HiKx+YaQKhackvz2X9V+TSywjo4CUWL+ohyTmMu7s4HSy5boYuci29IhgYgp
btOtIkAt8nc9+4g9kuH1T4kvNgtM2bZJlca1N4VR2xAZjiDWHZ+OeUrekJgi5AriLsJ/6t
BGkM1ehH/0iCmpis7TsgrV4sMIxQrETCBR0REjT1xHjVn8VYs/Dh1Dl5PTEUkvVMEx2PWy
sq0WAetcT90VaFIXRMcSZ9akWEmUAWXcQ/Ai12kXzmeFYWXUZa6s157rrX0dP5BA6X8rX+
O+Gvbz/Sn/i+Qfuar6Oe2qSmtcQMqjgGXKXGk0QgheNY0T7W+i+WZvhn5gi6fA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1690050193;
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=kCmri2LmiVI4FZWvFFzi+9NrA3kj9LY6F9CxCIUZ1LM=;
b=ZHaCAHr6pFHUzlN2aFdEZ9CQCb/KELL80gcnmUdhsRSzt58Ky1+8fHigIQa0RCHIplN5vv
5aIJDsmYPSYjMINlWksh5f+SZnLhz6xhV5LiQzuUc81Z54lawaTVXJ/mgxs1JGqb/S1hEX
xIR5p+ro5Vd81uNp/Q9VMyobPeLNdFMjk/kUuf8wT/g137L6+vpd6eH4LvvG5EzYzCIDm/
mKVcyR1keZImVgsOdF8Wq4Y/LrRiDBbOvx6wadO0JV+FdXiHPchzlr+K7Bm854nDDKKTvn
AfXtI6KvvZyfRDykQArIN9Zth+lQQ8ncWFMiolvnsf2yGOOKtE3wJ7JsgX6wBA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690050193; a=rsa-sha256; cv=none;
b=xZDDPeoQYjyXLfvtvHU/w2qOkn737s1UVTw3z1O2o4QFQmR3S4Tkww0q6Tu2QLleqNp4XX
Dizf1ZyrYXe+wHQLckLI+GJXb3WWaWqV/wPLDAYBIQKQarLHnRz4pBxHivf0xZyHZoH3vX
lBmhWZci6/j7+hIvKtE9LXxqQgWDp5ieDFVKdQYmzTbjS6WVq6oZw5WdyUQYHCJqd1eZy8
5oGKu8HK82IU4/IWbLqpYXRP0RB/eqbd6z3cHmSNO1s1f0bHsh3bsj7rmsn2fat9DMg0wn
ZN/ATn/tAGeNe6Z4wYMfWgdYa9yqVmHsPnuTsjnyE9bLrDdaHxUGNc4E1qJ5SA==
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 4R7ZYF2mfGz14fp;
Sat, 22 Jul 2023 18:23:13 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36MINDf1075367;
Sat, 22 Jul 2023 18:23:13 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36MIND9w075366;
Sat, 22 Jul 2023 18:23:13 GMT
(envelope-from git)
Date: Sat, 22 Jul 2023 18:23:13 GMT
Message-Id: <202307221823.36MIND9w075366@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Dimitry Andric <dim@FreeBSD.org>
Subject: git: 50a4d8b34570 - stable/13 - depend-cleanup.sh: handle 32-bit dependencies having no 64-bit equivalent
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dim
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 50a4d8b345705ff2180c150903228f99b08b5674
Auto-Submitted: auto-generated
The branch stable/13 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=50a4d8b345705ff2180c150903228f99b08b5674
commit 50a4d8b345705ff2180c150903228f99b08b5674
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-07-10 22:50:09 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-07-22 18:22:34 +0000
depend-cleanup.sh: handle 32-bit dependencies having no 64-bit equivalent
For example with the recent removal of ffs.S for 32-bit arm and i386,
the egrep in clean_dep() did not find any files to remove, even if you
added a "clean_dep lib/libc ffs S" line. This is because it will never
find the ffs.S filename in the 64-bit .depend files for libc.
Split the searching and removing of 32-bit dependencies and objects into
a separate part to cope with this. This can be used similarly later on,
for other bitnesses.
MFC after: 3 days
(cherry picked from commit 7ba8cc9b7b6bdea142d7ecb82c7d3a9b095e967d)
---
tools/build/depend-cleanup.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 58a7c72b2082..92a085067c2b 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -33,7 +33,11 @@ clean_dep()
echo "Removing stale dependencies and objects for $2.$3"; \
rm -f \
"$OBJTOP"/$1/.depend.$2.* \
- "$OBJTOP"/$1/$2.*o \
+ "$OBJTOP"/$1/$2.*o
+ fi
+ if egrep -qw "$2\.$3" "$OBJTOP"/obj-lib32/$1/.depend.$2.*o 2>/dev/null; then
+ echo "Removing 32-bit stale dependencies and objects for $2.$3"
+ rm -f \
"$OBJTOP"/obj-lib32/$1/.depend.$2.* \
"$OBJTOP"/obj-lib32/$1/$2.*o
fi