From nobody Mon Sep 15 04:04:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQBHP2JSsz680H3; Mon, 15 Sep 2025 04:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQBHP1dWjz42Pw; Mon, 15 Sep 2025 04:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909057; 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=ubYt7Hc+cCTNB+c1ErPeahrH/AmOoWAx/fLXDa7fmtY=; b=GK90yrDJa09idlZ+t1CCHbLBG/LirA8TVdfRmul9xZbsR3fDVIFlgXaLfOLREVZF37V0mr FyW/tqt7Nz00ng111BXuT4wkIlKCuqotfPV0qTgwV2S4viclMndFaDqt93+k6+/wC2ZNaM k+eNeYwGCHroTpx4f+8YTYMDcFcX9rA0Y+y8EAe/N91KHb8Q13RVQdrVqFEZ+ZbwP/WoF2 0pDcdX/zuoDe5TeuV6EAx2Hacx8aieq3WR1PpHu5GOHo0ZA0yCEMgfadz+v3JqNqhjcN4E JD3Bj8ofdknowpg02HPoHSdEF2ByyZ+c48570GYAzYHTKnIhSzEKWajX8H+DmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909057; 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=ubYt7Hc+cCTNB+c1ErPeahrH/AmOoWAx/fLXDa7fmtY=; b=Pl8JDUQ5JzZa0ZIyNeWN0BoExWjgZ4sgZUIqlWF5gKxuNph4E9PoxYy0QjpjOkQF9QMkb5 M6Wl15WOJ1s92Avi3Y6OlWPZXPvVBxM1VK6of/iA9g6Mt7RoeTeZhRYh9QLIT+qyIGXbBc XmBg3KUJohNN9ctguAvyifgg5Jhb0SjQ1LsOiYbekYiKZgkWQWP33b+gCG6ckjLYLPL6lC CvMhT1LrwPi0bs+43yeImu2RNhM4hLBiwG1dQeQSOKQO8t1peZSGVXcMmgUlnMUjd/pohl m+JvS3PlZqtCphIMpXjIymf7NCLDFfkNWrPdQwZVsBBMM+F7UWKsLqLbUCA55g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757909057; a=rsa-sha256; cv=none; b=Ml3zdRs3o4ApfLeooaBUa20nVnwUeM2fTDIdzXSsIALKdhzp99eQReA3qNm6GaONpp/zjE w2Y3K4hb4fyacomIplaocvvQeeadpnLfhep2GP98mpeUGRTR3s1wId9fz4OPzWUhN1Ipx4 x8k+ye3Rw4H/9SDlp9gKSRsWNBRim5Grrq5i7PSdm4A3N1GVoXquG+S9IUlDsMjG8aL4M9 W5PDV169F5SkUjS11VzhAHQAx1D4z8HTHQGbnB+oFx06vMWxwJxqX//WmxSCWRA9Uz47xC LgFtY4/RLTDDiUgPHA5Spq0x2c4zgCMX1HkhkbDp7EZWgrNXk2KyA7C/GRv34A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQBHP0fvbzfVM; Mon, 15 Sep 2025 04:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58F44GGs046666; Mon, 15 Sep 2025 04:04:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58F44G5K046663; Mon, 15 Sep 2025 04:04:16 GMT (envelope-from git) Date: Mon, 15 Sep 2025 04:04:16 GMT Message-Id: <202509150404.58F44G5K046663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 1a849ff1e9a9 - stable/15 - jail: simplify EVFILT_JAIL events List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1a849ff1e9a93f2d0f66c962a17b20af13796f01 Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=1a849ff1e9a93f2d0f66c962a17b20af13796f01 commit 1a849ff1e9a93f2d0f66c962a17b20af13796f01 Author: Jamie Gritton AuthorDate: 2025-09-12 05:22:45 +0000 Commit: Jamie Gritton CommitDate: 2025-09-15 03:33:18 +0000 jail: simplify EVFILT_JAIL events Instead of using the EVFILT_PROC model of attempting to automatically register new events when a child jail is created, just give a single event when a child jail is created. As was already done with jail attach events, make a best-effort report of the added jail's id in kn_data. If the are multiple NOTE_JAIL_CHILD and/or NOTE_JAIL_ATTACH events, set the NOTE_JAIL_MULTI flag, and don't report anything in data, indicating that the caller will need to query the system state on their own. (cherry picked from commit dbcaac13e49c88d1c077f34f56dd2b7ba77a145a) --- lib/libsys/kqueue.2 | 41 +++++++++++------------------ sys/kern/kern_event.c | 71 +++++++++++---------------------------------------- sys/kern/kern_jail.c | 4 +-- sys/sys/event.h | 17 ++++++------ 4 files changed, 39 insertions(+), 94 deletions(-) diff --git a/lib/libsys/kqueue.2 b/lib/libsys/kqueue.2 index e413f7d4fbca..aafb5317c5e0 100644 --- a/lib/libsys/kqueue.2 +++ b/lib/libsys/kqueue.2 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 4, 2025 +.Dd September 11, 2025 .Dt KQUEUE 2 .Os .Sh NAME @@ -614,41 +614,30 @@ The process ID will be stored in If more than one process has attached since the last call to .Fn kevent , .Va data -will contain the most recently attached process ID, -with -.Dv NOTE_JAIL_ATTACH_MULTI -set in -.Va fflags . +will be zero. .It Dv NOTE_JAIL_REMOVE The jail has been removed. .It Dv NOTE_JAIL_CHILD A child of the watched jail has been created. -.It Dv NOTE_TRACK -Follow child jails created under this jail. -Register a new kevent to monitor the child jail using the same -.Va fflags -as the original event. -The child jail will signal an event with -.Dv NOTE_CHILD -set in -.Va fflags -and the parent JID in +Its jail ID will be stored in .Va data . -.Pp -If registering a new kevent fails -.Pq usually due to resource limitations , -it will signal an event with -.Dv NOTE_TRACKERR -set in -.Va fflags , -and the child jail will not signal a -.Dv NOTE_CHILD -event. +If more than one jail has been created since the last call to +.Fn kevent , +.Va data +will be zero. .El .Pp On return, .Va fflags contains the events which triggered the filter. +It will also contain +.Dv NOTE_JAIL_MULTI +if more than one +.Dv NOTE_JAIL_ATTACH +or +.Dv NOTE_JAIL_CHILD +event has been received since the last call to +.Fn kevent . .It Dv EVFILT_TIMER Establishes an arbitrary timer identified by .Va ident . diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 501adc151d44..8d1ff313735b 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -539,8 +539,7 @@ filt_proc(struct knote *kn, long hint) * process forked. Additionally, for each knote attached to the * parent, check whether user wants to track the new process. If so * attach a new knote to it, and immediately report an event with the - * child's pid. This is also called on jail creation, which is treated - * the same way by jail events. + * child's pid. */ void knote_fork(struct knlist *list, int pid) @@ -567,8 +566,6 @@ knote_fork(struct knlist *list, int pid) /* * The same as knote(), activate the event. */ - _Static_assert(NOTE_JAIL_CHILD == NOTE_FORK, - "NOTE_JAIL_CHILD should be the same as NOTE_FORK"); if ((kn->kn_sfflags & NOTE_TRACK) == 0) { if (kn->kn_fop->f_event(kn, NOTE_FORK)) KNOTE_ACTIVATE(kn, 1); @@ -632,30 +629,11 @@ int filt_jailattach(struct knote *kn) { struct prison *pr; - bool immediate; - immediate = false; if (kn->kn_id == 0) { /* Let jid=0 watch the current prison (including prison0). */ pr = curthread->td_ucred->cr_prison; mtx_lock(&pr->pr_mtx); - } else if (kn->kn_flags & (EV_FLAG1 | EV_FLAG2)) { - /* - * The kernel registers prisons before they are valid, - * so prison_find_child will fail. - */ - TAILQ_FOREACH(pr, &allprison, pr_list) { - if (pr->pr_id < kn->kn_id) - continue; - if (pr->pr_id > kn->kn_id) { - pr = NULL; - break; - } - mtx_lock(&pr->pr_mtx); - break; - } - if (pr == NULL) - return (ENOENT); } else { sx_slock(&allprison_lock); pr = prison_find_child(curthread->td_ucred->cr_prison, @@ -670,32 +648,7 @@ filt_jailattach(struct knote *kn) } kn->kn_ptr.p_prison = pr; kn->kn_flags |= EV_CLEAR; - - /* - * Internal flag indicating registration done by kernel for the - * purposes of getting a NOTE_CHILD notification. - */ - if (kn->kn_flags & EV_FLAG2) { - kn->kn_flags &= ~EV_FLAG2; - kn->kn_data = kn->kn_sdata; /* parent id */ - kn->kn_fflags = NOTE_CHILD; - kn->kn_sfflags &= ~NOTE_JAIL_CTRLMASK; - immediate = true; /* Force immediate activation of child note. */ - } - /* - * Internal flag indicating registration done by kernel (for other than - * NOTE_CHILD). - */ - if (kn->kn_flags & EV_FLAG1) { - kn->kn_flags &= ~EV_FLAG1; - } - knlist_add(pr->pr_klist, kn, 1); - - /* Immediately activate any child notes. */ - if (immediate) - KNOTE_ACTIVATE(kn, 0); - mtx_unlock(&pr->pr_mtx); return (0); } @@ -720,18 +673,24 @@ filt_jail(struct knote *kn, long hint) if (pr == NULL) /* already activated, from attach filter */ return (0); - /* Mask off extra data. */ - event = (u_int)hint & NOTE_JAIL_CTRLMASK; + /* + * Mask off extra data. In the NOTE_JAIL_CHILD case, that's + * everything except the NOTE_JAIL_CHILD bit itself, since a + * JID is any positive integer. + */ + event = ((u_int)hint & NOTE_JAIL_CHILD) ? NOTE_JAIL_CHILD : + (u_int)hint & NOTE_JAIL_CTRLMASK; /* If the user is interested in this event, record it. */ if (kn->kn_sfflags & event) kn->kn_fflags |= event; - /* Report the attached process id. */ - if (event == NOTE_JAIL_ATTACH) { + /* Report the created jail id or attached process id. */ + if (event == NOTE_JAIL_CHILD || event == NOTE_JAIL_ATTACH) { if (kn->kn_data != 0) - kn->kn_fflags |= NOTE_JAIL_ATTACH_MULTI; - kn->kn_data = hint & NOTE_JAIL_DATAMASK; + kn->kn_fflags |= NOTE_JAIL_MULTI; + kn->kn_data = (kn->kn_fflags & NOTE_JAIL_MULTI) ? 0U : + (u_int)hint & ~event; } /* Prison is gone, so flag the event as finished. */ @@ -1729,8 +1688,8 @@ findkn: /* * If possible, find an existing knote to use for this kevent. */ - if ((kev->filter == EVFILT_PROC || kev->filter == EVFILT_JAIL) - && (kev->flags & (EV_FLAG1 | EV_FLAG2)) != 0) { + if (kev->filter == EVFILT_PROC && + (kev->flags & (EV_FLAG1 | EV_FLAG2)) != 0) { /* This is an internal creation of a process tracking * note. Don't attempt to coalesce this with an * existing note. diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 3d18b03119ff..d90ccf4a04c8 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2221,9 +2221,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) */ if (created) { sx_assert(&allprison_lock, SX_XLOCKED); - mtx_lock(&ppr->pr_mtx); - knote_fork(ppr->pr_klist, pr->pr_id); - mtx_unlock(&ppr->pr_mtx); + prison_knote(ppr, NOTE_JAIL_CHILD | pr->pr_id); mtx_lock(&pr->pr_mtx); drflags |= PD_LOCKED; pr->pr_state = PRISON_STATE_ALIVE; diff --git a/sys/sys/event.h b/sys/sys/event.h index f161d2c938c1..91fbaa4834f7 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -205,19 +205,18 @@ struct freebsd11_kevent32 { #define NOTE_PCTRLMASK 0xf0000000 /* mask for hint bits */ #define NOTE_PDATAMASK 0x000fffff /* mask for pid */ +/* additional flags for EVFILT_PROC */ +#define NOTE_TRACK 0x00000001 /* follow across fork/create */ +#define NOTE_TRACKERR 0x00000002 /* could not track child */ +#define NOTE_CHILD 0x00000004 /* am a child process */ + /* data/hint flags for EVFILT_JAIL */ -#define NOTE_JAIL_SET 0x80000000 /* jail was modified */ -#define NOTE_JAIL_CHILD 0x40000000 /* child jail was created */ +#define NOTE_JAIL_CHILD 0x80000000 /* child jail was created */ +#define NOTE_JAIL_SET 0x40000000 /* jail was modified */ #define NOTE_JAIL_ATTACH 0x20000000 /* jail was attached to */ #define NOTE_JAIL_REMOVE 0x10000000 /* jail was removed */ -#define NOTE_JAIL_ATTACH_MULTI 0x08000000 /* multiple procs attached */ +#define NOTE_JAIL_MULTI 0x08000000 /* multiple child or attach */ #define NOTE_JAIL_CTRLMASK 0xf0000000 /* mask for hint bits */ -#define NOTE_JAIL_DATAMASK 0x000fffff /* mask for pid */ - -/* additional flags for EVFILT_PROC and EVFILT_JAIL */ -#define NOTE_TRACK 0x00000001 /* follow across fork/create */ -#define NOTE_TRACKERR 0x00000002 /* could not track child */ -#define NOTE_CHILD 0x00000004 /* am a child process/jail */ /* additional flags for EVFILT_TIMER */ #define NOTE_SECONDS 0x00000001 /* data is seconds */ From nobody Mon Sep 15 04:04:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQBHQ2x3jz6803L; Mon, 15 Sep 2025 04:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQBHQ259Hz42c1; Mon, 15 Sep 2025 04:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909058; 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=O2/2gBiE+llPpteg7Cbzx1xrm6XVAjHDh73z1fiQgEQ=; b=ZijFlgYp2lJcfWJTf+NlowZVKpSBvhW8shcIOGCdA8J/Zrvk3tM8SfVUIhUmsDyrhyMNj8 mACcowsCxRxXPkAef4CGhJTfdRJXkXIR+FcvyqD5V3a5cvSmnv5A8Z4/aXOhslmLY0X+7i tocEjAHIQtKu6aOEwTfvCBqdX5Y+NlB+yPEgTPRlGbaq652E2mzMaegPs0YzvyIjfcw1G4 S9l+e3Ngzhm70kcFxKVZxF1HbINHF+Qdj6nLIipGXH9smdXFROF22Hgcg+3XJb1yL4uPr/ wO/TzsRDI36L6t3Sew8Lxx6AjM3A0z7uxVJm5YDhPSkfDdwAWEXDnTCwBgHe9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909058; 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=O2/2gBiE+llPpteg7Cbzx1xrm6XVAjHDh73z1fiQgEQ=; b=qfjAmVz0KpPKuxnM/Dxmmjn+FNppgJHKKi86yuzRqXgu5TnO5ZxyLaP4Zmdu1oL6VcC6wU tYbibW0vi4QppbOXCD41QibAXYEVVCgW9HYPyvmII0KH0V5Fg0Fpfg+9UAnTAKwHMn6tBY 65VhHxttOzge78e1MhByQfr9jqlHpK7qe2HEvjDhzVozDW0MqyHfTBLZ5VKJTkiMRHJMJM m8WW1L8paX09/ycUUIhSgUXbsdoDHp7758xKS2HtvqfnY7NTOzAzaLvMknvcW+nbI+kRrq jNvKtkAwthhpltJrEpjJB6iddWlkIZABYAeeKTDB7tTL8QTATx/gCoHnT0gbfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757909058; a=rsa-sha256; cv=none; b=Sd2CZ9XF5/N7CRVhvHlH0vXF3cBE+dOz8Zxu2gE6JBOzIT+4T0H69AjTYYYOye6atxrbQ1 xMJL3tdkgv34Nva4J6RAceAJTboReApzlFL/jdn3vjJ2w/JH9tPUC1/o12OlWlaAkMM7fx EkcJ+lfZtc3i1FLo9h/Q3Y7an2J39JIjJUvtAE7ITsoTuMAWuvpUp3FHlaC65BvD3vI+my bZcnm9o6t0arfYOMJRjBqpnV85NEp+k3oER19UpB/xwH/hHdttzdZnVsCnAPG31Lre0C7f 9M23BYlUL1xZPH29wxrlTGaYjpTwPaVsrWKYLbO0Mdv70VwFGeyIXkAXlc0rrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQBHQ1QhZzfkM; Mon, 15 Sep 2025 04:04:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58F44Ic9046700; Mon, 15 Sep 2025 04:04:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58F44IaE046697; Mon, 15 Sep 2025 04:04:18 GMT (envelope-from git) Date: Mon, 15 Sep 2025 04:04:18 GMT Message-Id: <202509150404.58F44IaE046697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 9d7f89ef2607 - stable/15 - jaildesc: add kevent support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9d7f89ef26073bb56e6ec9c3370089067a71babc Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7f89ef26073bb56e6ec9c3370089067a71babc commit 9d7f89ef26073bb56e6ec9c3370089067a71babc Author: Jamie Gritton AuthorDate: 2025-09-12 18:33:19 +0000 Commit: Jamie Gritton CommitDate: 2025-09-15 03:33:48 +0000 jaildesc: add kevent support Give jail descriptors the same kevent flags as jails. Also fix the event reporting in jails, where it was including data for events the user didn't ask for. (cherry picked from commit 66d8ffe3046ded1eb3f78599c6af8eb965482ef5) --- lib/libsys/kqueue.2 | 15 +++++- sys/kern/kern_event.c | 18 ++++--- sys/kern/kern_jail.c | 1 + sys/kern/kern_jaildesc.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++- sys/sys/event.h | 5 +- sys/sys/jaildesc.h | 4 ++ 6 files changed, 168 insertions(+), 13 deletions(-) diff --git a/lib/libsys/kqueue.2 b/lib/libsys/kqueue.2 index aafb5317c5e0..96c9b0222a37 100644 --- a/lib/libsys/kqueue.2 +++ b/lib/libsys/kqueue.2 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 11, 2025 +.Dd September 12, 2025 .Dt KQUEUE 2 .Os .Sh NAME @@ -638,6 +638,19 @@ or .Dv NOTE_JAIL_CHILD event has been received since the last call to .Fn kevent . +.It Dv EVFILT_JAILDESC +Takes a jail descriptor returned by +.Xr jail_set 2 +or +.Xr jail_get 2 +as the identifier and the events to watch for in +.Va fflags , +and returns when the jail performs one or more of the requested events. +The events to monitor and the resulting +.Va fflags +are the same as those listed in +.Dv EVFILT_JAIL , +above. .It Dv EVFILT_TIMER Establishes an arbitrary timer identified by .Va ident . diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 8d1ff313735b..57cbfb8a0361 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -376,6 +377,7 @@ static struct { [~EVFILT_SENDFILE] = { &null_filtops }, [~EVFILT_EMPTY] = { &file_filtops, 1 }, [~EVFILT_JAIL] = { &jail_filtops, 1 }, + [~EVFILT_JAILDESC] = { &file_filtops, 1 }, }; /* @@ -682,15 +684,15 @@ filt_jail(struct knote *kn, long hint) (u_int)hint & NOTE_JAIL_CTRLMASK; /* If the user is interested in this event, record it. */ - if (kn->kn_sfflags & event) + if (kn->kn_sfflags & event) { kn->kn_fflags |= event; - - /* Report the created jail id or attached process id. */ - if (event == NOTE_JAIL_CHILD || event == NOTE_JAIL_ATTACH) { - if (kn->kn_data != 0) - kn->kn_fflags |= NOTE_JAIL_MULTI; - kn->kn_data = (kn->kn_fflags & NOTE_JAIL_MULTI) ? 0U : - (u_int)hint & ~event; + /* Report the created jail id or attached process id. */ + if (event == NOTE_JAIL_CHILD || event == NOTE_JAIL_ATTACH) { + if (kn->kn_data != 0) + kn->kn_fflags |= NOTE_JAIL_MULTI; + kn->kn_data = (kn->kn_fflags & NOTE_JAIL_MULTI) ? 0U : + (u_int)hint & ~event; + } } /* Prison is gone, so flag the event as finished. */ diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index d90ccf4a04c8..43035dc009b3 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -5371,6 +5371,7 @@ prison_knote(struct prison *pr, long hint) if (!locked) mtx_lock(&pr->pr_mtx); KNOTE_LOCKED(pr->pr_klist, hint); + jaildesc_knote(pr, hint); if (!locked) mtx_unlock(&pr->pr_mtx); } diff --git a/sys/kern/kern_jaildesc.c b/sys/kern/kern_jaildesc.c index c9e80f5d8941..3f322b271400 100644 --- a/sys/kern/kern_jaildesc.c +++ b/sys/kern/kern_jaildesc.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -46,6 +47,8 @@ MALLOC_DEFINE(M_JAILDESC, "jaildesc", "jail descriptors"); +static fo_poll_t jaildesc_poll; +static fo_kqfilter_t jaildesc_kqfilter; static fo_stat_t jaildesc_stat; static fo_close_t jaildesc_close; static fo_fill_kinfo_t jaildesc_fill_kinfo; @@ -56,8 +59,8 @@ static struct fileops jaildesc_ops = { .fo_write = invfo_rdwr, .fo_truncate = invfo_truncate, .fo_ioctl = invfo_ioctl, - .fo_poll = invfo_poll, - .fo_kqfilter = invfo_kqfilter, + .fo_poll = jaildesc_poll, + .fo_kqfilter = jaildesc_kqfilter, .fo_stat = jaildesc_stat, .fo_close = jaildesc_close, .fo_chmod = invfo_chmod, @@ -135,6 +138,7 @@ jaildesc_alloc(struct thread *td, struct file **fpp, int *fdp, int owning) finit(fp, priv_check_cred(fp->f_cred, PRIV_JAIL_SET) == 0 ? FREAD | FWRITE : FREAD, DTYPE_JAILDESC, jd, &jaildesc_ops); JAILDESC_LOCK_INIT(jd); + knlist_init_mtx(&jd->jd_selinfo.si_note, &jd->jd_lock); if (owning) jd->jd_flags |= JDF_OWNING; *fpp = fp; @@ -176,6 +180,36 @@ jaildesc_prison_cleanup(struct prison *pr) } } +/* + * Pass a note to all listening kqueues. + */ +void +jaildesc_knote(struct prison *pr, long hint) +{ + struct jaildesc *jd; + int prison_locked; + + if (!LIST_EMPTY(&pr->pr_descs)) { + prison_locked = mtx_owned(&pr->pr_mtx); + if (!prison_locked) + prison_lock(pr); + LIST_FOREACH(jd, &pr->pr_descs, jd_list) { + JAILDESC_LOCK(jd); + if (hint == NOTE_JAIL_REMOVE) { + jd->jd_flags |= JDF_REMOVED; + if (jd->jd_flags & JDF_SELECTED) { + jd->jd_flags &= ~JDF_SELECTED; + selwakeup(&jd->jd_selinfo); + } + } + KNOTE_LOCKED(&jd->jd_selinfo.si_note, hint); + JAILDESC_UNLOCK(jd); + } + if (!prison_locked) + prison_unlock(pr); + } +} + static int jaildesc_close(struct file *fp, struct thread *td) { @@ -223,12 +257,112 @@ jaildesc_close(struct file *fp, struct thread *td) } prison_free(pr); } + knlist_destroy(&jd->jd_selinfo.si_note); JAILDESC_LOCK_DESTROY(jd); free(jd, M_JAILDESC); } return (0); } +static int +jaildesc_poll(struct file *fp, int events, struct ucred *active_cred, + struct thread *td) +{ + struct jaildesc *jd; + int revents; + + revents = 0; + jd = fp->f_data; + JAILDESC_LOCK(jd); + if (jd->jd_flags & JDF_REMOVED) + revents |= POLLHUP; + if (revents == 0) { + selrecord(td, &jd->jd_selinfo); + jd->jd_flags |= JDF_SELECTED; + } + JAILDESC_UNLOCK(jd); + return (revents); +} + +static void +jaildesc_kqops_detach(struct knote *kn) +{ + struct jaildesc *jd; + + jd = kn->kn_fp->f_data; + knlist_remove(&jd->jd_selinfo.si_note, kn, 0); +} + +static int +jaildesc_kqops_event(struct knote *kn, long hint) +{ + struct jaildesc *jd; + u_int event; + + jd = kn->kn_fp->f_data; + if (hint == 0) { + /* + * Initial test after registration. Generate a + * NOTE_JAIL_REMOVE in case the prison already died + * before registration. + */ + event = jd->jd_flags & JDF_REMOVED ? NOTE_JAIL_REMOVE : 0; + } else { + /* + * Mask off extra data. In the NOTE_JAIL_CHILD case, + * that's everything except the NOTE_JAIL_CHILD bit + * itself, since a JID is any positive integer. + */ + event = ((u_int)hint & NOTE_JAIL_CHILD) ? NOTE_JAIL_CHILD : + (u_int)hint & NOTE_JAIL_CTRLMASK; + } + + /* If the user is interested in this event, record it. */ + if (kn->kn_sfflags & event) { + kn->kn_fflags |= event; + /* Report the created jail id or attached process id. */ + if (event == NOTE_JAIL_CHILD || event == NOTE_JAIL_ATTACH) { + if (kn->kn_data != 0) + kn->kn_fflags |= NOTE_JAIL_MULTI; + kn->kn_data = (kn->kn_fflags & NOTE_JAIL_MULTI) ? 0U : + (u_int)hint & ~event; + } + } + + /* Prison is gone, so flag the event as finished. */ + if (event == NOTE_JAIL_REMOVE) { + kn->kn_flags |= EV_EOF | EV_ONESHOT; + if (kn->kn_fflags == 0) + kn->kn_flags |= EV_DROP; + return (1); + } + + return (kn->kn_fflags != 0); +} + +static const struct filterops jaildesc_kqops = { + .f_isfd = 1, + .f_detach = jaildesc_kqops_detach, + .f_event = jaildesc_kqops_event, +}; + +static int +jaildesc_kqfilter(struct file *fp, struct knote *kn) +{ + struct jaildesc *jd; + + jd = fp->f_data; + switch (kn->kn_filter) { + case EVFILT_JAILDESC: + kn->kn_fop = &jaildesc_kqops; + kn->kn_flags |= EV_CLEAR; + knlist_add(&jd->jd_selinfo.si_note, kn, 0); + return (0); + default: + return (EINVAL); + } +} + static int jaildesc_stat(struct file *fp, struct stat *sb, struct ucred *active_cred) { diff --git a/sys/sys/event.h b/sys/sys/event.h index 91fbaa4834f7..084eaafcbdc0 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -46,7 +46,8 @@ #define EVFILT_SENDFILE (-12) /* attached to sendfile requests */ #define EVFILT_EMPTY (-13) /* empty send socket buf */ #define EVFILT_JAIL (-14) /* attached to struct prison */ -#define EVFILT_SYSCOUNT 14 +#define EVFILT_JAILDESC (-15) /* attached to jail descriptors */ +#define EVFILT_SYSCOUNT 15 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #define EV_SET(kevp_, a, b, c, d, e, f) do { \ @@ -210,7 +211,7 @@ struct freebsd11_kevent32 { #define NOTE_TRACKERR 0x00000002 /* could not track child */ #define NOTE_CHILD 0x00000004 /* am a child process */ -/* data/hint flags for EVFILT_JAIL */ +/* data/hint flags for EVFILT_JAIL and EVFILT_JAILDESC */ #define NOTE_JAIL_CHILD 0x80000000 /* child jail was created */ #define NOTE_JAIL_SET 0x40000000 /* jail was modified */ #define NOTE_JAIL_ATTACH 0x20000000 /* jail was attached to */ diff --git a/sys/sys/jaildesc.h b/sys/sys/jaildesc.h index 2451b04f7302..fda270d62e70 100644 --- a/sys/sys/jaildesc.h +++ b/sys/sys/jaildesc.h @@ -35,6 +35,7 @@ #ifdef _KERNEL #include +#include #include #include #include @@ -54,6 +55,7 @@ struct jaildesc { LIST_ENTRY(jaildesc) jd_list; /* (d,p) this prison's descs */ struct prison *jd_prison; /* (d) the prison */ struct mtx jd_lock; + struct selinfo jd_selinfo; /* (d) event notification */ unsigned jd_flags; /* (d) JDF_* flags */ }; @@ -69,6 +71,7 @@ struct jaildesc { /* * Flags for the jd_flags field */ +#define JDF_SELECTED 0x00000001 /* issue selwakeup() */ #define JDF_REMOVED 0x00000002 /* jail was removed */ #define JDF_OWNING 0x00000004 /* closing descriptor removes jail */ @@ -77,6 +80,7 @@ int jaildesc_find(struct thread *td, int fd, struct prison **prp, int jaildesc_alloc(struct thread *td, struct file **fpp, int *fdp, int owning); void jaildesc_set_prison(struct file *jd, struct prison *pr); void jaildesc_prison_cleanup(struct prison *pr); +void jaildesc_knote(struct prison *pr, long hint); #endif /* _KERNEL */ From nobody Mon Sep 15 04:04:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQBHS4dgvz67yYX; Mon, 15 Sep 2025 04:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQBHR4pLYz42pl; Mon, 15 Sep 2025 04:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909059; 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=MYc6HaxLe749fbOs/vEyPnAmUpGWgCIJXAbwGj6aPRk=; b=UcpwCrodOT0SDIgB706Rtej3q9fCD1VP4+LQiClP2xj+r5FVa4ljQAB45jjAy9LSdZo3fV 1BDW3rJVcnfsPZS+XRfgCsg8YD4pBKq0G62ATS/QsRrZjgf5gXBjjm0RaxRRbKIkv8uC10 1GqNiMBhafV6McOUDEnkoC+w176xcHblmIE9LWfAwRcyIkDeLYMuDhb8BI6XKQrl4VIhjM 8IqVpcfkosGFOMvSUG7Z2WKB9YiGXDWgsjv6sRwSZ+L0tP6n+Z5fUiMB8TA5vjMHJ2yU+C U1+G08sGuPDdOI55h5JNuIGBUNh/3EWtLPvWdKr6GaZOPoJX8Fi15/9EQhTGpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757909059; 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=MYc6HaxLe749fbOs/vEyPnAmUpGWgCIJXAbwGj6aPRk=; b=Mjb0pno2ZuEGu2YK9KIKQpKYchZUQ85MMdMPQ9/fexNyXApSyOG9R4v5chRpqaBAsqf0QO FKIUcLu+c1e1ateGDyiYg1WieiI96bHJKPpfKM61/Z6ztqrnweDmfyCm8Yx4oZpcBiyC3y p7lGWp3HA7oONMQMTLWiAYP1e53W+yADrmO453h98Dvs/tOfd2ciqf6l9r1BQ007i1bmU1 +xVP4CwveiIPyf6qY0mXz3Bp57ApAhCbbUABY1JP/ra8537UchsRFuz8SQQ2NvHEEf4kv2 ljW5+x+HHWiqg45E1lyjgd+WU1yHiADA/oSIDStN0Ja8j+6AIN40+u9CqFTv3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757909059; a=rsa-sha256; cv=none; b=w6+0Bx8zXrSWIZzHRvNeN0Qza9zaLDxnXcANTKjXj/D0A4QViBxDzmLbtIJx5lnBKQMCWd CajRBwFLGWS5yjDiMj20RZpi4DFGJMaAieZBsgyzO6kAQ0RaFbuoVidKIVEfeC/MFhnRwE jemfKt7v/zd8HJR+bvbPzf5DvTutpG9gTdOrMmsIJ+0/Ik400btk+WNmKN5rI6L2b3Z8yb u7XpbiwzzUCMsExrzQfXZNMx0vFAH+cfhcM4l54wvN7yFQC0gEbUSM8YL45s1rTTKiORIx ACpSl6dFDfJ1qaQqZD3ZacC3lTAmjyA1XGCP7BWUA2NHTy+NJnEBaZ1Sit8Kgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQBHR2NGtzfkN; Mon, 15 Sep 2025 04:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58F44JY4046739; Mon, 15 Sep 2025 04:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58F44J5w046736; Mon, 15 Sep 2025 04:04:19 GMT (envelope-from git) Date: Mon, 15 Sep 2025 04:04:19 GMT Message-Id: <202509150404.58F44J5w046736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: deaa609d065d - stable/15 - jaildesc: remove desc from the sysctl parameter list List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: deaa609d065d525a13392d09057afa237fbe4d68 Auto-Submitted: auto-generated The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=deaa609d065d525a13392d09057afa237fbe4d68 commit deaa609d065d525a13392d09057afa237fbe4d68 Author: Jamie Gritton AuthorDate: 2025-09-13 22:30:14 +0000 Commit: Jamie Gritton CommitDate: 2025-09-15 03:34:00 +0000 jaildesc: remove desc from the sysctl parameter list Like lastjid, desc should count as a pseudo-parameter. The difference lies entirely in the security.jail.param sysctls, which list all of the jail parameters. Since desc opens and returns a file descriptor, it has no place in such uses as "jls all." Like lastjid, it's still recognized by the kernel if passed in/out, and hard-coded into libjail so it can be recognized there. (cherry picked from commit e75dda31c1eead9ad40580bd8fec17f2bbf55a21) --- lib/libjail/jail.c | 10 +++++++++- sys/kern/kern_jail.c | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index f761bc6993e5..ad3348af0d2d 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -920,13 +920,21 @@ jailparam_type(struct jailparam *jp) } desc; int mib[CTL_MAXNAME]; - /* The "lastjid" parameter isn't real. */ + /* + * Some pseudo-parameters don't show up in the sysctl + * parameter list. + */ name = jp->jp_name; if (!strcmp(name, "lastjid")) { jp->jp_valuelen = sizeof(int); jp->jp_ctltype = CTLTYPE_INT | CTLFLAG_WR; return (0); } + if (!strcmp(name, "desc")) { + jp->jp_valuelen = sizeof(int); + jp->jp_ctltype = CTLTYPE_INT | CTLFLAG_RW; + return (0); + } /* Find the sysctl that describes the parameter. */ mib[0] = 0; diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 43035dc009b3..a75ba89d2a7e 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4935,7 +4935,6 @@ sysctl_jail_param(SYSCTL_HANDLER_ARGS) * jail creation time but cannot be changed in an existing jail. */ SYSCTL_JAIL_PARAM(, jid, CTLTYPE_INT | CTLFLAG_RDTUN, "I", "Jail ID"); -SYSCTL_JAIL_PARAM(, desc, CTLTYPE_INT | CTLFLAG_RW, "I", "Jail descriptor"); SYSCTL_JAIL_PARAM(, parent, CTLTYPE_INT | CTLFLAG_RD, "I", "Jail parent ID"); SYSCTL_JAIL_PARAM_STRING(, name, CTLFLAG_RW, MAXHOSTNAMELEN, "Jail name"); SYSCTL_JAIL_PARAM_STRING(, path, CTLFLAG_RDTUN, MAXPATHLEN, "Jail root path"); From nobody Mon Sep 15 13:52:30 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQRL73XdKz67Nn2; Mon, 15 Sep 2025 13:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQRL715l2z3LLq; Mon, 15 Sep 2025 13:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757944351; 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=kSBoVhGC9g/5tYEJMCgvbp03KG6ky3AfPKXYaINBKY4=; b=SkdH5AI+9zBHILJKxHn8erZHekEXyZYZrtL+SkmeQFm/bwGp4qJHJG89phan1iuIdgh8hG wLHoUkZ6qRnyRynMFT/m53V1oRUQT4HUTZeLsBF+67H5PydxJqYBV73B52CmY0s58MqVT4 vrEAMlpb+Tlk8SjEXuzxRxl0qEY5LA/4kIz1lmajKAWzoaudkMwn9hXhDlvOLQFwmK9JL5 4uO30V8XK5Q6M2vVlHz6+QzR8O3NcTcZgsgaLdApq0w7mno2ENX8IYeUDnEw0goTXc5Zqt rWUwfryJ7TTl2M5E+rXXwn41RRybz6klFrURQVjBJ4ffLCMNcjHq1qM+UJZTGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757944351; 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=kSBoVhGC9g/5tYEJMCgvbp03KG6ky3AfPKXYaINBKY4=; b=vqElP3uqsb+kIE6AFnGzsLdJK8//RhbtsHdWkLvj1Wh3GN3j3X2r0tYGW1mDZFs2nZ05rm w+R6ZgQ9PcYhzaa/eXjUMS3b6ReP5fzP/gxzOLPZfUS+UbyDcjVjkRmOQlrJDYNMUihUSa T/qwGPulTqpbmH8nh3jpA51F8W+migJyssAq4KLNnxIqGOAhrfizMp7Y6e7YWAEgESMaRz k6CuPmpc2c2mb7CYBuFA+ix41gpPuZW3wy3iKzvFIO2rHJU82hvVVuhUIjpRyeZAzWFuSl CwzNjyefKHIcyXaKZbnwURo4BZtYGdzoR5SThjCGf6vAmEJyQcnAeTtKfXiwFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757944351; a=rsa-sha256; cv=none; b=wY4pae6eZq/azqER5038D5CSsnQWN9erQNH5Pfi10k2riZO0+RnQDHFasUyTKdk3Hbal5U cS+qfm/NjwQrMQSmCiHa+WRI7WrdFuoiiX4Wo0F/O9ZuT8w1vFlABeHv/nmKrvIbGSgqz4 5mC0Mh+gQx94jMNfEo/hiXb4UsVTxcNX1RMafOD0Gz9ZSI7EMxcHo1XWkJIN/YAI2N5Fjy Zux4JeAgw3X0BtbdcZu7B63+4IdXx18uUIdEUHQsbdnhAeEua5Kkm+Uq7YpF6L4tWcFnL+ 1CAga8A7vbr+uG8Px6X+nMJ2xiofBdIrjDufNCEWC4aCsVkXGYlNwYx8D93WmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQRL70jJ7zwh7; Mon, 15 Sep 2025 13:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FDqVvW051639; Mon, 15 Sep 2025 13:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FDqUAv051636; Mon, 15 Sep 2025 13:52:30 GMT (envelope-from git) Date: Mon, 15 Sep 2025 13:52:30 GMT Message-Id: <202509151352.58FDqUAv051636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 70caaeb8b63f - stable/14 - sys: add MBIM (mobile broadband interface module) interface type. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70caaeb8b63f9e11e1f495ab3918119c537a8677 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=70caaeb8b63f9e11e1f495ab3918119c537a8677 commit 70caaeb8b63f9e11e1f495ab3918119c537a8677 Author: Pierre Pronchery AuthorDate: 2025-01-20 23:39:17 +0000 Commit: Ed Maste CommitDate: 2025-09-15 13:51:43 +0000 sys: add MBIM (mobile broadband interface module) interface type. This is part of the upcoming USB umb(4) work. PR: 263783 Approved by: adrian, zlei Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48167 (cherry picked from commit 86bfbaf1002c88b5c1a6d3ed261becedb533490b) --- sys/net/if_types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/if_types.h b/sys/net/if_types.h index 17227726a663..dee71af80a5d 100644 --- a/sys/net/if_types.h +++ b/sys/net/if_types.h @@ -256,6 +256,7 @@ typedef enum { IFT_PFLOG = 0xf6, /* PF packet filter logging */ IFT_PFSYNC = 0xf7, /* PF packet filter synchronization */ IFT_WIREGUARD = 0xf8, /* WireGuard tunnel */ + IFT_MBIM = 0xf9, /* Mobile Broadband Interface Model */ } ifType; /* From nobody Mon Sep 15 19:11:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPj5V3yz67sYn; Mon, 15 Sep 2025 19:11:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPj4v2jz4FDk; Mon, 15 Sep 2025 19:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963465; 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=byRJElEum4P/zcHOdwdkDgY2atPVe4RXpqg+J8RB9G8=; b=B2i6oKIe2JKx+pWx3Nhl7/Rz1dELv2Kfi/2qVUoSkoeCwLJqBMqyIrb+B2RmqBSPma98IR 8XqRMJGwVfVn6oq2H+H7pv5nYM+myd4TJsTWcuLASD2tCrZ/vlVFG3Gh5xrRX+GEcEPNdl SNWZYF6i78hXVm789T1KytCLzBZFSILwxQIEKwfXvgRugAAaMLBUCWrAWbSzU9C7mZ8Te6 lZcvQiPH7dLTgH277DSH46uUYe5VDdsrrM3PYhQLL+Yeb8oAJu1i3Dq2lB4/WThfNWg/o8 wowR5Y/TlAAdaJF1UnTYLEZxQuUjU0GfIo1k0w23iScvyIjQLXnn3PxokbWD3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963465; 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=byRJElEum4P/zcHOdwdkDgY2atPVe4RXpqg+J8RB9G8=; b=g4C3tnz6Q95WAZjWuhJLNoqn8vUjlmnPvoNLhQ3C6oDlsTtlMu/DDss+gX6y2e1q6Q628X e92WISIF3IrHunzEJ85ftsuV7RqaGfJmsMc20FAuB85XXBcMijYXvd/vhdqLhjib+SfYOf 3dvXEC6qOvWaeIhLjSb+7a8BmfrEb5IQxOxEjmpoyWe56VRB1ujfHfuLt/9EjFiEN9IZjF c2pt9gzU/96lWctwwRYcrSCCsKEreZCiuEFFZ/hAoQWEpnWEykqeY4s1ZN/MF/zYYnMKsy tfEDSo7trZfWoKV+f/K5jhPGvVapFTC/F8Ld32Fln+RPaPg6f86vLt1CSAkDjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963465; a=rsa-sha256; cv=none; b=JYRIPa6ThHFLvsnjQNez0HfVdmo+Vu4NC9BTYYtUb2knoOe0Oun8RaTOe8K9CCdZGnUkzB 2JX9yZRAVhIfa8pZEdx05c4LLHs5UdgrQSj+gU1vOmZFynMdSYP69cMbumqshjuPyxCVTS rCVtBnbYscrCSL1GKUWuQtDFGWjoe2TA1GaHi7CW6PVfusYpnQjlTkzDLtKlYNEGNrSKdo cOEmAK3NgFZxIPZYPu3win8nRHNVS6FTKGeZ7/7RxXq97EnHEjJWMTCqwkTQUQ9ixz+txz 875g+2OWMMV5pJaAvYCTdAfsI+sl4KKK1NSSyeGSnqAvZN7j1bHyHncuYE8BJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPj4VPhz16s6; Mon, 15 Sep 2025 19:11:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJB5MS049590; Mon, 15 Sep 2025 19:11:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJB5xj049587; Mon, 15 Sep 2025 19:11:05 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:05 GMT Message-Id: <202509151911.58FJB5xj049587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 68f8fa4ada24 - stable/15 - LinuxKPI: pci: implement for_each_pci_dev() and improve pci_get_device() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 68f8fa4ada24aaf53a2d463b53259439dfb32146 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=68f8fa4ada24aaf53a2d463b53259439dfb32146 commit 68f8fa4ada24aaf53a2d463b53259439dfb32146 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:20:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:50:49 +0000 LinuxKPI: pci: implement for_each_pci_dev() and improve pci_get_device() Implement for_each_pci_dev() needed by a wireless driver update. For that also improve pci_get_device() and add the functionality to support the odev argument to start searching from that. Sponsored by: The FreeBSD Foundation (intially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52066 (cherry picked from commit 910cf345d0ee9a5d72856a1ba35382eb4f0db951) --- sys/compat/linuxkpi/common/include/linux/pci.h | 3 +++ sys/compat/linuxkpi/common/src/linux_pci.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 3fd4191b9917..df29af87f160 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -1445,6 +1445,9 @@ linuxkpi_pci_get_device(uint32_t vendor, uint32_t device, struct pci_dev *odev) return (lkpi_pci_get_device(vendor, device, odev)); } +#define for_each_pci_dev(_pdev) \ + while ((_pdev = linuxkpi_pci_get_device(PCI_ANY_ID, PCI_ANY_ID, _pdev)) != NULL) + /* This is a FreeBSD extension so we can use bus_*(). */ static inline void linuxkpi_pcim_want_to_use_bus_functions(struct pci_dev *pdev) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index d5bbbea1eb2c..00d4a25e86ed 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -289,12 +289,18 @@ lkpi_pci_get_device(uint32_t vendor, uint32_t device, struct pci_dev *odev) { struct pci_dev *pdev, *found; - KASSERT(odev == NULL, ("%s: odev argument not yet supported\n", __func__)); - found = NULL; spin_lock(&pci_lock); list_for_each_entry(pdev, &pci_devices, links) { - if (pdev->vendor == vendor && pdev->device == device) { + /* Walk until we find odev. */ + if (odev != NULL) { + if (pdev == odev) + odev = NULL; + continue; + } + + if ((pdev->vendor == vendor || vendor == PCI_ANY_ID) && + (pdev->device == device || device == PCI_ANY_ID)) { found = pdev; break; } From nobody Mon Sep 15 19:11:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPl1F9Pz67sbb; Mon, 15 Sep 2025 19:11:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPk5mwrz4FDn; Mon, 15 Sep 2025 19:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963466; 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=1AOB44YM9X2s/g5yQ0ZVLJ8amuRHQe8NTCOwoRczxCQ=; b=qGC521587DaydU8l68NShPUBzDjRINO0p+uf3Pxw1Y2ZKzrlPqqRCUaTw41yQbNRrc2L6o 68iiLXc+8oL4J7Ie7Py2EFB12eL1DPEOAP9jB4GzIvCmYG1olLPKtAYjXyIUo/jedaGCVg w/SXTRkRxXPGgcbWEcmEWgMop53gA8qhGxZLa7hylt3SwxprSeCSxyJhYM1Ni9VaDLVjmh dzxM9aNED9CHvh5hT3ef60jgDoQI1uPq+z01ABGj52JoSPc5QQeE7arg6n2xMhTcNu+1J6 9XVoBM69Zbiq5gqmk6XHtccHBquLcl0oNc0nEetxnfVS+saADpyhkGaSD08Rsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963466; 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=1AOB44YM9X2s/g5yQ0ZVLJ8amuRHQe8NTCOwoRczxCQ=; b=TESo9t8ZocMLUmkpzKqDmPjI3vYIMoO7zIXzZ0v2d80Ghzr/JPBSqlH2AY8LQiGGCbEPgp KkOrYqZhvnONoexc7ShNaV8BWRyOQIGHAaET4iWTXz9f0Gsre1dBPgW2uFtd5ItCQEynKq VkdwBeAdX2xy2ejA+cIRPbneIQmNYkoB19dmO5rhy6IoiCnBygXlhB0pq/sYgCNJVpWafr A3JCNa8YssQ09TROZ7WwdsSq5lPngm2rLkE7VFPK2iOOsDQpqZu+T8OVK1x+SiI2GdcIUw z3JM76f3jNmnRanj8+tnLzQus/ni7k4Rne9B1Jtt72vMIUFrq3MBJWAaUK2g0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963466; a=rsa-sha256; cv=none; b=M3F1ybCysINUFsaZqQE4eSEfPVzzd3e2bZSB5oxxgjhfENAWBaQe91BUU4VGb5fCBOBME3 gZJujTsCTyyXZt+sOF5re/dLZ+R51rcyoWRveXxUQabdllxaJP//E269HIXITE9EfUFmsL P7usLZZsz+QUzA4HzLeQBu5b+CpbQAWrZTlS3qP0ukswOVn0GsZXUBl8UkfAyfrgGuYkSq pISaHeORY15NmawXwo5439WnT+AwGahyFkwnW5N8u845R3fFKP8m6a4j4E009m5L7iKp37 O/4NruMKu7yEzwlzRXGVbPc01ZaiIWWGTycxuym7pBYvV6jzLyWoWmpKNFtZCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPk5Ctyz16jC; Mon, 15 Sep 2025 19:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJB65R049626; Mon, 15 Sep 2025 19:11:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJB6Kf049623; Mon, 15 Sep 2025 19:11:06 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:06 GMT Message-Id: <202509151911.58FJB6Kf049623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cfb8f4bf2c2b - stable/15 - LinuxKPI: pci: implement pcim_iomap() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cfb8f4bf2c2b9cfc8d5ed5a19b98f4a19f023ba6 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cfb8f4bf2c2b9cfc8d5ed5a19b98f4a19f023ba6 commit cfb8f4bf2c2b9cfc8d5ed5a19b98f4a19f023ba6 Author: Bjoern A. Zeeb AuthorDate: 2025-07-31 17:45:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51:01 +0000 LinuxKPI: pci: implement pcim_iomap() Like pci_iomap() add the devres version pcim_iomap() using the former to get the resource. Add a helper function to validate that the bar is within a valid range and sprinkle that check also to other related functions. Sponsored by: The FreeBSD Foundation (intially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52067 (cherry picked from commit 2f9064a5d2b50f292cc8699d2be5c66c317f1dc7) --- sys/compat/linuxkpi/common/include/linux/pci.h | 3 ++ sys/compat/linuxkpi/common/src/linux_pci.c | 58 +++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index df29af87f160..49d2cd79d474 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -365,6 +365,7 @@ void __iomem **linuxkpi_pcim_iomap_table(struct pci_dev *pdev); void *linuxkpi_pci_iomap_range(struct pci_dev *, int, unsigned long, unsigned long); void *linuxkpi_pci_iomap(struct pci_dev *, int, unsigned long); +void *linuxkpi_pcim_iomap(struct pci_dev *, int, unsigned long); void linuxkpi_pci_iounmap(struct pci_dev *pdev, void *res); int linuxkpi_pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask, const char *name); @@ -803,6 +804,8 @@ static inline void pci_disable_sriov(struct pci_dev *dev) linuxkpi_pci_iomap_range(pdev, mmio_bar, mmio_off, mmio_size) #define pci_iomap(pdev, mmio_bar, mmio_size) \ linuxkpi_pci_iomap(pdev, mmio_bar, mmio_size) +#define pcim_iomap(pdev, bar, maxlen) \ + linuxkpi_pcim_iomap(pdev, bar, maxlen) #define pci_iounmap(pdev, res) \ linuxkpi_pci_iounmap(pdev, res) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 00d4a25e86ed..44024e495bb2 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -145,6 +145,23 @@ struct linux_dma_priv { #define DMA_PRIV_LOCK(priv) mtx_lock(&(priv)->lock) #define DMA_PRIV_UNLOCK(priv) mtx_unlock(&(priv)->lock) +static void +lkpi_set_pcim_iomap_devres(struct pcim_iomap_devres *dr, int bar, + void *res) +{ + dr->mmio_table[bar] = (void *)rman_get_bushandle(res); + dr->res_table[bar] = res; +} + +static bool +lkpi_pci_bar_id_valid(int bar) +{ + if (bar < 0 || bar > PCIR_MAX_BAR_0) + return (false); + + return (true); +} + static int linux_pdev_dma_uninit(struct pci_dev *pdev) { @@ -763,6 +780,9 @@ _lkpi_pci_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen __unused) struct pci_mmio_region *mmio, *p; int type; + if (!lkpi_pci_bar_id_valid(bar)) + return (NULL); + type = pci_resource_type(pdev, bar); if (type < 0) { device_printf(pdev->dev.bsddev, "%s: bar %d type %d\n", @@ -803,6 +823,9 @@ linuxkpi_pci_iomap_range(struct pci_dev *pdev, int bar, { struct resource *res; + if (!lkpi_pci_bar_id_valid(bar)) + return (NULL); + res = _lkpi_pci_iomap(pdev, bar, maxlen); if (res == NULL) return (NULL); @@ -816,9 +839,41 @@ linuxkpi_pci_iomap_range(struct pci_dev *pdev, int bar, void * linuxkpi_pci_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen) { + if (!lkpi_pci_bar_id_valid(bar)) + return (NULL); + return (linuxkpi_pci_iomap_range(pdev, bar, 0, maxlen)); } +void * +linuxkpi_pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen) +{ + struct pcim_iomap_devres *dr; + void *res; + + if (!lkpi_pci_bar_id_valid(bar)) + return (NULL); + + dr = lkpi_pcim_iomap_devres_find(pdev); + if (dr == NULL) + return (NULL); + + if (dr->res_table[bar] != NULL) + return (dr->res_table[bar]); + + res = linuxkpi_pci_iomap(pdev, bar, maxlen); + if (res == NULL) { + /* + * Do not free the devres in case there were + * other valid mappings before already. + */ + return (NULL); + } + lkpi_set_pcim_iomap_devres(dr, bar, res); + + return (res); +} + void linuxkpi_pci_iounmap(struct pci_dev *pdev, void *res) { @@ -870,8 +925,7 @@ linuxkpi_pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask, const char *nam res = _lkpi_pci_iomap(pdev, bar, 0); if (res == NULL) goto err; - dr->mmio_table[bar] = (void *)rman_get_bushandle(res); - dr->res_table[bar] = res; + lkpi_set_pcim_iomap_devres(dr, bar, res); mappings |= (1 << bar); } From nobody Mon Sep 15 19:11:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPm2T8wz67sQy; Mon, 15 Sep 2025 19:11:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPl6S94z4F67; Mon, 15 Sep 2025 19:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963467; 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=lHZSTSLbqVHWaIXgXDu0YKXOI3bNdstdWixSfzHZEI4=; b=FaTyFnU9N2iePPzIRjgp/N2KkXAVbPQtkdNZsC6NGw1Rj6GHbRmQzRojzwB5cI+S3BBik7 OyqaeIXzc+RcmM37XVGlrD8nmRjOwPq/7qkc6+15fuEA/p0rr2kVV/TJ/tltbLMX7agZaq vmLHx16f5JtJf0ntLymAc8Hz5tWdPfon99SIP/nBTuxCsyEx3uq+AAvMPNX7ANbaVcdMkr tilc4sCTovB+pBRyd171F23nY5aOYO6hPU5gc4fGjbOympNDicg/oTvtoWuKpABpOigErA p73Skl9Ld1/GpdG0Rzt910kmNN+2xEZtkqNEyCYIn4TbuYjHiXk2IBviv8BWUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963467; 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=lHZSTSLbqVHWaIXgXDu0YKXOI3bNdstdWixSfzHZEI4=; b=QgtQ6Kno9JEzLxu7I2uIQuDmehwo44tdOYhSQxSLUFk0t3wms43sYE4F+rEvTT5sU7ClIg KJWxJonm22o4xnTuo6OHgzerf64MdRIR5/Aq9dEPlKjzXAwUFN1zI9+ldVRNat5TStTfpy lV2fLnGytbzN+4FEa7zssCVkPTX6fsRBZgtq1ziDnA+DJhF/say//NcU4VXY34+olB2Lay NKY6Aofrec/nsqR3E1pZzi4f8gVP1Ror9/fto9HdDN9UgeTfqTgkssVOxedd47O3If7QQa Y9Mgg42vjw3ObyLDty5uI2Hz4oOWo3IXYM/xT7cbOyyLsMVsaQz7OieEr99i5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963467; a=rsa-sha256; cv=none; b=lhiRy+bopw8MJt4ShJ6TkWFXm+gC1xAUoQWjSFWsdo+3T59/sK6jslDx0q9qusCaWhH1me BkolDWKRVM7D1Fr3WoqfVq/FEUDA9RVMsk+OflA29rodL1wUE46anCIwFR/Rad57nlDpmI Ua6GMmeZPMTxm8ZRoV9JzoBAITTJ1aciInwXu7/I26T03OiH9IjqHMM29FDDU/tEKG06Tw h8JCb3FRXSmm9lwC6e9jIRhlqg9vl/hP0o7MWmNCYcu045Wqj5RcMyBGSL+J5YN0Y3wuLX NJWaROompbrzLx845EWIxq03jly6ct59HHd7fZcwuNw1lxBgMDbraIefW1gR2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPl5vj8z16gS; Mon, 15 Sep 2025 19:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJB74b049667; Mon, 15 Sep 2025 19:11:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJB7uf049664; Mon, 15 Sep 2025 19:11:07 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:07 GMT Message-Id: <202509151911.58FJB7uf049664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ff31767e530a - stable/15 - LinuxKPI: pci: implement [linuxkpi_]pcim_request_all_regions() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff31767e530abb4a54131af199fed6ec946a5fa4 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ff31767e530abb4a54131af199fed6ec946a5fa4 commit ff31767e530abb4a54131af199fed6ec946a5fa4 Author: Bjoern A. Zeeb AuthorDate: 2025-07-31 18:28:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51:12 +0000 LinuxKPI: pci: implement [linuxkpi_]pcim_request_all_regions() Factor out the pci_request_region() implementation into an internal function and make pci_request_region() a simple wrapperaround it. Likewise implement pcim_request_all_regions() as a loop calling pci_request_region() for each entry. In two cases which we returned an error before (bar index is valid but bar is not (no len), and neither IO nor MEM) we now reutrn success (nothing to do for us). Otherwise callers, especially pcim_request_all_regions() would error out for the wrong reasons. This seems to also match the expected behaviour of pci_request_region(). Sponsored by: The FreeBSD Foundation (intially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52068 (cherry picked from commit 7e21158d44cd46e720395604ca6f00f2fa36b20c) --- sys/compat/linuxkpi/common/include/linux/pci.h | 11 ++++-- sys/compat/linuxkpi/common/src/linux_pci.c | 55 ++++++++++++++++++++++---- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 49d2cd79d474..d891d0df3546 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -355,7 +355,6 @@ struct pci_dev { TAILQ_HEAD(, pci_mmio_region) mmio; }; -int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name); int pci_alloc_irq_vectors(struct pci_dev *pdev, int minv, int maxv, unsigned int flags); bool pci_device_is_present(struct pci_dev *pdev); @@ -369,7 +368,9 @@ void *linuxkpi_pcim_iomap(struct pci_dev *, int, unsigned long); void linuxkpi_pci_iounmap(struct pci_dev *pdev, void *res); int linuxkpi_pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask, const char *name); +int linuxkpi_pci_request_region(struct pci_dev *, int, const char *); int linuxkpi_pci_request_regions(struct pci_dev *pdev, const char *res_name); +int linuxkpi_pcim_request_all_regions(struct pci_dev *, const char *); void linuxkpi_pci_release_region(struct pci_dev *pdev, int bar); void linuxkpi_pci_release_regions(struct pci_dev *pdev); int linuxkpi_pci_enable_msix(struct pci_dev *pdev, struct msix_entry *entries, @@ -562,12 +563,16 @@ done: return (pdev->bus->self); } +#define pci_request_region(pdev, bar, res_name) \ + linuxkpi_pci_request_region(pdev, bar, res_name) #define pci_release_region(pdev, bar) \ linuxkpi_pci_release_region(pdev, bar) -#define pci_release_regions(pdev) \ - linuxkpi_pci_release_regions(pdev) #define pci_request_regions(pdev, res_name) \ linuxkpi_pci_request_regions(pdev, res_name) +#define pci_release_regions(pdev) \ + linuxkpi_pci_release_regions(pdev) +#define pcim_request_all_regions(pdev, name) \ + linuxkpi_pcim_request_all_regions(pdev, name) static inline void lkpi_pci_disable_msix(struct pci_dev *pdev) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 44024e495bb2..7db8af8e88f9 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1159,8 +1159,9 @@ pci_resource_len(struct pci_dev *pdev, int bar) return (rle->count); } -int -pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) +static int +lkpi_pci_request_region(struct pci_dev *pdev, int bar, const char *res_name, + bool managed) { struct resource *res; struct pci_devres *dr; @@ -1168,9 +1169,20 @@ pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) int rid; int type; + if (!lkpi_pci_bar_id_valid(bar)) + return (-EINVAL); + + /* + * If the bar is not valid, return success without adding the BAR; + * otherwise linuxkpi_pcim_request_all_regions() will error. + */ + if (pci_resource_len(pdev, bar) == 0) + return (0); + /* Likewise if it is neither IO nor MEM, nothing to do for us. */ type = pci_resource_type(pdev, bar); if (type < 0) - return (-ENODEV); + return (0); + rid = PCIR_BAR(bar); res = bus_alloc_resource_any(pdev->dev.bsddev, type, &rid, RF_ACTIVE|RF_SHAREABLE); @@ -1183,11 +1195,16 @@ pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) /* * It seems there is an implicit devres tracking on these if the device - * is managed; otherwise the resources are not automatiaclly freed on - * FreeBSD/LinuxKPI tough they should be/are expected to be by Linux - * drivers. + * is managed (lkpi_pci_devres_find() case); otherwise the resources are + * not automatically freed on FreeBSD/LinuxKPI though they should be/are + * expected to be by Linux drivers. + * Otherwise if we are called from a pcim-function with the managed + * argument set, we need to track devres independent of pdev->managed. */ - dr = lkpi_pci_devres_find(pdev); + if (managed) + dr = lkpi_pci_devres_get_alloc(pdev); + else + dr = lkpi_pci_devres_find(pdev); if (dr != NULL) { dr->region_mask |= (1 << bar); dr->region_table[bar] = res; @@ -1203,6 +1220,12 @@ pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) return (0); } +int +linuxkpi_pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) +{ + return (lkpi_pci_request_region(pdev, bar, res_name, false)); +} + int linuxkpi_pci_request_regions(struct pci_dev *pdev, const char *res_name) { @@ -1219,6 +1242,24 @@ linuxkpi_pci_request_regions(struct pci_dev *pdev, const char *res_name) return (0); } +int +linuxkpi_pcim_request_all_regions(struct pci_dev *pdev, const char *res_name) +{ + int bar, error; + + for (bar = 0; bar <= PCIR_MAX_BAR_0; bar++) { + error = lkpi_pci_request_region(pdev, bar, res_name, true); + if (error != 0) { + device_printf(pdev->dev.bsddev, "%s: bar %d res_name '%s': " + "lkpi_pci_request_region returned %d\n", __func__, + bar, res_name, error); + pci_release_regions(pdev); + return (error); + } + } + return (0); +} + void linuxkpi_pci_release_region(struct pci_dev *pdev, int bar) { From nobody Mon Sep 15 19:11:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPn3ydHz67sc7; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPn0dQTz4FVr; Mon, 15 Sep 2025 19:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963469; 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=PPal/o6nwQYKaRdXMS2pL0g7Xd1yReFbl7CE880yCPA=; b=qNRvjQAYyRl1mkG/QL1/7Q/Eruw26pbPgG4YZ4AYZ7RdvNJT550tQQSunLaZrQpuEBoI3l 5vmyETpIAtVvPaaWqcXxXpIsF5KGASXmEQ8wcUilPFGDnZXiiRxVStOWzGcCemWx0Ko2ij xYKl0i8F8Pi9Fv1mT8oIwoRu7hREVPXk+9KEEBfcCAoRXUVoycTcNrDCaEGp3Y9RTKvzBL +IQivo5Vn3iAi2K6IZDAqDqL+cCdkNQTVeaE2dJfJMFUyiNaTIBq96TtnVj3AAPtan3bRN v+gDhTANYNY66+jtObks4Zpm0tS4Zukg0zS9mNL+13Cq6AtqFZYwyC2PEV+juA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963469; 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=PPal/o6nwQYKaRdXMS2pL0g7Xd1yReFbl7CE880yCPA=; b=lvDKTS3OadkaJXRDVSW1Pqnc7OVskfmWm8f54OwHUeiNv8nyBXOmINqR7vhqXab15Fgrw9 F4MyRyXoMnTS3lqlKOaHPz4RXeh5x9st/qu0Id1bNU8E0pp5fpl2t+NYyq1OifkoVa1j8/ ALrjkGL04G0VhvIrGE/Y0g60a0liIVsfNpJhwtIzwsfI3LXyCPvy735D1Nty1mues4kfVi LQScEbing0TO5SbiB+fSYp0o4L+qCUsv6XPwN7HsQHTcatfbpbplUkcV2rLg5ghAmfbkDk 7N/oSqZDW7ddD8Xl8EIa+MAUUXQOI6WhXNZBGKz66NvqO2A6DElS/QdybnKiJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963469; a=rsa-sha256; cv=none; b=ZCLWPVhef3I1ECNK3vTFVFN5gj3c4XoIP1YJhdwsbbljFwZi3J/sILAxBG2gf61/whmJ3U pQ7cQ3bn9+XSazxWJBUIIzM7HYuj5I1sUW/PO5292lOL3FhQpChWDhTMII4cc9C6BCDRpH 0O8LEaqdsg1MeFGi8HqkKasmwuu2z7RBNXPROHyW/MJaY4SLFz/hsru7GccjV5lQGF6xcJ BZwMyJjXP8/BFv3IU2kfz53kbucLQhnJ5QqcDq7xC6nw9roJ9ArO317NzsGcLwqRXDVyht c4zu/QXoU2dklANSnld6SZzTaOz/xdMefTi8eocOFdnmUUK3pN9ud1+l/gTc/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPn05hCz16RC; Mon, 15 Sep 2025 19:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJB8BH049702; Mon, 15 Sep 2025 19:11:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJB8HE049699; Mon, 15 Sep 2025 19:11:08 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:08 GMT Message-Id: <202509151911.58FJB8HE049699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8fca57469f7c - stable/15 - LinuxKPI: pci: allow children to be attached to a pci_dev List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8fca57469f7c33367c5f32f738a8fa8af40b6dda Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8fca57469f7c33367c5f32f738a8fa8af40b6dda commit 8fca57469f7c33367c5f32f738a8fa8af40b6dda Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:22:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51:18 +0000 LinuxKPI: pci: allow children to be attached to a pci_dev This will be used for hooking suspend/resume in for LinuxKPI 802.11 based drivers. Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52070 (cherry picked from commit 627234627b51c2f12c29d10617d7bbd18936ea55) --- sys/compat/linuxkpi/common/src/linux_pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 7db8af8e88f9..43fd6ad28ac4 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -111,6 +111,9 @@ static device_method_t pci_methods[] = { DEVMETHOD(pci_iov_uninit, linux_pci_iov_uninit), DEVMETHOD(pci_iov_add_vf, linux_pci_iov_add_vf), + /* Bus interface. */ + DEVMETHOD(bus_add_child, bus_generic_add_child), + /* backlight interface */ DEVMETHOD(backlight_update_status, linux_backlight_update_status), DEVMETHOD(backlight_get_status, linux_backlight_get_status), From nobody Mon Sep 15 19:11:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPp3vsqz67sdy; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPp1mh7z4FQV; Mon, 15 Sep 2025 19:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963470; 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=BB/ROqrld5XbbeL3exq9RINmiHGeK5ll9PflvufRsms=; b=VPsMDZOygl9FOIjh1BngyHPVF2ujyYZhZoOXiASWngCpUZV7k+J9qlG5LhUruDWZ/L4AVl SdxtqZG4XUbpEkOLpCYJorFxEyKkPJzmaU2lthE/AdsLmWx4ddqtBxBO7P6ziHUbA3j47w oC+makNiKolN28BIF83+zDMLGzG94rHLojfty+SnvgG4j4qe6q4r92UHBG3UlfNn2GUpo7 Y3UKgv6lYjD3YBOLzGIx2FAmOtxAB32dGfLKWIVXYg7KaWg1tzmqHlfV4Eex8sjA87nfud yLwwSVxLXrmM26IEn/ujgfc771z4LUOQbzLNEHdYyAoY5V+7SW2VIYWcu0/9tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963470; 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=BB/ROqrld5XbbeL3exq9RINmiHGeK5ll9PflvufRsms=; b=YQGG2PqnlRE+RCmdTYuubXVd1BNouWaw5wGJnDwwkNtrRpcfcKSpt2W7E3ZV3Em9elKmw6 N2bjuezsYiv02OkAXec4Eg877LPbSDqlKLcAO9reAiT+cTMiim8u+MOscpLGYhwkfVQnYK 26TR+kwnDuFM0yNwlttEk6Hyl6waAdRMwmO4vvUzBad52slZ8gycw47BhRVS/SAhiQ6S/X 4+oZKENu0Iq/al7L1EqVSlk3kHzBwrr242JxuhrMGPdpbIq5duWoWLKI6ngwb9SSVP2BRm 7XBpX3LKUIUoCq0oDuEy4L01q7y7dLJtI1G7DQxzbVvndApPZfqNtNdOqj32mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963470; a=rsa-sha256; cv=none; b=yUyeci2jHZSODJJBHViZXPebLqjalWAriP/LEU46bIOSTaI6fc1FwFl4G/dl42MPjVIWWx ox1ZnTKZi7U1Q2JJOCcbAUL1amJmuK9+zaBYeKrozaW6PMJYl3FNeNl0F8uTH0wMqsVl8k D8Ta05b7MpFrtAraNMImu+0tUIj4bM5RUKhMnnk9WKWfuVx4Vdy2C++/gVb+Mobvxy3Nkh cQSvzPzi2yeXIzIyRWbi7DIwvfFYuqHj9bNXQNcIPgd+phXLu/Yo4K/cvpKIjmmdErvlB+ bZ+x5M0LwJbLNUrKSEAWLiPoy1xZccl1uUdBMkdDngNvqGZu1oNxXOgtgKU9dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPp1681z15g4; Mon, 15 Sep 2025 19:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBAsH049737; Mon, 15 Sep 2025 19:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBArQ049734; Mon, 15 Sep 2025 19:11:10 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:10 GMT Message-Id: <202509151911.58FJBArQ049734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: ab45c859374d - stable/15 - LinuxKPI: correct the LINUXKPI_VERSION check for abs_diff() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab45c859374d750a6b68292cf40889b8ca5db04a Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ab45c859374d750a6b68292cf40889b8ca5db04a commit ab45c859374d750a6b68292cf40889b8ca5db04a Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:23:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51:26 +0000 LinuxKPI: correct the LINUXKPI_VERSION check for abs_diff() The code introduced abs_diff() as migrated from drm to standard linux headers. The LINUXKPI_VERSION check did not allow this to be visible by default in-tree. Make sure the v6.6 check is optional. drm-kmod always defines LINUXKPI_VERSION so this should be fine. Sponsored by: The FreeBSD Foundation (initially) Fixes: afc450fac9f04 Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52071 (cherry picked from commit 736b16e88d2384f9dd0ec11c0492e825b8d42193) --- sys/compat/linuxkpi/common/include/linux/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/math.h b/sys/compat/linuxkpi/common/include/linux/math.h index 5a348a57747b..1d50e011f66d 100644 --- a/sys/compat/linuxkpi/common/include/linux/math.h +++ b/sys/compat/linuxkpi/common/include/linux/math.h @@ -56,7 +56,7 @@ __ret; \ }) -#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 60600 +#if !defined(LINUXKPI_VERSION) || (LINUXKPI_VERSION >= 60600) #define abs_diff(x, y) ({ \ __typeof(x) _x = (x); \ __typeof(y) _y = (y); \ From nobody Mon Sep 15 19:11:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPq4k5cz67skp; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPq2SG0z4FFS; Mon, 15 Sep 2025 19:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963471; 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=O2sawGkUpp4oIJbTADLG4rD821dWEiuZuBMoz70uBxE=; b=jku1MDnHhGc0nebSXP95UFzGjnqAXXdeRzgxZw4ICHOIOnzTcA8xyR+lN46zX4jFwXKpLU mqIWQW+NlEzk3P1ZjoG4vslA7xGvk1OST9Ynwr2i73JXDH6txSDxM/8gDTjS3yFL+1aS8/ IaPonjOhulMgA4qZhf4AtPDCF6mn60yXtf0N7b30EqIINjgXnHUNVo/Zw+Cay5AcDhFnsU wY3ANASCpr16SSSCRIB2F6mR4RqzUUU6m40zdck+ljpQNsHxnxd0BM9krPfPN6aG+QjY9z NYaEOM4ljtUqLopyTSKOvPHdnI8aSFNvYBVZFobct8Q0PiYVl/KFVhE8p+T63A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963471; 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=O2sawGkUpp4oIJbTADLG4rD821dWEiuZuBMoz70uBxE=; b=YINLjSCedtDUJTTRC0OJC6MnOfgglqun5UFVJLQbvYL8EE0w4gOygpVKdqJR7tpUsT7m+5 m2h6TdTn4qJw1bSc/LIDDxz4kG/3UWLvyXQO2j3phAK61RpkrQabPWGvORmRYvrGW/KKyt vE/CYnjeiKqac8cSysaCOEeAQQgaeCmPw6S+KDWX5eZ7CMeq2xZBsJckX3YF3YnzyqJY2M XJkPqcSXTMQVMd8gVgTIxBUVNxUUf7XqJeIaZRzaduKQkLzeWtJ02+Q3bPi0G2DIkV6SVo /wsx96RX+ANbLRyLBTW2UFjkxYndv65sswLf7xcol71SrMxFCmWHpkqarZlrdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963471; a=rsa-sha256; cv=none; b=LZerANa6bFmNr5LReNn9QPGLIrEoEebrwUkY8++A0V9ztKa/2KWMJHJNLUxwVl3fwetZXM t6mHOWq0MN1qQPGeFOyRY7KYhiZ+j5lk+Oi6pi2spHjYK/tJp/AAZl9HjXb8W4InHLBlu1 C5vUoJwIVG2zZFXWSc5s8PP+CfZMYuIJ8a+BGePbDekwWl8DomLu93tsImVT/0LSPM/7/D 7dT0zuPDRNLGD413T6Jmb82uf8I6CFimpN8v+6aNnSzC3wgBcihY3svyi7k4hWJvl4Q+Bt YLOjOjkG/oZQEIbp//rMuVVFgnwjVyZUC45mM8qTBlT2q3BSs02C7WSlVewksw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPq1zytz16VL; Mon, 15 Sep 2025 19:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBB5Q049778; Mon, 15 Sep 2025 19:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBBh0049775; Mon, 15 Sep 2025 19:11:11 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:11 GMT Message-Id: <202509151911.58FJBBh0049775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: aa673b7101d9 - stable/15 - LinuxKPI: acpi; fix type to acpi_get_handle() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aa673b7101d9ca8c2f1353d1d5093fb548f8388d Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=aa673b7101d9ca8c2f1353d1d5093fb548f8388d commit aa673b7101d9ca8c2f1353d1d5093fb548f8388d Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:23:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51:36 +0000 LinuxKPI: acpi; fix type to acpi_get_handle() The native AcpiGetHandle() and acpi_get_handle() take a const char * argument for pathname and not an acpi_string (char *). For that they spell it out fully as 'const char *', so should we. Sponsored by: The FreeBSD Foundation (intially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52072 (cherry picked from commit c1264b6238c97810849bc38818d27c1ade1d4fc1) --- sys/compat/linuxkpi/common/include/acpi/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi.h b/sys/compat/linuxkpi/common/include/acpi/acpi.h index 016c7ede0f6e..9bb435591daa 100644 --- a/sys/compat/linuxkpi/common/include/acpi/acpi.h +++ b/sys/compat/linuxkpi/common/include/acpi/acpi.h @@ -131,7 +131,7 @@ acpi_format_exception(ACPI_STATUS Exception) } static inline ACPI_STATUS -acpi_get_handle(ACPI_HANDLE Parent, ACPI_STRING Pathname, +acpi_get_handle(ACPI_HANDLE Parent, const char *Pathname, ACPI_HANDLE *RetHandle) { return (AcpiGetHandle(Parent, Pathname, RetHandle)); From nobody Mon Sep 15 19:11:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPs1Gvzz67sj2; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPr3LYWz4FYt; Mon, 15 Sep 2025 19:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963472; 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=T+fxD+sUhf5NFs9285ZI182mqpG/kQE2UUMQqMqFYqs=; b=MP/DDi6+mJpHL6PDTiZOCSDkY0dyFYo3aKg6/LtoPtX+lm60+CLJXc+4/JGRz1zG3GX++2 MHAl1+JoH1JzBkBWupuw2efCZ2gNQiPDddIvIH5IXxXSoYY+0SMs+sy6tKsFMH3vIg3K39 Tfa/zcP8Vd0zU5My3l9QlNuEsJYLVc/1ErE+mYimOmKgMczx47kV/f1oOOMQyUhoSMU8Sr Mi5fcQ0kirVHEbsadLyFEr/a3fn6XB9lACxPMsP4TJV51Bz6Rtbnu/eFH1Ss9Yi6Kpj3Sy GeDIGErg2NRYV7bETmrDX9aDiIkz+sIZF9DJBf/rsipM9iwKElknOAYubvBZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963472; 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=T+fxD+sUhf5NFs9285ZI182mqpG/kQE2UUMQqMqFYqs=; b=ZYFSUaYhHw+jPmqH5EjINtTdnngFRZNYG5nGYXvkLwgCQAuUI60AM6e0CeCit7JPJu6S40 0LIlrQ6y2MxW3UNn3M+56vSkc0MPlD7baK4Lcixl//95mx+JXYfInWDuVHIfU5mvcSgfYj 7VZ/PeXGKcWxVQo6Pg/b5H4foR71cX22+czeJGyZvpMEHSxSQcQluu/D6dpZ98X4QpNY7x wKCeuy7OyDwik/ZrqUj1s3JUXicbylvWGZPGWN3mTCFaXFmxfVzzaHJSCEyD6W64KAIOza KJBHmdaX8jI5Bz+eKLA8fjljL0utBua/k6JznQfdfhulDTucLCBLqkc/uW5kRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963472; a=rsa-sha256; cv=none; b=EuW/WNe6yvBTiAcuqzmlZ/ei7tIq8tE6iPCDpLHVnDZUos4YFIYtEMhnq4DDFUF31QPb0b KC0mCueFKAof2pPROSvLu0V6nt6f5eSlp6Pape9smo5qCpqvzweCcCH5T0bdGT7nsy11ZX +ZJQAkNgIiK9u4yU4BsT4GQ9Ks42WQUZQUS4sOIkbaSJSKhh7UfWMT+A6tCPJEpBgzB7nR ggwI5LY0YBKKvGmLPfPwM6lPFEC3M++kqrzQM8juQZlVypiMn+ZC+Lc4Qsrq/4GFGidG88 /T8ovkX0D/8JlGEEJfLwDvqigBlbEte+io4O26DhRy2lZElg+LADHCKigAPpGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPr2hCbz16dx; Mon, 15 Sep 2025 19:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBCu6049816; Mon, 15 Sep 2025 19:11:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBCer049812; Mon, 15 Sep 2025 19:11:12 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:12 GMT Message-Id: <202509151911.58FJBCer049812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 352be5b48ba8 - stable/15 - LinuxKPI: rename from_timer() to timer_container_of() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 352be5b48ba8b3ec1e3e5dd0dbee4da8d1fa78b0 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=352be5b48ba8b3ec1e3e5dd0dbee4da8d1fa78b0 commit 352be5b48ba8b3ec1e3e5dd0dbee4da8d1fa78b0 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:23:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51:41 +0000 LinuxKPI: rename from_timer() to timer_container_of() With Linux 6.16 from_timer() got renamed to timer_container_of(); add the LINUXKPI_VERSION check with a default to the current version. Update all in-tree consumers (apart from wireless drivers managed otherwise). Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52073 (cherry picked from commit 81cb7c4c8e7bc4951c77fe64a63a847ed6abee38) --- sys/compat/linuxkpi/common/include/linux/timer.h | 5 +++++ sys/compat/linuxkpi/common/src/linux_80211.c | 2 +- sys/dev/irdma/irdma_cm.c | 2 +- sys/dev/irdma/irdma_utils.c | 4 ++-- sys/dev/qat/qat_common/adf_gen4_timer.c | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h index a635f0faea59..bd06e3158fa3 100644 --- a/sys/compat/linuxkpi/common/include/linux/timer.h +++ b/sys/compat/linuxkpi/common/include/linux/timer.h @@ -49,8 +49,13 @@ extern unsigned long linux_timer_hz_mask; #define TIMER_IRQSAFE 0x0001 +#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION < 61600) #define from_timer(var, arg, field) \ container_of(arg, typeof(*(var)), field) +#else +#define timer_container_of(var, arg, field) \ + container_of(arg, typeof(*(var)), field) +#endif #define timer_setup(timer, func, flags) do { \ CTASSERT(((flags) & ~TIMER_IRQSAFE) == 0); \ diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index f0881773726f..d00734001a59 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -7814,7 +7814,7 @@ lkpi_wiphy_delayed_work_timer(struct timer_list *tl) { struct wiphy_delayed_work *wdwk; - wdwk = from_timer(wdwk, tl, timer); + wdwk = timer_container_of(wdwk, tl, timer); wiphy_work_queue(wdwk->wiphy, &wdwk->work); } diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c index 450fae662dd8..d4d4f328fb43 100644 --- a/sys/dev/irdma/irdma_cm.c +++ b/sys/dev/irdma/irdma_cm.c @@ -1316,7 +1316,7 @@ irdma_cm_timer_tick(struct timer_list *t) struct irdma_timer_entry *send_entry, *close_entry; struct list_head *list_core_temp; struct list_head *list_node; - struct irdma_cm_core *cm_core = from_timer(cm_core, t, tcp_timer); + struct irdma_cm_core *cm_core = timer_container_of(cm_core, t, tcp_timer); struct irdma_sc_vsi *vsi; u32 settimer = 0; unsigned long timetosend; diff --git a/sys/dev/irdma/irdma_utils.c b/sys/dev/irdma/irdma_utils.c index 5fc37022981f..038f1980082b 100644 --- a/sys/dev/irdma/irdma_utils.c +++ b/sys/dev/irdma/irdma_utils.c @@ -876,7 +876,7 @@ irdma_terminate_done(struct irdma_sc_qp *qp, int timeout_occurred) static void irdma_terminate_timeout(struct timer_list *t) { - struct irdma_qp *iwqp = from_timer(iwqp, t, terminate_timer); + struct irdma_qp *iwqp = timer_container_of(iwqp, t, terminate_timer); struct irdma_sc_qp *qp = &iwqp->sc_qp; irdma_terminate_done(qp, 1); @@ -1528,7 +1528,7 @@ static void irdma_hw_stats_timeout(struct timer_list *t) { struct irdma_vsi_pestat *pf_devstat = - from_timer(pf_devstat, t, stats_timer); + timer_container_of(pf_devstat, t, stats_timer); struct irdma_sc_vsi *sc_vsi = pf_devstat->vsi; if (sc_vsi->dev->hw_attrs.uk_attrs.hw_rev >= IRDMA_GEN_2) diff --git a/sys/dev/qat/qat_common/adf_gen4_timer.c b/sys/dev/qat/qat_common/adf_gen4_timer.c index 96b65cdff181..2c74d09418e5 100644 --- a/sys/dev/qat/qat_common/adf_gen4_timer.c +++ b/sys/dev/qat/qat_common/adf_gen4_timer.c @@ -57,7 +57,7 @@ end: static void timer_handler(struct timer_list *tl) { - struct adf_int_timer *int_timer = from_timer(int_timer, tl, timer); + struct adf_int_timer *int_timer = timer_container_of(int_timer, tl, timer); struct adf_accel_dev *accel_dev = int_timer->accel_dev; struct adf_hb_timer_data *hb_timer_data = NULL; u64 timeout_val = adf_get_next_timeout(int_timer->timeout_val); From nobody Mon Sep 15 19:11:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPs6kj2z67sTv; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPs487Sz4FnP; Mon, 15 Sep 2025 19:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963473; 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=9Q8glrBFEMy5ICMx4ChAhBmD2a7noMLrdvt0QZk9ZJw=; b=IcdxnHJRKmTq/UnxF4pU4Vy9UPjS3cy5yRvhHnavuxj8WW9vBoiJAgMvnX8OxD9gMa7gZd O0rTchWL5qU5RN7gvAjZ/0JbKU2E+zat08UbsQ+/k6421hOiAgvV+65k0wFaMT89Z2fwOY dSNSB2wmiVu9QYSveXHnCpNvXQJlahwiYxmlWH6UI6xX/mrWSXSRGchaIL5HMYwi/WKWG7 FTWXDm/pJaZTwqjEptnXZHKSIGn1INQsGTWyikjXGM2YbDIx4nhFdk/4jz/WvuSs0FVoKO kXierEhRTYOCjr4UfxMlPGc+xImndD2fNe6WhkBCy2cZicrZgjht+g4DzG4cLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963473; 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=9Q8glrBFEMy5ICMx4ChAhBmD2a7noMLrdvt0QZk9ZJw=; b=i6LpPL2o1A8M9bwT9ixEudiqm9F5L3daLhshdCH63QRKND9nq49nPBLZzZzvHJEfCBjT2+ hT0qHuHp6O7vAZIGbqHVxsfZ4MAjlN5iC87NQdYPUP9qNKxhQCVrOTcnVoBdMNlaQgJ4vE UbBYW4D/rrbGzTD75AqtksRkrsF98zF5Q4i7l68b2wIuWuZCpeoewaVU306dJtUbrs/qTm aR0OWEb+N5fYHHlgxrutn11bciYUuxbEJzpb/tiYBCcqKYC6On35PMf91tmuDhYJGAO3Jw Ezyp/BlI+bFdCtkBLnRciHN7GI6mvWiw9KFd2y19xkWrC4UO4XPj27y6C6pVLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963473; a=rsa-sha256; cv=none; b=XcLoj4WgacIlY08YqNN8EMm0BrOXJXus8foIbDaRCMpvXNkwoA8DKv/pRP4BAjEk5PULcj FKTBhdrkdFVzO+ex6lLjUaF1zEy1GEcaxsngyp5vxMwuiDESmjeljqNrJFzHWUYMgUTb4W 3dkaS0ulKHfl/a4XutLbossb+JOY21pSd7mhnIzjcnZlCxBfIpLtyxBB/e//qQh4ieVy8p cO10tQC7qgGciuWNQpkNOQT/Dtc/ZUisTiNjK3jMx9sjoAhaSIGAmph1h3289Ov53oUEcO IKMRpaEAipVBxDrRSJLa8Fm2coVTiSVzf+GGAzcJQ5TV59Ay4dODRQmJZ1qT9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPs3Qb8z16Bx; Mon, 15 Sep 2025 19:11:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBDmF049852; Mon, 15 Sep 2025 19:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBD6w049849; Mon, 15 Sep 2025 19:11:13 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:13 GMT Message-Id: <202509151911.58FJBD6w049849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 88198564dbd8 - stable/15 - LinuxKPI: timer KPI *_timer -> timer_* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 88198564dbd82a97d655e73459c03eccf7031331 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88198564dbd82a97d655e73459c03eccf7031331 commit 88198564dbd82a97d655e73459c03eccf7031331 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:24:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:51:48 +0000 LinuxKPI: timer KPI *_timer -> timer_* del_timer() got renamed to timer_delete() approximately in Linux 6.2 (similar for *_sync and likely others). Keep the old functions as compat; unclear when we can gc them. We should also re-define them with a linuxkpi_ prefix to avoid possible conflicts in the future if we do a full pass over this at some point. Sponsored by: The FreeBSD Foundation (intiially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52074 (cherry picked from commit 5cb64a1d3fe75526fb879ef4dce5860bbb4e4aea) --- sys/compat/linuxkpi/common/include/linux/timer.h | 16 ++++++++++++++-- sys/compat/linuxkpi/common/src/linux_compat.c | 11 ++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h index bd06e3158fa3..d48939e28a02 100644 --- a/sys/compat/linuxkpi/common/include/linux/timer.h +++ b/sys/compat/linuxkpi/common/include/linux/timer.h @@ -84,11 +84,23 @@ extern unsigned long linux_timer_hz_mask; extern int mod_timer(struct timer_list *, unsigned long); extern void add_timer(struct timer_list *); extern void add_timer_on(struct timer_list *, int cpu); -extern int del_timer(struct timer_list *); -extern int del_timer_sync(struct timer_list *); + +extern int timer_delete(struct timer_list *); extern int timer_delete_sync(struct timer_list *); extern int timer_shutdown_sync(struct timer_list *); +static inline int +del_timer(struct timer_list *tl) +{ + return (timer_delete(tl)); +} + +static inline int +del_timer_sync(struct timer_list *tl) +{ + return (timer_delete_sync(tl)); +} + #define timer_pending(timer) callout_pending(&(timer)->callout) #define round_jiffies(j) \ ((unsigned long)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask)) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index dcdec0dfcc78..458744a9fec6 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -2120,7 +2120,7 @@ add_timer_on(struct timer_list *timer, int cpu) } int -del_timer(struct timer_list *timer) +timer_delete(struct timer_list *timer) { if (callout_stop(&(timer)->callout) == -1) @@ -2129,7 +2129,7 @@ del_timer(struct timer_list *timer) } int -del_timer_sync(struct timer_list *timer) +timer_delete_sync(struct timer_list *timer) { if (callout_drain(&(timer)->callout) == -1) @@ -2137,13 +2137,6 @@ del_timer_sync(struct timer_list *timer) return (1); } -int -timer_delete_sync(struct timer_list *timer) -{ - - return (del_timer_sync(timer)); -} - int timer_shutdown_sync(struct timer_list *timer) { From nobody Mon Sep 15 19:11:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPv4MqYz67snw; Mon, 15 Sep 2025 19:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPt50wNz4FXC; Mon, 15 Sep 2025 19:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963474; 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=+wEUYJn+AYT61BINbX2MbkEoDLUgdRbrwnWrIhXYli0=; b=pjPgOsgRjehfChWt2+39XDU7mS873q+q/wummQUxED2F03UN/30hzs7s579SdQLaWxA8cT yjHpcKaIPQEUf3sAi1FeC3tm0+2yIMUA6fIHwtXVahu4YCdq7/uxspnmuKQFAjyVOcrNSl QUH11Rg23FuQwkYDCrQraEgHZneIJnuhXX5FIb7uto7X8pIaZIfESzGiI1CsEl3RwL3wZ4 RbblpYWUsPXK1hSsmQM5AL6gNJwsZubt3LAGROEG45fAcltFrfEF8/l5h1SGq+BF+rALKP NbI7iGzVSfn9wiYWXXI/yvtzCTU+sSvtJ0cL4FTSf5Afkvgrt8CavK1cDFr8iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963474; 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=+wEUYJn+AYT61BINbX2MbkEoDLUgdRbrwnWrIhXYli0=; b=Gp4DlkWe/KzTfM6hjStch98Zi7k1uu4ZSseden/N2prbMnx7NK29rL5a1E+Um1qjQTB2Z/ 5HYGhJ6UpxPIYEfn0hKc/HkWPPW9BLfIQQ78+ax3SuqCBcY5/Hx8d5nMFQ/AXV0nSELwSd ExVI+qsnmCKCFUTxZl5qMCrUUPLVUuIe8hKtBZV4L7BWZSuw+DQt0lpmlcNudFsPLOdyHQ q+o25tOHXoOeSAwLBEOMytiR+EsCwxXAvlVlXhdQunO9hM1GTLhPITOesFTsNIue3aKlZJ wfZ5yxF/LcT3hbHkApdZQhrJ9CZA0hqjbo3gTzUbkuQCY/dSh051zKnADTDIig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963474; a=rsa-sha256; cv=none; b=k9sdgmIkQGqqjg1nE7h+22NZ7aA9DXSrhBxMJm3Fu3ISXDy7MxoY1fbE7o/jCCn0GRir1n X1tH9QgB1SNibfe9mzBBE1UFYOyTkAzWwlw/XAxcZD2CJq2BGRjw+FYq86hPqRgf7l9lmx 7HIcQT3j5e1M3dzArinfo0P8XnIWBoJZ+rcuknffLY2vSqN5r465tth8Or4VnCnikmuV2/ kB7Oxo9EwLeWw0umLe6SWN0Q7rYLcZptM0hXSrDLV/l8S7t+IRReKf8zkktgAtQwgIcAuR Aa5USTO8akWLPU/pQ0cXByCi4BMA1n4qTslxrRqTf6qp5qUAj+Srh8Q0uOX41A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPt4XC0z16By; Mon, 15 Sep 2025 19:11:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBEJV049887; Mon, 15 Sep 2025 19:11:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBE2m049884; Mon, 15 Sep 2025 19:11:14 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:14 GMT Message-Id: <202509151911.58FJBE2m049884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 830cc677d97e - stable/15 - LinuxKPI: cleanup: implement __free() and DEFINE_FREE(); use for kfree() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 830cc677d97eebd02ade8b33ec17de38f2705a73 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=830cc677d97eebd02ade8b33ec17de38f2705a73 commit 830cc677d97eebd02ade8b33ec17de38f2705a73 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:24:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:52:25 +0000 LinuxKPI: cleanup: implement __free() and DEFINE_FREE(); use for kfree() A wifi driver update needs this. Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52075 (cherry picked from commit 39e9290d890b2aa07b68f2fe956b96e5df9a1da2) --- sys/compat/linuxkpi/common/include/linux/cleanup.h | 14 +++++++++++++- sys/compat/linuxkpi/common/include/linux/slab.h | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/cleanup.h b/sys/compat/linuxkpi/common/include/linux/cleanup.h index 01f234f0cbe7..45c2a2359ddf 100644 --- a/sys/compat/linuxkpi/common/include/linux/cleanup.h +++ b/sys/compat/linuxkpi/common/include/linux/cleanup.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2024-2025 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -43,4 +43,16 @@ guard_ ## _n ## _t guard_ ## _n ## _ ## __COUNTER__ \ __cleanup(guard_ ## _n ## _destroy) = guard_ ## _n ## _create +#define DEFINE_FREE(_n, _t, _f) \ + static inline void \ + __free_ ## _n(void *p) \ + { \ + _t _T; \ + \ + _T = *(_t *)p; \ + _f; \ + } + +#define __free(_n) __cleanup(__free_##_n) + #endif /* _LINUXKPI_LINUX_CLEANUP_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h index 47e3d133eb6c..0e649e1e3c4a 100644 --- a/sys/compat/linuxkpi/common/include/linux/slab.h +++ b/sys/compat/linuxkpi/common/include/linux/slab.h @@ -40,8 +40,10 @@ #include #include #include +#include #include #include +#include MALLOC_DECLARE(M_KMALLOC); @@ -153,6 +155,8 @@ kfree(const void *ptr) lkpi_kfree(ptr); } +DEFINE_FREE(kfree, void *, if (!IS_ERR_OR_NULL(_T)) kfree(_T)) + /* * Other k*alloc() funtions using the above as underlying allocator. */ From nobody Mon Sep 15 19:11:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPx2J8Pz67sm3; Mon, 15 Sep 2025 19:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPx0Df3z4Fnw; Mon, 15 Sep 2025 19:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963477; 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=7+wsrIQsuDCL9ZeCZPzMvZ+6FVfO5032a1QDl4BYnfc=; b=KDhq+cdR7iwm1gRpsCIvRp56Ff3UgqbiDqjDXDQB9PA0aJHO4gRLOwEwSl7hWVf51LYAuX XtfW7zV1Vnv9/xtQ+ID0fjxZNCxH3se+qGPVRvPFC1pDSiOy6AQOv8a/bile9IL0wji6zx GMbxe53f20D2eiGuAK6dpiCeYyXY9gjaUS5ACNQbh3+07fOCcYkqcLeczwUo8GimnUJkEL VZ7k2XMd9n3BvHBFMsZTRYEzrfxGOfOL2hhZlbHLVjZaXL8KFsQ62FfnLFzFpcOugguVWH kFzOft6YaxUeMikqDHOJSa2DfSCfYs43Y6CtMLfCxqj0E9fMF5Ql7NuljAetiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963477; 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=7+wsrIQsuDCL9ZeCZPzMvZ+6FVfO5032a1QDl4BYnfc=; b=iLsv8jrLrUv+gE9glBa/iwnlWYt6ky99gRf4iIZBuDLdzZlWG9yM5CMluWo0W0/TBznPhe wAxpRN5tgtlE/vM5lv5LTzK3dY8LPF5D7efUK0p5coONYEK7xqyFFVey3CQbYi1CPOtmHJ OtJUtzgxmX27Sj9pWkVM9LIOaxJ/5wYdvzrbHDdGx7ypqalhBMdzACIcaLbBDxBxfJf4cX ZOkSZdUSZ9xhEIpO5xHuUMEe+/a4STp+UhwSmg8Gtgi4Ekfl/8e82W0XeuCf1fYnsVSSHn Du6Mv9P8YrVvKSIdJ3Oh0HZZm5dgp9Pi7ZsvjB1nGKhqVf0kbAWsiiNl7lMcFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963477; a=rsa-sha256; cv=none; b=V19WsWf8mwufwvkMS4RXNmJ7je5C/QRY9I7e5FFpVXNyMUQrPD4RTtpD+8WBUFsU8Dr8uB q8xjgS8/dYFkvowwz42nYtrl4gI/RBLDokXDJqQZTA9ZvAZ2nEAxyc5CBeL7ViMhRWKCTp soj5abuE6NF0S+5uJxaK1Mm7/HP4y/bw5EmNtGEk+CFOqbPUWz5D4Ky2ymjiF+K/QpyVOx qgHAVQjyAKMEyBbsm7Z3ahq3bkgAMJY/5UHUBA66QOA5KhcYv7/vn5jiq6SUPk0jBPGm8p 7tEJbKo5emwI0rSn+PqpIQlW7EBnK0JbzKVYMPnwbJwXKc4jmDqX2pYAmdld4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPw6n4Qz16dy; Mon, 15 Sep 2025 19:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBG35049957; Mon, 15 Sep 2025 19:11:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBGNI049954; Mon, 15 Sep 2025 19:11:16 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:16 GMT Message-Id: <202509151911.58FJBGNI049954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 310885b40ad2 - stable/15 - LinuxKPI: add __struct_size List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 310885b40ad256b054d65353c375b29700ee024c Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=310885b40ad256b054d65353c375b29700ee024c commit 310885b40ad256b054d65353c375b29700ee024c Author: Bjoern A. Zeeb AuthorDate: 2025-08-18 19:53:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:52:36 +0000 LinuxKPI: add __struct_size Use __builtin_object_size() by default. If __builtin_dynamic_object_size() is available use that instead. I would hope that in a future version we can remove the conditional checks but in order to be able to MFC this without checking all compiler versions simply keep it this way for now. Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52077 (cherry picked from commit ff5bcb742899f8398ccb1b9e292b2e5aeeb7fedb) --- sys/compat/linuxkpi/common/include/linux/compiler.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h index fb5ad3bf4fe4..948396144ad6 100644 --- a/sys/compat/linuxkpi/common/include/linux/compiler.h +++ b/sys/compat/linuxkpi/common/include/linux/compiler.h @@ -130,4 +130,10 @@ #define is_signed_type(t) ((t)-1 < (t)1) #define is_unsigned_type(t) ((t)-1 > (t)1) +#if __has_builtin(__builtin_dynamic_object_size) +#define __struct_size(_s) __builtin_dynamic_object_size(_s, 0) +#else +#define __struct_size(_s) __builtin_object_size(_s, 0) +#endif + #endif /* _LINUXKPI_LINUX_COMPILER_H_ */ From nobody Mon Sep 15 19:11:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPw1qdxz67srb; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPv6CkQz4FcN; Mon, 15 Sep 2025 19:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963476; 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=ymXwOI3IAC84SWhsyd0PH46YuHyYKT5sF2r3sb7Pu+o=; b=nmAht87scB1pa2xOZ4X79NTYGScASpkALYLf+1K05Pv25of9K1zp0Lj1eop/8bR1yiodXU ZZVrzfCTBQQzri7Ni7jmaHraTbWltIc7mQo8OEwVQxSzeEeyEXbTke9P1jfIEckVmGoH34 YeM6qTHslYyMldY7P3ZIj1C2Z7W0+9YSV1Lqw+u2OHMKnpaIh+dCdEGw4Xvm7B7RWIYbVZ qfYidHiYGbSb6Fdl9dAo3Ijof7pcUQ67IC/uNKaMwjcEWr+eEGUZ+N8GyDVUbh+1zY7beM GUfo1gYZTDC0ThRXf1xPDCFnfwxWYEVzSWycoko5HBku2+OAvOTnbWRsWsLcsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963476; 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=ymXwOI3IAC84SWhsyd0PH46YuHyYKT5sF2r3sb7Pu+o=; b=gF1bKwQbYtmL1kOul7WHKZhfWErFoN2xA4offuk//gHVaf0xgVnsFJiVy3N+iCg6F0wG5q tTlkDi7BMZdjFP8qYh4uo1716yuDj3DBqApxl88ARFInKtamk+BD2LKQHvqWVx2zX7NyMY Emx3bZ7CNh+JD/wPvBrJbSLvNC7AcADwPxiN/g0oOxAIN+kfAOU6IBAJ/seJJzin0jBBU0 uBgrnc2uU81FDDxOYf4gaQr/I02Zj59ALuUZvQPv/pc32FSBceqTDuAxfbZn5DHkDoPLBE XtF+cb11Gjll1NkM/JR4cuUgUnug9omXsTkM2d/Os9U3mA35q3A/0u/u+gc58g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963476; a=rsa-sha256; cv=none; b=mlp963fvPFuyomhB4Yqfc1Utht0lZm1ZhCBxWLPlvQh4aJmBakA8tc+m1I955tChb7seDh Fuuc90OoMNgxuEcu2doqp1uo5UhewJ8mt3jbhqJcg6hGJHbEuzyYnt0Lva7dLecw3kB4uL wMp5RLrF7jfH+lddoN52V6OoboEGHcZLHgSWD/lL4/mIEQE8mwxGoG0WX+fqTT+936JFPl cyh8uQI5jfM9DdBw8eUFWKtrDQ70lYv4Nn9COV4dYn4h2mcC27e9Cp0azM8Hjs5TgY34RT OVjxO+3ZsFRTGdCdMvlDzrFtI+jsP5AUzI2bfZlMACpVW1YgJ/+2qVMIXmJccw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPv5nX0z16s9; Mon, 15 Sep 2025 19:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBFRi049922; Mon, 15 Sep 2025 19:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBF9x049919; Mon, 15 Sep 2025 19:11:15 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:15 GMT Message-Id: <202509151911.58FJBF9x049919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4d5a78c5f40a - stable/15 - LinuxKPI: add DEFINE_LOCK_GUARD_0 for rcu List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d5a78c5f40aa2dfd672ccfa4a6fff93e216c32b Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5a78c5f40aa2dfd672ccfa4a6fff93e216c32b commit 4d5a78c5f40aa2dfd672ccfa4a6fff93e216c32b Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:25:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:52:31 +0000 LinuxKPI: add DEFINE_LOCK_GUARD_0 for rcu This adds guard support for non-real-types like rcu locking meaning that we need to keep the lock state separately ourselves. _T is still special and needs to be updated. Given it may not be used it needs an __unused attribute (we are using the LinuxKPI __maybe_unused which indeed is more expressive in this case). Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52076 (cherry picked from commit 3f48a0fe53ca7e001852f4a406c1bdfab1cd2f6d) --- sys/compat/linuxkpi/common/include/linux/cleanup.h | 35 ++++++++++++++++++++++ .../linuxkpi/common/include/linux/rcupdate.h | 5 +++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/cleanup.h b/sys/compat/linuxkpi/common/include/linux/cleanup.h index 45c2a2359ddf..5bb146f082ed 100644 --- a/sys/compat/linuxkpi/common/include/linux/cleanup.h +++ b/sys/compat/linuxkpi/common/include/linux/cleanup.h @@ -55,4 +55,39 @@ #define __free(_n) __cleanup(__free_##_n) +/* + * Given this is a _0 version it should likely be broken up into parts. + * But we have no idead what a _1, _2, ... version would do different + * until we see a call. + * This is used for a not-real-type (rcu). We use a bool to "simulate" + * the lock held. Also _T still special, may not always be used, so tag + * with __unused (or better the LinuxKPI __maybe_unused). + */ +#define DEFINE_LOCK_GUARD_0(_n, _lock, _unlock, ...) \ + \ + typedef struct { \ + bool lock; \ + __VA_ARGS__; \ + } guard_ ## _n ## _t; \ + \ + static inline void \ + guard_ ## _n ## _destroy(guard_ ## _n ## _t *_T) \ + { \ + if (_T->lock) { \ + _unlock; \ + } \ + } \ + \ + static inline guard_ ## _n ## _t \ + guard_ ## _n ## _create(void) \ + { \ + guard_ ## _n ## _t _tmp; \ + guard_ ## _n ## _t *_T __maybe_unused; \ + \ + _tmp.lock = true; \ + _T = &_tmp; \ + _lock; \ + return (_tmp); \ + } + #endif /* _LINUXKPI_LINUX_CLEANUP_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/rcupdate.h b/sys/compat/linuxkpi/common/include/linux/rcupdate.h index 85d766c8dbc9..4aceb7296cd6 100644 --- a/sys/compat/linuxkpi/common/include/linux/rcupdate.h +++ b/sys/compat/linuxkpi/common/include/linux/rcupdate.h @@ -1,7 +1,7 @@ /*- * Copyright (c) 2016-2017 Mellanox Technologies, Ltd. * All rights reserved. - * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2024-2025 The FreeBSD Foundation * * Portions of this software were developed by Björn Zeeb * under sponsorship from the FreeBSD Foundation. @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -162,4 +163,6 @@ void linux_synchronize_rcu(unsigned type); #define init_rcu_head_on_stack(...) #define destroy_rcu_head_on_stack(...) +DEFINE_LOCK_GUARD_0(rcu, rcu_read_lock(), rcu_read_unlock()) + #endif /* _LINUXKPI_LINUX_RCUPDATE_H_ */ From nobody Mon Sep 15 19:11:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPy47Qbz67ss5; Mon, 15 Sep 2025 19:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPy0zbYz4FhH; Mon, 15 Sep 2025 19:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963478; 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=J6hXeTq3TkNGT2PJiwwujL4mN/Y1XqF8/N9S5wMunOU=; b=jwQZioTHqPb5Rdoji/IQIWaePreykiwEYaQcQdXY7Kp6/toz0CGNybA8NJhBPZnFKFbwxD xrk5ASNjn8XYsOPbrU9hjwizJz4BmcieSjcuvl4BNhiYoyOqnMdcT5FGXR1wZrkjJpjcI4 UPxFgW5XX+NLZWkTMCNJ9cP+oi8sDnMJRxDLNNM3mYU7tS0joDsBx0Po7g63XJ1YrPwEeJ y/ZqSAmeEFLFge7B2x5c/SzQfmbeE4xVw7t3SQM+VcCjIqP84tdLyjnQWGhkIqjvqgEGbm V4Pz2QSgSEbfPdN/juEI6ZkCmbCAlYlOehUBGjf632gnaHoGbqvn+wm9t+SbDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963478; 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=J6hXeTq3TkNGT2PJiwwujL4mN/Y1XqF8/N9S5wMunOU=; b=WhOX9Ef9tiCnhUMcuwD32oOBF8hwSehviCSvldegrJ4EeX0AdxIwxhTwe+aaUixiYHGCUD qZMjQu2Oq3pBj3TY7Yq25L5NIh+fF8s7YjQ7La5cOWF52W/CjR3I2OeSvmFZbK9FoqJMXC UmajU72q4GaqffduT3pwFkuNAF/gI5okMoadRJF4kmJO+25M92E2OJWKEsMva6GM/BCyqQ bF+dO5k7P/jSLQRsHb0AWOU8dW58frlFxQhjB5dI0KWJlOvqhPihT8xe56js1l73H6fC8C rNWRyQSpA3vADsNuVR4bLI+P8xN6oJdOuRbnrhKP5D7O/f9nuuoTexky/ev/rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963478; a=rsa-sha256; cv=none; b=WJKQenKKE26rwqxkOOjRRLEjdAP40NwifN4Xvjq8SN8GjpnKTNBJBEPJq4IcZJHxmrtOay bqo8TrqLtZ4Psk3tYMeqVmjCkfVGMQZo5g0EcgcClaGWQAkUK9dbSKzLdzuZ5Hhst4b08F iG7IcK5kUWVG4Jvmom4SakZcWF3v/SKu/I2hgGwuQcNMeUlz/3ef9Xrz8Jdq0xrmR60Ssr ughvmMXzAZjlLG3EItRkYxM/FaaZY9dRAU6ErL+wFwR0ZN8kOfXAkx9WTdSaD6WzMv+DL9 wdWu9XFnTdtOoQltESdAUv9WP5e9LnPkzTv9hAKvIdM0W5FMKL//u5gjND2OcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPx70t9z16sB; Mon, 15 Sep 2025 19:11:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBHri049992; Mon, 15 Sep 2025 19:11:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBHda049989; Mon, 15 Sep 2025 19:11:17 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:17 GMT Message-Id: <202509151911.58FJBHda049989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cd2bd8bf672c - stable/15 - LinuxKPI: sync overflow.h from Linux v6.16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd2bd8bf672cd5925531b6440d57f1c48e025079 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2bd8bf672cd5925531b6440d57f1c48e025079 commit cd2bd8bf672cd5925531b6440d57f1c48e025079 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:26:32 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:52:42 +0000 LinuxKPI: sync overflow.h from Linux v6.16 It seems overflow.h wsa imported directly from Linux in 3208d4ad2b8320a. Update the file to the newer version as needed for wireless driver updates. Sponsored by: The FreeBSD Foundation (initially) Obtained from: git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 038d61fd642278 (tag: v6.16) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52078 (cherry picked from commit 70c508e691de1ed0f70b4a6f0773bfb5d627050d) --- .../linuxkpi/common/include/linux/overflow.h | 180 +++++++++++++++++---- 1 file changed, 153 insertions(+), 27 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/overflow.h b/sys/compat/linuxkpi/common/include/linux/overflow.h index 9ba9b9500f11..e811037b8ecc 100644 --- a/sys/compat/linuxkpi/common/include/linux/overflow.h +++ b/sys/compat/linuxkpi/common/include/linux/overflow.h @@ -33,8 +33,10 @@ * credit to Christian Biere. */ #define __type_half_max(type) ((type)1 << (8*sizeof(type) - 1 - is_signed_type(type))) -#define type_max(T) ((T)((__type_half_max(T) - 1) + __type_half_max(T))) -#define type_min(T) ((T)((T)-type_max(T)-(T)1)) +#define __type_max(T) ((T)((__type_half_max(T) - 1) + __type_half_max(T))) +#define type_max(t) __type_max(typeof(t)) +#define __type_min(T) ((T)((T)-type_max(T)-(T)1)) +#define type_min(t) __type_min(typeof(t)) /* * Avoids triggering -Wtype-limits compilation warning, @@ -59,45 +61,122 @@ static inline bool __must_check __must_check_overflow(bool overflow) * @b: second addend * @d: pointer to store sum * - * Returns 0 on success. + * Returns true on wrap-around, false otherwise. * - * *@d holds the results of the attempted addition, but is not considered - * "safe for use" on a non-zero return value, which indicates that the - * sum has overflowed or been truncated. + * *@d holds the results of the attempted addition, regardless of whether + * wrap-around occurred. */ #define check_add_overflow(a, b, d) \ __must_check_overflow(__builtin_add_overflow(a, b, d)) +/** + * wrapping_add() - Intentionally perform a wrapping addition + * @type: type for result of calculation + * @a: first addend + * @b: second addend + * + * Return the potentially wrapped-around addition without + * tripping any wrap-around sanitizers that may be enabled. + */ +#define wrapping_add(type, a, b) \ + ({ \ + type __val; \ + __builtin_add_overflow(a, b, &__val); \ + __val; \ + }) + +/** + * wrapping_assign_add() - Intentionally perform a wrapping increment assignment + * @var: variable to be incremented + * @offset: amount to add + * + * Increments @var by @offset with wrap-around. Returns the resulting + * value of @var. Will not trip any wrap-around sanitizers. + * + * Returns the new value of @var. + */ +#define wrapping_assign_add(var, offset) \ + ({ \ + typeof(var) *__ptr = &(var); \ + *__ptr = wrapping_add(typeof(var), *__ptr, offset); \ + }) + /** * check_sub_overflow() - Calculate subtraction with overflow checking * @a: minuend; value to subtract from * @b: subtrahend; value to subtract from @a * @d: pointer to store difference * - * Returns 0 on success. + * Returns true on wrap-around, false otherwise. * - * *@d holds the results of the attempted subtraction, but is not considered - * "safe for use" on a non-zero return value, which indicates that the - * difference has underflowed or been truncated. + * *@d holds the results of the attempted subtraction, regardless of whether + * wrap-around occurred. */ #define check_sub_overflow(a, b, d) \ __must_check_overflow(__builtin_sub_overflow(a, b, d)) +/** + * wrapping_sub() - Intentionally perform a wrapping subtraction + * @type: type for result of calculation + * @a: minuend; value to subtract from + * @b: subtrahend; value to subtract from @a + * + * Return the potentially wrapped-around subtraction without + * tripping any wrap-around sanitizers that may be enabled. + */ +#define wrapping_sub(type, a, b) \ + ({ \ + type __val; \ + __builtin_sub_overflow(a, b, &__val); \ + __val; \ + }) + +/** + * wrapping_assign_sub() - Intentionally perform a wrapping decrement assign + * @var: variable to be decremented + * @offset: amount to subtract + * + * Decrements @var by @offset with wrap-around. Returns the resulting + * value of @var. Will not trip any wrap-around sanitizers. + * + * Returns the new value of @var. + */ +#define wrapping_assign_sub(var, offset) \ + ({ \ + typeof(var) *__ptr = &(var); \ + *__ptr = wrapping_sub(typeof(var), *__ptr, offset); \ + }) + /** * check_mul_overflow() - Calculate multiplication with overflow checking * @a: first factor * @b: second factor * @d: pointer to store product * - * Returns 0 on success. + * Returns true on wrap-around, false otherwise. * - * *@d holds the results of the attempted multiplication, but is not - * considered "safe for use" on a non-zero return value, which indicates - * that the product has overflowed or been truncated. + * *@d holds the results of the attempted multiplication, regardless of whether + * wrap-around occurred. */ #define check_mul_overflow(a, b, d) \ __must_check_overflow(__builtin_mul_overflow(a, b, d)) +/** + * wrapping_mul() - Intentionally perform a wrapping multiplication + * @type: type for result of calculation + * @a: first factor + * @b: second factor + * + * Return the potentially wrapped-around multiplication without + * tripping any wrap-around sanitizers that may be enabled. + */ +#define wrapping_mul(type, a, b) \ + ({ \ + type __val; \ + __builtin_mul_overflow(a, b, &__val); \ + __val; \ + }) + /** * check_shl_overflow() - Calculate a left-shifted value and check overflow * @a: Value to be shifted @@ -122,7 +201,7 @@ static inline bool __must_check __must_check_overflow(bool overflow) typeof(a) _a = a; \ typeof(s) _s = s; \ typeof(d) _d = d; \ - u64 _a_full = _a; \ + unsigned long long _a_full = _a; \ unsigned int _to_shift = \ is_non_negative(_s) && _s < 8 * sizeof(*d) ? _s : 0; \ *_d = (_a_full << _to_shift); \ @@ -132,10 +211,10 @@ static inline bool __must_check __must_check_overflow(bool overflow) #define __overflows_type_constexpr(x, T) ( \ is_unsigned_type(typeof(x)) ? \ - (x) > type_max(typeof(T)) : \ + (x) > type_max(T) : \ is_unsigned_type(typeof(T)) ? \ - (x) < 0 || (x) > type_max(typeof(T)) : \ - (x) < type_min(typeof(T)) || (x) > type_max(typeof(T))) + (x) < 0 || (x) > type_max(T) : \ + (x) < type_min(T) || (x) > type_max(T)) #define __overflows_type(x, T) ({ \ typeof(T) v = 0; \ @@ -312,27 +391,40 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend) struct_size((type *)NULL, member, count) /** - * _DEFINE_FLEX() - helper macro for DEFINE_FLEX() family. - * Enables caller macro to pass (different) initializer. + * __DEFINE_FLEX() - helper macro for DEFINE_FLEX() family. + * Enables caller macro to pass arbitrary trailing expressions * * @type: structure type name, including "struct" keyword. * @name: Name for a variable to define. * @member: Name of the array member. * @count: Number of elements in the array; must be compile-time const. - * @initializer: initializer expression (could be empty for no init). + * @trailer: Trailing expressions for attributes and/or initializers. */ -#define _DEFINE_FLEX(type, name, member, count, initializer) \ +#define __DEFINE_FLEX(type, name, member, count, trailer...) \ _Static_assert(__builtin_constant_p(count), \ "onstack flex array members require compile-time const count"); \ union { \ u8 bytes[struct_size_t(type, member, count)]; \ type obj; \ - } name##_u initializer; \ + } name##_u trailer; \ type *name = (type *)&name##_u /** - * DEFINE_FLEX() - Define an on-stack instance of structure with a trailing - * flexible array member. + * _DEFINE_FLEX() - helper macro for DEFINE_FLEX() family. + * Enables caller macro to pass (different) initializer. + * + * @type: structure type name, including "struct" keyword. + * @name: Name for a variable to define. + * @member: Name of the array member. + * @count: Number of elements in the array; must be compile-time const. + * @initializer: Initializer expression (e.g., pass `= { }` at minimum). + */ +#define _DEFINE_FLEX(type, name, member, count, initializer...) \ + __DEFINE_FLEX(type, name, member, count, = { .obj initializer }) + +/** + * DEFINE_RAW_FLEX() - Define an on-stack instance of structure with a trailing + * flexible array member, when it does not have a __counted_by annotation. * * @type: structure type name, including "struct" keyword. * @name: Name for a variable to define. @@ -342,8 +434,42 @@ static inline size_t __must_check size_sub(size_t minuend, size_t subtrahend) * Define a zeroed, on-stack, instance of @type structure with a trailing * flexible array member. * Use __struct_size(@name) to get compile-time size of it afterwards. + * Use __member_size(@name->member) to get compile-time size of @name members. + * Use STACK_FLEX_ARRAY_SIZE(@name, @member) to get compile-time number of + * elements in array @member. + */ +#define DEFINE_RAW_FLEX(type, name, member, count) \ + __DEFINE_FLEX(type, name, member, count, = { }) + +/** + * DEFINE_FLEX() - Define an on-stack instance of structure with a trailing + * flexible array member. + * + * @TYPE: structure type name, including "struct" keyword. + * @NAME: Name for a variable to define. + * @MEMBER: Name of the array member. + * @COUNTER: Name of the __counted_by member. + * @COUNT: Number of elements in the array; must be compile-time const. + * + * Define a zeroed, on-stack, instance of @TYPE structure with a trailing + * flexible array member. + * Use __struct_size(@NAME) to get compile-time size of it afterwards. + * Use __member_size(@NAME->member) to get compile-time size of @NAME members. + * Use STACK_FLEX_ARRAY_SIZE(@name, @member) to get compile-time number of + * elements in array @member. + */ +#define DEFINE_FLEX(TYPE, NAME, MEMBER, COUNTER, COUNT) \ + _DEFINE_FLEX(TYPE, NAME, MEMBER, COUNT, = { .COUNTER = COUNT, }) + +/** + * STACK_FLEX_ARRAY_SIZE() - helper macro for DEFINE_FLEX() family. + * Returns the number of elements in @array. + * + * @name: Name for a variable defined in DEFINE_RAW_FLEX()/DEFINE_FLEX(). + * @array: Name of the array member. */ -#define DEFINE_FLEX(type, name, member, count) \ - _DEFINE_FLEX(type, name, member, count, = {}) +#define STACK_FLEX_ARRAY_SIZE(name, array) \ + (__member_size((name)->array) / sizeof(*(name)->array) + \ + __must_be_array((name)->array)) #endif /* _LINUXKPI_LINUX_OVERFLOW_H */ From nobody Mon Sep 15 19:11:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZPz5D60z67sxV; Mon, 15 Sep 2025 19:11:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZPz15Zlz4FrT; Mon, 15 Sep 2025 19:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963479; 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=Vo7twbnppyUdkHTfnqulNUX55uF1aqJ2eKhiCXwjH00=; b=O02xyrrTVAAyEstRs0J2I3VOGjX9XuCAlOK1HusZXUGgJFs+NpqDoLy9n9qA6F038votkZ /8I0qBoHq9jiIrWeFOnVOfU6FeZGh+s8YACVfjWtwwK32fY0Fz/1AEqKmcI0cwmEo4nSsv zH7ie9Rwa7jlgNPaDj3Yc5ckJZ+yE2qrS14ewQLPIdabYsF9ciTHCfrAYgqXvusYPVsr1o hazFAiOOa8Gs1ulPpWGEDbMEFXMhedwUYqhCoKNq9MwvS9qengnKdd10+WmHFnVckmeQuS R9oHKMIUdmNafNeKUo08XzEsgYPKNVlP66cNQr+RNCRQ3jyWp4IJqWlIPZTqJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963479; 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=Vo7twbnppyUdkHTfnqulNUX55uF1aqJ2eKhiCXwjH00=; b=sr+1XK4PCZT9Bxd3ck1ts7pU2bZGm0nixhoKiu3ucYJWPqCbYZ9y7OZKltbI9GOCs4nfJ5 LS/OFPJNHmZceh6n1J49HFpWOrUSSU7x6ecFS7n/CfJC/Z6Fkp/xEzvq3zqJexfAVtoYO2 bqh6DGgEbUrRJLgttSa1Q3YJGe493mCGa6miLy96tkqNVz9ogZFtfmD1sPsappF1PnHAAn bsgVZFx10OeongRHJhytP1Nr6UAfVhBWQbo6GRZYXVyU9Ge+F7NYKipn0gBwo+tNoiZeu2 sSjWcd2LcXsfH01lHU3X9+I7b4BgOwHDTTwg8I4+gUx/ZO9/kBb0x0xCouxHhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963479; a=rsa-sha256; cv=none; b=latV6CujeDWGXaKpmiHuzFmjGGrtJVU7ex7Fol2Gxb6RKSXTlbr39nGrTXp6MVZ1uLKb1d DiVOhcYGuaVrhZ/qlGp74ghubh+wN0rRW4XseVn9iEHhuH5IZ7T6b2oJS7oMVmhPyqcgRF PBkI4C/mz9lUBQAaiQTrT3K71IWMgxKUxU3i49kts0cfXtxneMVSxrz3TwSZm8S+0/kvV/ ehnwHtwKbDgrbdTMYHgqMF9ICPc1NVhJJ3aDpqDcynLWpncy5Vd/nk328ZrwoAyMQIOwmo WNmkzt9HiVZjQdQq6UuNUhwe72CHAZ+l+I8YSzQOx6HKdhh4eGUzyxhmAVZ3DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZPz0QDDz16C0; Mon, 15 Sep 2025 19:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBIbS050778; Mon, 15 Sep 2025 19:11:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBIF6050756; Mon, 15 Sep 2025 19:11:18 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:18 GMT Message-Id: <202509151911.58FJBIF6050756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3753913c9e1c - stable/15 - LinuxKPI: kunit: add static_stub.h and more dummy headers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3753913c9e1c3375be29b8f4ab925b054fe1ac4b Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3753913c9e1c3375be29b8f4ab925b054fe1ac4b commit 3753913c9e1c3375be29b8f4ab925b054fe1ac4b Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:27:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:52:49 +0000 LinuxKPI: kunit: add static_stub.h and more dummy headers These came up during a wifi driver update. Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52079 (cherry picked from commit 7c473933624f701263a83da526cac680b1ca69ed) --- sys/compat/linuxkpi/common/include/kunit/static_stub.h | 15 +++++++++++++++ sys/compat/linuxkpi/dummy/include/kunit/skbuff.h | 0 sys/compat/linuxkpi/dummy/include/kunit/test-bug.h | 0 sys/compat/linuxkpi/dummy/include/kunit/test.h | 0 4 files changed, 15 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/kunit/static_stub.h b/sys/compat/linuxkpi/common/include/kunit/static_stub.h new file mode 100644 index 000000000000..9d425d46dbb0 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/kunit/static_stub.h @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2025 The FreeBSD Foundation + * + * This software was developed by Björn Zeeb under sponsorship from + * the FreeBSD Foundation. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_KUNIT_STATIC_STUB_H +#define _LINUXKPI_KUNIT_STATIC_STUB_H + +#define KUNIT_STATIC_STUB_REDIRECT(_fn, ...) do { } while(0) + +#endif /* _LINUXKPI_KUNIT_STATIC_STUB_H */ diff --git a/sys/compat/linuxkpi/dummy/include/kunit/skbuff.h b/sys/compat/linuxkpi/dummy/include/kunit/skbuff.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/kunit/test-bug.h b/sys/compat/linuxkpi/dummy/include/kunit/test-bug.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sys/compat/linuxkpi/dummy/include/kunit/test.h b/sys/compat/linuxkpi/dummy/include/kunit/test.h new file mode 100644 index 000000000000..e69de29bb2d1 From nobody Mon Sep 15 19:11:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZQ05wgnz67sq2; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZQ02Ytfz4Frg; Mon, 15 Sep 2025 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963480; 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=mBAHnhuIJ/iFpf8D0h+lI+yw/MzG+pXe/GhB96ZQKnw=; b=CnBv5XM+1ADFQxr7XBiMS4xAI60zXxhusHDzY5vL6VFLKVdsW4saLSeQxqNKpn+KtMRdUE EVS04Wektzir71sBGI135lb6csYpO1tPnVfYt64uR6a4pnVDkbltpWnbnJKOENdin8luiB 1yaHMFp8cqUbIZhA5H9n04qNyCeoK4ZIGi4FjSAnLjuYNjIKOYF6g4e4BhurawnoTZgKgp vQ/GU31b3q9dEaTwU88jsFxsZjLexAqdFlwxXntq6I8vG4KMZq8uGA6bpxtQEoiTWL4u3H DC8pqHQKMkfLaW8aer0svuYDJZY29MzBMMJprvDTQzFrqC1vUUIrpFFWIh1MIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963480; 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=mBAHnhuIJ/iFpf8D0h+lI+yw/MzG+pXe/GhB96ZQKnw=; b=cQGo66kPZWv2HCogNZTSg3S8UvM7sTCo9+OLUO+z1i40B3iMJ3Ro3oKsl6TTwu83Zg4Jq9 WdttRycGamP8fp7t78bzib/+uza20ZiUVflnxOKIGaENeDkqjCSEUxIPHP0S2HaP+rkuxv DTkTS+8sIVOUcgpAjxDS93qYkq4yZartPVUCeeneJK2PbdoZDhrQDoWzpVqTh9L4XBMFbn krhJhY17vrVoaSXljCbDur/pyTlt/E7jDzTGGFWIeV/GEeN8/zYLLiqPywr8CwHaPjmHZL 5PBllDwaw9Aq8higKUweLmwIiqnaaich9311bV5ZOEIkcjsSve8huuo6aDnrDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963480; a=rsa-sha256; cv=none; b=hidaPe8wUdqWZISZubd2pt6+4Nl5/Mx8xsF4YzKGsYyGRIyH42dY9G/FY45AW/H11Nh+EC J6eayb7Ny6klIeGyXwEeOATK5vqainb7WTe14CQ5VEsVH7UEYY26+NCZXDJZtlqsOlpYiq qoeTEaE8CJ4TIYL7J3v2HBdHr5J63vnQ2Eoa2JjAkG/3valkTJl7kDZNXJuIREJ+4VY+GM hxtHReJOvgcKvuoBYjwob2QPHDAxnHl3b8SmKipSAhrd5ApYMiuOh3aSBjdDrmhjJ0dCSW NayoAE8w70Ct9HtfGTGGaBCkOU6OsHiYeQesPmWCeSU97MtAcjQUfHmnB1l4sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZQ01KlMz16sD; Mon, 15 Sep 2025 19:11:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBK4r051122; Mon, 15 Sep 2025 19:11:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBK28051119; Mon, 15 Sep 2025 19:11:20 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:20 GMT Message-Id: <202509151911.58FJBK28051119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 88122c8eb70d - stable/15 - LinuxKPI: maths64: implement roundup_u64() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 88122c8eb70d81decb7c6dd16e551c3df6ad3818 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88122c8eb70d81decb7c6dd16e551c3df6ad3818 commit 88122c8eb70d81decb7c6dd16e551c3df6ad3818 Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:27:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:52:54 +0000 LinuxKPI: maths64: implement roundup_u64() Needed by a wifi driver update. Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52080 (cherry picked from commit 2a44e10edb13e6b2be7fa2814b418a6959cb1171) --- sys/compat/linuxkpi/common/include/linux/math64.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h index a216d350570f..25ca9da1b622 100644 --- a/sys/compat/linuxkpi/common/include/linux/math64.h +++ b/sys/compat/linuxkpi/common/include/linux/math64.h @@ -98,6 +98,12 @@ div64_u64_round_up(uint64_t dividend, uint64_t divisor) return ((dividend + divisor - 1) / divisor); } +static inline uint64_t +roundup_u64(uint64_t x1, uint32_t x2) +{ + return (div_u64(x1 + x2 - 1, x2) * x2); +} + #define DIV64_U64_ROUND_UP(...) \ div64_u64_round_up(__VA_ARGS__) From nobody Mon Sep 15 19:11:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZQ14hskz67sqB; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZQ12rJJz4FbG; Mon, 15 Sep 2025 19:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963481; 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=lkEXNkEHS1H3I8jWOmq6kF765VaAihA9HImV1/S4mlc=; b=AM06WdTnZjWkG82bnVHkG2x36ew+kns1AjuRnn3Fl4F4thUtbAVzv0LSxlIVJaLa66p1/+ ofeg/SYZPqmNz4s9whIhj41OV4hrOLduApX2A1EFN1VHabKBBx4UQL8tTjlw2w+Mf40XgM gRTY4U4i2rX0ONzqJIhMMEzem9fZ5eQtZlYYiemvi97V9ByAY8wE9iLw2R/KQuRuRKChwU KxhteNh6f+rtx7ZFkTtWGmgXLeDTFGbrJDiXtY/qpaUIY7CXutl+ZNObL356A+Z1XdRyTY lnZDaqCR9pl8YFdFQIN8x9+OXCzASCF3spUjjG781Va8jqEPlzQND/VMK5h5zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963481; 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=lkEXNkEHS1H3I8jWOmq6kF765VaAihA9HImV1/S4mlc=; b=kuecUgPlDDHU585uTmJgoafypug9C8wJbjsImJHsYdFiMq40lcCzntQHqloDYtmS/dQzBt j0/i6gNxMMUcazXYek47KKUyui7WvsLuWfPlMxVj0SV4Tn8Sdts3yMjmvPQNs1sC/aqqBI Tfbp30cm7Mr0EmxYd1w73kUSC6yEW28sUutL1dP2iKLSXOe66j35elLKUuLQZL+uTNBF4o og+nIBHkXuGnt2isY+xWFaPKvsp2ntThPHuHKj4vdIMUb2OvfRngQelXqEJ6U/JEr/OUhu 50oYfXU5rm5RPCPGQOPG9U70XFNGvrbdB9GQAv5XniY2S5GBakZETfY3iECA/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963481; a=rsa-sha256; cv=none; b=IFvmnmOFRzA/5l1254594+Iu6GxM6LZ64320E8jUyfyqK7RcwE8QVQMPbKo+xgRLwNY74Y +/hKsx3wPBcfJkfDcipx6SMwvehj0r27ian6iqakoZbEIfVkfj6uvjb0u1ASJuAHRlwTO5 QanKaYyduMPjpgL03N8QAsnkaJqh2Gx6PH2sVhqNELeGpM2KMVRjHMxlowZaWUl5QSwQql H5zs4/ZRIAlPVS6P+4drHOopfcXq6DjAyR8dKmVmJhiSfKk3zbu+Mnmc7h/MKPds7x1W+/ /krBoZWXGL5RrZQTiNeuBl9EFFKy54hFORrXGhFyy8CH/tcf+2YYLQE8eSZZ4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZQ12GbHz16gc; Mon, 15 Sep 2025 19:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBLh1051158; Mon, 15 Sep 2025 19:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBLsA051155; Mon, 15 Sep 2025 19:11:21 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:21 GMT Message-Id: <202509151911.58FJBLsA051155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f20a09e161f0 - stable/15 - LinuxKPI: devres: divorce dem_kfree from lkpi_devm_kmalloc_release List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f20a09e161f07874c3a01b1579e8a5d2356df8ce Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f20a09e161f07874c3a01b1579e8a5d2356df8ce commit f20a09e161f07874c3a01b1579e8a5d2356df8ce Author: Bjoern A. Zeeb AuthorDate: 2025-09-04 20:28:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:53:01 +0000 LinuxKPI: devres: divorce dem_kfree from lkpi_devm_kmalloc_release dem_kfree() is called from all over the place and should actually do something; contrary to lkpi_devm_kmalloc_release() it can also take a const void *. We have to __DECONST() that though as the entire devres framework does otherwise not take a const argument. This was discovered during the rtw89 upadte to 6.16. Sponsored by: The FreeBSD Foundation (initially) Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D52082 (cherry picked from commit 4ab64e34911ab06e567caaf07ed18f7770a61cc8) --- sys/compat/linuxkpi/common/include/linux/device.h | 5 +++-- sys/compat/linuxkpi/common/src/linux_devres.c | 26 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h index 2556b0c45e49..7dd6340746d2 100644 --- a/sys/compat/linuxkpi/common/include/linux/device.h +++ b/sys/compat/linuxkpi/common/include/linux/device.h @@ -4,7 +4,7 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Ltd. * All rights reserved. - * Copyright (c) 2021-2022 The FreeBSD Foundation + * Copyright (c) 2021-2025 The FreeBSD Foundation * * Portions of this software were developed by Björn Zeeb * under sponsorship from the FreeBSD Foundation. @@ -284,7 +284,8 @@ int lkpi_devres_destroy(struct device *, void(*release)(struct device *, void *) void lkpi_devres_release_free_list(struct device *); void lkpi_devres_unlink(struct device *, void *); void lkpi_devm_kmalloc_release(struct device *, void *); -#define devm_kfree(_d, _p) lkpi_devm_kmalloc_release(_d, _p) +void lkpi_devm_kfree(struct device *, const void *); +#define devm_kfree(_d, _p) lkpi_devm_kfree(_d, _p) static inline const char * dev_driver_string(const struct device *dev) diff --git a/sys/compat/linuxkpi/common/src/linux_devres.c b/sys/compat/linuxkpi/common/src/linux_devres.c index 84f03ba0dd7d..23c91cb5ab2f 100644 --- a/sys/compat/linuxkpi/common/src/linux_devres.c +++ b/sys/compat/linuxkpi/common/src/linux_devres.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * This software was developed by Bj\xc3\xb6rn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -223,6 +223,30 @@ lkpi_devm_kmalloc_release(struct device *dev __unused, void *p __unused) /* Nothing to do. Freed with the devres. */ } +static int +lkpi_devm_kmalloc_match(struct device *dev __unused, void *p, void *mp) +{ + return (p == mp); +} + +void +lkpi_devm_kfree(struct device *dev, const void *p) +{ + void *mp; + int error; + + if (p == NULL) + return; + + /* I assume Linux simply casts the const away... */ + mp = __DECONST(void *, p); + error = lkpi_devres_destroy(dev, lkpi_devm_kmalloc_release, + lkpi_devm_kmalloc_match, mp); + if (error != 0) + dev_warn(dev, "%s: lkpi_devres_destroy failed with %d\n", + __func__, error); +} + struct devres_action { void *data; void (*action)(void *); From nobody Mon Sep 15 19:11:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZQ25Znzz67skb; Mon, 15 Sep 2025 19:11: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZQ23jWbz4Fxm; Mon, 15 Sep 2025 19:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963482; 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=7AFSANaG7Q/6M9HARXrcPO8HeSZlrDL1Hm6ra0bOKr0=; b=JZmQ/cEmnmmr/8f5TRa7GFpuhB7x9JOSsipdVr/rQvLlscteI2eRP2Da3mG1mDyYB1qJN7 AEooc3UNHhBmPsKkpQXFUdUlP0qj6Z7tFVn4V2pWHDOqQQS9Flwk1u2G7P+Zk3qbq6cwxZ 2roqBT0lvh7CvexmTUpAspw8ad6lhUp3/LcgVqGrihyzYyGNk3KtBqe0ghbjKXE5u7R1eQ zob0AyF5m8Ct9sKHR8H34Okcfwvk3MZk+vVV3kI6MYafNxuA6wN9PyyslHh76F3OaYRRdD AdZVdCspfrrI9Cw4ZdX/FHqyuNycp+nYSia7UeYd+ZKTom1Ngi+sTCpqoumNhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757963482; 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=7AFSANaG7Q/6M9HARXrcPO8HeSZlrDL1Hm6ra0bOKr0=; b=shzzVlifKeU6h9/YGvoYboWRiTruOGsHBHxI2UyfLrFJBzaU4KfZRn/p6rNO3N6U9ssW9n KrNokFzPYlYlU0XqxQCkBYDmnTub2Pp9asGOQc6aBXJmBnJY6aMRzK4zeVODvgpH3dlOJZ kjpbqQyBIXC1N0SbxWeP3p6WtfFrzDpzHA+pVQnYlW/Ny2g4wXVPaijKxZnx6+6FuCt8ak DtLOoug7HeT5zlZ/R6dRbGUEk2XHIZnDd2oJnmUYKQiWGT9MfMDkuq0vj30zsWcxlMUq6p 5fo6TchncHUokFjZroz76CewyybfAmQMYMQvUwl3ITa1ZC7iMecGbP9m4wU/cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757963482; a=rsa-sha256; cv=none; b=rAJBfi2hbT51kEx1eRbuyoA7JyPljmainOwvQFVmWz4ae2sFLgpp8CosU+E57J+fxE+bs7 XK1bos07KnhkSw9rjVYNwkAkiNFPWjFTPprKORVY6OEFGWcMr0of4Fi6g45EupllxaFa4W JrAwG/PEbhtEwrxzUwYu2B9vw+YluygVxRnZ88yzP3hpthOZjiV2hBAdvTL7YKLLYpyhdE P+S46jVTK2nWSoj7tJQn3QItjcz0rabeSrlDF/JOTXhi1JP4+F05L22NV9Do1N37G/R+zx mxXpnp6cwG3cHfzZqmX9r/TwldxU3TwOGryxpM3rHtXZ7PzZ2/fKu8xNu1eS7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZQ23Jvmz16jD; Mon, 15 Sep 2025 19:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJBMcV051194; Mon, 15 Sep 2025 19:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJBMPL051191; Mon, 15 Sep 2025 19:11:22 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:11:22 GMT Message-Id: <202509151911.58FJBMPL051191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b0469fa7f10f - stable/15 - LinuxKPI: 802.11: avoid recursive wiphy lock List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b0469fa7f10f9fe5510a5445f38d1bf0b832c1e7 Auto-Submitted: auto-generated The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b0469fa7f10f9fe5510a5445f38d1bf0b832c1e7 commit b0469fa7f10f9fe5510a5445f38d1bf0b832c1e7 Author: Bjoern A. Zeeb AuthorDate: 2025-09-11 14:44:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-09-15 14:53:07 +0000 LinuxKPI: 802.11: avoid recursive wiphy lock When freeing the last reference of the net80211 node the net80211 node_free() code may directly call into the crypto code to delete the keys. While we still holding the wiphy lock this would lead to a recursion on the non-recursive wiphy lock. Defer freeing the reference until we are back under the net80211 com lock. Reported by: Mark Phillips (mark freebsdfoundation.org) on 15.0-ALPHA1 (cherry picked from commit 3c38dce87ecd2c87744e4b7ff1904ee841f88a47) --- sys/compat/linuxkpi/common/src/linux_80211.c | 54 ++++++++++++++++++---------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d00734001a59..bc4b334de28e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2568,12 +2568,6 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif->lvif_bss_synched = false; LKPI_80211_LVIF_UNLOCK(lvif); lkpi_lsta_remove(lsta, lvif); - /* - * The very last release the reference on the ni for the ni/lsta on - * lvif->lvif_bss. Upon return from this both ni and lsta are invalid - * and potentially freed. - */ - ieee80211_free_node(ni); /* conf_tx */ @@ -2582,6 +2576,18 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int out: wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); + if (error == 0) { + /* + * We do this outside the wiphy lock as net80211::node_free() may call + * into crypto code to delete keys and we have a recursed on + * non-recursive sx panic. Also only do this if we get here w/o error. + * + * The very last release the reference on the ni for the ni/lsta on + * lvif->lvif_bss. Upon return from this both ni and lsta are invalid + * and potentially freed. + */ + ieee80211_free_node(ni); + } return (error); } @@ -2906,12 +2912,6 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lvif->lvif_bss_synched = false; LKPI_80211_LVIF_UNLOCK(lvif); lkpi_lsta_remove(lsta, lvif); - /* - * The very last release the reference on the ni for the ni/lsta on - * lvif->lvif_bss. Upon return from this both ni and lsta are invalid - * and potentially freed. - */ - ieee80211_free_node(ni); /* conf_tx */ @@ -2921,6 +2921,18 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i out: wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); + if (error == EALREADY) { + /* + * We do this outside the wiphy lock as net80211::node_free() may call + * into crypto code to delete keys and we have a recursed on + * non-recursive sx panic. Also only do this if we get here w/o error. + * + * The very last release the reference on the ni for the ni/lsta on + * lvif->lvif_bss. Upon return from this both ni and lsta are invalid + * and potentially freed. + */ + ieee80211_free_node(ni); + } outni: return (error); } @@ -3522,12 +3534,6 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lvif->lvif_bss = NULL; lvif->lvif_bss_synched = false; LKPI_80211_LVIF_UNLOCK(lvif); - /* - * The very last release the reference on the ni for the ni/lsta on - * lvif->lvif_bss. Upon return from this both ni and lsta are invalid - * and potentially freed. - */ - ieee80211_free_node(ni); /* conf_tx */ @@ -3537,6 +3543,18 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int out: wiphy_unlock(hw->wiphy); IEEE80211_LOCK(vap->iv_ic); + if (error == EALREADY) { + /* + * We do this outside the wiphy lock as net80211::node_free() may call + * into crypto code to delete keys and we have a recursed on + * non-recursive sx panic. Also only do this if we get here w/o error. + * + * The very last release the reference on the ni for the ni/lsta on + * lvif->lvif_bss. Upon return from this both ni and lsta are invalid + * and potentially freed. + */ + ieee80211_free_node(ni); + } outni: return (error); } From nobody Mon Sep 15 19:21:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZf3539Lz67v0d; Mon, 15 Sep 2025 19:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZf345BPz4LFK; Mon, 15 Sep 2025 19:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964107; 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=XHEs5mNFC8dA8lfBSw9XW7yWKKK1FRGr2//cvKyjU64=; b=RGGnwIlvLba5c4j3wy1j8K033i03mpX57Zg64oCtaCDwfQiM34vSmKA6ciP5hiz9ZXFxFA pQTHCunA2ztbggQX8mUBRnvnieVdrS8QgBScllJPsYuQ5IQQC4F4Vtco6LO82T2Zn9Evo6 s5GeO13nnBgPa9yJCL/bUJhUgDnNKRMDkkrbYU1gUkF+FwBa2hFG7/BIR30j4Gwd6nxCmJ E1eJQ4ej63hHEEQOWu+BOSQVW5Py6ds5JdosLmpo6MU8RYZ2Kp/RZufSSQssHBc4LjOrwW A/d7erVv5/TWpf+QIHi9N4Zql2FVRQAsQhvevL1n+L3hOHthNtdQjMzmD0xgnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964107; 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=XHEs5mNFC8dA8lfBSw9XW7yWKKK1FRGr2//cvKyjU64=; b=A5pDHKCTCXAWh+uJPIxww1k/Rzlr6mf1i2bvIIi9G54Cv930l/JBwK50vCEOVjjBWkchpj WbXHeXd8d4MVa3JVzeFytTeH78xaTmrOC2xq4hNJn5VTNLLyKtfYuw8663AUjLKxWowQTX 2K14H68jKjha25j3xlHFRpn9f8X12a/DGivlTmSxsv/ANDbdmsCoL81+uQhfOTyIDQw/3N E2nnAhtAbkk+76syauBIvkhqcKCDXQkUFdRr92XdHGPlaF1MBhfATxh1ky6NcWKvLepNqp bTreEK/keadGnVHnLFIO0fuPi4V0/kRH+8oOZI+mIKfx++SUX7IwDbNQ9+E/Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757964107; a=rsa-sha256; cv=none; b=MnOaRLiE5f7eZA+jSjGDjv59/YN97HmaAoklUulv4YPN3hG7dD08Ofpm0shEGrg8KQUALo fsjhobHofpMEtWjJuMz7PC1b5THlho9dxc2L386rUvWfZFEEakVdoGJ0/DHUjiS3DtJp/f FxFFM6OSiJysbGQOjks0EnwSmZcYkns2fa5he29POUFa4h25h1kMzjSBVCNmhBmBnAhZTR t+d8hn9MnQOmBh4OuvRN5Jaf5GUG+feRTb0BnKRRuouc34/0B5BW6ju/QBsPugqjchCI56 PGKPF84VA1J/URRBHg3OzyXF2YVZiBrQ0yhF0LwhhpDQoQngEpceGtvr0lA/OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZf33b67z16y1; Mon, 15 Sep 2025 19:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJLl1Y073278; Mon, 15 Sep 2025 19:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJLlHh073275; Mon, 15 Sep 2025 19:21:47 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:21:47 GMT Message-Id: <202509151921.58FJLlHh073275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 4efc1b22aab1 - stable/14 - riscv: Fix SSTC extension support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4efc1b22aab1a15bff95012deb789696d71f97ec Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4efc1b22aab1a15bff95012deb789696d71f97ec commit 4efc1b22aab1a15bff95012deb789696d71f97ec Author: Ruslan Bukin AuthorDate: 2024-05-22 14:51:45 +0000 Commit: Mitchell Horne CommitDate: 2025-09-15 19:20:27 +0000 riscv: Fix SSTC extension support From the SSTC spec: "If the stimecmp (supervisor-mode timer compare) register is implemented, then STIP is read-only in mip and reflects the supervisor-level timer interrupt signal resulting from stimecmp. This timer interrupt signal is cleared by writing stimecmp with a value greater than the current time value." This fixes operation in Spike with sstc extension enabled. Example: spike --isa RV64IMAFDCH_zicntr_zihpm_sstc Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D45226 (cherry picked from commit ddd0d4f4cd65341a07bb3bb833dee7982018fd60) --- sys/riscv/riscv/timer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index e3d7fc87cea2..b4aa054cae9d 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015-2017 Ruslan Bukin + * Copyright (c) 2015-2024 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the @@ -144,7 +144,10 @@ riscv_timer_intr(void *arg) sc = (struct riscv_timer_softc *)arg; - csr_clear(sip, SIP_STIP); + if (has_sstc) + csr_write(stimecmp, -1UL); + else + csr_clear(sip, SIP_STIP); if (sc->et.et_active) sc->et.et_event_cb(&sc->et, sc->et.et_arg); From nobody Mon Sep 15 19:21:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZf5074dz67v2Y; Mon, 15 Sep 2025 19:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZf44rL6z4Ktc; Mon, 15 Sep 2025 19:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964108; 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=0HOypQaA0WPzT47C6sntgC2fYZogYt10V4YrdfX+4y0=; b=DDs4LeqiHaJboJJvWdzATgl8felho3u0myz2h5FAq5vk/G/oLj/g8tQlb4+PTRHTrKJsOj V54gfUOhLN57TS1xz3z0hOoBuz31TaEFpxVEB7nuDCxKL1b9ZVB0+uziL/utnnqQDXZXAT srnNK4QvUkR7dCzneuxPfIkB8SezDU0AUMtXmZ+droj6D/vfDd9FQq0jdFoUpeQRrXIsmK 6UkPcDNuAfcNbYAe9TYZEgpyE2uXCLT4gJoQVTtIzaMybUnKwXFv7xFCLdTPwY+dqxfy49 oVo680ac9bfXU0y/7VHOhaqMcTLw3iq6BJ0MmOT0JRCF7w3/1oAuFRvoRZwsEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964108; 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=0HOypQaA0WPzT47C6sntgC2fYZogYt10V4YrdfX+4y0=; b=sA/mJltIf7wTu0AK/Qb0DvqHCcyPe/m1zMI7p9D6SnMsDEhqV0gebU5/WY8y4UPKU9lLzF EDrZLwcyjAZeqDLi9kE3OdJd3xb6sbAfjc98c2gP/EBFstvU9DAlXLDMufxJN0pxE8QGSB E1zCx3kaxwWnnQzmCHgf0veNmMjXnnb83u/OqV6yd58VjU8JZsfAl/kh9maOdp0up1W+ej 2gHR6KfIzHdmOt5LwabFYicsDX3w8nFPNBvnIf6YPz9sLesZLZ7jvdIoPvoYvg8xiWwnfl vR4xjrXRp9pxoolLRVvNURq3jBOVBFOIvbA2YehJdaKeQajPd//PfJsGsL6yyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757964108; a=rsa-sha256; cv=none; b=htMtAsck8Db/3qHUVpWwPJQ36hvSSOmyM7qNE7ONMOGIcJ4klxAOjQEr4d/t/CV+v9wQXU zG66yJuFI5DlCrQJ+pnwb29sZnX7daJIlSXKidVXu2PGLaSuMqrGTpZnVQN/gc90L90Keo m7aVRYccvv5qq4YbHJLWRuyXcbWfjQp9E1ys9f7HNN0UpKmWT0YXa62kPCOCOENHsMe/UT XU1CucA9knNSSrDWSa4PsN5g5koAjeNV/upueoTZT0EbnWty7Xe9aiFzB25IDdEN7qpwHH kKgzb3sykEcV/cO0eu6M7CENGdBvYM07AF2jzzG+rxH1zb6zEhNuXZQdqsGgGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZf44RRXz16y2; Mon, 15 Sep 2025 19:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJLmW3073319; Mon, 15 Sep 2025 19:21:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJLmgZ073315; Mon, 15 Sep 2025 19:21:48 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:21:48 GMT Message-Id: <202509151921.58FJLmgZ073315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 31eaa0141c49 - stable/14 - riscv timer: fix interrupt handling. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 31eaa0141c49128fabfc65f3d282997a8d5e9cdc Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=31eaa0141c49128fabfc65f3d282997a8d5e9cdc commit 31eaa0141c49128fabfc65f3d282997a8d5e9cdc Author: Ruslan Bukin AuthorDate: 2025-03-26 08:09:50 +0000 Commit: Mitchell Horne CommitDate: 2025-09-15 19:20:32 +0000 riscv timer: fix interrupt handling. Based on the spec the STIP bit of SIP register is read-only. To clear STIP bit from supervisor we have to do an SBI call to firmware. Upon reception of SBI request, the machine-mode firmware clears the STIP bit in the MIP register. This fixes operation on Codasip A730. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D49487 (cherry picked from commit 6d58c670060a17817fa0c8ebf4e7543c3d2b4523) --- sys/riscv/riscv/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index b4aa054cae9d..8390fa9c448c 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015-2024 Ruslan Bukin + * Copyright (c) 2015-2025 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the @@ -147,7 +147,7 @@ riscv_timer_intr(void *arg) if (has_sstc) csr_write(stimecmp, -1UL); else - csr_clear(sip, SIP_STIP); + sbi_set_timer(-1UL); if (sc->et.et_active) sc->et.et_event_cb(&sc->et, sc->et.et_arg); From nobody Mon Sep 15 19:34:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZx63WWzz67wSn; Mon, 15 Sep 2025 19:34:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZx632MMz4Myj; Mon, 15 Sep 2025 19:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964890; 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=Hc1e/UFpSzpgqypsIXw8O/Tblu6lgcm1E8EsZTAsNu0=; b=Yjx4Su3+CUDctNdRXuzXZHMpRQMdfEX7IKSOeb3Njjl/Vwkk3pKINmynPd4/pOlpH70w6e CG/oLp3KRA9PdR/jWUxbXW1Fb8pkJNCzt17YVUIJ9dcuYWgNsvfoqeoHgAwmlGrqLaDxE+ vrSWRuMDzpWjxhN71QrEbsr9QBG5aBv7msc+v9DXuqgmfYHo3lcRef7WbUBJaYG/9iwOK9 s9gSeAgli4k4u4/9umazMO9JfhSz81OZhPkdOgeLfvaFQYbREgYQCwrdcBl0F3SngcI9md sYMd2hthD01gXSTHVk1gHgJMLY/zydgBUjXFDPvwYT/bJwz4im4lNdb4FPgOhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964890; 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=Hc1e/UFpSzpgqypsIXw8O/Tblu6lgcm1E8EsZTAsNu0=; b=fMiUM39XeMMgeXfTgdbxBCQiolBuhamrxT98BlPG8wOg1Kv60zzjlHjVyH/AzjdGpXZKde mmoLwL2un5lKRt5hmr4zfrNyY6YG/pFUn07OlQGeIeswgs5lbqjTFMXfvUqzKRDnx+XF8e r5Y7uve6MmJVq/5leidWNrid1c0bCYLYwaMDXoSAkgNIrMaD+uk9tK9aqVML+A1iMRZ+cn /7VyXjiOg8VL87lE8aU+1RiCuxoPw7d44oVLN7oQBVRnoPi02oD8J/VHO10lUYkLsDxwEk pghl2UjgfWnFr4EY8mY1LYei4we3kL9b6vjOW/ieMddQBxdz0jnX7Uux35KGEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757964890; a=rsa-sha256; cv=none; b=Z7Mw/1JCkIjdmr5QpMc/QJAZiUeZ9JVd3sRez4dmkhMGrW9lLeVABu331Ji3xmhRXopnYN LvVkSCG6j/PgRQLsx8Zu6vlz1LRFtIcpXORUDAG7tfSzxT+rInT8D0H4T1hiPIug7cWMB1 +0xNC8jvSbP9S5BjvQ6BIoCUPIXilNxq+RsdzBxbF3L3GcRRE5TsbqtaXefuYEEWu2SxO5 l7XwZjTTfBep8j7Ql1HI6cIGrPNuis3HWSpMPUe5tFMVwRcIfKiiVlz30s2/1k0nx3zTS4 MJFmCJSGFAHLb88E2l2pFNVIn9BaGI026D/Sur6LcIJZYJZ0XKJ9TBxPMGdXvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZx62RB9z17KV; Mon, 15 Sep 2025 19:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJYoDP092989; Mon, 15 Sep 2025 19:34:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJYor9092985; Mon, 15 Sep 2025 19:34:50 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:34:50 GMT Message-Id: <202509151934.58FJYor9092985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 850182848dad - stable/13 - riscv: Fix SSTC extension support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 850182848dada6f8524e9df2a75a01aa50b09b69 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=850182848dada6f8524e9df2a75a01aa50b09b69 commit 850182848dada6f8524e9df2a75a01aa50b09b69 Author: Ruslan Bukin AuthorDate: 2024-05-22 14:51:45 +0000 Commit: Mitchell Horne CommitDate: 2025-09-15 19:32:14 +0000 riscv: Fix SSTC extension support From the SSTC spec: "If the stimecmp (supervisor-mode timer compare) register is implemented, then STIP is read-only in mip and reflects the supervisor-level timer interrupt signal resulting from stimecmp. This timer interrupt signal is cleared by writing stimecmp with a value greater than the current time value." This fixes operation in Spike with sstc extension enabled. Example: spike --isa RV64IMAFDCH_zicntr_zihpm_sstc Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D45226 (cherry picked from commit ddd0d4f4cd65341a07bb3bb833dee7982018fd60) --- sys/riscv/riscv/timer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index 66131914607c..f7657130ff70 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015-2017 Ruslan Bukin + * Copyright (c) 2015-2024 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the @@ -142,7 +142,10 @@ riscv_timer_intr(void *arg) sc = (struct riscv_timer_softc *)arg; - csr_clear(sip, SIP_STIP); + if (has_sstc) + csr_write(stimecmp, -1UL); + else + csr_clear(sip, SIP_STIP); if (sc->et.et_active) sc->et.et_event_cb(&sc->et, sc->et.et_arg); From nobody Mon Sep 15 19:34:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQZx746Jmz67wSp; Mon, 15 Sep 2025 19:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQZx73DQFz4MqL; Mon, 15 Sep 2025 19:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964891; 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=iBvMIypVFbq2BGP+q7FJ1GNvfFt9tD0g0g8/sr/0gM4=; b=o/7bakfISDge/zte+0PgBMypGYUGVKNTGdmaJzwF2i0IKGMdU1y3mdK3ks3fz1eCr9VG8w ao250bVoqpM24CFLUOeVLLYgtaeMyAHEa6kwsd2oOnXRCmsqBRHBj2gOvLfbGkSzI0U0Rn laCsjVuj4SZPxcMB1dhrzZC/by/GsCfx26ZTPVlp6aF7Hg7cXo6gKArJEAAbBZBYqzIZAs 0wzYwgqrdp1dFvWCovaCX73ovZtBvKigKHvBffpvtjBaxpQKUFmoqLgs7r/XssqidqnqwH beNjWCz6zNFgF0h+MfGfSUInA8rZwVPpzaNnIBuQJAjzfywrhpGF5Fav0ubbaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757964891; 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=iBvMIypVFbq2BGP+q7FJ1GNvfFt9tD0g0g8/sr/0gM4=; b=QSpYFZEtZ4bWGV3GIJpSr+aKhQnK3HW8SL7J4qmHx2iKY6w0xTk7oZr4qzdxwMOi7g/ViP op4kr6OSS1rhTlS2SnWs/25STHk0m1fkaGCbuNMJkLIDiZ+mijLFz/Lafkc6/P0bYRveea B8mpVUUchXsLgv+zelFj7YQqd+NanveFHt4hgwlCEOnMG8b59hS9HCj1x92kvqgUbTxtGA +DKmkajRS6WwEVOEEhgTpcc1igcja1S0ZErcDmMZpKD0gdNkCgfABIf17BRxY0M8AbJKXf FVzN3YiNKFlcmwMcXZtiImAT9KOeUOUygLxf5mHja1J7NtDSt1oTDwIWS+UeFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757964891; a=rsa-sha256; cv=none; b=I66i5vzJJnoQ4JhHRhqGGwKs9s+jjF4nqaiDKl7lNAsAdGIoKBfyShoC+iegsllWTSXVpn COGt3eZgGdFDmoPDoKtUbMcB+IRyihW0DpJ+RiJsJoiMkFVWFY7svdzDQRoyYZxfWAxs4Z IdXXEJUwPXimcrZsy/SjYWIvCOVt2Z2DaNXkRF81O4eu6vdE8cLa56zksTLWnD9pgR8CeK YzCmbAnlodSW1jSRInwQMsao5UEWwXoaAnlqOjx/aflFYLh0JGBJnQ80EVE7QvZg2oq0d4 kT+CFl3FTnyxQSvEWK1/dpixaaFJC2bL6dFSy0+LvsHH3K4SRYEDispM0ikH/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQZx72kQsz16wZ; Mon, 15 Sep 2025 19:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FJYph7093028; Mon, 15 Sep 2025 19:34:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FJYpj8093024; Mon, 15 Sep 2025 19:34:51 GMT (envelope-from git) Date: Mon, 15 Sep 2025 19:34:51 GMT Message-Id: <202509151934.58FJYpj8093024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 8302f09d844c - stable/13 - riscv timer: fix interrupt handling. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8302f09d844cdf2c942af57ee7babea127675990 Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8302f09d844cdf2c942af57ee7babea127675990 commit 8302f09d844cdf2c942af57ee7babea127675990 Author: Ruslan Bukin AuthorDate: 2025-03-26 08:09:50 +0000 Commit: Mitchell Horne CommitDate: 2025-09-15 19:32:17 +0000 riscv timer: fix interrupt handling. Based on the spec the STIP bit of SIP register is read-only. To clear STIP bit from supervisor we have to do an SBI call to firmware. Upon reception of SBI request, the machine-mode firmware clears the STIP bit in the MIP register. This fixes operation on Codasip A730. Reviewed by: mhorne Differential Revision: https://reviews.freebsd.org/D49487 (cherry picked from commit 6d58c670060a17817fa0c8ebf4e7543c3d2b4523) --- sys/riscv/riscv/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/riscv/riscv/timer.c b/sys/riscv/riscv/timer.c index f7657130ff70..122591960101 100644 --- a/sys/riscv/riscv/timer.c +++ b/sys/riscv/riscv/timer.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2015-2024 Ruslan Bukin + * Copyright (c) 2015-2025 Ruslan Bukin * All rights reserved. * * Portions of this software were developed by SRI International and the @@ -145,7 +145,7 @@ riscv_timer_intr(void *arg) if (has_sstc) csr_write(stimecmp, -1UL); else - csr_clear(sip, SIP_STIP); + sbi_set_timer(-1UL); if (sc->et.et_active) sc->et.et_event_cb(&sc->et, sc->et.et_arg); From nobody Tue Sep 16 02:49:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQmZz6m8fz685fg; Tue, 16 Sep 2025 02:49: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQmZz5YD2z46vl; Tue, 16 Sep 2025 02: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=1757990987; 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=OWZsHcTpuJYeK/5b79+zyHuAtx0uCd94YdBvLqv2PRk=; b=Eeei9XdB4jN9b5w+LqllZ0xcI5aQFBDlODwOzmY2mVK7L/GVzfdjWKKxiYPwk+zqamSi+w lU3VBC+KwWHGkoTL+SSUc6EZwp2ETZubm3bu3w9yDOKWywyVUdefYrsXH9b+Y2xsPfaRKM OErQbaOivxjCIKAY36kcNY3yIl2fu7B7LtER+IUiHyB3SoMkU5QaMrf8VGGzuNVrm6DG6G q+twMUvEPg7SaSqbJ3WbG+96jtM+D0vx53E8l/H4DnpfTFUPRgtinI7FsLEVuv6R5PMX2o Od7Rc+M18C7IiJfo1Q5YA51OOgujtKe6MI6oESeqvW+wo8vKtm4bUD2sFN8VxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757990987; 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=OWZsHcTpuJYeK/5b79+zyHuAtx0uCd94YdBvLqv2PRk=; b=PRZQigG841FURczJIIXrb1/4IWpeHoadc52wcpB1Rm1xjTgEXBqv5NsT3rdfRuVl+gc37h BVBvXBI/dxau0l00C2OPIhaOAqMsZim9V/692rxtw45JFKnyLq5dTXWsPf+5Ka1HksDiBq 7G16k0LpeUS254hsYiyCx23EIyhEApRFYtXdHH+9WyHCjbGQzGRKqxcMrqRZ7rgMkjrTFM cLbKqkoMrTw1DVPujdLIjO42JXZgY3PBp2WVUydiyqzupUWoSATouRCn0tOFmRPrPNXeiB w0MakV3SuarMV9bGod34Rl0XkJJJagoChvk5bFPLZvmXnCVHuKqsEE1RvIE+9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757990987; a=rsa-sha256; cv=none; b=V2VueCqhOTy6FhY4gt/YW+2nOvJ4MFlPWGPT+AW4PP2V5O/xnOVWVLryHW6NrT8zoG5/LT 24oeT3f+d3YLFxMUsuKtlHYAeigVS4K/nC/m2cm+0gBnCkn5krLRB15JQSvRZaWwtbNVHz 1CLBY4n45XqGE2Wwd/kKRhX+PFu35/eUWeSPf4YTsQQ4Eq1tdH5rdgAQ1wo7QyNPMA7c4n k1erc15Z/ERolzkOHx8aannky1ht9Zz+TT5nSJD/Tm3VszL1Ql+Qf//kvsFIipW775nJrd eMHzUvNtjCdTLeBpaswjFqheOsdGtdNTz4QC9Frz/Me/9wAdsFDSDJiI/QuV4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQmZz51YLz69F; Tue, 16 Sep 2025 02:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58G2nl1v099882; Tue, 16 Sep 2025 02:49:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58G2nlRu099878; Tue, 16 Sep 2025 02:49:47 GMT (envelope-from git) Date: Tue, 16 Sep 2025 02:49:47 GMT Message-Id: <202509160249.58G2nlRu099878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7140a4790cbc - stable/15 - kern_thr_exit(): clear kASTs in advance List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7140a4790cbc6c897673276299a1bc3ad63dc3f8 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7140a4790cbc6c897673276299a1bc3ad63dc3f8 commit 7140a4790cbc6c897673276299a1bc3ad63dc3f8 Author: Konstantin Belousov AuthorDate: 2025-09-08 03:43:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-16 02:45:12 +0000 kern_thr_exit(): clear kASTs in advance PR: 289204 (cherry picked from commit f51d7d5139a76d225c9f537bd948525ababdef0c) --- sys/kern/kern_thr.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 0e8c2b9f362e..4329959a2ef4 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -346,6 +346,17 @@ kern_thr_exit(struct thread *td) p = td->td_proc; + /* + * Clear kernel ASTs in advance of selecting the last exiting + * thread and acquiring schedulers locks. It is fine to + * clear the ASTs here even if we are not going to exit after + * all. On the other hand, leaving them pending could trigger + * execution in subsystems in a context where they are not + * prepared to handle top kernel actions, even in execution of + * an unrelated thread. + */ + ast_kclear(td); + /* * If all of the threads in a process call this routine to * exit (e.g. all threads call pthread_exit()), exactly one From nobody Tue Sep 16 02:49:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQmb101pmz685w1; Tue, 16 Sep 2025 02:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQmb061VCz46yJ; Tue, 16 Sep 2025 02: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=1757990988; 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=2uw20ZbpZNtfE8QtSjA2Cj8UY06o4t/1Acew+P9zIog=; b=PcFw4A60wa3a1GrEgnZpNE+zvP3lu7nVoBvxQq2BGWm+cOBnF0zXhH8/bRm9IHgF14/bh5 fsF7usLiD/qoA04zWgw84tJK4+MaClMEAAvLGQUQgTcMQAaqjWJZON6IVBV4d3XqSs8/sp yv1oIYSTaNFPW6Rfof0YCkUEeACbtOi3z0LfRqlb7Qt8SxKi/BS1mS7x5ehfYQjWQFUODY 3fR0/Cw+oFtRvDhjLD7EHShd2uFyee/qYxGM6lhAxSexPOI8HR9LAxTT8wvqBT8lVDP538 TsCvBgTOyBLFrMsBi/MGKPMccqWoBehDf6H9MPCjnD8REhvQCJiadh1c12Am1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757990988; 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=2uw20ZbpZNtfE8QtSjA2Cj8UY06o4t/1Acew+P9zIog=; b=NqLV+eTNLMCDFlGMTvWmFgRbcCzfeM+POL0oXEYp6ph7EKJx7tng5bWEgRSy9wnPryI5Tc chXhb25mZWLE6c9WPyVqklW6DavMX1htsSKC4otMHSFjxl0XngJQ39UU7ExF9Vn7ItLHWx fNN8F0KFOj0gj5XSjnBEyqg1VkK0EaO0gCp/a9Cn+uV0hy1JbbIAieTTcRERBwbtQeFjfH aKMcPPHfkCLnVftrwQxHgTnPeX1kIqwU/Itg1ndN/WB/g73AulxSQL3jnWkNsgUL1oTklw Puz1ZI/3vAiMs6kxaIOYHy3zwrrm1cr+6/GHZiJnuZDX0BpGw2wFqvxCk1RcYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757990988; a=rsa-sha256; cv=none; b=oeoGY2BqvIp9KxW2vtZQ+M7mIKKY+nx3fh1COCzFUc+5ePEk+STyT2gOj8VcHMRfM+kiVN BbTSIf5gePV//mOoHfJttHxQc6XL37AD6i3ULB64ViXkFlrsw5et49BpP9BouJk3aWgN9w ZuA+9xNHlkyc/mH/zI8BrSLS49XDyb73F8AmA4pE45FV7AN8G3G8r/fki6v2EU2Z9XrwXK xQeObojkFV4b8xHzbu4mD4pMWpdcCaC+KL8iGFk5vsW4VSPtRryQvxxuRSzy2frpQeqtOf kUuHXxBL6ehvQrTA0q+DIWnnWWnWg4JWTMca3xuq5EggPTrNv16gG2WaeGTWYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQmb05d5qz67h; Tue, 16 Sep 2025 02:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58G2nmI7099915; Tue, 16 Sep 2025 02:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58G2nm6F099912; Tue, 16 Sep 2025 02:49:48 GMT (envelope-from git) Date: Tue, 16 Sep 2025 02:49:48 GMT Message-Id: <202509160249.58G2nm6F099912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1234bd1b7213 - stable/15 - geom: only set TDP_GEOM for user threads List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1234bd1b7213c253ad7730ee2cef642d0aab234e Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1234bd1b7213c253ad7730ee2cef642d0aab234e commit 1234bd1b7213c253ad7730ee2cef642d0aab234e Author: Konstantin Belousov AuthorDate: 2025-09-08 13:46:08 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-16 02:45:12 +0000 geom: only set TDP_GEOM for user threads PR: 289204 (cherry picked from commit b0474e14895908f45c64158b0e558236923b8eb2) --- sys/geom/geom_event.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index 341233a6ef47..ffd46db55416 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -347,6 +347,7 @@ static void g_post_event_ep_va(g_event_t *func, void *arg, int wuflag, struct g_event *ep, va_list ap) { + struct thread *td; void *p; u_int n; @@ -366,8 +367,12 @@ g_post_event_ep_va(g_event_t *func, void *arg, int wuflag, TAILQ_INSERT_TAIL(&g_events, ep, events); mtx_unlock(&g_eventlock); wakeup(&g_wait_event); - curthread->td_pflags |= TDP_GEOM; - ast_sched(curthread, TDA_GEOM); + + td = curthread; + if ((td->td_pflags & TDP_KTHREAD) == 0) { + td->td_pflags |= TDP_GEOM; + ast_sched(td, TDA_GEOM); + } } void From nobody Tue Sep 16 02:49:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQmb21VTQz685nF; Tue, 16 Sep 2025 02:49:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQmb16jH0z46vs; Tue, 16 Sep 2025 02:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757990990; 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=HqSFYfwEIxHZXcwTymoqCdtuMhRb0xVzP1GnvDEsOMw=; b=krkgTRMLGGB13UqpmzqvdSmDNvhsj7aE+UdtX5AqiJjBNZ0zgViz1G0l8GnL1Gr+Ke9bX4 pVF8ZYIuvjz/FnVfJRg/gxrW8FRXKtG7wo5maUD6ID2sXjja7sasrrCmEyPFdQbPzAqPJQ aH12XpVWhtzj87JZNemVtIshNA7+4WggpQayTrRoaLoo3FD/tGatj8P74swQvDtKlJfsQO JYQyLW3nFopnyR1cS6L+92b9NU1yBDWGDtV0YWU1ViqByI3HmUynbSvNVBQUx9Zdl9pXzf /5MzqSW6lWPtg2+ZPn83fptwJMhoP5rAuaEnCNVbZrJKwHGwnf8XMbzAClM7aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757990990; 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=HqSFYfwEIxHZXcwTymoqCdtuMhRb0xVzP1GnvDEsOMw=; b=Ab19UMZ/vwrBMmzAHO+gqhz3pkdZ19U8jglg/+mcmdtEweAX78b8zCikymEy+yr9qeX8Sw yruhgpSmi2O1oO/Pc9fPEM5F3LaVg4l0IsIlWs79IkD70IHQeMQTgdhhC+5OfTI21dagaM opaBGsFmVwbuISC/512VA4sNLrD3Vu7CsPbRHxkCOrMETtmQ8wMzWFCDabFol3I3WSGSPG 9LBkhsZ0dojnMvKhcZ5joCu1P9Gh6+FRfKFTQFzKbbDErwNKyn0uKEhmX0oJhC03AfZcHa qF91s2JeB6tjqt6nQPh18kAxoi6agsksEwWqYVAwQsPDR/nq6jmHduw4N23wMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757990990; a=rsa-sha256; cv=none; b=YLXH5CliE60O0I5ZvHtn3q38Gn85eS0HHiqZDP3zVbmWVllAeNDtPVM9j2SIJZf8kCOUY7 Tu3TvNZI8Pa/jm5aUyARQuO5G4ldMuL4dyCXIZxv66AWuVMPGU/34EKcadPVjNpqmmpZ1Q CiIp9n1pBEDLQHEquNlzS1Ba8kuAGtuz+RgzVfe5PtaYoSkLiFsOkiVVV20vD8lIXcg0EL B2nQgL+LMV36l2Iucnj6u2mBoNV5WxWU0dRBUrHkE4f31qm9lSFWwJbf631yEakmKLL4e8 k5cgmXUzvMb7j4+j1c8Gl1qpjC6hWXxss0jyc1dXO45/ri5mk8or+FeG7KbBAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQmb169v9z6XP; Tue, 16 Sep 2025 02:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58G2nnbY099949; Tue, 16 Sep 2025 02:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58G2nnSp099945; Tue, 16 Sep 2025 02:49:49 GMT (envelope-from git) Date: Tue, 16 Sep 2025 02:49:49 GMT Message-Id: <202509160249.58G2nnSp099945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c2427a67c7af - stable/15 - kern/kern_event.c: properly spell COMPAT_FREEBSD32 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c2427a67c7af60bd4d07acce0ab4f0c4be2258c2 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c2427a67c7af60bd4d07acce0ab4f0c4be2258c2 commit c2427a67c7af60bd4d07acce0ab4f0c4be2258c2 Author: Konstantin Belousov AuthorDate: 2025-09-13 17:42:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-16 02:45:13 +0000 kern/kern_event.c: properly spell COMPAT_FREEBSD32 PR: 289504 (cherry picked from commit cab4cf201acf76b415a8f1a59ea4eeeb14b4636c) --- sys/kern/kern_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 57cbfb8a0361..72cbff6c1371 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3127,7 +3127,7 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) return (error); td = curthread; -#ifdef FREEBSD_COMPAT32 +#ifdef COMPAT_FREEBSD32 compat32 = SV_CURPROC_FLAG(SV_ILP32); #else compat32 = false; From nobody Tue Sep 16 02:50:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQmbg5rWCz685fl; Tue, 16 Sep 2025 02:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQmbg4zyWz47YV; Tue, 16 Sep 2025 02:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757991023; 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=GbvxPjP0SCpOHqPcZ6k9p6TLZ8k02554QHp3uVKM0LI=; b=l0iFJD4bNv6VU5WlBbMD8SZnbDHgGncamAhsO7RQuOXKHQtETdT6sYiIs0sWHaheUNEGK8 2tAswpkajq0EZeL0KPhpXKWnQVpqFL0pX2b+dz/eHjkCwBFk27cEoxoxmPQL0bGZrtA63k b7qgPTHfe0NLkEIzIwsPTEyQ7DOY738b9gUr/1sCzbkKE8AQycOFAZ2Tzo0h5q/P0m4AoB 6uHoqT1g9tyGnt4wGDiDpfzJ5iovT/FCZzbnRXaZw+2Uux4lSmSeJ2fA4kQHOPQZREyCEh 0RDpklXv/YERKg9AAx9KVauoXXT1PFvtJ3Ke1q6x89c3Pgz5DlUYQEh0IhBEHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757991023; 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=GbvxPjP0SCpOHqPcZ6k9p6TLZ8k02554QHp3uVKM0LI=; b=cArsQEYA+jD15u0utMa8Mn3EpiZd7NhZrIJq+r5o10a2rM6PVgq3Hf1SjNnXTINQfNUhP2 Dpcj1R75RP1hbvOsnl3m3tH7P3eXvb5FIyonQYsKgqeLj/cFPwQR+xsyysNV2HQqeo0ewv xyx5BpsAadsjBnfUR5hN3I3XKvwpA1lflvF1Z2fX6oAyKzimBw2U6Pqu3Bl2WxBRX5fsVI V1susMXlTzj7VY7V1wCmcLzxOlzdmxUNBQMjKzL3rJMdnukkNDuK1dTHqAh7iZ2C7M82b3 ls3OciUvihbUXVyW580ZH7WTFAJK1rienTn+a8fFSpoOCvNHxP6GhxIiSNJMuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757991023; a=rsa-sha256; cv=none; b=rbSELjsGlJMun9SEMJ43L/UQrNKNZ2V/liYPZ10SVmkMVDz2umhlJI5IgAQGbd+BxjB+4K e2TwFG1YMbpUGHbh1MXWA00QkrrFYs0ogBT9loI87HQMyyzYeNha15pK1qmJ991TOAv7hX gj7i6679bEtN5sReh1BmLchT4lJ/mL0koCS5RCVMjkk0N3VUEpCbVUH/vEnABuVjslreD/ axIt8vGc8aoEjprZkOhKepRgTO2rOgcMAkD6miu78HVsvH8GPnTRObtlVqaJgc0Mjfusc3 SKgpVxpsGr+jPUpL+msIoDesXvQu4unXxAszPv9iizlmpZRw5muGXpcybnxgvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQmbg4Vj7z69G; Tue, 16 Sep 2025 02:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58G2oNto009039; Tue, 16 Sep 2025 02:50:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58G2oN97009036; Tue, 16 Sep 2025 02:50:23 GMT (envelope-from git) Date: Tue, 16 Sep 2025 02:50:23 GMT Message-Id: <202509160250.58G2oN97009036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 594982a69714 - stable/14 - kern_thr_exit(): clear kASTs in advance List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 594982a69714150ccf8616ffbce65fecab70ec03 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=594982a69714150ccf8616ffbce65fecab70ec03 commit 594982a69714150ccf8616ffbce65fecab70ec03 Author: Konstantin Belousov AuthorDate: 2025-09-08 03:43:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-16 02:44:24 +0000 kern_thr_exit(): clear kASTs in advance PR: 289204 (cherry picked from commit f51d7d5139a76d225c9f537bd948525ababdef0c) --- sys/kern/kern_thr.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c index 8ad885b42ebe..1b5f0b1a33ad 100644 --- a/sys/kern/kern_thr.c +++ b/sys/kern/kern_thr.c @@ -339,6 +339,17 @@ kern_thr_exit(struct thread *td) p = td->td_proc; + /* + * Clear kernel ASTs in advance of selecting the last exiting + * thread and acquiring schedulers locks. It is fine to + * clear the ASTs here even if we are not going to exit after + * all. On the other hand, leaving them pending could trigger + * execution in subsystems in a context where they are not + * prepared to handle top kernel actions, even in execution of + * an unrelated thread. + */ + ast_kclear(td); + /* * If all of the threads in a process call this routine to * exit (e.g. all threads call pthread_exit()), exactly one From nobody Tue Sep 16 02:50:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQmbj0MY7z685yS; Tue, 16 Sep 2025 02:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQmbh64C8z47TZ; Tue, 16 Sep 2025 02:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757991024; 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=NrInk6fQ4E5tUscgUt3QuLZ7l9dZlow2pLI4LexMH2A=; b=K89m0+BY0vTmhGV0czAcCJMTop8mVTcFuaOLv4CqRiSeiQcooU5GUYNaiiToE1k8nZlq4q X6XhEWYiYDs4ukLl3jAcmDrkw7bPqDkI9DwD7na2dDkJXgjUdx6vZ7hvIk/noLfqKNnRM7 CIM9E3u3+bKPFE6gOzGDH4j3hyVDoYRvT6k0ZxpTC2mxicocguXwP6ZAKEM0TJGZTYRz4j Hnjd9xzhPaZResYkrzNcrzr6xoh38yD6dakswPWtDzA+TtXishJB1yXg0+rFqy1CfuEuB9 Z5wNqVN3K4SCELvPD5TyWh+xG2kHCmoywwv5MA1dVtqrkNnlJB0G2LA29V0Iyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757991024; 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=NrInk6fQ4E5tUscgUt3QuLZ7l9dZlow2pLI4LexMH2A=; b=sZen8KDevFB/PBum4vqHIV8gQooNGCGYkjBjogwphKYonRw4XcgromW73v9pSG2MesjJ2a 5nIbcSHRmD7EupXKV0Mt5Dnlxa/T92ZgN70TbVpwzy4XBk8S7udM4YIjwAvdZrCZmYkzsQ CT/9XicewrARigIvl9a2/BfmzvtjNfQqmZSuQpMv6XbPyOSq6hnnDDp8ua79kgCEPvjkiN Won34dnTdnIioLBYPXr7DTItgWA1wg72wwEu4U0Cnq9FrAyFkjJMBrW1VvuVyDrUdYTNdV V0pdzvW0JrGDzKFUpvWC7U1/rpsUYsfRLZRnJqMzKeX40VH4mbPabhRa9tvPeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757991024; a=rsa-sha256; cv=none; b=ahIfmcJf4T4U8lMFXViog9uOojpZERNXsgXCar8McDAX1aIt3rClAjGyZiOH1DG3ZY9Tf2 K/M6gxZZ5CVbXNxmXMaI4WCKbkg+xkQ3/r7A3gGyKthrsxhrsqZ3NsAydI/Xj9AhyehPWx l8d/wuvZ1PBB6wWFj6UCjhoQD+yC+ncSMwszSOJnLwqqmWsNI2hddvIYjikhYSmaPPkSJU q45+vg3rin7WS5TMueUDFZeMewlhGJrmkzqe1Zp4real2PEG2JFVsuPhkygAcK4tpmbaQB NPYFGTIqW0iwNQHK2XqFr38VAlzksL9YoqxL/aThhMA1g7GumSVWPfw6rJOTsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQmbh5SRRz6WT; Tue, 16 Sep 2025 02:50:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58G2oOPf009072; Tue, 16 Sep 2025 02:50:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58G2oO83009069; Tue, 16 Sep 2025 02:50:24 GMT (envelope-from git) Date: Tue, 16 Sep 2025 02:50:24 GMT Message-Id: <202509160250.58G2oO83009069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a1dcf2fc8f32 - stable/14 - geom: only set TDP_GEOM for user threads List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a1dcf2fc8f327c5d492278f14c07380b7170fc68 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a1dcf2fc8f327c5d492278f14c07380b7170fc68 commit a1dcf2fc8f327c5d492278f14c07380b7170fc68 Author: Konstantin Belousov AuthorDate: 2025-09-08 13:46:08 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-16 02:44:24 +0000 geom: only set TDP_GEOM for user threads PR: 289204 (cherry picked from commit b0474e14895908f45c64158b0e558236923b8eb2) --- sys/geom/geom_event.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index 0973b87b36bc..0facaa68a49c 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -349,6 +349,7 @@ static void g_post_event_ep_va(g_event_t *func, void *arg, int wuflag, struct g_event *ep, va_list ap) { + struct thread *td; void *p; u_int n; @@ -368,8 +369,12 @@ g_post_event_ep_va(g_event_t *func, void *arg, int wuflag, TAILQ_INSERT_TAIL(&g_events, ep, events); mtx_unlock(&g_eventlock); wakeup(&g_wait_event); - curthread->td_pflags |= TDP_GEOM; - ast_sched(curthread, TDA_GEOM); + + td = curthread; + if ((td->td_pflags & TDP_KTHREAD) == 0) { + td->td_pflags |= TDP_GEOM; + ast_sched(td, TDA_GEOM); + } } void From nobody Tue Sep 16 02:50:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cQmbk3mPWz685qc; Tue, 16 Sep 2025 02:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQmbj6SFBz47fL; Tue, 16 Sep 2025 02:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757991025; 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=UUpug0XjdLDeApx4qyOkR5UEgH0bTloCYaN1GEohatQ=; b=m7z7g0L4+EpMJE1jOSluMjwGY0yRg83JxhJB4rWwn7cTzFplSvFgk0PDxfn1oNS9JvpbmR R3sWdZH3z8LTsBewzEghUHwJAdhvrV8l/XYy0PbxPRajg5JWvFzzgwXszoYont00RdWh1O 9WcaY+GU189cGhGqjzyTKg1Bj25WaSxIQ4KreLx2/15enbglKdf9zm4jHLaO/XAzRe5jM+ voTxIPYnif2016AFy7zp2lc2X+SfT5+XjxtWDk6A9LEZTL9oVrxA4g3OWu7okFHDTgEudq Se+msu+DV9oPE1QZrWJXxKBnRIHPQUv2jNJR0cbfOlIbGFfL3ibopeF3y16mhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757991025; 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=UUpug0XjdLDeApx4qyOkR5UEgH0bTloCYaN1GEohatQ=; b=JCaFifirHsmJMGKybgxyAQnOyoUGIkVa3xeuXqyHkdOZwRQvLK2c1T4ufZaCODA1f1wGQH Q3fupU/4AJFm4iVmf8rNyQEbypEaYl6mWGftWBH0r23UOraoxUt/skwQfn/bjfmEzgITas wA503ZkJt/9TzdE9qZRniQ6s66SSnQlCf6j5OAZ01cTrBA4jCB+rQQpG1no+u7u8RxNIUE A2/ctNOI/6CZ7wU/Hal8eKv4/6AHC3CHDtj+QoXp5/PJeDf/VbUzNmYdAQuWNJ3+XY9IVT +pVgwA9Rr6Iu6OeXSa/HS928riCNQdt47zyB0JTN6ZhDSg4/zntfoaSwFud2JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757991025; a=rsa-sha256; cv=none; b=S0Yf/Tpg+WYJ7cVjKll5CSH4WZ5R6Wcyu84/JNlG51C0ePAQg4SeHMNULn8gxpikAVrl7z 2kbdjG9dcMLYIz+JN9OyUHu8Oblz4MewRzoHAg4dlIyVcREhdhP5i2+iGAq9XJd/nXmzxQ 0G54bWtRbwKUsQDI+21WLPQM6UpuMdpQZfICi60qhjJuAGjsSqaBkHuaHdQ+CUYeeYSYEf 9GrnVJ7h+a5U/+7RHnQ7swYsrS30GwBaQD6IQTI0NPc8jmTuxiQHo5HS9IhbmlUmTY1V6+ xkOD0V9kOvFa2I7BlPiLOTsPfW4lxYTy26BhpYb5MAE1X5yhhiqta+k9/XaecA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cQmbj5zkCz69H; Tue, 16 Sep 2025 02:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58G2oP2D009108; Tue, 16 Sep 2025 02:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58G2oPWJ009105; Tue, 16 Sep 2025 02:50:25 GMT (envelope-from git) Date: Tue, 16 Sep 2025 02:50:25 GMT Message-Id: <202509160250.58G2oPWJ009105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8c40728a46d4 - stable/14 - kern/kern_event.c: properly spell COMPAT_FREEBSD32 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c40728a46d4c2a3a93314deca47252f5c2ebe12 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8c40728a46d4c2a3a93314deca47252f5c2ebe12 commit 8c40728a46d4c2a3a93314deca47252f5c2ebe12 Author: Konstantin Belousov AuthorDate: 2025-09-13 17:42:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-16 02:44:39 +0000 kern/kern_event.c: properly spell COMPAT_FREEBSD32 PR: 289504 (cherry picked from commit cab4cf201acf76b415a8f1a59ea4eeeb14b4636c) --- sys/kern/kern_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index eb77a5064113..50d04e1fe253 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3033,7 +3033,7 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) return (error); td = curthread; -#ifdef FREEBSD_COMPAT32 +#ifdef COMPAT_FREEBSD32 compat32 = SV_CURPROC_FLAG(SV_ILP32); #else compat32 = false; From nobody Tue Sep 16 13:59:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RF5Wvyz67Jv8; Tue, 16 Sep 2025 13:59:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RF5DMBz3X7x; Tue, 16 Sep 2025 13:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031145; 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=zglo4T8vgBbtmA7szeeRh2p8bYd6oTBpkYtP69PvK0U=; b=ZkL6ABhYfZm6MF0miYrNnfI24rbKS1BtY5l8MDfQO85ysqJEH5Upqgdvwx9j2ATOGAmV4M GbVzbyrNce0rBHFKvmpH7l2rylPExueLKR/C5vQYMvknv/ExJxGaJ+1bJv5EQiebttPYwR oM7vh8UcOwmjYgzPtGFOW/KViCGjlBSQ66sgWAm1Sd3KgRq7ucmQBtynjNtenUv4+6sDCV pAjWWgstygH4qp/I4vPfaF8N9js5/JQbLaW1YZlsUni+okrycUYfmcvpZOLxYAeMU67OS6 mIwriiZT5ZeZST4Ca3KprU2Zf0PUzZOmP1vyFAr92oWNZjH5teUAn1+FuN70Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031145; 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=zglo4T8vgBbtmA7szeeRh2p8bYd6oTBpkYtP69PvK0U=; b=s5PxX8OKYQmZMIbnCh7sCBXEbqMRsIqJqRZrhCxa+Cirxm646AFcugz8MUU/pAVStUmTGR wNRgwuDTa/KabEWYuPJbTGfBCDTa0mAnadKiE08RgrgIeseUORfnq+kwMZ9SKXgambTwCP v8MU8Jv9/2OftqpMMwNtq3RAV4Jv9/h3dDHr190Ny7p1S+WrNAE00h71hPmbirrPyfywd1 WXM/vjZ/EOfguDInqFUjQRl5JAMl0GCL+YqaGFe2gJd94VuM0oDdEqB8X4z6hYI/Q6P509 2ADrTl2SAXwwLSdgx1EmHfEVa8JRV4DTjdVpDaI44+aYs42m2H45QoDOTMLjJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031145; a=rsa-sha256; cv=none; b=W1PnAjw0sFXgKxOnYEhJfK1GVMWOEGqiPNWtRHsTBgKgydIBsrXGA+jijXVFAaRfltlOZW wdT+cdkHaQLwNsflM0SdeuFMyQkQYeAHaiXpV48qq1FKxUQejJ5Icc87f0MadiKFH4CkwD SzA/fcRb7LUMe/K/eLr1Z7f2wKIwi/AGb7KuBiZ1V1KU8ZKKWJBGcBCa1D9VjeIGnLRdhe guGARVYF8/C4OEkEKFICwVNidyQTQVUEMpeP5VivLqf8oiZympmXug3WsPcxYxv7/89VA+ /bAM7O5RoHua3Kw4nd/fuqDVc30U03zVuyFr/+zrfMFquuBkaA2ffZ1stxBm5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RF4cfczkTC; Tue, 16 Sep 2025 13:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDx5Qo064276; Tue, 16 Sep 2025 13:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDx5Ot064271; Tue, 16 Sep 2025 13:59:05 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:05 GMT Message-Id: <202509161359.58GDx5Ot064271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: abe8e3aecea6 - stable/15 - unbound: Update to 1.23.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: abe8e3aecea6f33bb0eb578a44834aacdcfaef05 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=abe8e3aecea6f33bb0eb578a44834aacdcfaef05 commit abe8e3aecea6f33bb0eb578a44834aacdcfaef05 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-07 18:59:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:05:52 +0000 unbound: Update to 1.23.1 Release notes at https://nlnetlabs.nl/news/2025/Jul/16/unbound-1.23.1-released/ Since we don't enable ECS, this is mostly a nop for us. Merge commit 'c8864f6ba46ff3271d97b4ae1c3cc6ce01eaf18a' MFC after: 3 days (cherry picked from commit 5a0119491adbea0876d9d6dc0ef3e71f3d64a20b) --- contrib/unbound/config.guess | 17 +- contrib/unbound/config.h.in | 360 +- contrib/unbound/config.sub | 28 +- contrib/unbound/configure | 4467 ++++++++++++--------- contrib/unbound/configure.ac | 5 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf | 300 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3 | 4 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8 | 14 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8 | 8 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8 | 343 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1 | 4 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8 | 8 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5 | 741 +++- contrib/unbound/doc/unbound.conf.5.in | 2 +- contrib/unbound/edns-subnet/subnetmod.c | 152 +- contrib/unbound/edns-subnet/subnetmod.h | 4 + contrib/unbound/ltmain.sh | 1555 ++++--- contrib/unbound/smallapp/unbound-control-setup.sh | 227 +- lib/libunbound/Makefile | 31 +- lib/libunbound/config.h | 521 ++- 28 files changed, 5633 insertions(+), 3178 deletions(-) diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index 48a684601bd2..a9d01fde4617 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2024 Free Software Foundation, Inc. +# Copyright 1992-2025 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2024-07-27' +timestamp='2025-07-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2024 Free Software Foundation, Inc. +Copyright 1992-2025 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1597,8 +1597,11 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; - *:Ironclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad + x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*) + GUESS=$UNAME_MACHINE-pc-ironclad-mlibc + ;; + *:[Ii]ronclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc ;; esac @@ -1808,8 +1811,8 @@ fi exit 1 # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-format: "%Y-%02m-%02d" # time-stamp-end: "'" # End: diff --git a/contrib/unbound/config.h.in b/contrib/unbound/config.h.in index f2dc8c8b92b3..584810398b91 100644 --- a/contrib/unbound/config.h.in +++ b/contrib/unbound/config.h.in @@ -48,13 +48,13 @@ internal symbols */ #undef EXPORT_ALL_SYMBOLS -/* Define to 1 if you have the `accept4' function. */ +/* Define to 1 if you have the 'accept4' function. */ #undef HAVE_ACCEPT4 -/* Define to 1 if you have the `arc4random' function. */ +/* Define to 1 if you have the 'arc4random' function. */ #undef HAVE_ARC4RANDOM -/* Define to 1 if you have the `arc4random_uniform' function. */ +/* Define to 1 if you have the 'arc4random_uniform' function. */ #undef HAVE_ARC4RANDOM_UNIFORM /* Define to 1 if you have the header file. */ @@ -78,7 +78,7 @@ /* If we have be64toh */ #undef HAVE_BE64TOH -/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +/* Define to 1 if you have the 'BIO_set_callback_ex' function. */ #undef HAVE_BIO_SET_CALLBACK_EX /* Define to 1 if you have the header file. */ @@ -87,241 +87,241 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BSD_STRING_H -/* Define to 1 if you have the `chown' function. */ +/* Define to 1 if you have the 'chown' function. */ #undef HAVE_CHOWN -/* Define to 1 if you have the `chroot' function. */ +/* Define to 1 if you have the 'chroot' function. */ #undef HAVE_CHROOT -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +/* Define to 1 if you have the 'CRYPTO_cleanup_all_ex_data' function. */ #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA -/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +/* Define to 1 if you have the 'CRYPTO_THREADID_set_callback' function. */ #undef HAVE_CRYPTO_THREADID_SET_CALLBACK -/* Define to 1 if you have the `ctime_r' function. */ +/* Define to 1 if you have the 'ctime_r' function. */ #undef HAVE_CTIME_R -/* Define to 1 if you have the `daemon' function. */ +/* Define to 1 if you have the 'daemon' function. */ #undef HAVE_DAEMON -/* Define to 1 if you have the declaration of `arc4random', and to 0 if you +/* Define to 1 if you have the declaration of 'arc4random', and to 0 if you don't. */ #undef HAVE_DECL_ARC4RANDOM -/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 +/* Define to 1 if you have the declaration of 'arc4random_uniform', and to 0 if you don't. */ #undef HAVE_DECL_ARC4RANDOM_UNIFORM -/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if +/* Define to 1 if you have the declaration of 'evsignal_assign', and to 0 if you don't. */ #undef HAVE_DECL_EVSIGNAL_ASSIGN -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you +/* Define to 1 if you have the declaration of 'inet_ntop', and to 0 if you don't. */ #undef HAVE_DECL_INET_NTOP -/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you +/* Define to 1 if you have the declaration of 'inet_pton', and to 0 if you don't. */ #undef HAVE_DECL_INET_PTON -/* Define to 1 if you have the declaration of `nghttp2_session_server_new', +/* Define to 1 if you have the declaration of 'nghttp2_session_server_new', and to 0 if you don't. */ #undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW -/* Define to 1 if you have the declaration of `ngtcp2_conn_server_new', and to +/* Define to 1 if you have the declaration of 'ngtcp2_conn_server_new', and to 0 if you don't. */ #undef HAVE_DECL_NGTCP2_CONN_SERVER_NEW -/* Define to 1 if you have the declaration of `ngtcp2_crypto_encrypt_cb', and +/* Define to 1 if you have the declaration of 'ngtcp2_crypto_encrypt_cb', and to 0 if you don't. */ #undef HAVE_DECL_NGTCP2_CRYPTO_ENCRYPT_CB -/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_ED25519', and to 0 if you don't. */ #undef HAVE_DECL_NID_ED25519 -/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_ED448', and to 0 if you don't. */ #undef HAVE_DECL_NID_ED448 -/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_secp384r1', and to 0 if you don't. */ #undef HAVE_DECL_NID_SECP384R1 -/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 +/* Define to 1 if you have the declaration of 'NID_X9_62_prime256v1', and to 0 if you don't. */ #undef HAVE_DECL_NID_X9_62_PRIME256V1 -/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you +/* Define to 1 if you have the declaration of 'reallocarray', and to 0 if you don't. */ #undef HAVE_DECL_REALLOCARRAY -/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you +/* Define to 1 if you have the declaration of 'redisConnect', and to 0 if you don't. */ #undef HAVE_DECL_REDISCONNECT -/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 +/* Define to 1 if you have the declaration of 'sk_SSL_COMP_pop_free', and to 0 if you don't. */ #undef HAVE_DECL_SK_SSL_COMP_POP_FREE /* Define to 1 if you have the declaration of - `SSL_COMP_get_compression_methods', and to 0 if you don't. */ + 'SSL_COMP_get_compression_methods', and to 0 if you don't. */ #undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS -/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to +/* Define to 1 if you have the declaration of 'SSL_CTX_set_ecdh_auto', and to 0 if you don't. */ #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO -/* Define to 1 if you have the declaration of `strlcat', and to 0 if you +/* Define to 1 if you have the declaration of 'strlcat', and to 0 if you don't. */ #undef HAVE_DECL_STRLCAT -/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you +/* Define to 1 if you have the declaration of 'strlcpy', and to 0 if you don't. */ #undef HAVE_DECL_STRLCPY -/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if +/* Define to 1 if you have the declaration of 'XML_StopParser', and to 0 if you don't. */ #undef HAVE_DECL_XML_STOPPARSER /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `DSA_SIG_set0' function. */ +/* Define to 1 if you have the 'DSA_SIG_set0' function. */ #undef HAVE_DSA_SIG_SET0 /* Define to 1 if you have the header file. */ #undef HAVE_ENDIAN_H -/* Define to 1 if you have the `endprotoent' function. */ +/* Define to 1 if you have the 'endprotoent' function. */ #undef HAVE_ENDPROTOENT -/* Define to 1 if you have the `endpwent' function. */ +/* Define to 1 if you have the 'endpwent' function. */ #undef HAVE_ENDPWENT -/* Define to 1 if you have the `endservent' function. */ +/* Define to 1 if you have the 'endservent' function. */ #undef HAVE_ENDSERVENT -/* Define to 1 if you have the `ENGINE_cleanup' function. */ +/* Define to 1 if you have the 'ENGINE_cleanup' function. */ #undef HAVE_ENGINE_CLEANUP -/* Define to 1 if you have the `ERR_free_strings' function. */ +/* Define to 1 if you have the 'ERR_free_strings' function. */ #undef HAVE_ERR_FREE_STRINGS -/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +/* Define to 1 if you have the 'ERR_load_crypto_strings' function. */ #undef HAVE_ERR_LOAD_CRYPTO_STRINGS -/* Define to 1 if you have the `event_assign' function. */ +/* Define to 1 if you have the 'event_assign' function. */ #undef HAVE_EVENT_ASSIGN -/* Define to 1 if you have the `event_base_free' function. */ +/* Define to 1 if you have the 'event_base_free' function. */ #undef HAVE_EVENT_BASE_FREE -/* Define to 1 if you have the `event_base_get_method' function. */ +/* Define to 1 if you have the 'event_base_get_method' function. */ #undef HAVE_EVENT_BASE_GET_METHOD -/* Define to 1 if you have the `event_base_new' function. */ +/* Define to 1 if you have the 'event_base_new' function. */ #undef HAVE_EVENT_BASE_NEW -/* Define to 1 if you have the `event_base_once' function. */ +/* Define to 1 if you have the 'event_base_once' function. */ #undef HAVE_EVENT_BASE_ONCE /* Define to 1 if you have the header file. */ #undef HAVE_EVENT_H -/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +/* Define to 1 if you have the 'EVP_aes_256_cbc' function. */ #undef HAVE_EVP_AES_256_CBC -/* Define to 1 if you have the `EVP_cleanup' function. */ +/* Define to 1 if you have the 'EVP_cleanup' function. */ #undef HAVE_EVP_CLEANUP -/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' +/* Define to 1 if you have the 'EVP_default_properties_is_fips_enabled' function. */ #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED -/* Define to 1 if you have the `EVP_DigestVerify' function. */ +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ #undef HAVE_EVP_DIGESTVERIFY -/* Define to 1 if you have the `EVP_dss1' function. */ +/* Define to 1 if you have the 'EVP_dss1' function. */ #undef HAVE_EVP_DSS1 -/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +/* Define to 1 if you have the 'EVP_EncryptInit_ex' function. */ #undef HAVE_EVP_ENCRYPTINIT_EX -/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +/* Define to 1 if you have the 'EVP_MAC_CTX_set_params' function. */ #undef HAVE_EVP_MAC_CTX_SET_PARAMS -/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +/* Define to 1 if you have the 'EVP_MD_CTX_new' function. */ #undef HAVE_EVP_MD_CTX_NEW -/* Define to 1 if you have the `EVP_sha1' function. */ +/* Define to 1 if you have the 'EVP_sha1' function. */ #undef HAVE_EVP_SHA1 -/* Define to 1 if you have the `EVP_sha256' function. */ +/* Define to 1 if you have the 'EVP_sha256' function. */ #undef HAVE_EVP_SHA256 -/* Define to 1 if you have the `EVP_sha512' function. */ +/* Define to 1 if you have the 'EVP_sha512' function. */ #undef HAVE_EVP_SHA512 -/* Define to 1 if you have the `ev_default_loop' function. */ +/* Define to 1 if you have the 'ev_default_loop' function. */ #undef HAVE_EV_DEFAULT_LOOP -/* Define to 1 if you have the `ev_loop' function. */ +/* Define to 1 if you have the 'ev_loop' function. */ #undef HAVE_EV_LOOP /* Define to 1 if you have the header file. */ #undef HAVE_EXPAT_H -/* Define to 1 if you have the `explicit_bzero' function. */ +/* Define to 1 if you have the 'explicit_bzero' function. */ #undef HAVE_EXPLICIT_BZERO -/* Define to 1 if you have the `fcntl' function. */ +/* Define to 1 if you have the 'fcntl' function. */ #undef HAVE_FCNTL -/* Define to 1 if you have the `FIPS_mode' function. */ +/* Define to 1 if you have the 'FIPS_mode' function. */ #undef HAVE_FIPS_MODE -/* Define to 1 if you have the `fork' function. */ +/* Define to 1 if you have the 'fork' function. */ #undef HAVE_FORK -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ #undef HAVE_FSEEKO -/* Define to 1 if you have the `fsync' function. */ +/* Define to 1 if you have the 'fsync' function. */ #undef HAVE_FSYNC /* Whether getaddrinfo is available */ #undef HAVE_GETADDRINFO -/* Define to 1 if you have the `getauxval' function. */ +/* Define to 1 if you have the 'getauxval' function. */ #undef HAVE_GETAUXVAL -/* Define to 1 if you have the `getentropy' function. */ +/* Define to 1 if you have the 'getentropy' function. */ #undef HAVE_GETENTROPY -/* Define to 1 if you have the `getifaddrs' function. */ +/* Define to 1 if you have the 'getifaddrs' function. */ #undef HAVE_GETIFADDRS /* Define to 1 if you have the header file. */ #undef HAVE_GETOPT_H -/* Define to 1 if you have the `getpwnam' function. */ +/* Define to 1 if you have the 'getpwnam' function. */ #undef HAVE_GETPWNAM -/* Define to 1 if you have the `getrlimit' function. */ +/* Define to 1 if you have the 'getrlimit' function. */ #undef HAVE_GETRLIMIT -/* Define to 1 if you have the `gettid' function. */ +/* Define to 1 if you have the 'gettid' function. */ #undef HAVE_GETTID -/* Define to 1 if you have the `glob' function. */ +/* Define to 1 if you have the 'glob' function. */ #undef HAVE_GLOB /* Define to 1 if you have the header file. */ #undef HAVE_GLOB_H -/* Define to 1 if you have the `gmtime_r' function. */ +/* Define to 1 if you have the 'gmtime_r' function. */ #undef HAVE_GMTIME_R /* Define to 1 if you have the header file. */ @@ -330,7 +330,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_HIREDIS_HIREDIS_H -/* Define to 1 if you have the `HMAC_Init_ex' function. */ +/* Define to 1 if you have the 'HMAC_Init_ex' function. */ #undef HAVE_HMAC_INIT_EX /* If we have htobe64 */ @@ -339,19 +339,19 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IFADDRS_H -/* Define to 1 if you have the `if_nametoindex' function. */ +/* Define to 1 if you have the 'if_nametoindex' function. */ #undef HAVE_IF_NAMETOINDEX -/* Define to 1 if you have the `inet_aton' function. */ +/* Define to 1 if you have the 'inet_aton' function. */ #undef HAVE_INET_ATON -/* Define to 1 if you have the `inet_ntop' function. */ +/* Define to 1 if you have the 'inet_ntop' function. */ #undef HAVE_INET_NTOP -/* Define to 1 if you have the `inet_pton' function. */ +/* Define to 1 if you have the 'inet_pton' function. */ #undef HAVE_INET_PTON -/* Define to 1 if you have the `initgroups' function. */ +/* Define to 1 if you have the 'initgroups' function. */ #undef HAVE_INITGROUPS /* Define to 1 if you have the header file. */ @@ -363,10 +363,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IPHLPAPI_H -/* Define to 1 if you have the `isblank' function. */ +/* Define to 1 if you have the 'isblank' function. */ #undef HAVE_ISBLANK -/* Define to 1 if you have the `kill' function. */ +/* Define to 1 if you have the 'kill' function. */ #undef HAVE_KILL /* Use portable libbsd functions */ @@ -384,7 +384,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_NET_TSTAMP_H -/* Define to 1 if you have the `localtime_r' function. */ +/* Define to 1 if you have the 'localtime_r' function. */ #undef HAVE_LOCALTIME_R /* Define to 1 if you have the header file. */ @@ -393,7 +393,7 @@ /* If have GNU libc compatible malloc */ #undef HAVE_MALLOC -/* Define to 1 if you have the `memmove' function. */ +/* Define to 1 if you have the 'memmove' function. */ #undef HAVE_MEMMOVE /* Define to 1 if you have the header file. */ @@ -435,49 +435,49 @@ /* Define this to use ngtcp2. */ #undef HAVE_NGTCP2 -/* Define to 1 if you have the `ngtcp2_ccerr_default' function. */ +/* Define to 1 if you have the 'ngtcp2_ccerr_default' function. */ #undef HAVE_NGTCP2_CCERR_DEFAULT -/* Define to 1 if you have the `ngtcp2_conn_encode_0rtt_transport_params' +/* Define to 1 if you have the 'ngtcp2_conn_encode_0rtt_transport_params' function. */ #undef HAVE_NGTCP2_CONN_ENCODE_0RTT_TRANSPORT_PARAMS -/* Define to 1 if you have the `ngtcp2_conn_get_max_local_streams_uni' +/* Define to 1 if you have the 'ngtcp2_conn_get_max_local_streams_uni' function. */ #undef HAVE_NGTCP2_CONN_GET_MAX_LOCAL_STREAMS_UNI -/* Define to 1 if you have the `ngtcp2_conn_get_num_scid' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_get_num_scid' function. */ #undef HAVE_NGTCP2_CONN_GET_NUM_SCID -/* Define to 1 if you have the `ngtcp2_conn_in_closing_period' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_in_closing_period' function. */ #undef HAVE_NGTCP2_CONN_IN_CLOSING_PERIOD -/* Define to 1 if you have the `ngtcp2_conn_in_draining_period' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_in_draining_period' function. */ #undef HAVE_NGTCP2_CONN_IN_DRAINING_PERIOD /* Define if ngtcp2_conn_shutdown_stream has 4 arguments. */ #undef HAVE_NGTCP2_CONN_SHUTDOWN_STREAM4 -/* Define to 1 if you have the `ngtcp2_conn_tls_early_data_rejected' function. +/* Define to 1 if you have the 'ngtcp2_conn_tls_early_data_rejected' function. */ #undef HAVE_NGTCP2_CONN_TLS_EARLY_DATA_REJECTED -/* Define to 1 if you have the `ngtcp2_crypto_encrypt_cb' function. */ +/* Define to 1 if you have the 'ngtcp2_crypto_encrypt_cb' function. */ #undef HAVE_NGTCP2_CRYPTO_ENCRYPT_CB /* Define to 1 if you have the - `ngtcp2_crypto_quictls_configure_client_context' function. */ + 'ngtcp2_crypto_quictls_configure_client_context' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT /* Define to 1 if you have the - `ngtcp2_crypto_quictls_configure_server_context' function. */ + 'ngtcp2_crypto_quictls_configure_server_context' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT /* Define to 1 if you have the - `ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ + 'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL -/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */ +/* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */ #undef HAVE_NGTCP2_ENCRYPTION_LEVEL /* Define to 1 if you have the header file. @@ -494,13 +494,13 @@ /* Use libnss for crypto */ #undef HAVE_NSS -/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +/* Define to 1 if you have the 'OpenSSL_add_all_digests' function. */ #undef HAVE_OPENSSL_ADD_ALL_DIGESTS /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_BN_H -/* Define to 1 if you have the `OPENSSL_config' function. */ +/* Define to 1 if you have the 'OPENSSL_config' function. */ #undef HAVE_OPENSSL_CONFIG /* Define to 1 if you have the header file. */ @@ -521,10 +521,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_ERR_H -/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +/* Define to 1 if you have the 'OPENSSL_init_crypto' function. */ #undef HAVE_OPENSSL_INIT_CRYPTO -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +/* Define to 1 if you have the 'OPENSSL_init_ssl' function. */ #undef HAVE_OPENSSL_INIT_SSL /* Define to 1 if you have the header file. */ @@ -539,10 +539,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_SSL_H -/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +/* Define to 1 if you have the 'OSSL_PARAM_BLD_new' function. */ #undef HAVE_OSSL_PARAM_BLD_NEW -/* Define to 1 if you have the `poll' function. */ +/* Define to 1 if you have the 'poll' function. */ #undef HAVE_POLL /* Define to 1 if you have the header file. */ @@ -554,10 +554,10 @@ /* Have PTHREAD_PRIO_INHERIT. */ #undef HAVE_PTHREAD_PRIO_INHERIT -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +/* Define to 1 if the system has the type 'pthread_rwlock_t'. */ #undef HAVE_PTHREAD_RWLOCK_T -/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +/* Define to 1 if the system has the type 'pthread_spinlock_t'. */ #undef HAVE_PTHREAD_SPINLOCK_T /* Define to 1 if you have the header file. */ @@ -566,101 +566,101 @@ /* Define if you have Python libraries and header files. */ #undef HAVE_PYTHON -/* Define to 1 if you have the `random' function. */ +/* Define to 1 if you have the 'random' function. */ #undef HAVE_RANDOM -/* Define to 1 if you have the `RAND_cleanup' function. */ +/* Define to 1 if you have the 'RAND_cleanup' function. */ #undef HAVE_RAND_CLEANUP /* If we have reallocarray(3) */ #undef HAVE_REALLOCARRAY -/* Define to 1 if you have the `recvmsg' function. */ +/* Define to 1 if you have the 'recvmsg' function. */ #undef HAVE_RECVMSG -/* Define to 1 if you have the `sendmsg' function. */ +/* Define to 1 if you have the 'sendmsg' function. */ #undef HAVE_SENDMSG -/* Define to 1 if you have the `setregid' function. */ +/* Define to 1 if you have the 'setregid' function. */ #undef HAVE_SETREGID -/* Define to 1 if you have the `setresgid' function. */ +/* Define to 1 if you have the 'setresgid' function. */ #undef HAVE_SETRESGID -/* Define to 1 if you have the `setresuid' function. */ +/* Define to 1 if you have the 'setresuid' function. */ #undef HAVE_SETRESUID -/* Define to 1 if you have the `setreuid' function. */ +/* Define to 1 if you have the 'setreuid' function. */ #undef HAVE_SETREUID -/* Define to 1 if you have the `setrlimit' function. */ +/* Define to 1 if you have the 'setrlimit' function. */ #undef HAVE_SETRLIMIT -/* Define to 1 if you have the `setsid' function. */ +/* Define to 1 if you have the 'setsid' function. */ #undef HAVE_SETSID -/* Define to 1 if you have the `setusercontext' function. */ +/* Define to 1 if you have the 'setusercontext' function. */ #undef HAVE_SETUSERCONTEXT -/* Define to 1 if you have the `SHA512_Update' function. */ +/* Define to 1 if you have the 'SHA512_Update' function. */ #undef HAVE_SHA512_UPDATE -/* Define to 1 if you have the `shmget' function. */ +/* Define to 1 if you have the 'shmget' function. */ #undef HAVE_SHMGET -/* Define to 1 if you have the `sigprocmask' function. */ +/* Define to 1 if you have the 'sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define to 1 if you have the `sleep' function. */ +/* Define to 1 if you have the 'sleep' function. */ #undef HAVE_SLEEP -/* Define to 1 if you have the `snprintf' function. */ +/* Define to 1 if you have the 'snprintf' function. */ #undef HAVE_SNPRINTF -/* Define to 1 if you have the `socketpair' function. */ +/* Define to 1 if you have the 'socketpair' function. */ #undef HAVE_SOCKETPAIR /* Using Solaris threads */ #undef HAVE_SOLARIS_THREADS -/* Define to 1 if you have the `srandom' function. */ +/* Define to 1 if you have the 'srandom' function. */ #undef HAVE_SRANDOM /* Define if you have the SSL libraries installed. */ #undef HAVE_SSL -/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_alpn_protos' function. */ #undef HAVE_SSL_CTX_SET_ALPN_PROTOS -/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_alpn_select_cb' function. */ #undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB -/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_ciphersuites' function. */ #undef HAVE_SSL_CTX_SET_CIPHERSUITES -/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_security_level' function. */ #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL -/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' +/* Define to 1 if you have the 'SSL_CTX_set_tlsext_ticket_key_evp_cb' function. */ #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB -/* Define to 1 if you have the `SSL_CTX_set_tmp_ecdh' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_tmp_ecdh' function. */ #undef HAVE_SSL_CTX_SET_TMP_ECDH -/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +/* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */ #undef HAVE_SSL_GET0_ALPN_SELECTED -/* Define to 1 if you have the `SSL_get0_peername' function. */ +/* Define to 1 if you have the 'SSL_get0_peername' function. */ #undef HAVE_SSL_GET0_PEERNAME -/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +/* Define to 1 if you have the 'SSL_get1_peer_certificate' function. */ #undef HAVE_SSL_GET1_PEER_CERTIFICATE -/* Define to 1 if you have the `SSL_is_quic' function. */ +/* Define to 1 if you have the 'SSL_is_quic' function. */ #undef HAVE_SSL_IS_QUIC -/* Define to 1 if you have the `SSL_set1_host' function. */ +/* Define to 1 if you have the 'SSL_set1_host' function. */ #undef HAVE_SSL_SET1_HOST /* Define to 1 if you have the header file. */ @@ -681,7 +681,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strftime' function. */ +/* Define to 1 if you have the 'strftime' function. */ #undef HAVE_STRFTIME /* Define to 1 if you have the header file. */ @@ -690,39 +690,39 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcat' function. */ +/* Define to 1 if you have the 'strlcat' function. */ #undef HAVE_STRLCAT -/* Define to 1 if you have the `strlcpy' function. */ +/* Define to 1 if you have the 'strlcpy' function. */ #undef HAVE_STRLCPY -/* Define to 1 if you have the `strptime' function. */ +/* Define to 1 if you have the 'strptime' function. */ #undef HAVE_STRPTIME -/* Define to 1 if you have the `strsep' function. */ +/* Define to 1 if you have the 'strsep' function. */ #undef HAVE_STRSEP -/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ +/* Define to 1 if 'ipi_spec_dst' is a member of 'struct in_pktinfo'. */ #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST -/* Define to 1 if `tokenlen' is a member of `struct ngtcp2_pkt_hd'. */ +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_pkt_hd'. */ #undef HAVE_STRUCT_NGTCP2_PKT_HD_TOKENLEN -/* Define to 1 if `max_tx_udp_payload_size' is a member of `struct +/* Define to 1 if 'max_tx_udp_payload_size' is a member of 'struct ngtcp2_settings'. */ #undef HAVE_STRUCT_NGTCP2_SETTINGS_MAX_TX_UDP_PAYLOAD_SIZE -/* Define to 1 if `tokenlen' is a member of `struct ngtcp2_settings'. */ +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_settings'. */ #undef HAVE_STRUCT_NGTCP2_SETTINGS_TOKENLEN -/* Define to 1 if `original_dcid_present' is a member of `struct +/* Define to 1 if 'original_dcid_present' is a member of 'struct ngtcp2_transport_params'. */ #undef HAVE_STRUCT_NGTCP2_TRANSPORT_PARAMS_ORIGINAL_DCID_PRESENT -/* Define to 1 if the system has the type `struct ngtcp2_version_cid'. */ +/* Define to 1 if the system has the type 'struct ngtcp2_version_cid'. */ #undef HAVE_STRUCT_NGTCP2_VERSION_CID -/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ +/* Define to 1 if 'sun_len' is a member of 'struct sockaddr_un'. */ #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN /* Define if you have Swig libraries and header files. */ @@ -782,16 +782,16 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TIME_H -/* Define to 1 if you have the `tzset' function. */ +/* Define to 1 if you have the 'tzset' function. */ #undef HAVE_TZSET /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `usleep' function. */ +/* Define to 1 if you have the 'usleep' function. */ #undef HAVE_USLEEP -/* Define to 1 if you have the `vfork' function. */ +/* Define to 1 if you have the 'vfork' function. */ #undef HAVE_VFORK /* Define to 1 if you have the header file. */ @@ -809,22 +809,22 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WINSOCK2_H -/* Define to 1 if `fork' works. */ +/* Define to 1 if 'fork' works. */ #undef HAVE_WORKING_FORK -/* Define to 1 if `vfork' works. */ +/* Define to 1 if 'vfork' works. */ #undef HAVE_WORKING_VFORK -/* Define to 1 if you have the `writev' function. */ +/* Define to 1 if you have the 'writev' function. */ #undef HAVE_WRITEV /* Define to 1 if you have the header file. */ #undef HAVE_WS2TCPIP_H -/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ +/* Define to 1 if you have the 'X509_VERIFY_PARAM_set1_host' function. */ #undef HAVE_X509_VERIFY_PARAM_SET1_HOST -/* Define to 1 if you have the `_beginthreadex' function. */ +/* Define to 1 if you have the '_beginthreadex' function. */ #undef HAVE__BEGINTHREADEX /* If HMAC_Init_ex() returns void */ @@ -923,16 +923,16 @@ /* Shared data */ #undef SHARE_DIR -/* The size of `pthread_t', as computed by sizeof. */ +/* The size of 'pthread_t', as computed by sizeof. */ #undef SIZEOF_PTHREAD_T -/* The size of `size_t', as computed by sizeof. */ +/* The size of 'size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of 'time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T -/* The size of `unsigned long', as computed by sizeof. */ +/* The size of 'unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* define if (v)snprintf does not return length needed, (but length used) */ @@ -941,7 +941,7 @@ /* Define to 1 if libsodium supports sodium_set_misuse_handler */ #undef SODIUM_MISUSE_HANDLER -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -1035,7 +1035,7 @@ /* Define this to enable SHA256 and SHA512 support. */ #undef USE_SHA2 -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif @@ -1096,11 +1096,15 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -1141,30 +1145,36 @@ /* Define if you want PyUnbound. */ #undef WITH_PYUNBOUND -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ +/* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a + 'char[]'. */ #undef YYTEXT_POINTER /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* Define to 1 if necessary to make fseeko visible. */ #undef _LARGEFILE_SOURCE -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES /* Enable for compile on Minix */ #undef _NETBSD_SOURCE +/* Number of bits in time_t, on hosts where this is settable. */ +#undef _TIME_BITS + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +#undef __MINGW_USE_VC2005_COMPAT + /* defined to use gcc ansi snprintf and sscanf that understands %lld when compiled for windows. */ #undef __USE_MINGW_ANSI_STDIO -/* Define to empty if `const' does not conform to ANSI C. */ +/* Define to empty if 'const' does not conform to ANSI C. */ #undef const -/* Define to `int' if doesn't define. */ +/* Define as 'int' if doesn't define. */ #undef gid_t /* in_addr_t */ @@ -1173,28 +1183,28 @@ /* in_port_t */ #undef in_port_t -/* Define to `__inline__' or `__inline' if that's what the C compiler +/* Define to '__inline__' or '__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline #endif -/* Define to `short' if does not define. */ +/* Define to 'short' if does not define. */ #undef int16_t -/* Define to `int' if does not define. */ +/* Define to 'int' if does not define. */ #undef int32_t -/* Define to `long long' if does not define. */ +/* Define to 'long long' if does not define. */ #undef int64_t -/* Define to `signed char' if does not define. */ +/* Define to 'signed char' if does not define. */ #undef int8_t *** 17339 LINES SKIPPED *** From nobody Tue Sep 16 13:59:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RH1GmCz67JpC; Tue, 16 Sep 2025 13:59:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RG69tnz3Wk1; Tue, 16 Sep 2025 13:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031146; 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=GybszpMaMs8WWfGE6f7qacGmNFXkkFApX02il75vk5Y=; b=xUz1A4h35N9FU0Ixyfwt9SVtfCPu7sYs0/KNnkriFzmuNXGFOpSLrS3alib2uCGE1D86bq ctI6GW2b561gBHRPqff4VH7WT17JnSY5cgaftYuM/mDkCWQl1leoGvpo5aLd6hv1D7gYGB uZuMsRaLF2xaG1bIv/82xE3TXnHN6nxSW6Yu8RESxnD2R63WgVZbzs9wi5gFrjbAg7SBNp M+7mZwzu1QpyVdzBP9hGKJ6UtcV0jnBDe9AkscLPhKPnzFZ4b0/VD80OLFAOAOTqVrQ2aG ISEqAJ1+jq7Y+7HZvTVioFSF7VpbQ+FlDdCckNyXNdBn2DaPJTVokodlcH2cSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031146; 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=GybszpMaMs8WWfGE6f7qacGmNFXkkFApX02il75vk5Y=; b=HuhkNKk9DE2vtfDpVwcqTP05I8uDPp2EqfHg0PneT15Mq4+cu6ZsF9UI/jMnRwISCfMMYI PFDiP+Qhysa9HYBw2Q/hUhEafDcf9PiTOk722TMKjf5nNMbuEMM5yo2oCqiDA8M2vBEt3q DwCJ/tHIE159AkGB1a6MEy8m+Ae/q9OW8gJjF2LmbPAzE14boiI6xCFpqe1mgQOkBSmElY FfCq7KbkV+8EMcmq/Vkx077x46vGKPyl16dquP7UA0n9XCStS4Vg3xsKP9XgOIxGj6TPIF ptCcM3L+KHwacV441dGTM9JkvM5abKsF0XXjts9eKTfJ1eW0vL7tlEEJ7ACOlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031146; a=rsa-sha256; cv=none; b=gxSEAObPrYOyz1hFmbKZ3yfPUUcV/VZcOqukyakKTRdHVn/NunRxLMSaZ46l6YQBTZUSYe vTIpRDploHplr6qnCwQoZarGSgmbHnXH7SfH30xK0XBbY6ZCiib0vSlI4TF7HJzTdeshyr peiBelzUbDecRUL7sJasDz5tG3SW5WsckJnK+4AfmO63ZCc77Q41cL2+Gb6AVsQ2QUwyGa W5vCulFy6810B6p6nBB4UZJIQ1WUOR4gQcV1TkOD6DAB3iq1VbcQtWlLbcnLv5ur6FrWNl 1JcRPMXAOYm6tWtVdxam6wOEZSNIgMRDxhqxI7wNI2qj5Zr2nP9ReEXnZS+dNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RG5ZgtzkfT; Tue, 16 Sep 2025 13:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDx6ub064317; Tue, 16 Sep 2025 13:59:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDx6oI064314; Tue, 16 Sep 2025 13:59:06 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:06 GMT Message-Id: <202509161359.58GDx6oI064314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 668fbde7df9a - stable/15 - man: Add -l option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 668fbde7df9af6e78cef7e9f5fa8ec7cb0966119 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=668fbde7df9af6e78cef7e9f5fa8ec7cb0966119 commit 668fbde7df9af6e78cef7e9f5fa8ec7cb0966119 Author: Ingo Schwarze AuthorDate: 2025-09-07 20:52:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:05:52 +0000 man: Add -l option Add a -l option which causes man to interpret all arguments as paths to open directly rather than man pages to search for in MANPATH. See the PR for a detailed rationale. PR: 289245 MFC after: 1 week Reviewed by: ziaee, emaste Differential Revision: https://reviews.freebsd.org/D52385 (cherry picked from commit 14b61b2e931741281d0bfef426e9809f16006504) --- usr.bin/man/man.1 | 24 ++++++++++++++++++------ usr.bin/man/man.sh | 33 ++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1 index 820d6a5b33a9..707677ccce06 100644 --- a/usr.bin/man/man.1 +++ b/usr.bin/man/man.1 @@ -33,7 +33,7 @@ .Nd display online manual documentation pages .Sh SYNOPSIS .Nm -.Op Fl adho +.Op Fl adhlo .Op Fl t | w .Op Fl M Ar manpath .Op Fl P Ar pager @@ -144,6 +144,15 @@ Search names and descriptions of all manual pages for an extended regular .Ar expression , emulating basic functionality of .Xr apropos 1 . +.It Fl l +Interpret all arguments as absolute or relative filename(s) +of the manual page(s) to display. +No search is done and the options +.Fl M , +.Fl m , +and +.Fl S +are ignored. .It Fl m Ar arch Ns Op : Ns Ar machine Override the default architecture and machine settings allowing lookup of other platform specific manual pages. @@ -269,12 +278,15 @@ will search the following paths when considering section 4 manual pages in .Pa /usr/share/man/man4 .El .Ss Displaying Specific Manual Files -The +For compatibility reasons, .Nm -utility also supports displaying a specific manual page if passed a path -to the file as long as it contains a +will interpret any argument containing at least one .Ql / -character. +character as an absolute or relative path to a manual page to be +displayed. +This heuristic, made redundant by the more widely supported +.Fl l +option, is now deprecated and may be removed in future releases. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -398,7 +410,7 @@ manual page: .Pp Show a manual page in the current working directory: .Pp -.Dl $ man ./man.1 +.Dl $ man -l man.1 .Pp Show the location of manual pages in sections 1 and 8 which contain the word .Ql arm : diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 18595042da5f..53961ae4997e 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -511,13 +511,21 @@ man_display_page_groff() { # Usage: man_find_and_display page # Search through the manpaths looking for the given page. man_find_and_display() { - local found_page locpath p path sect + local found_page has_slash locpath p path sect # Check to see if it's a file. But only if it has a '/' in - # the filename. + # the filename or if -l was specified. case "$1" in - */*) if [ -f "$1" -a -r "$1" ]; then + */*) has_slash=yes + ;; + esac + if [ -n "$has_slash" -o -n "$lflag" ]; then + if [ -f "$1" -a -r "$1" ]; then decho "Found a usable page, displaying that" + if [ -z "$lflag" ]; then + echo "Opening a file directly is deprecated," \ + "use -l instead." >&2 + fi unset use_cat manpage="$1" setup_cattool "$manpage" @@ -531,9 +539,12 @@ man_find_and_display() { man_display_page fi return + elif [ -n "$lflag" ]; then + echo "Cannot read $1" >&2 + ret=1 + return fi - ;; - esac + fi IFS=: for sect in $MANSECT; do @@ -601,7 +612,7 @@ man_parse_opts() { local cmd_arg OPTIND=1 - while getopts 'K:M:P:S:adfhkm:op:tw' cmd_arg; do + while getopts 'K:M:P:S:adfhklm:op:tw' cmd_arg; do case "${cmd_arg}" in K) Kflag=Kflag REGEXP=$OPTARG ;; @@ -613,6 +624,7 @@ man_parse_opts() { f) fflag=fflag ;; h) man_usage 0 ;; k) kflag=kflag ;; + l) lflag=lflag ;; m) mflag=$OPTARG ;; o) oflag=oflag ;; p) MANROFFSEQ=$OPTARG ;; @@ -625,16 +637,19 @@ man_parse_opts() { shift $(( $OPTIND - 1 )) # Check the args for incompatible options. - - case "${Kflag}${fflag}${kflag}${tflag}${wflag}" in + case "${Kflag}${fflag}${kflag}${lflag}${tflag}${wflag}" in Kflagfflag*) echo "Incompatible options: -K and -f"; man_usage ;; Kflag*kflag*) echo "Incompatible options: -K and -k"; man_usage ;; + Kflag*lflag*) echo "Incompatible options: -K and -l"; man_usage ;; Kflag*tflag) echo "Incompatible options: -K and -t"; man_usage ;; fflagkflag*) echo "Incompatible options: -f and -k"; man_usage ;; + fflag*lflag*) echo "Incompatible options: -f and -l"; man_usage ;; fflag*tflag*) echo "Incompatible options: -f and -t"; man_usage ;; fflag*wflag) echo "Incompatible options: -f and -w"; man_usage ;; - *kflagtflag*) echo "Incompatible options: -k and -t"; man_usage ;; + *kflaglflag*) echo "Incompatible options: -k and -l"; man_usage ;; + *kflag*tflag*) echo "Incompatible options: -k and -t"; man_usage ;; *kflag*wflag) echo "Incompatible options: -k and -w"; man_usage ;; + *lflag*wflag) echo "Incompatible options: -l and -w"; man_usage ;; *tflagwflag) echo "Incompatible options: -t and -w"; man_usage ;; esac From nobody Tue Sep 16 13:59:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RJ1JcSz67Jbg; Tue, 16 Sep 2025 13:59:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RH6j61z3Wy4; Tue, 16 Sep 2025 13:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031148; 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=prJpZbeJi9iKnzhLFSOl2wO54BRLK/4zhpH8+D+33DY=; b=thLZRt5vvHAFGNZeEQGtEC3Bxw2qxsg4XUZGucO7BI4LQH2kbcT6JtLIxOtFcbVfnLdVW8 ozXVjQA01XDh/DTu+7sfU6iERETLJMEQnDta6YTyBX+bQd0wGoszgwtxXOVhEcFlIlf+C0 1e1ClwZ4N5tC730X/qx6PLOplcGs9B4s0weffOQoXszP0p4ErUpyGxqtc2SxxowLr4T5sO e/g8Xlu7whd8l5a3DWCSticGpCKTUptUt/UO6tqSEbFGin21ipx6ECFD9y6MMyvzHgykFa 3GupqDSnbX6d6g9kmGkQgHOkP1x1TqALtP21c4d+TTDcdtmlPVdTyRgV7XzGbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031147; 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=prJpZbeJi9iKnzhLFSOl2wO54BRLK/4zhpH8+D+33DY=; b=RhcHSB1w6FcX9BG6OmFZa/1gFIG4W75hDeriGJ+7P6JSc6ECxoXYnxh/mQmcogxnKBmF/q fIt3odkx2JTfKrgHYMOQ26QkcHvYOCLJa3n67RKMvEVXc9yQEEh6jSg5Q6fUZTipVTRDd8 39tvtp2bsAKmzpnU9QoiNkGRFoMEUQJNL+k+PxJmUSVQPPQnytu2iG6z4SkZ10kAq0ztEa Q0d91QhXsIuYEdH/PV5WY8LXj2V2+H792kKYaDIu9Bo6tPQHTAkhzyuJciO/NmbqU4cwfD x9AwmHgAQZ7+4fMkxRMqyIdkFvO76WS4uLiFrve7xpiUEoisZmISLzgzjm7J5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031147; a=rsa-sha256; cv=none; b=sHCl0X0UwAyr3fRbbfFJ7SmVa0iecSBkTatsc1P3lCqSa5fx0imgY3kWWc+3TWsAwSLhoj OswL67Vbi0QJQ1cGUDal86Woc0csheQwW55PdwACbeBRpJfCcsYOILy/RPz7tTG8elhV4f 0eXbgGFYEAqF8RkbGRUVK1vtYEpSemMuhV3YfCh4h5zpLOlh1fzIijg6qLxImkYCR8YIWV 3Ye6Z2wWAgmkhbJE3myXcVB/52XuHwBpzG1Z+cGQ4Zud4Elcj6p9aAPZPHCZ7k/4elQXOL jyTBwExhM0IXHRyqdQmbcEqlMk7Xa7mjQZp0DtuP2gxCCpLbpsK0mIE64WfQQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RH69HszkR8; Tue, 16 Sep 2025 13:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDx771064356; Tue, 16 Sep 2025 13:59:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDx7GH064353; Tue, 16 Sep 2025 13:59:07 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:07 GMT Message-Id: <202509161359.58GDx7GH064353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 340f2a651313 - stable/15 - src.sys.mk: Support src.conf in SRCTOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 340f2a651313c21b302a9137ba4765a6f04cd1cd Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=340f2a651313c21b302a9137ba4765a6f04cd1cd commit 340f2a651313c21b302a9137ba4765a6f04cd1cd Author: Dag-Erling Smørgrav AuthorDate: 2025-09-10 16:57:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:43 +0000 src.sys.mk: Support src.conf in SRCTOP If SRCCONF is not defined and src.conf exists at the top level of the source tree, use that instead of /etc/src.conf. MFC after: 3 days Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D52470 (cherry picked from commit dd8c666d8b78f6b9ddb691f0505837fa885ff3b4) UPDATING: mention the src.conf change Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") (cherry picked from commit ab2fea3f9a5a58f0ba90499ad3a8614e3dca0c5f) --- .gitignore | 1 + UPDATING | 5 +++++ share/man/man5/src.conf.5 | 9 ++++++--- share/mk/src.sys.mk | 4 ++++ sys/conf/kern.pre.mk | 4 ++++ tools/build/options/makeman | 7 +++++-- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3ed711f301ac..a53a26f16d4f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ tags .clangd .ccls-cache sys/*/compile +/src.conf diff --git a/UPDATING b/UPDATING index 2837b5aec0a8..ae4f14a24858 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ 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. +20250916: + If SRCCONF is unset and a file named src.conf is present at + the top of the source tree, it will now be used instead of + /etc/src.conf. + 20250905: __FreeBSD_version 1500064 after branching stable/15 from main. diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index aa6a85754a8c..d251bf0cd9e7 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd September 5, 2025 +.Dd September 16, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -29,8 +29,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index 2b9fc255a26d..ec035fb71e54 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -6,7 +6,11 @@ .if !defined(_WITHOUT_SRCCONF) # Allow user to configure things that only effect src tree builds. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if !empty(SRCCONF) && \ (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && \ !target(_srcconf_included_) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 1fcfd6467e7f..0251486247da 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -8,7 +8,11 @@ # the rest of /usr/src, but they still always process SRCCONF even though # the normal mechanisms to prevent that (compiling out of tree) won't # work. To ensure they do work, we have to duplicate thee few lines here. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) .include "${SRCCONF}" _srcconf_included_: diff --git a/tools/build/options/makeman b/tools/build/options/makeman index ddd08443e61c..88ee5884d180 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -222,8 +222,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable From nobody Tue Sep 16 13:59:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RK2TW5z67JfF; Tue, 16 Sep 2025 13:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RK0SLQz3WkM; Tue, 16 Sep 2025 13:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031149; 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=v8EXMZ0dNRuBpqqNOayElFsGL6MLw21fAY5W0j80XBA=; b=YJA9t0tpy50TiStTlNtoP3wnob7j+MvYiY+AF0tC/RuAHDqT+D06yGFYzj5f86npQxChav rvcRHX9a1J6We13eteVhpaBJzVkW74Gtwd+g6qQ3NpaxKODFdgLqSEY9/3kGOq8m8aAPIV d7rNEQlSbmy+h95nMOPqP/t0CuKNUmpA+oAJz3I/ukyFBM/mIkj05/IwWxmemYpkaZVdXm Jj1xPlL9MX2W19pFjIwgGTT7cB0pbzOUD5ZcelgpFzTnBDsQNwn6wbssYduXkRdgItZ+a1 zgjsHoRSf6mVrdlqw1YLOT922RzgwyrGdLgEPz/LQlh99kPYAd2XhEubWv6TdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031149; 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=v8EXMZ0dNRuBpqqNOayElFsGL6MLw21fAY5W0j80XBA=; b=F7oWnNqL6bhjMlTf5QfEZAAfYys49Q34gyDy4LjFL3S/VSCVg1s81KDzcH5/v4QHW3BpiX 6ePgkzowL0w7Z2nLqsZys0nemDB9PPy8iypJpKMNDnUWE2TjgnqDlJdOaU1w38yKQAEGvl oGE+30ijXtNIzF8DjxecadVBoM67XuYg+BgBp6O1Iv3j9wFGpFl0Qyg8cwAV/Bq6ezfpx/ vhd4XPL0cg57bYW6EjnDqiNMa93Ppb8DX9bo+ohwtIDC7tUX+o1Kwg49FwtgzU1XxaU3/d 1QN6NzooXd9ER7K5Wz0NhhZeYrnw8Vz5Bl9HJZzwwlwt7ZvuwkZZ2Qs96LnV2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031149; a=rsa-sha256; cv=none; b=AqSwEEhMF6ptdDBrGOcT9mFrF7uR3NNAOC0FsIOHfXQvbELpQL+npJgqqVKxEG05WiKP4z uDPI1okH/qIzuKjFzr/q6sDeU+wcXIh/f13G7Z+kbJXjcql4W9mLgjUwrSPDQIcTU5PBHm H1kpH08lecqqitD8kX/6o6IQDOpPDYXXBfB0LJB1OoZb5ac4Jtgqws+IJgidauMJElBAiZ 3nQIeCUw4auoNC23z6r1fng+RXBNs6WOcONBfD7uLALekpheRbiU39hdn6y4NoHM9FGbR/ PzEgS1SvHYWuLFmgNRZIeegPhesqouzWwJLmi08l9w8YPqLHiPHzJP8DmLCqrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RK00pvzkfV; Tue, 16 Sep 2025 13:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDx8NI064391; Tue, 16 Sep 2025 13:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDx83v064388; Tue, 16 Sep 2025 13:59:08 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:08 GMT Message-Id: <202509161359.58GDx83v064388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f6ff04831acf - stable/15 - uptime: Mention libxo support in manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f6ff04831acf4b3ae693afb96a090e4a0c3803ab Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ff04831acf4b3ae693afb96a090e4a0c3803ab commit f6ff04831acf4b3ae693afb96a090e4a0c3803ab Author: Dag-Erling Smørgrav AuthorDate: 2025-09-11 20:51:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:45 +0000 uptime: Mention libxo support in manual page MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52489 (cherry picked from commit 55bd607b9930e5f61219007ad0a81801c8cfdbf3) --- usr.bin/w/uptime.1 | 18 ++++++++++++++++-- usr.bin/w/w.1 | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1 index b93972d3f932..37881793736f 100644 --- a/usr.bin/w/uptime.1 +++ b/usr.bin/w/uptime.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd September 11, 2025 .Dt UPTIME 1 .Os .Sh NAME @@ -33,6 +33,7 @@ .Nd show how long system has been running .Sh SYNOPSIS .Nm +.Op Fl -libxo .Sh DESCRIPTION The .Nm @@ -40,6 +41,17 @@ utility displays the current time, the length of time the system has been up, the number of users, and the load average of the system over the last 1, 5, and 15 minutes. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_options 7 +for details on command line arguments. +.El .Sh FILES .Bl -tag -width /boot/kernel/kernel .It Pa /boot/kernel/kernel @@ -51,7 +63,9 @@ $ uptime 11:23AM up 3:01, 8 users, load averages: 21.09, 15.43, 12.79 .Ed .Sh SEE ALSO -.Xr w 1 +.Xr w 1 , +.Xr libxo 3 , +.Xr xo_options 7 .Sh HISTORY The .Nm diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1 index 159eb3370c8c..2dbcffdeda1f 100644 --- a/usr.bin/w/w.1 +++ b/usr.bin/w/w.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 16, 2025 +.Dd September 11, 2025 .Dt W 1 .Os .Sh NAME @@ -54,7 +54,7 @@ user is on, the host from which the user is logged in, the time the user logged on, the time since the user last typed anything, and the name and arguments of the current process. .Pp -The options are as follows: +The following options are available: .Bl -tag -width indent .It Fl -libxo Generate output via From nobody Tue Sep 16 13:59:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RP658rz67JpJ; Tue, 16 Sep 2025 13:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RP47spz3XC9; Tue, 16 Sep 2025 13:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031153; 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=YsjAkt+zPlBfNYhYmxX1t8AtvE4unTNnf6KiaTZepXs=; b=xsyZq61m/1l1kXlHuPOdgQP0vVE23bxy86pQw/QDfiXu6F+ga452eZVLCTWErITjPBJP4J bDMDJGr2yNYwFASb4rVZEFe45vt7OpfMBwFg8DuigHT+0QAaB/+ZF1y1RtAjkI4bS6d73O i3FNhDz60nabxzusJ1osI/4cMYw4+pZeYawRz6J30dABtIyTX/wYqLFeeIZKlI+kFtW0Kk S/kmU56QgV0a9KzmIkghQLw2jQqBgPOx/3+qZLewSggEeqZfwOdfz0hkk1yWO0F6KvMPAc x7731Tn1325Rm6pyE3vrQJ4k3d3poG2X38BMhavZWzJphwU5aXM3RTo171Zc5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031153; 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=YsjAkt+zPlBfNYhYmxX1t8AtvE4unTNnf6KiaTZepXs=; b=h2w8bD/CYQxA4CJqabRXLc/pF2Eg8lj+D6xgDZ3Cqg8LusrycSTV6zVi4iweEoUyTgX1xx 525lwPukFVOR0l4OIWMaFxyHYEEuGPJoDWlVnicbp4bTYHxIgTP4ItR12Z6MKSFcfNExRa 4tnbIHiq7yY3hkn42XWWtGE3TWrWyQOBbJZ9ojoMLnl/gX2L73KcZPTj1Z4P0R81AUB4jg fXGZAoUsCVHAFuQb0qTWGGc3vPKHRESN2UPmlBStF/4brndcWtvXE3VXikSRdCOsCphT8W rH0TRdKI/dkJrFU3opE3u2GVm4PuN6CQFiGNCWZY5K0mOJthVEFps14h/DVDMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031153; a=rsa-sha256; cv=none; b=i6F2eNTUhltBGBeBnJkCcVt5MaQeV33Kl0gR1eBhZYFFZ3XgE6KY8w0G+MZse4TkNc2zx2 +EwMu2vebuE8g4n1DFCGYMKp7U2IGYE2+TMLw2baUZw0nKpBJC68cGUO1XueCrsbh8TTcI BTIUJBQCZ33r+Dr00REXw0Yo9kriZvivnt04BkvfS/R+GWsKNtk/secxMJIOeNv+ppIi3g SqaMi5fyRukud3C5StmYXgq+XiQrzkT7IctbmKCI4NsYJQymsaGQNnY1OvP/CtoV35KZY5 gFjeIGe2QJv9abZw+6ruV+MqL3Zbdslag6GrjoA5oHkfwsL/jbfTtOIOwV9Wew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RP3Z4QzkRC; Tue, 16 Sep 2025 13:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxDm2064566; Tue, 16 Sep 2025 13:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxDn0064563; Tue, 16 Sep 2025 13:59:13 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:13 GMT Message-Id: <202509161359.58GDxDn0064563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bc8b95bb7695 - stable/14 - w: Fix idle time in json output, add login/idle times to json output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc8b95bb7695b372d0d25d261fa8f3d7beed7fc8 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bc8b95bb7695b372d0d25d261fa8f3d7beed7fc8 commit bc8b95bb7695b372d0d25d261fa8f3d7beed7fc8 Author: Marius Halden AuthorDate: 2025-08-29 14:36:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:03:58 +0000 w: Fix idle time in json output, add login/idle times to json output Currently the idle time will show as `true` part of the time in the json output and quoting depends on what is being printed. Make sure it's always printed correctly and for consistency treated as a string in the json output. Login time delta and since times are currently exposed in the xml output, expose these times in the json output as well. In the json and xml outputs expose the number of seconds idle as a new field or attribute respectively. MFC after: 1 week Sponsored by: Modirum MDPay Event: Oslo Hackathon 202508 Differential Revision: https://reviews.freebsd.org/D52237 (cherry picked from commit 6e6febb54da91bf5e13007c3d8f4a54495273969) --- usr.bin/w/pr_time.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c index 7be11b777e79..ff2da1bcc3c9 100644 --- a/usr.bin/w/pr_time.c +++ b/usr.bin/w/pr_time.c @@ -82,8 +82,13 @@ pr_attime(time_t *started, time_t *now) (void)wcsftime(buf, sizeof(buf), fmt, &tp); len = wcslen(buf); width = wcswidth(buf, len); - xo_attr("since", "%lu", (unsigned long) *started); - xo_attr("delta", "%lu", (unsigned long) diff); + if (xo_get_style(NULL) == XO_STYLE_XML) { + xo_attr("since", "%lu", (unsigned long)*started); + xo_attr("delta", "%lu", (unsigned long)diff); + } else { + xo_emit("{e:login-time-since/%lu}{e:login-time-delta/%lu}", + (unsigned long)*started, (unsigned long)diff); + } if (len == width) xo_emit("{:login-time/%-7.7ls/%ls}", buf); else if (width < 7) @@ -103,10 +108,16 @@ pr_attime(time_t *started, time_t *now) int pr_idle(time_t idle) { + /* In encoded formats, emit the raw data as well */ + if (xo_get_style(NULL) == XO_STYLE_XML) + xo_attr("seconds", "%lu", (unsigned long) idle); + else + xo_emit("{e:idle-seconds/%lu}", (unsigned long) idle); + /* If idle more than 36 hours, print as a number of days. */ if (idle >= 36 * 3600) { int days = idle / 86400; - xo_emit(" {:idle/%dday%s} ", days, days > 1 ? "s" : " " ); + xo_emit(" {q:idle/%dday%s} ", days, days > 1 ? "s" : " " ); if (days >= 100) return (2); if (days >= 10) @@ -114,16 +125,17 @@ pr_idle(time_t idle) } /* If idle more than an hour, print as HH:MM. */ - else if (idle >= 3600) - xo_emit(" {:idle/%2d:%02d/} ", + else if (idle >= 3600) { + xo_emit(" {q:idle/%2d:%02d} ", (int)(idle / 3600), (int)((idle % 3600) / 60)); + } else if (idle / 60 == 0) - xo_emit(" - "); + xo_emit(" - {q:idle//0}"); /* Else print the minutes idle. */ else - xo_emit(" {:idle/%2d} ", (int)(idle / 60)); + xo_emit(" {q:idle/%2d} ", (int)(idle / 60)); return (0); /* not idle longer than 9 days */ } From nobody Tue Sep 16 13:59:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RQ6lJPz67Jrq; Tue, 16 Sep 2025 13:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RQ6Dypz3X7M; Tue, 16 Sep 2025 13:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031154; 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=OyQUTWRCZUjdZTZTmspKwhAmDhpgIyTBtC3bc4VweJs=; b=V3U99ddtrzIAo6cOhbHur1f2/PHUtpuCzO0Ls8rvASDG28qSqpevyLFASXCaCzJbkBxQ3w Pjc8s1iNybypa5UVl4wpI+XldYAWaVXIL0Rgr8CVTUTyFK3qRx+fpVjTG2hHMBH+HAlgrq Ly65o1jVvwGDKCen5CGLnqQl/ASwbvLwmBGv5gQuBhvM2EFuFQAgvRz/rQPKOPg1BPvaC+ rFmrckrItQK3R4Camgsq7JTUX6vi0A4b+zijFBZiu9J9JFphKdR3SW8UJNxmKBICUEz+mX CfEACH/iAHtKpDdiVo42N3CedajCLOO7CwP5ymZszlZZ+on+jFVfX6+nfrNjoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031154; 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=OyQUTWRCZUjdZTZTmspKwhAmDhpgIyTBtC3bc4VweJs=; b=TNpJ2fqE6d+C0cyBIGxV1CYjcgUJXmRmllwpr4F7ax8RMdnlsuE1U4MMyEWf98BMwZKieg Wf/LivF0ggeoAVqdnV5hUPufTPbRmArkzlkWwLUhMDk3EyvSdmg6uNbgo3BKwA1nztD26+ +S6cBX8adxSvLRnGxQ7hOoEoYn9jshRo0OKU50kRjbf/1gEs5jPKvIFosAWhC+siwk+bBt 59E3f/D3PZYAu48QRztvIpm9wb7ryMcpcCFnglHXoMYhLEGZZvdgqrEapmsk8OfovY/wl8 YlPkPB9oKAJEso5h4QwT1RtKhsjnoZN+CCpApnrw8GW0kBtJvWaUFM4XSlmTew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031154; a=rsa-sha256; cv=none; b=KNL1wsKTaISqnOEtf+DT3GxziMGmwUjPpHAuXBrswKxks3gM9bltvzoonh1ZEVAqqUw3Cq EYXs55LHtr5i/tOPh72VHJaIE/YlKPVzYsB/V3Ez+SJiP+6RaYv0nPXU8IJHD/ck0X7mF4 7VFuWv19WWV01LxMNqYx+MeBR80Ov4lu/9CoCKFrfTx5wtFtXKyJA9vWRkk7iRuWPR7eQZ cF7t43EdtG3S+CIvb6O7pnLrg5WMo/zFxE401lQWogtZAhNey5qxGcOmZxIO7/ZWUAMusN CgtehU3WLFdipNUoaq8M5rFW/epSWBjuU7BJB6bzxOi201qaD83XSpZFuaw2ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RQ5VKNzkTD; Tue, 16 Sep 2025 13:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxE7U064601; Tue, 16 Sep 2025 13:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxEFc064598; Tue, 16 Sep 2025 13:59:14 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:14 GMT Message-Id: <202509161359.58GDxEFc064598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a2058a619c6b - stable/14 - unbound: Update to 1.23.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2058a619c6b60c2f22ae2fa7e91a3e9b99669d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a2058a619c6b60c2f22ae2fa7e91a3e9b99669d9 commit a2058a619c6b60c2f22ae2fa7e91a3e9b99669d9 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-07 18:59:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:05:54 +0000 unbound: Update to 1.23.1 Release notes at https://nlnetlabs.nl/news/2025/Jul/16/unbound-1.23.1-released/ Since we don't enable ECS, this is mostly a nop for us. Merge commit 'c8864f6ba46ff3271d97b4ae1c3cc6ce01eaf18a' MFC after: 3 days (cherry picked from commit 5a0119491adbea0876d9d6dc0ef3e71f3d64a20b) --- contrib/unbound/config.guess | 17 +- contrib/unbound/config.h.in | 360 +- contrib/unbound/config.sub | 28 +- contrib/unbound/configure | 4467 ++++++++++++--------- contrib/unbound/configure.ac | 5 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf | 300 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3 | 4 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8 | 14 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8 | 8 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8 | 343 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1 | 4 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8 | 8 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5 | 741 +++- contrib/unbound/doc/unbound.conf.5.in | 2 +- contrib/unbound/edns-subnet/subnetmod.c | 152 +- contrib/unbound/edns-subnet/subnetmod.h | 4 + contrib/unbound/ltmain.sh | 1555 ++++--- contrib/unbound/smallapp/unbound-control-setup.sh | 227 +- lib/libunbound/Makefile | 31 +- lib/libunbound/config.h | 521 ++- 28 files changed, 5633 insertions(+), 3178 deletions(-) diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index 48a684601bd2..a9d01fde4617 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2024 Free Software Foundation, Inc. +# Copyright 1992-2025 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2024-07-27' +timestamp='2025-07-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2024 Free Software Foundation, Inc. +Copyright 1992-2025 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1597,8 +1597,11 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; - *:Ironclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad + x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*) + GUESS=$UNAME_MACHINE-pc-ironclad-mlibc + ;; + *:[Ii]ronclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc ;; esac @@ -1808,8 +1811,8 @@ fi exit 1 # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-format: "%Y-%02m-%02d" # time-stamp-end: "'" # End: diff --git a/contrib/unbound/config.h.in b/contrib/unbound/config.h.in index f2dc8c8b92b3..584810398b91 100644 --- a/contrib/unbound/config.h.in +++ b/contrib/unbound/config.h.in @@ -48,13 +48,13 @@ internal symbols */ #undef EXPORT_ALL_SYMBOLS -/* Define to 1 if you have the `accept4' function. */ +/* Define to 1 if you have the 'accept4' function. */ #undef HAVE_ACCEPT4 -/* Define to 1 if you have the `arc4random' function. */ +/* Define to 1 if you have the 'arc4random' function. */ #undef HAVE_ARC4RANDOM -/* Define to 1 if you have the `arc4random_uniform' function. */ +/* Define to 1 if you have the 'arc4random_uniform' function. */ #undef HAVE_ARC4RANDOM_UNIFORM /* Define to 1 if you have the header file. */ @@ -78,7 +78,7 @@ /* If we have be64toh */ #undef HAVE_BE64TOH -/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +/* Define to 1 if you have the 'BIO_set_callback_ex' function. */ #undef HAVE_BIO_SET_CALLBACK_EX /* Define to 1 if you have the header file. */ @@ -87,241 +87,241 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BSD_STRING_H -/* Define to 1 if you have the `chown' function. */ +/* Define to 1 if you have the 'chown' function. */ #undef HAVE_CHOWN -/* Define to 1 if you have the `chroot' function. */ +/* Define to 1 if you have the 'chroot' function. */ #undef HAVE_CHROOT -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +/* Define to 1 if you have the 'CRYPTO_cleanup_all_ex_data' function. */ #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA -/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +/* Define to 1 if you have the 'CRYPTO_THREADID_set_callback' function. */ #undef HAVE_CRYPTO_THREADID_SET_CALLBACK -/* Define to 1 if you have the `ctime_r' function. */ +/* Define to 1 if you have the 'ctime_r' function. */ #undef HAVE_CTIME_R -/* Define to 1 if you have the `daemon' function. */ +/* Define to 1 if you have the 'daemon' function. */ #undef HAVE_DAEMON -/* Define to 1 if you have the declaration of `arc4random', and to 0 if you +/* Define to 1 if you have the declaration of 'arc4random', and to 0 if you don't. */ #undef HAVE_DECL_ARC4RANDOM -/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 +/* Define to 1 if you have the declaration of 'arc4random_uniform', and to 0 if you don't. */ #undef HAVE_DECL_ARC4RANDOM_UNIFORM -/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if +/* Define to 1 if you have the declaration of 'evsignal_assign', and to 0 if you don't. */ #undef HAVE_DECL_EVSIGNAL_ASSIGN -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you +/* Define to 1 if you have the declaration of 'inet_ntop', and to 0 if you don't. */ #undef HAVE_DECL_INET_NTOP -/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you +/* Define to 1 if you have the declaration of 'inet_pton', and to 0 if you don't. */ #undef HAVE_DECL_INET_PTON -/* Define to 1 if you have the declaration of `nghttp2_session_server_new', +/* Define to 1 if you have the declaration of 'nghttp2_session_server_new', and to 0 if you don't. */ #undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW -/* Define to 1 if you have the declaration of `ngtcp2_conn_server_new', and to +/* Define to 1 if you have the declaration of 'ngtcp2_conn_server_new', and to 0 if you don't. */ #undef HAVE_DECL_NGTCP2_CONN_SERVER_NEW -/* Define to 1 if you have the declaration of `ngtcp2_crypto_encrypt_cb', and +/* Define to 1 if you have the declaration of 'ngtcp2_crypto_encrypt_cb', and to 0 if you don't. */ #undef HAVE_DECL_NGTCP2_CRYPTO_ENCRYPT_CB -/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_ED25519', and to 0 if you don't. */ #undef HAVE_DECL_NID_ED25519 -/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_ED448', and to 0 if you don't. */ #undef HAVE_DECL_NID_ED448 -/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_secp384r1', and to 0 if you don't. */ #undef HAVE_DECL_NID_SECP384R1 -/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 +/* Define to 1 if you have the declaration of 'NID_X9_62_prime256v1', and to 0 if you don't. */ #undef HAVE_DECL_NID_X9_62_PRIME256V1 -/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you +/* Define to 1 if you have the declaration of 'reallocarray', and to 0 if you don't. */ #undef HAVE_DECL_REALLOCARRAY -/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you +/* Define to 1 if you have the declaration of 'redisConnect', and to 0 if you don't. */ #undef HAVE_DECL_REDISCONNECT -/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 +/* Define to 1 if you have the declaration of 'sk_SSL_COMP_pop_free', and to 0 if you don't. */ #undef HAVE_DECL_SK_SSL_COMP_POP_FREE /* Define to 1 if you have the declaration of - `SSL_COMP_get_compression_methods', and to 0 if you don't. */ + 'SSL_COMP_get_compression_methods', and to 0 if you don't. */ #undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS -/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to +/* Define to 1 if you have the declaration of 'SSL_CTX_set_ecdh_auto', and to 0 if you don't. */ #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO -/* Define to 1 if you have the declaration of `strlcat', and to 0 if you +/* Define to 1 if you have the declaration of 'strlcat', and to 0 if you don't. */ #undef HAVE_DECL_STRLCAT -/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you +/* Define to 1 if you have the declaration of 'strlcpy', and to 0 if you don't. */ #undef HAVE_DECL_STRLCPY -/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if +/* Define to 1 if you have the declaration of 'XML_StopParser', and to 0 if you don't. */ #undef HAVE_DECL_XML_STOPPARSER /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `DSA_SIG_set0' function. */ +/* Define to 1 if you have the 'DSA_SIG_set0' function. */ #undef HAVE_DSA_SIG_SET0 /* Define to 1 if you have the header file. */ #undef HAVE_ENDIAN_H -/* Define to 1 if you have the `endprotoent' function. */ +/* Define to 1 if you have the 'endprotoent' function. */ #undef HAVE_ENDPROTOENT -/* Define to 1 if you have the `endpwent' function. */ +/* Define to 1 if you have the 'endpwent' function. */ #undef HAVE_ENDPWENT -/* Define to 1 if you have the `endservent' function. */ +/* Define to 1 if you have the 'endservent' function. */ #undef HAVE_ENDSERVENT -/* Define to 1 if you have the `ENGINE_cleanup' function. */ +/* Define to 1 if you have the 'ENGINE_cleanup' function. */ #undef HAVE_ENGINE_CLEANUP -/* Define to 1 if you have the `ERR_free_strings' function. */ +/* Define to 1 if you have the 'ERR_free_strings' function. */ #undef HAVE_ERR_FREE_STRINGS -/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +/* Define to 1 if you have the 'ERR_load_crypto_strings' function. */ #undef HAVE_ERR_LOAD_CRYPTO_STRINGS -/* Define to 1 if you have the `event_assign' function. */ +/* Define to 1 if you have the 'event_assign' function. */ #undef HAVE_EVENT_ASSIGN -/* Define to 1 if you have the `event_base_free' function. */ +/* Define to 1 if you have the 'event_base_free' function. */ #undef HAVE_EVENT_BASE_FREE -/* Define to 1 if you have the `event_base_get_method' function. */ +/* Define to 1 if you have the 'event_base_get_method' function. */ #undef HAVE_EVENT_BASE_GET_METHOD -/* Define to 1 if you have the `event_base_new' function. */ +/* Define to 1 if you have the 'event_base_new' function. */ #undef HAVE_EVENT_BASE_NEW -/* Define to 1 if you have the `event_base_once' function. */ +/* Define to 1 if you have the 'event_base_once' function. */ #undef HAVE_EVENT_BASE_ONCE /* Define to 1 if you have the header file. */ #undef HAVE_EVENT_H -/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +/* Define to 1 if you have the 'EVP_aes_256_cbc' function. */ #undef HAVE_EVP_AES_256_CBC -/* Define to 1 if you have the `EVP_cleanup' function. */ +/* Define to 1 if you have the 'EVP_cleanup' function. */ #undef HAVE_EVP_CLEANUP -/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' +/* Define to 1 if you have the 'EVP_default_properties_is_fips_enabled' function. */ #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED -/* Define to 1 if you have the `EVP_DigestVerify' function. */ +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ #undef HAVE_EVP_DIGESTVERIFY -/* Define to 1 if you have the `EVP_dss1' function. */ +/* Define to 1 if you have the 'EVP_dss1' function. */ #undef HAVE_EVP_DSS1 -/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +/* Define to 1 if you have the 'EVP_EncryptInit_ex' function. */ #undef HAVE_EVP_ENCRYPTINIT_EX -/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +/* Define to 1 if you have the 'EVP_MAC_CTX_set_params' function. */ #undef HAVE_EVP_MAC_CTX_SET_PARAMS -/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +/* Define to 1 if you have the 'EVP_MD_CTX_new' function. */ #undef HAVE_EVP_MD_CTX_NEW -/* Define to 1 if you have the `EVP_sha1' function. */ +/* Define to 1 if you have the 'EVP_sha1' function. */ #undef HAVE_EVP_SHA1 -/* Define to 1 if you have the `EVP_sha256' function. */ +/* Define to 1 if you have the 'EVP_sha256' function. */ #undef HAVE_EVP_SHA256 -/* Define to 1 if you have the `EVP_sha512' function. */ +/* Define to 1 if you have the 'EVP_sha512' function. */ #undef HAVE_EVP_SHA512 -/* Define to 1 if you have the `ev_default_loop' function. */ +/* Define to 1 if you have the 'ev_default_loop' function. */ #undef HAVE_EV_DEFAULT_LOOP -/* Define to 1 if you have the `ev_loop' function. */ +/* Define to 1 if you have the 'ev_loop' function. */ #undef HAVE_EV_LOOP /* Define to 1 if you have the header file. */ #undef HAVE_EXPAT_H -/* Define to 1 if you have the `explicit_bzero' function. */ +/* Define to 1 if you have the 'explicit_bzero' function. */ #undef HAVE_EXPLICIT_BZERO -/* Define to 1 if you have the `fcntl' function. */ +/* Define to 1 if you have the 'fcntl' function. */ #undef HAVE_FCNTL -/* Define to 1 if you have the `FIPS_mode' function. */ +/* Define to 1 if you have the 'FIPS_mode' function. */ #undef HAVE_FIPS_MODE -/* Define to 1 if you have the `fork' function. */ +/* Define to 1 if you have the 'fork' function. */ #undef HAVE_FORK -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ #undef HAVE_FSEEKO -/* Define to 1 if you have the `fsync' function. */ +/* Define to 1 if you have the 'fsync' function. */ #undef HAVE_FSYNC /* Whether getaddrinfo is available */ #undef HAVE_GETADDRINFO -/* Define to 1 if you have the `getauxval' function. */ +/* Define to 1 if you have the 'getauxval' function. */ #undef HAVE_GETAUXVAL -/* Define to 1 if you have the `getentropy' function. */ +/* Define to 1 if you have the 'getentropy' function. */ #undef HAVE_GETENTROPY -/* Define to 1 if you have the `getifaddrs' function. */ +/* Define to 1 if you have the 'getifaddrs' function. */ #undef HAVE_GETIFADDRS /* Define to 1 if you have the header file. */ #undef HAVE_GETOPT_H -/* Define to 1 if you have the `getpwnam' function. */ +/* Define to 1 if you have the 'getpwnam' function. */ #undef HAVE_GETPWNAM -/* Define to 1 if you have the `getrlimit' function. */ +/* Define to 1 if you have the 'getrlimit' function. */ #undef HAVE_GETRLIMIT -/* Define to 1 if you have the `gettid' function. */ +/* Define to 1 if you have the 'gettid' function. */ #undef HAVE_GETTID -/* Define to 1 if you have the `glob' function. */ +/* Define to 1 if you have the 'glob' function. */ #undef HAVE_GLOB /* Define to 1 if you have the header file. */ #undef HAVE_GLOB_H -/* Define to 1 if you have the `gmtime_r' function. */ +/* Define to 1 if you have the 'gmtime_r' function. */ #undef HAVE_GMTIME_R /* Define to 1 if you have the header file. */ @@ -330,7 +330,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_HIREDIS_HIREDIS_H -/* Define to 1 if you have the `HMAC_Init_ex' function. */ +/* Define to 1 if you have the 'HMAC_Init_ex' function. */ #undef HAVE_HMAC_INIT_EX /* If we have htobe64 */ @@ -339,19 +339,19 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IFADDRS_H -/* Define to 1 if you have the `if_nametoindex' function. */ +/* Define to 1 if you have the 'if_nametoindex' function. */ #undef HAVE_IF_NAMETOINDEX -/* Define to 1 if you have the `inet_aton' function. */ +/* Define to 1 if you have the 'inet_aton' function. */ #undef HAVE_INET_ATON -/* Define to 1 if you have the `inet_ntop' function. */ +/* Define to 1 if you have the 'inet_ntop' function. */ #undef HAVE_INET_NTOP -/* Define to 1 if you have the `inet_pton' function. */ +/* Define to 1 if you have the 'inet_pton' function. */ #undef HAVE_INET_PTON -/* Define to 1 if you have the `initgroups' function. */ +/* Define to 1 if you have the 'initgroups' function. */ #undef HAVE_INITGROUPS /* Define to 1 if you have the header file. */ @@ -363,10 +363,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IPHLPAPI_H -/* Define to 1 if you have the `isblank' function. */ +/* Define to 1 if you have the 'isblank' function. */ #undef HAVE_ISBLANK -/* Define to 1 if you have the `kill' function. */ +/* Define to 1 if you have the 'kill' function. */ #undef HAVE_KILL /* Use portable libbsd functions */ @@ -384,7 +384,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_NET_TSTAMP_H -/* Define to 1 if you have the `localtime_r' function. */ +/* Define to 1 if you have the 'localtime_r' function. */ #undef HAVE_LOCALTIME_R /* Define to 1 if you have the header file. */ @@ -393,7 +393,7 @@ /* If have GNU libc compatible malloc */ #undef HAVE_MALLOC -/* Define to 1 if you have the `memmove' function. */ +/* Define to 1 if you have the 'memmove' function. */ #undef HAVE_MEMMOVE /* Define to 1 if you have the header file. */ @@ -435,49 +435,49 @@ /* Define this to use ngtcp2. */ #undef HAVE_NGTCP2 -/* Define to 1 if you have the `ngtcp2_ccerr_default' function. */ +/* Define to 1 if you have the 'ngtcp2_ccerr_default' function. */ #undef HAVE_NGTCP2_CCERR_DEFAULT -/* Define to 1 if you have the `ngtcp2_conn_encode_0rtt_transport_params' +/* Define to 1 if you have the 'ngtcp2_conn_encode_0rtt_transport_params' function. */ #undef HAVE_NGTCP2_CONN_ENCODE_0RTT_TRANSPORT_PARAMS -/* Define to 1 if you have the `ngtcp2_conn_get_max_local_streams_uni' +/* Define to 1 if you have the 'ngtcp2_conn_get_max_local_streams_uni' function. */ #undef HAVE_NGTCP2_CONN_GET_MAX_LOCAL_STREAMS_UNI -/* Define to 1 if you have the `ngtcp2_conn_get_num_scid' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_get_num_scid' function. */ #undef HAVE_NGTCP2_CONN_GET_NUM_SCID -/* Define to 1 if you have the `ngtcp2_conn_in_closing_period' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_in_closing_period' function. */ #undef HAVE_NGTCP2_CONN_IN_CLOSING_PERIOD -/* Define to 1 if you have the `ngtcp2_conn_in_draining_period' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_in_draining_period' function. */ #undef HAVE_NGTCP2_CONN_IN_DRAINING_PERIOD /* Define if ngtcp2_conn_shutdown_stream has 4 arguments. */ #undef HAVE_NGTCP2_CONN_SHUTDOWN_STREAM4 -/* Define to 1 if you have the `ngtcp2_conn_tls_early_data_rejected' function. +/* Define to 1 if you have the 'ngtcp2_conn_tls_early_data_rejected' function. */ #undef HAVE_NGTCP2_CONN_TLS_EARLY_DATA_REJECTED -/* Define to 1 if you have the `ngtcp2_crypto_encrypt_cb' function. */ +/* Define to 1 if you have the 'ngtcp2_crypto_encrypt_cb' function. */ #undef HAVE_NGTCP2_CRYPTO_ENCRYPT_CB /* Define to 1 if you have the - `ngtcp2_crypto_quictls_configure_client_context' function. */ + 'ngtcp2_crypto_quictls_configure_client_context' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT /* Define to 1 if you have the - `ngtcp2_crypto_quictls_configure_server_context' function. */ + 'ngtcp2_crypto_quictls_configure_server_context' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT /* Define to 1 if you have the - `ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ + 'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL -/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */ +/* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */ #undef HAVE_NGTCP2_ENCRYPTION_LEVEL /* Define to 1 if you have the header file. @@ -494,13 +494,13 @@ /* Use libnss for crypto */ #undef HAVE_NSS -/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +/* Define to 1 if you have the 'OpenSSL_add_all_digests' function. */ #undef HAVE_OPENSSL_ADD_ALL_DIGESTS /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_BN_H -/* Define to 1 if you have the `OPENSSL_config' function. */ +/* Define to 1 if you have the 'OPENSSL_config' function. */ #undef HAVE_OPENSSL_CONFIG /* Define to 1 if you have the header file. */ @@ -521,10 +521,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_ERR_H -/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +/* Define to 1 if you have the 'OPENSSL_init_crypto' function. */ #undef HAVE_OPENSSL_INIT_CRYPTO -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +/* Define to 1 if you have the 'OPENSSL_init_ssl' function. */ #undef HAVE_OPENSSL_INIT_SSL /* Define to 1 if you have the header file. */ @@ -539,10 +539,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_SSL_H -/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +/* Define to 1 if you have the 'OSSL_PARAM_BLD_new' function. */ #undef HAVE_OSSL_PARAM_BLD_NEW -/* Define to 1 if you have the `poll' function. */ +/* Define to 1 if you have the 'poll' function. */ #undef HAVE_POLL /* Define to 1 if you have the header file. */ @@ -554,10 +554,10 @@ /* Have PTHREAD_PRIO_INHERIT. */ #undef HAVE_PTHREAD_PRIO_INHERIT -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +/* Define to 1 if the system has the type 'pthread_rwlock_t'. */ #undef HAVE_PTHREAD_RWLOCK_T -/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +/* Define to 1 if the system has the type 'pthread_spinlock_t'. */ #undef HAVE_PTHREAD_SPINLOCK_T /* Define to 1 if you have the header file. */ @@ -566,101 +566,101 @@ /* Define if you have Python libraries and header files. */ #undef HAVE_PYTHON -/* Define to 1 if you have the `random' function. */ +/* Define to 1 if you have the 'random' function. */ #undef HAVE_RANDOM -/* Define to 1 if you have the `RAND_cleanup' function. */ +/* Define to 1 if you have the 'RAND_cleanup' function. */ #undef HAVE_RAND_CLEANUP /* If we have reallocarray(3) */ #undef HAVE_REALLOCARRAY -/* Define to 1 if you have the `recvmsg' function. */ +/* Define to 1 if you have the 'recvmsg' function. */ #undef HAVE_RECVMSG -/* Define to 1 if you have the `sendmsg' function. */ +/* Define to 1 if you have the 'sendmsg' function. */ #undef HAVE_SENDMSG -/* Define to 1 if you have the `setregid' function. */ +/* Define to 1 if you have the 'setregid' function. */ #undef HAVE_SETREGID -/* Define to 1 if you have the `setresgid' function. */ +/* Define to 1 if you have the 'setresgid' function. */ #undef HAVE_SETRESGID -/* Define to 1 if you have the `setresuid' function. */ +/* Define to 1 if you have the 'setresuid' function. */ #undef HAVE_SETRESUID -/* Define to 1 if you have the `setreuid' function. */ +/* Define to 1 if you have the 'setreuid' function. */ #undef HAVE_SETREUID -/* Define to 1 if you have the `setrlimit' function. */ +/* Define to 1 if you have the 'setrlimit' function. */ #undef HAVE_SETRLIMIT -/* Define to 1 if you have the `setsid' function. */ +/* Define to 1 if you have the 'setsid' function. */ #undef HAVE_SETSID -/* Define to 1 if you have the `setusercontext' function. */ +/* Define to 1 if you have the 'setusercontext' function. */ #undef HAVE_SETUSERCONTEXT -/* Define to 1 if you have the `SHA512_Update' function. */ +/* Define to 1 if you have the 'SHA512_Update' function. */ #undef HAVE_SHA512_UPDATE -/* Define to 1 if you have the `shmget' function. */ +/* Define to 1 if you have the 'shmget' function. */ #undef HAVE_SHMGET -/* Define to 1 if you have the `sigprocmask' function. */ +/* Define to 1 if you have the 'sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define to 1 if you have the `sleep' function. */ +/* Define to 1 if you have the 'sleep' function. */ #undef HAVE_SLEEP -/* Define to 1 if you have the `snprintf' function. */ +/* Define to 1 if you have the 'snprintf' function. */ #undef HAVE_SNPRINTF -/* Define to 1 if you have the `socketpair' function. */ +/* Define to 1 if you have the 'socketpair' function. */ #undef HAVE_SOCKETPAIR /* Using Solaris threads */ #undef HAVE_SOLARIS_THREADS -/* Define to 1 if you have the `srandom' function. */ +/* Define to 1 if you have the 'srandom' function. */ #undef HAVE_SRANDOM /* Define if you have the SSL libraries installed. */ #undef HAVE_SSL -/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_alpn_protos' function. */ #undef HAVE_SSL_CTX_SET_ALPN_PROTOS -/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_alpn_select_cb' function. */ #undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB -/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_ciphersuites' function. */ #undef HAVE_SSL_CTX_SET_CIPHERSUITES -/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_security_level' function. */ #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL -/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' +/* Define to 1 if you have the 'SSL_CTX_set_tlsext_ticket_key_evp_cb' function. */ #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB -/* Define to 1 if you have the `SSL_CTX_set_tmp_ecdh' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_tmp_ecdh' function. */ #undef HAVE_SSL_CTX_SET_TMP_ECDH -/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +/* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */ #undef HAVE_SSL_GET0_ALPN_SELECTED -/* Define to 1 if you have the `SSL_get0_peername' function. */ +/* Define to 1 if you have the 'SSL_get0_peername' function. */ #undef HAVE_SSL_GET0_PEERNAME -/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +/* Define to 1 if you have the 'SSL_get1_peer_certificate' function. */ #undef HAVE_SSL_GET1_PEER_CERTIFICATE -/* Define to 1 if you have the `SSL_is_quic' function. */ +/* Define to 1 if you have the 'SSL_is_quic' function. */ #undef HAVE_SSL_IS_QUIC -/* Define to 1 if you have the `SSL_set1_host' function. */ +/* Define to 1 if you have the 'SSL_set1_host' function. */ #undef HAVE_SSL_SET1_HOST /* Define to 1 if you have the header file. */ @@ -681,7 +681,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strftime' function. */ +/* Define to 1 if you have the 'strftime' function. */ #undef HAVE_STRFTIME /* Define to 1 if you have the header file. */ @@ -690,39 +690,39 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcat' function. */ +/* Define to 1 if you have the 'strlcat' function. */ #undef HAVE_STRLCAT -/* Define to 1 if you have the `strlcpy' function. */ +/* Define to 1 if you have the 'strlcpy' function. */ #undef HAVE_STRLCPY -/* Define to 1 if you have the `strptime' function. */ +/* Define to 1 if you have the 'strptime' function. */ #undef HAVE_STRPTIME -/* Define to 1 if you have the `strsep' function. */ +/* Define to 1 if you have the 'strsep' function. */ #undef HAVE_STRSEP -/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ +/* Define to 1 if 'ipi_spec_dst' is a member of 'struct in_pktinfo'. */ #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST -/* Define to 1 if `tokenlen' is a member of `struct ngtcp2_pkt_hd'. */ +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_pkt_hd'. */ #undef HAVE_STRUCT_NGTCP2_PKT_HD_TOKENLEN -/* Define to 1 if `max_tx_udp_payload_size' is a member of `struct +/* Define to 1 if 'max_tx_udp_payload_size' is a member of 'struct ngtcp2_settings'. */ #undef HAVE_STRUCT_NGTCP2_SETTINGS_MAX_TX_UDP_PAYLOAD_SIZE -/* Define to 1 if `tokenlen' is a member of `struct ngtcp2_settings'. */ +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_settings'. */ #undef HAVE_STRUCT_NGTCP2_SETTINGS_TOKENLEN -/* Define to 1 if `original_dcid_present' is a member of `struct +/* Define to 1 if 'original_dcid_present' is a member of 'struct ngtcp2_transport_params'. */ #undef HAVE_STRUCT_NGTCP2_TRANSPORT_PARAMS_ORIGINAL_DCID_PRESENT -/* Define to 1 if the system has the type `struct ngtcp2_version_cid'. */ +/* Define to 1 if the system has the type 'struct ngtcp2_version_cid'. */ #undef HAVE_STRUCT_NGTCP2_VERSION_CID -/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ +/* Define to 1 if 'sun_len' is a member of 'struct sockaddr_un'. */ #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN /* Define if you have Swig libraries and header files. */ @@ -782,16 +782,16 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TIME_H -/* Define to 1 if you have the `tzset' function. */ +/* Define to 1 if you have the 'tzset' function. */ #undef HAVE_TZSET /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `usleep' function. */ +/* Define to 1 if you have the 'usleep' function. */ #undef HAVE_USLEEP -/* Define to 1 if you have the `vfork' function. */ +/* Define to 1 if you have the 'vfork' function. */ #undef HAVE_VFORK /* Define to 1 if you have the header file. */ @@ -809,22 +809,22 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WINSOCK2_H -/* Define to 1 if `fork' works. */ +/* Define to 1 if 'fork' works. */ #undef HAVE_WORKING_FORK -/* Define to 1 if `vfork' works. */ +/* Define to 1 if 'vfork' works. */ #undef HAVE_WORKING_VFORK -/* Define to 1 if you have the `writev' function. */ +/* Define to 1 if you have the 'writev' function. */ #undef HAVE_WRITEV /* Define to 1 if you have the header file. */ #undef HAVE_WS2TCPIP_H -/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ +/* Define to 1 if you have the 'X509_VERIFY_PARAM_set1_host' function. */ #undef HAVE_X509_VERIFY_PARAM_SET1_HOST -/* Define to 1 if you have the `_beginthreadex' function. */ +/* Define to 1 if you have the '_beginthreadex' function. */ #undef HAVE__BEGINTHREADEX /* If HMAC_Init_ex() returns void */ @@ -923,16 +923,16 @@ /* Shared data */ #undef SHARE_DIR -/* The size of `pthread_t', as computed by sizeof. */ +/* The size of 'pthread_t', as computed by sizeof. */ #undef SIZEOF_PTHREAD_T -/* The size of `size_t', as computed by sizeof. */ +/* The size of 'size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of 'time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T -/* The size of `unsigned long', as computed by sizeof. */ +/* The size of 'unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* define if (v)snprintf does not return length needed, (but length used) */ @@ -941,7 +941,7 @@ /* Define to 1 if libsodium supports sodium_set_misuse_handler */ #undef SODIUM_MISUSE_HANDLER -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -1035,7 +1035,7 @@ /* Define this to enable SHA256 and SHA512 support. */ #undef USE_SHA2 -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif @@ -1096,11 +1096,15 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -1141,30 +1145,36 @@ /* Define if you want PyUnbound. */ #undef WITH_PYUNBOUND -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ +/* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a + 'char[]'. */ #undef YYTEXT_POINTER /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* Define to 1 if necessary to make fseeko visible. */ #undef _LARGEFILE_SOURCE -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES /* Enable for compile on Minix */ #undef _NETBSD_SOURCE +/* Number of bits in time_t, on hosts where this is settable. */ +#undef _TIME_BITS + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +#undef __MINGW_USE_VC2005_COMPAT + /* defined to use gcc ansi snprintf and sscanf that understands %lld when compiled for windows. */ #undef __USE_MINGW_ANSI_STDIO -/* Define to empty if `const' does not conform to ANSI C. */ +/* Define to empty if 'const' does not conform to ANSI C. */ #undef const -/* Define to `int' if doesn't define. */ +/* Define as 'int' if doesn't define. */ #undef gid_t /* in_addr_t */ @@ -1173,28 +1183,28 @@ /* in_port_t */ #undef in_port_t -/* Define to `__inline__' or `__inline' if that's what the C compiler +/* Define to '__inline__' or '__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline #endif -/* Define to `short' if does not define. */ +/* Define to 'short' if does not define. */ #undef int16_t -/* Define to `int' if does not define. */ +/* Define to 'int' if does not define. */ #undef int32_t -/* Define to `long long' if does not define. */ +/* Define to 'long long' if does not define. */ #undef int64_t -/* Define to `signed char' if does not define. */ +/* Define to 'signed char' if does not define. */ #undef int8_t *** 17339 LINES SKIPPED *** From nobody Tue Sep 16 13:59:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RS1hTpz67JpK; Tue, 16 Sep 2025 13:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RR71wxz3XNZ; Tue, 16 Sep 2025 13:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031156; 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=AV3CEq9Bd2qUExN2/u1mTokaYl++BC8u+iDxk4QHFtc=; b=Yq0alSOM3SwHbopq/FkQ1Ij46SewQzUYZox25t/vy8F+qmLj5zHSHryIu10r0BfDs9HiQZ rAwZhKOSYJjjsqiQvdKv09JL7+FxM9Ok9YMc/Nf02ZLCx5Rbz7EvI3Wz30ayhnkUbjXw4n TsBwhYXUuxzrIoOv0ZTWocwwuEZ3L7I8fuopwa8Z8nzAmdiByjDa/MwGc2abxVrw6J6Gi/ Pe8lciuNFQFPvBknDhGqdZpOGiH2vtSVBl8MF4PbJVtBsKMRnnNLGVN+76a2H0vqMgJx0l qzofQoWJxEFKHyqhlL/HdZ7LPiRhuEpJgWaatT6pHgarxj6q2MuE/g2f6Mr+yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031156; 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=AV3CEq9Bd2qUExN2/u1mTokaYl++BC8u+iDxk4QHFtc=; b=wI3l9gTnkFPG3twwhEENn0yydkJQrDt7luHwfN9q5zZmKAvH4E0EI5BOuLAR/YMs+/IO2Y JQjz0S/rug+IpOpfO1vR9Muao7rNFbtOxJW7RdPDWzVwKFH7wL2qKGP9gbBEh/mInTWjEb KYy25fC2bZjXJ4bSlBdL+G+PNAwOES3MxK5Rs6WNWYIoVSmx2noyrXIxIFf+5wEfv/siIq JHlkhZTiqywpbnsWfpXAT8XtyKcfuGBU8lbT1sEm9Rt2SVeaGFZQoZ7bck6LnTrCZJ8Hm6 euMjIooW7ehHaPploc60x1EVVkzyWa87Lvd6n34u4LXf7D9N1x0fCdG7f/8csg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031156; a=rsa-sha256; cv=none; b=t8cVUUs+LQ83BNNaBnQ/YNcQWaN6AoWHf1ue4Rd6Jrg5ZwZPgEqtzRRhsNTKpbwkjuU+A8 9Q4NejQoavzHt+3uWD2f2qMohCT8VR2gRPszxoQ52fwPyRuJHcyiJ4SNWq6kwCXKE59eKJ YSTbHFbB2I5Nis4JuOKAUYoKhxmFtDGmOXwUMralD6JbfmuzEgH6wYrmR7nuDq4WLTRix0 aJU3rjBO4WT+9Xh5KiVq1aJ8K4/gCewnQfsOzoJOYdXWud9DiDx5zLm/msTo2FQVpzxXzv TzRT4xr+VGIMIeSxNMik8MO58YnOKgVpxLfOYH+4UWdjqY3iinWaw2G2tcdkCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RR69cTzkTF; Tue, 16 Sep 2025 13:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxFgN064636; Tue, 16 Sep 2025 13:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxFxu064633; Tue, 16 Sep 2025 13:59:15 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:15 GMT Message-Id: <202509161359.58GDxFxu064633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 61735a4f685b - stable/14 - man: Add -l option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 61735a4f685bb1a1d2a787d79e1541ed017a5ca5 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=61735a4f685bb1a1d2a787d79e1541ed017a5ca5 commit 61735a4f685bb1a1d2a787d79e1541ed017a5ca5 Author: Ingo Schwarze AuthorDate: 2025-09-07 20:52:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:05:54 +0000 man: Add -l option Add a -l option which causes man to interpret all arguments as paths to open directly rather than man pages to search for in MANPATH. See the PR for a detailed rationale. PR: 289245 MFC after: 1 week Reviewed by: ziaee, emaste Differential Revision: https://reviews.freebsd.org/D52385 (cherry picked from commit 14b61b2e931741281d0bfef426e9809f16006504) --- usr.bin/man/man.1 | 24 ++++++++++++++++++------ usr.bin/man/man.sh | 33 ++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1 index 820d6a5b33a9..707677ccce06 100644 --- a/usr.bin/man/man.1 +++ b/usr.bin/man/man.1 @@ -33,7 +33,7 @@ .Nd display online manual documentation pages .Sh SYNOPSIS .Nm -.Op Fl adho +.Op Fl adhlo .Op Fl t | w .Op Fl M Ar manpath .Op Fl P Ar pager @@ -144,6 +144,15 @@ Search names and descriptions of all manual pages for an extended regular .Ar expression , emulating basic functionality of .Xr apropos 1 . +.It Fl l +Interpret all arguments as absolute or relative filename(s) +of the manual page(s) to display. +No search is done and the options +.Fl M , +.Fl m , +and +.Fl S +are ignored. .It Fl m Ar arch Ns Op : Ns Ar machine Override the default architecture and machine settings allowing lookup of other platform specific manual pages. @@ -269,12 +278,15 @@ will search the following paths when considering section 4 manual pages in .Pa /usr/share/man/man4 .El .Ss Displaying Specific Manual Files -The +For compatibility reasons, .Nm -utility also supports displaying a specific manual page if passed a path -to the file as long as it contains a +will interpret any argument containing at least one .Ql / -character. +character as an absolute or relative path to a manual page to be +displayed. +This heuristic, made redundant by the more widely supported +.Fl l +option, is now deprecated and may be removed in future releases. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -398,7 +410,7 @@ manual page: .Pp Show a manual page in the current working directory: .Pp -.Dl $ man ./man.1 +.Dl $ man -l man.1 .Pp Show the location of manual pages in sections 1 and 8 which contain the word .Ql arm : diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index b1cfc6c41752..fe9c388c0df8 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -501,13 +501,21 @@ man_display_page_groff() { # Usage: man_find_and_display page # Search through the manpaths looking for the given page. man_find_and_display() { - local found_page locpath p path sect + local found_page has_slash locpath p path sect # Check to see if it's a file. But only if it has a '/' in - # the filename. + # the filename or if -l was specified. case "$1" in - */*) if [ -f "$1" -a -r "$1" ]; then + */*) has_slash=yes + ;; + esac + if [ -n "$has_slash" -o -n "$lflag" ]; then + if [ -f "$1" -a -r "$1" ]; then decho "Found a usable page, displaying that" + if [ -z "$lflag" ]; then + echo "Opening a file directly is deprecated," \ + "use -l instead." >&2 + fi unset use_cat manpage="$1" setup_cattool "$manpage" @@ -516,9 +524,12 @@ man_find_and_display() { man_display_page fi return + elif [ -n "$lflag" ]; then + echo "Cannot read $1" >&2 + ret=1 + return fi - ;; - esac + fi IFS=: for sect in $MANSECT; do @@ -586,7 +597,7 @@ man_parse_opts() { local cmd_arg OPTIND=1 - while getopts 'K:M:P:S:adfhkm:op:tw' cmd_arg; do + while getopts 'K:M:P:S:adfhklm:op:tw' cmd_arg; do case "${cmd_arg}" in K) Kflag=Kflag REGEXP=$OPTARG ;; @@ -598,6 +609,7 @@ man_parse_opts() { f) fflag=fflag ;; h) man_usage 0 ;; k) kflag=kflag ;; + l) lflag=lflag ;; m) mflag=$OPTARG ;; o) oflag=oflag ;; p) MANROFFSEQ=$OPTARG ;; @@ -610,16 +622,19 @@ man_parse_opts() { shift $(( $OPTIND - 1 )) # Check the args for incompatible options. - - case "${Kflag}${fflag}${kflag}${tflag}${wflag}" in + case "${Kflag}${fflag}${kflag}${lflag}${tflag}${wflag}" in Kflagfflag*) echo "Incompatible options: -K and -f"; man_usage ;; Kflag*kflag*) echo "Incompatible options: -K and -k"; man_usage ;; + Kflag*lflag*) echo "Incompatible options: -K and -l"; man_usage ;; Kflag*tflag) echo "Incompatible options: -K and -t"; man_usage ;; fflagkflag*) echo "Incompatible options: -f and -k"; man_usage ;; + fflag*lflag*) echo "Incompatible options: -f and -l"; man_usage ;; fflag*tflag*) echo "Incompatible options: -f and -t"; man_usage ;; fflag*wflag) echo "Incompatible options: -f and -w"; man_usage ;; - *kflagtflag*) echo "Incompatible options: -k and -t"; man_usage ;; + *kflaglflag*) echo "Incompatible options: -k and -l"; man_usage ;; + *kflag*tflag*) echo "Incompatible options: -k and -t"; man_usage ;; *kflag*wflag) echo "Incompatible options: -k and -w"; man_usage ;; + *lflag*wflag) echo "Incompatible options: -l and -w"; man_usage ;; *tflagwflag) echo "Incompatible options: -t and -w"; man_usage ;; esac From nobody Tue Sep 16 13:59:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RT4PKHz67Jrr; Tue, 16 Sep 2025 13:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RT1kCZz3XK5; Tue, 16 Sep 2025 13:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031157; 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=EvW2OmLS3FzlGt1e8hctpbssYbfyQkfenZjBDagOwxg=; b=pI68wgy0OSR1nAflwW0rBv1AGpYyQwD8e5XQExjAXglzRnFb71/zZkcjdocnnWto171cjH NxvcBG+4pCJzntE4soGj063HQV0D/q6EeGr8330fDkLM/7NKe3TLQ/7N6cOf+M+nj8/pxP eAG9sF1vPliE95+gGJ2U6Zb1mgJlZ8CodbHgwRxT5PxFmo6dBIfOH3vd9MTvChg+ncDsER eWhJyGy7b7Xr97FQtb2qhOAI4VpY4GnWFtMsyHvvyMf8Og9D0k/nyd8KDwIJKAkvV4caAr Ep1+XBwiU4SmwpHnJUcGLM48ABV9E4MO9xyjOKn9ycGoAGYUIr91aY5UTMA7Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031157; 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=EvW2OmLS3FzlGt1e8hctpbssYbfyQkfenZjBDagOwxg=; b=l2saLQ7EA382nk0JQlv+6e/nFRZonM0CW4khSujRbttZBOWx8XiSlhbNdK0xVpnxrO8G/S AgDYnMG6+VMtlw9Lp1hZBPVIyvTihGmT7PBMh5nLEp66p3HdLP4wD9tGL6BHy3zhC93mLy 9PAUX43EvFDB0CnpsgB/n5tPD9/RldHIuPj1XPdxKHc8gpDcOxMhdCBPb05im5nRpNNnMt Xz3hv5s8r51DfNCDlnwfuv7/xR4XagRoczTG60hwM+RkZ9lv9u5JCoFXs5NkoRxrQnTik4 bfmdd+Et2avx/oQEg4jTw0D0ydU7civYCcFqZMI0+I5Qle3tHODUHzu3rYcPgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031157; a=rsa-sha256; cv=none; b=sv3UB7Ubh6mR07aL0a4FuvRKSBc/f/8aumklAVutW2dST8Wo4D+0aY+h402jF610YPxFzy O8QX3wn2MxKSDes/IfMAF5RIJS8UuJvlh7px/WlAfc7y0teLImdCejil6DIcTmIxurbhZK SlznpbFsDba/YZV7AiSSqnePCS4FHxFiRZYbuA5RvECrolCpAKpcASWOeUO1XYpzFR6/E6 HdTWjoP7a+OOdC5H54fP/xre3Jg2mJqqqBxi4znrpRfbh+dbrfnXp+b6ZYPU/J1si//Zfh cLF3tuEirVZW51RPyp7aBLEdKf9wv7pL19XpVhBIkj6qtVS+SmKQCWpcTUPSvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RT0lxlzkRD; Tue, 16 Sep 2025 13:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxGqO064672; Tue, 16 Sep 2025 13:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxGpM064668; Tue, 16 Sep 2025 13:59:16 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:16 GMT Message-Id: <202509161359.58GDxGpM064668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a5bf37963aeb - stable/14 - src.sys.mk: Support src.conf in SRCTOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5bf37963aeb6ee2dc2c26cb39a1931ea7558055 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a5bf37963aeb6ee2dc2c26cb39a1931ea7558055 commit a5bf37963aeb6ee2dc2c26cb39a1931ea7558055 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-10 16:57:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:55 +0000 src.sys.mk: Support src.conf in SRCTOP If SRCCONF is not defined and src.conf exists at the top level of the source tree, use that instead of /etc/src.conf. MFC after: 3 days Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D52470 (cherry picked from commit dd8c666d8b78f6b9ddb691f0505837fa885ff3b4) UPDATING: mention the src.conf change Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") (cherry picked from commit ab2fea3f9a5a58f0ba90499ad3a8614e3dca0c5f) --- .gitignore | 1 + UPDATING | 5 +++++ share/man/man5/src.conf.5 | 9 ++++++--- share/mk/src.sys.mk | 4 ++++ sys/conf/kern.pre.mk | 4 ++++ tools/build/options/makeman | 7 +++++-- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 785568271794..ffa366fde357 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ tags .cache .clangd .ccls-cache +/src.conf diff --git a/UPDATING b/UPDATING index 965ecac80055..644e17fc55be 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ 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. +20250916: + If SRCCONF is unset and a file named src.conf is present at + the top of the source tree, it will now be used instead of + /etc/src.conf. + 20250823: Commit 3f61ececacd8 changed the internal KAPI between the NFS modules. As such, they all need to be rebuilt diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 63fba6d2ac01..24d041d055a4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd June 13, 2025 +.Dd September 16, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -29,8 +29,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index d5c2af0c559d..d563859586b0 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -6,7 +6,11 @@ .if !defined(_WITHOUT_SRCCONF) # Allow user to configure things that only effect src tree builds. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if !empty(SRCCONF) && \ (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && \ !target(_srcconf_included_) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index ff19cd75d3ea..becd11da64c9 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -8,7 +8,11 @@ # the rest of /usr/src, but they still always process SRCCONF even though # the normal mechanisms to prevent that (compiling out of tree) won't # work. To ensure they do work, we have to duplicate thee few lines here. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) .include "${SRCCONF}" _srcconf_included_: diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 4e44c78b0278..fb75990cc383 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -179,8 +179,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable From nobody Tue Sep 16 13:59:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RV3FXDz67JvJ; Tue, 16 Sep 2025 13:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RV1P1Nz3XLd; Tue, 16 Sep 2025 13:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031158; 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=wkZxPaLVgidQzFNNUA++07nMTD6Wnksn98Yi8MBvcmA=; b=lUYU7WjcxF9s7gX5J7QUZxw6mI5kXztvYZRlLG27AwNUXIUW6cK+ommhw3vdOv2RHOPfoS R/47ZKSuR8bgKbHT+lx5YI9i2sv+e5AbMmvyhAEdMjKQ/NWCWNGAtxpkatyF1wePsYu9Qq Y0kPZ5sLSdyuxVX9kBol10xTutNWSRpkAfXZ5P8h+YEcFYqGy3ufPCS92+mGoq0SoCqXbE gf62wPgLOYclNCesOlqrP2uv3dVF2Vw0o68fHFURdPl0pJ49TEVg/cpGcf+07cZj9p09SY TAmTZkk2TwBJrQ6WDUdVYl1QCE14dc3yXR99As4qeywmchFGC52hGNGo7gYQng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031158; 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=wkZxPaLVgidQzFNNUA++07nMTD6Wnksn98Yi8MBvcmA=; b=lprWWKeU+7YxaPT5PnFOw2TEpUfyJSGVTjyxtY2P3CJp9GymVIsCBlxQtIE0i/kMju6MKw R0kyum9OeAIZV7Wp7xQlnzGWkJrvt0dK0i4jeOrGJcY0Ev+pKOAjND1DkKVGky/ujJ0uvd KDiezhOJUWt48CEwnpqoVQJ5E2lSAnIlYlPHIAO6okeAs5oE6oN9YK+9HqwyZyeG5CJObP oWwHZLeFGbUu7q2H2SVBraR07QiTBAXHJkcM455ZpuF8RdoQ5TaX7nnflOzCecHaJHrTh1 IvywLr1KDUfVduExORyAN5y8BQKYidZNxDONfB/sHnEkSt4zRmi5sXa98x7Qxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031158; a=rsa-sha256; cv=none; b=n/pIgDBpiOCtuCBt1exbY2zPsp0qcLzUtnrJSsubQc1c7iYKXGSbI+AA3vlCB61dZGsECG ZK/1khUgZzxMzgxqojy9tjNayPhBEV6op/NM8mZaRVc8F5aNCCA8Qt5xzUz8Ea3PTpaFMh ycXWEOVnf4IYwuncJpx9SQk7fHY3jCG2QFHNq2g6MBYbM7wvXDhSyywgthmIvQUSa0yc2c eDK4T2LsfG+rSn4+7Pmm2SVAw8JGHDLV6qgvKUFd2EVtUiVD59XaD7dl4cYPmXRm6csgYL oALpVtCeP9RSTrMJ8rdOyyF54OTp1VLLhUYYzKUNGysIKLxTSiZBIdbosBEyjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RV10xzzkBm; Tue, 16 Sep 2025 13:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxILG064715; Tue, 16 Sep 2025 13:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxIBA064712; Tue, 16 Sep 2025 13:59:18 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:18 GMT Message-Id: <202509161359.58GDxIBA064712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 65ce9cefee56 - stable/14 - uptime: Mention libxo support in manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 65ce9cefee56a15c8361ee5d5154064e11d629a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=65ce9cefee56a15c8361ee5d5154064e11d629a7 commit 65ce9cefee56a15c8361ee5d5154064e11d629a7 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-11 20:51:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:27:56 +0000 uptime: Mention libxo support in manual page MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52489 (cherry picked from commit 55bd607b9930e5f61219007ad0a81801c8cfdbf3) --- usr.bin/w/uptime.1 | 18 ++++++++++++++++-- usr.bin/w/w.1 | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1 index 16c16c0b5318..b20e9066a470 100644 --- a/usr.bin/w/uptime.1 +++ b/usr.bin/w/uptime.1 @@ -27,7 +27,7 @@ .\" .\" @(#)uptime.1 8.2 (Berkeley) 4/18/94 .\" -.Dd August 18, 2020 +.Dd September 11, 2025 .Dt UPTIME 1 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nd show how long system has been running .Sh SYNOPSIS .Nm +.Op Fl -libxo .Sh DESCRIPTION The .Nm @@ -42,6 +43,17 @@ utility displays the current time, the length of time the system has been up, the number of users, and the load average of the system over the last 1, 5, and 15 minutes. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_options 7 +for details on command line arguments. +.El .Sh FILES .Bl -tag -width /boot/kernel/kernel .It Pa /boot/kernel/kernel @@ -53,7 +65,9 @@ $ uptime 11:23AM up 3:01, 8 users, load averages: 21.09, 15.43, 12.79 .Ed .Sh SEE ALSO -.Xr w 1 +.Xr w 1 , +.Xr libxo 3 , +.Xr xo_options 7 .Sh HISTORY The .Nm diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1 index 7f0d83032d4b..584c5d1b7129 100644 --- a/usr.bin/w/w.1 +++ b/usr.bin/w/w.1 @@ -27,7 +27,7 @@ .\" .\" @(#)w.1 8.1 (Berkeley) 6/6/93 .\" -.Dd August 24, 2020 +.Dd September 11, 2025 .Dt W 1 .Os .Sh NAME @@ -56,7 +56,7 @@ user is on, the host from which the user is logged in, the time the user logged on, the time since the user last typed anything, and the name and arguments of the current process. .Pp -The options are as follows: +The following options are available: .Bl -tag -width indent .It Fl -libxo Generate output via From nobody Tue Sep 16 13:59:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3RZ5lP5z67Jbt; Tue, 16 Sep 2025 13:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3RZ3tbqz3Xd7; Tue, 16 Sep 2025 13:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031162; 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=qbGTIGjX+VJK0fzwUaOAYM5Ny300Rqg0gAHXDR/BKwk=; b=o2K6QrNpCLYLjZysRgQrBjqKkQ+iJhmTVm+FFQvvld6NbBLGXlTQVmdsgJZjMbIkBZTvVP SAWij8Xc36++X9YZJQ5YHy9bPiWbrJOMKHswwrEt4x0KjnHJFG+AufpdUmm9Z32UHo/srr 61r/Rq8bske4z79QU5rztUgElKQeTJueTUhurbYHwzmi85+tXH9nDf1hUwVSHYLdEMbk7f Azm2hgmuTTPSVrQ1cpnWMM9IIxo9s1IuNuZa9CTrIPLodmlY0a1lu6KbaEH2stMspVHBBT RJ649UC0R/85RDOaNv1pxde/BQ43kpAk7KRnF4h7pPHRPL47v0+C3GGzUgsdeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031162; 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=qbGTIGjX+VJK0fzwUaOAYM5Ny300Rqg0gAHXDR/BKwk=; b=b4SwT2soHl84YC8q/vIjnf3xYFp4A08Aih8b80saW/LArSckO7Z5x7dJ9ISNAM5wWrKZPr uAiyiH1LZA6YxdMG7uJu6uNbhgOlrAQH0jgnDNZyY/6sasyiXMZXnahYgz1UN5tjEPhx/I ug2iPchXF9L+5UDV1si3zwHL3fYBgI6fBOTu0Rbz2HCg/9FVb8/G6EAXllHkb+KrymKaF4 0OyNjctL52xJNnnLMIODgIYtVhB2DAkLkTZLUoXtMgsyUwn4et2vKW2A25r2EVneGpz+le ASOl+UodadgQhb72VglCMLp81GAHLmV4a8FCUIPPmVep/tg4xohgvfl5Rb9Tzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031162; a=rsa-sha256; cv=none; b=sUrpsbp2NOVu77SnoSkA/Uc4C4QBvXtgnBHQQQtY2B0TgQ60yY8vC+BzLO251AibQIfB9a RIE/DwCAzDej+BHztHtmlsy+SG3Wu4b71ysxNtnLHwPSW4aVCL7wBjsAbT+tYgl8xOWvIk RqF6ffQS4lIvYdh/E5IfdMNUKjakurW742MSogMvIqBYP1svebJXufWvYTCCx9qt0H1hZI +KFyKDIXMmLET46JU1IfZH6GuVR3ZrConJy1GD6vw8cEmLT5SCCuJgLN9DT8RxEg67W0Ps Z4S4yAIqoJ0xSdn5mBwZFQ+lPoTKONWJs6ESC3DwDUuhpw4BPP+rgn//aAvBdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3RZ3MzlzkNd; Tue, 16 Sep 2025 13:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxMoS064895; Tue, 16 Sep 2025 13:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxM68064892; Tue, 16 Sep 2025 13:59:22 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:22 GMT Message-Id: <202509161359.58GDxM68064892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d703ae86bfa1 - stable/13 - w: Fix idle time in json output, add login/idle times to json output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d703ae86bfa1283ffbbaac37c884c61e8c1ead1c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d703ae86bfa1283ffbbaac37c884c61e8c1ead1c commit d703ae86bfa1283ffbbaac37c884c61e8c1ead1c Author: Marius Halden AuthorDate: 2025-08-29 14:36:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:03:57 +0000 w: Fix idle time in json output, add login/idle times to json output Currently the idle time will show as `true` part of the time in the json output and quoting depends on what is being printed. Make sure it's always printed correctly and for consistency treated as a string in the json output. Login time delta and since times are currently exposed in the xml output, expose these times in the json output as well. In the json and xml outputs expose the number of seconds idle as a new field or attribute respectively. MFC after: 1 week Sponsored by: Modirum MDPay Event: Oslo Hackathon 202508 Differential Revision: https://reviews.freebsd.org/D52237 (cherry picked from commit 6e6febb54da91bf5e13007c3d8f4a54495273969) --- usr.bin/w/pr_time.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c index 7be11b777e79..ff2da1bcc3c9 100644 --- a/usr.bin/w/pr_time.c +++ b/usr.bin/w/pr_time.c @@ -82,8 +82,13 @@ pr_attime(time_t *started, time_t *now) (void)wcsftime(buf, sizeof(buf), fmt, &tp); len = wcslen(buf); width = wcswidth(buf, len); - xo_attr("since", "%lu", (unsigned long) *started); - xo_attr("delta", "%lu", (unsigned long) diff); + if (xo_get_style(NULL) == XO_STYLE_XML) { + xo_attr("since", "%lu", (unsigned long)*started); + xo_attr("delta", "%lu", (unsigned long)diff); + } else { + xo_emit("{e:login-time-since/%lu}{e:login-time-delta/%lu}", + (unsigned long)*started, (unsigned long)diff); + } if (len == width) xo_emit("{:login-time/%-7.7ls/%ls}", buf); else if (width < 7) @@ -103,10 +108,16 @@ pr_attime(time_t *started, time_t *now) int pr_idle(time_t idle) { + /* In encoded formats, emit the raw data as well */ + if (xo_get_style(NULL) == XO_STYLE_XML) + xo_attr("seconds", "%lu", (unsigned long) idle); + else + xo_emit("{e:idle-seconds/%lu}", (unsigned long) idle); + /* If idle more than 36 hours, print as a number of days. */ if (idle >= 36 * 3600) { int days = idle / 86400; - xo_emit(" {:idle/%dday%s} ", days, days > 1 ? "s" : " " ); + xo_emit(" {q:idle/%dday%s} ", days, days > 1 ? "s" : " " ); if (days >= 100) return (2); if (days >= 10) @@ -114,16 +125,17 @@ pr_idle(time_t idle) } /* If idle more than an hour, print as HH:MM. */ - else if (idle >= 3600) - xo_emit(" {:idle/%2d:%02d/} ", + else if (idle >= 3600) { + xo_emit(" {q:idle/%2d:%02d} ", (int)(idle / 3600), (int)((idle % 3600) / 60)); + } else if (idle / 60 == 0) - xo_emit(" - "); + xo_emit(" - {q:idle//0}"); /* Else print the minutes idle. */ else - xo_emit(" {:idle/%2d} ", (int)(idle / 60)); + xo_emit(" {q:idle/%2d} ", (int)(idle / 60)); return (0); /* not idle longer than 9 days */ } From nobody Tue Sep 16 13:59:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3Rc4bDXz67JxW; Tue, 16 Sep 2025 13:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3Rc1lZbz3XQM; Tue, 16 Sep 2025 13:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031164; 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=hFbbz+z7Miqk2/CWK+Uvyuzss9z0moKHe6EU9tP9rD4=; b=jz9RhkwUuvJYuqh/9YKbOd1Yz1jVrJqgFJ1FRO37sLYaefaHwS6Huqfk/MHgY2Pog03996 V8BbaAU1w90bK3JSOAAugIy27GorDKPM6rwDElcov8sdnzVThTkfuqNxFHwn89yfH7rUYG G4GWFePovGKlo5ZNlROXN/YaIV4SOAzbcafW6baParr2WBJadgGXZIuPVNtoROBkZYOMtm 66/FiU5ZphEFapV/D2TrB975Jx+gC5P8snLizrtKqOWVpsMeVeGnSxN9tvRtha40yUHbyr mtrKmsu06QW19O1I8SXeJztFTRaQLe/DF4maWDWyb/zS633sOK6P1h/B7Ub2vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031164; 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=hFbbz+z7Miqk2/CWK+Uvyuzss9z0moKHe6EU9tP9rD4=; b=ercMfLshfUDv3ljMNzmn/zx7WAdZITkrv2fg0fY9DgAF55LUIheW2Tl8SbtpR8Kxrmmaex 20uw8xn7oNf/QtDF7XqzWoqz5cHc0QJiwU3b/MO6OrcZygzes8OVfxg1zUlSf/YM/QJXLK 0pgEdPZiPsmf/6gUtZ0CtzhEZMayS7Zd0rd9yqC/gvcxnRK5lITwMXWOkBAqt4QbBjlDtP p3zbAxoERLdR3wQa+n3ONM4T+JDsASOOBBafHheNTPFih4TNH8BA0zM8xHLTVhv1qTJ2CB La8FWOySflR8Yd5E5379k28Gz8XmVXkt/8T/AhkVHTaoBBDJ0r8Use0XsJqI+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031164; a=rsa-sha256; cv=none; b=k7bTu+rr8vGsqNOGnaR5AZCh2Tr5AQ4/QAHwKnRm40a37+9Yl6puTLCdgkyW+POocsvWHA OjEnn1ZzXSp2wCmVbBFJXbkhgDkjEUtg/UvcZkKVmVa17BxVooRTJk1PGFzwJMzmZ7qqtC hGRbqyB0CMwlsYnsSU7BZr3+eqx2Svi3HL4hl6O0nxbt4EV5KTwcrwYPUiOYJb1ojR5rud BLMb6VVEhqrOY1V5pZMUpv+21mFu6uw2Lz3exm0kzcIFMG/36vKEqECeF+awvfehWihetP GURKda9RohjRAzZK1f/pg2eeRZ785KPmEDgN3R5QGWu6A+gSBywEbA6qUqODHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3Rb5MQkzjZD; Tue, 16 Sep 2025 13:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxNKd064938; Tue, 16 Sep 2025 13:59:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxNB4064934; Tue, 16 Sep 2025 13:59:23 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:23 GMT Message-Id: <202509161359.58GDxNB4064934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c34e79820b38 - stable/13 - unbound: Update to 1.23.1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c34e79820b3852c24180cc5f9dcc15ff7dca3b90 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c34e79820b3852c24180cc5f9dcc15ff7dca3b90 commit c34e79820b3852c24180cc5f9dcc15ff7dca3b90 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-07 18:59:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:55:22 +0000 unbound: Update to 1.23.1 Release notes at https://nlnetlabs.nl/news/2025/Jul/16/unbound-1.23.1-released/ Since we don't enable ECS, this is mostly a nop for us. Merge commit 'c8864f6ba46ff3271d97b4ae1c3cc6ce01eaf18a' MFC after: 3 days (cherry picked from commit 5a0119491adbea0876d9d6dc0ef3e71f3d64a20b) --- contrib/unbound/config.guess | 17 +- contrib/unbound/config.h.in | 360 +- contrib/unbound/config.sub | 28 +- contrib/unbound/configure | 4467 ++++++++++++--------- contrib/unbound/configure.ac | 5 +- contrib/unbound/doc/README | 2 +- contrib/unbound/doc/example.conf | 300 +- contrib/unbound/doc/example.conf.in | 2 +- contrib/unbound/doc/libunbound.3 | 4 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8 | 14 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8 | 8 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8 | 343 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1 | 4 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8 | 8 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5 | 741 +++- contrib/unbound/doc/unbound.conf.5.in | 2 +- contrib/unbound/edns-subnet/subnetmod.c | 152 +- contrib/unbound/edns-subnet/subnetmod.h | 4 + contrib/unbound/ltmain.sh | 1555 ++++--- contrib/unbound/smallapp/unbound-control-setup.sh | 227 +- lib/libunbound/Makefile | 31 +- lib/libunbound/config.h | 503 ++- 28 files changed, 5624 insertions(+), 3169 deletions(-) diff --git a/contrib/unbound/config.guess b/contrib/unbound/config.guess index 48a684601bd2..a9d01fde4617 100755 --- a/contrib/unbound/config.guess +++ b/contrib/unbound/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2024 Free Software Foundation, Inc. +# Copyright 1992-2025 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2024-07-27' +timestamp='2025-07-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2024 Free Software Foundation, Inc. +Copyright 1992-2025 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1597,8 +1597,11 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; - *:Ironclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad + x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*) + GUESS=$UNAME_MACHINE-pc-ironclad-mlibc + ;; + *:[Ii]ronclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc ;; esac @@ -1808,8 +1811,8 @@ fi exit 1 # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-format: "%Y-%02m-%02d" # time-stamp-end: "'" # End: diff --git a/contrib/unbound/config.h.in b/contrib/unbound/config.h.in index f2dc8c8b92b3..584810398b91 100644 --- a/contrib/unbound/config.h.in +++ b/contrib/unbound/config.h.in @@ -48,13 +48,13 @@ internal symbols */ #undef EXPORT_ALL_SYMBOLS -/* Define to 1 if you have the `accept4' function. */ +/* Define to 1 if you have the 'accept4' function. */ #undef HAVE_ACCEPT4 -/* Define to 1 if you have the `arc4random' function. */ +/* Define to 1 if you have the 'arc4random' function. */ #undef HAVE_ARC4RANDOM -/* Define to 1 if you have the `arc4random_uniform' function. */ +/* Define to 1 if you have the 'arc4random_uniform' function. */ #undef HAVE_ARC4RANDOM_UNIFORM /* Define to 1 if you have the header file. */ @@ -78,7 +78,7 @@ /* If we have be64toh */ #undef HAVE_BE64TOH -/* Define to 1 if you have the `BIO_set_callback_ex' function. */ +/* Define to 1 if you have the 'BIO_set_callback_ex' function. */ #undef HAVE_BIO_SET_CALLBACK_EX /* Define to 1 if you have the header file. */ @@ -87,241 +87,241 @@ /* Define to 1 if you have the header file. */ #undef HAVE_BSD_STRING_H -/* Define to 1 if you have the `chown' function. */ +/* Define to 1 if you have the 'chown' function. */ #undef HAVE_CHOWN -/* Define to 1 if you have the `chroot' function. */ +/* Define to 1 if you have the 'chroot' function. */ #undef HAVE_CHROOT -/* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ +/* Define to 1 if you have the 'CRYPTO_cleanup_all_ex_data' function. */ #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA -/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +/* Define to 1 if you have the 'CRYPTO_THREADID_set_callback' function. */ #undef HAVE_CRYPTO_THREADID_SET_CALLBACK -/* Define to 1 if you have the `ctime_r' function. */ +/* Define to 1 if you have the 'ctime_r' function. */ #undef HAVE_CTIME_R -/* Define to 1 if you have the `daemon' function. */ +/* Define to 1 if you have the 'daemon' function. */ #undef HAVE_DAEMON -/* Define to 1 if you have the declaration of `arc4random', and to 0 if you +/* Define to 1 if you have the declaration of 'arc4random', and to 0 if you don't. */ #undef HAVE_DECL_ARC4RANDOM -/* Define to 1 if you have the declaration of `arc4random_uniform', and to 0 +/* Define to 1 if you have the declaration of 'arc4random_uniform', and to 0 if you don't. */ #undef HAVE_DECL_ARC4RANDOM_UNIFORM -/* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if +/* Define to 1 if you have the declaration of 'evsignal_assign', and to 0 if you don't. */ #undef HAVE_DECL_EVSIGNAL_ASSIGN -/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you +/* Define to 1 if you have the declaration of 'inet_ntop', and to 0 if you don't. */ #undef HAVE_DECL_INET_NTOP -/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you +/* Define to 1 if you have the declaration of 'inet_pton', and to 0 if you don't. */ #undef HAVE_DECL_INET_PTON -/* Define to 1 if you have the declaration of `nghttp2_session_server_new', +/* Define to 1 if you have the declaration of 'nghttp2_session_server_new', and to 0 if you don't. */ #undef HAVE_DECL_NGHTTP2_SESSION_SERVER_NEW -/* Define to 1 if you have the declaration of `ngtcp2_conn_server_new', and to +/* Define to 1 if you have the declaration of 'ngtcp2_conn_server_new', and to 0 if you don't. */ #undef HAVE_DECL_NGTCP2_CONN_SERVER_NEW -/* Define to 1 if you have the declaration of `ngtcp2_crypto_encrypt_cb', and +/* Define to 1 if you have the declaration of 'ngtcp2_crypto_encrypt_cb', and to 0 if you don't. */ #undef HAVE_DECL_NGTCP2_CRYPTO_ENCRYPT_CB -/* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_ED25519', and to 0 if you don't. */ #undef HAVE_DECL_NID_ED25519 -/* Define to 1 if you have the declaration of `NID_ED448', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_ED448', and to 0 if you don't. */ #undef HAVE_DECL_NID_ED448 -/* Define to 1 if you have the declaration of `NID_secp384r1', and to 0 if you +/* Define to 1 if you have the declaration of 'NID_secp384r1', and to 0 if you don't. */ #undef HAVE_DECL_NID_SECP384R1 -/* Define to 1 if you have the declaration of `NID_X9_62_prime256v1', and to 0 +/* Define to 1 if you have the declaration of 'NID_X9_62_prime256v1', and to 0 if you don't. */ #undef HAVE_DECL_NID_X9_62_PRIME256V1 -/* Define to 1 if you have the declaration of `reallocarray', and to 0 if you +/* Define to 1 if you have the declaration of 'reallocarray', and to 0 if you don't. */ #undef HAVE_DECL_REALLOCARRAY -/* Define to 1 if you have the declaration of `redisConnect', and to 0 if you +/* Define to 1 if you have the declaration of 'redisConnect', and to 0 if you don't. */ #undef HAVE_DECL_REDISCONNECT -/* Define to 1 if you have the declaration of `sk_SSL_COMP_pop_free', and to 0 +/* Define to 1 if you have the declaration of 'sk_SSL_COMP_pop_free', and to 0 if you don't. */ #undef HAVE_DECL_SK_SSL_COMP_POP_FREE /* Define to 1 if you have the declaration of - `SSL_COMP_get_compression_methods', and to 0 if you don't. */ + 'SSL_COMP_get_compression_methods', and to 0 if you don't. */ #undef HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS -/* Define to 1 if you have the declaration of `SSL_CTX_set_ecdh_auto', and to +/* Define to 1 if you have the declaration of 'SSL_CTX_set_ecdh_auto', and to 0 if you don't. */ #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO -/* Define to 1 if you have the declaration of `strlcat', and to 0 if you +/* Define to 1 if you have the declaration of 'strlcat', and to 0 if you don't. */ #undef HAVE_DECL_STRLCAT -/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you +/* Define to 1 if you have the declaration of 'strlcpy', and to 0 if you don't. */ #undef HAVE_DECL_STRLCPY -/* Define to 1 if you have the declaration of `XML_StopParser', and to 0 if +/* Define to 1 if you have the declaration of 'XML_StopParser', and to 0 if you don't. */ #undef HAVE_DECL_XML_STOPPARSER /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `DSA_SIG_set0' function. */ +/* Define to 1 if you have the 'DSA_SIG_set0' function. */ #undef HAVE_DSA_SIG_SET0 /* Define to 1 if you have the header file. */ #undef HAVE_ENDIAN_H -/* Define to 1 if you have the `endprotoent' function. */ +/* Define to 1 if you have the 'endprotoent' function. */ #undef HAVE_ENDPROTOENT -/* Define to 1 if you have the `endpwent' function. */ +/* Define to 1 if you have the 'endpwent' function. */ #undef HAVE_ENDPWENT -/* Define to 1 if you have the `endservent' function. */ +/* Define to 1 if you have the 'endservent' function. */ #undef HAVE_ENDSERVENT -/* Define to 1 if you have the `ENGINE_cleanup' function. */ +/* Define to 1 if you have the 'ENGINE_cleanup' function. */ #undef HAVE_ENGINE_CLEANUP -/* Define to 1 if you have the `ERR_free_strings' function. */ +/* Define to 1 if you have the 'ERR_free_strings' function. */ #undef HAVE_ERR_FREE_STRINGS -/* Define to 1 if you have the `ERR_load_crypto_strings' function. */ +/* Define to 1 if you have the 'ERR_load_crypto_strings' function. */ #undef HAVE_ERR_LOAD_CRYPTO_STRINGS -/* Define to 1 if you have the `event_assign' function. */ +/* Define to 1 if you have the 'event_assign' function. */ #undef HAVE_EVENT_ASSIGN -/* Define to 1 if you have the `event_base_free' function. */ +/* Define to 1 if you have the 'event_base_free' function. */ #undef HAVE_EVENT_BASE_FREE -/* Define to 1 if you have the `event_base_get_method' function. */ +/* Define to 1 if you have the 'event_base_get_method' function. */ #undef HAVE_EVENT_BASE_GET_METHOD -/* Define to 1 if you have the `event_base_new' function. */ +/* Define to 1 if you have the 'event_base_new' function. */ #undef HAVE_EVENT_BASE_NEW -/* Define to 1 if you have the `event_base_once' function. */ +/* Define to 1 if you have the 'event_base_once' function. */ #undef HAVE_EVENT_BASE_ONCE /* Define to 1 if you have the header file. */ #undef HAVE_EVENT_H -/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +/* Define to 1 if you have the 'EVP_aes_256_cbc' function. */ #undef HAVE_EVP_AES_256_CBC -/* Define to 1 if you have the `EVP_cleanup' function. */ +/* Define to 1 if you have the 'EVP_cleanup' function. */ #undef HAVE_EVP_CLEANUP -/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled' +/* Define to 1 if you have the 'EVP_default_properties_is_fips_enabled' function. */ #undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED -/* Define to 1 if you have the `EVP_DigestVerify' function. */ +/* Define to 1 if you have the 'EVP_DigestVerify' function. */ #undef HAVE_EVP_DIGESTVERIFY -/* Define to 1 if you have the `EVP_dss1' function. */ +/* Define to 1 if you have the 'EVP_dss1' function. */ #undef HAVE_EVP_DSS1 -/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +/* Define to 1 if you have the 'EVP_EncryptInit_ex' function. */ #undef HAVE_EVP_ENCRYPTINIT_EX -/* Define to 1 if you have the `EVP_MAC_CTX_set_params' function. */ +/* Define to 1 if you have the 'EVP_MAC_CTX_set_params' function. */ #undef HAVE_EVP_MAC_CTX_SET_PARAMS -/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +/* Define to 1 if you have the 'EVP_MD_CTX_new' function. */ #undef HAVE_EVP_MD_CTX_NEW -/* Define to 1 if you have the `EVP_sha1' function. */ +/* Define to 1 if you have the 'EVP_sha1' function. */ #undef HAVE_EVP_SHA1 -/* Define to 1 if you have the `EVP_sha256' function. */ +/* Define to 1 if you have the 'EVP_sha256' function. */ #undef HAVE_EVP_SHA256 -/* Define to 1 if you have the `EVP_sha512' function. */ +/* Define to 1 if you have the 'EVP_sha512' function. */ #undef HAVE_EVP_SHA512 -/* Define to 1 if you have the `ev_default_loop' function. */ +/* Define to 1 if you have the 'ev_default_loop' function. */ #undef HAVE_EV_DEFAULT_LOOP -/* Define to 1 if you have the `ev_loop' function. */ +/* Define to 1 if you have the 'ev_loop' function. */ #undef HAVE_EV_LOOP /* Define to 1 if you have the header file. */ #undef HAVE_EXPAT_H -/* Define to 1 if you have the `explicit_bzero' function. */ +/* Define to 1 if you have the 'explicit_bzero' function. */ #undef HAVE_EXPLICIT_BZERO -/* Define to 1 if you have the `fcntl' function. */ +/* Define to 1 if you have the 'fcntl' function. */ #undef HAVE_FCNTL -/* Define to 1 if you have the `FIPS_mode' function. */ +/* Define to 1 if you have the 'FIPS_mode' function. */ #undef HAVE_FIPS_MODE -/* Define to 1 if you have the `fork' function. */ +/* Define to 1 if you have the 'fork' function. */ #undef HAVE_FORK -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +/* Define to 1 if fseeko (and ftello) are declared in stdio.h. */ #undef HAVE_FSEEKO -/* Define to 1 if you have the `fsync' function. */ +/* Define to 1 if you have the 'fsync' function. */ #undef HAVE_FSYNC /* Whether getaddrinfo is available */ #undef HAVE_GETADDRINFO -/* Define to 1 if you have the `getauxval' function. */ +/* Define to 1 if you have the 'getauxval' function. */ #undef HAVE_GETAUXVAL -/* Define to 1 if you have the `getentropy' function. */ +/* Define to 1 if you have the 'getentropy' function. */ #undef HAVE_GETENTROPY -/* Define to 1 if you have the `getifaddrs' function. */ +/* Define to 1 if you have the 'getifaddrs' function. */ #undef HAVE_GETIFADDRS /* Define to 1 if you have the header file. */ #undef HAVE_GETOPT_H -/* Define to 1 if you have the `getpwnam' function. */ +/* Define to 1 if you have the 'getpwnam' function. */ #undef HAVE_GETPWNAM -/* Define to 1 if you have the `getrlimit' function. */ +/* Define to 1 if you have the 'getrlimit' function. */ #undef HAVE_GETRLIMIT -/* Define to 1 if you have the `gettid' function. */ +/* Define to 1 if you have the 'gettid' function. */ #undef HAVE_GETTID -/* Define to 1 if you have the `glob' function. */ +/* Define to 1 if you have the 'glob' function. */ #undef HAVE_GLOB /* Define to 1 if you have the header file. */ #undef HAVE_GLOB_H -/* Define to 1 if you have the `gmtime_r' function. */ +/* Define to 1 if you have the 'gmtime_r' function. */ #undef HAVE_GMTIME_R /* Define to 1 if you have the header file. */ @@ -330,7 +330,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_HIREDIS_HIREDIS_H -/* Define to 1 if you have the `HMAC_Init_ex' function. */ +/* Define to 1 if you have the 'HMAC_Init_ex' function. */ #undef HAVE_HMAC_INIT_EX /* If we have htobe64 */ @@ -339,19 +339,19 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IFADDRS_H -/* Define to 1 if you have the `if_nametoindex' function. */ +/* Define to 1 if you have the 'if_nametoindex' function. */ #undef HAVE_IF_NAMETOINDEX -/* Define to 1 if you have the `inet_aton' function. */ +/* Define to 1 if you have the 'inet_aton' function. */ #undef HAVE_INET_ATON -/* Define to 1 if you have the `inet_ntop' function. */ +/* Define to 1 if you have the 'inet_ntop' function. */ #undef HAVE_INET_NTOP -/* Define to 1 if you have the `inet_pton' function. */ +/* Define to 1 if you have the 'inet_pton' function. */ #undef HAVE_INET_PTON -/* Define to 1 if you have the `initgroups' function. */ +/* Define to 1 if you have the 'initgroups' function. */ #undef HAVE_INITGROUPS /* Define to 1 if you have the header file. */ @@ -363,10 +363,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IPHLPAPI_H -/* Define to 1 if you have the `isblank' function. */ +/* Define to 1 if you have the 'isblank' function. */ #undef HAVE_ISBLANK -/* Define to 1 if you have the `kill' function. */ +/* Define to 1 if you have the 'kill' function. */ #undef HAVE_KILL /* Use portable libbsd functions */ @@ -384,7 +384,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_NET_TSTAMP_H -/* Define to 1 if you have the `localtime_r' function. */ +/* Define to 1 if you have the 'localtime_r' function. */ #undef HAVE_LOCALTIME_R /* Define to 1 if you have the header file. */ @@ -393,7 +393,7 @@ /* If have GNU libc compatible malloc */ #undef HAVE_MALLOC -/* Define to 1 if you have the `memmove' function. */ +/* Define to 1 if you have the 'memmove' function. */ #undef HAVE_MEMMOVE /* Define to 1 if you have the header file. */ @@ -435,49 +435,49 @@ /* Define this to use ngtcp2. */ #undef HAVE_NGTCP2 -/* Define to 1 if you have the `ngtcp2_ccerr_default' function. */ +/* Define to 1 if you have the 'ngtcp2_ccerr_default' function. */ #undef HAVE_NGTCP2_CCERR_DEFAULT -/* Define to 1 if you have the `ngtcp2_conn_encode_0rtt_transport_params' +/* Define to 1 if you have the 'ngtcp2_conn_encode_0rtt_transport_params' function. */ #undef HAVE_NGTCP2_CONN_ENCODE_0RTT_TRANSPORT_PARAMS -/* Define to 1 if you have the `ngtcp2_conn_get_max_local_streams_uni' +/* Define to 1 if you have the 'ngtcp2_conn_get_max_local_streams_uni' function. */ #undef HAVE_NGTCP2_CONN_GET_MAX_LOCAL_STREAMS_UNI -/* Define to 1 if you have the `ngtcp2_conn_get_num_scid' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_get_num_scid' function. */ #undef HAVE_NGTCP2_CONN_GET_NUM_SCID -/* Define to 1 if you have the `ngtcp2_conn_in_closing_period' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_in_closing_period' function. */ #undef HAVE_NGTCP2_CONN_IN_CLOSING_PERIOD -/* Define to 1 if you have the `ngtcp2_conn_in_draining_period' function. */ +/* Define to 1 if you have the 'ngtcp2_conn_in_draining_period' function. */ #undef HAVE_NGTCP2_CONN_IN_DRAINING_PERIOD /* Define if ngtcp2_conn_shutdown_stream has 4 arguments. */ #undef HAVE_NGTCP2_CONN_SHUTDOWN_STREAM4 -/* Define to 1 if you have the `ngtcp2_conn_tls_early_data_rejected' function. +/* Define to 1 if you have the 'ngtcp2_conn_tls_early_data_rejected' function. */ #undef HAVE_NGTCP2_CONN_TLS_EARLY_DATA_REJECTED -/* Define to 1 if you have the `ngtcp2_crypto_encrypt_cb' function. */ +/* Define to 1 if you have the 'ngtcp2_crypto_encrypt_cb' function. */ #undef HAVE_NGTCP2_CRYPTO_ENCRYPT_CB /* Define to 1 if you have the - `ngtcp2_crypto_quictls_configure_client_context' function. */ + 'ngtcp2_crypto_quictls_configure_client_context' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT /* Define to 1 if you have the - `ngtcp2_crypto_quictls_configure_server_context' function. */ + 'ngtcp2_crypto_quictls_configure_server_context' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT /* Define to 1 if you have the - `ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ + 'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL -/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */ +/* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */ #undef HAVE_NGTCP2_ENCRYPTION_LEVEL /* Define to 1 if you have the header file. @@ -494,13 +494,13 @@ /* Use libnss for crypto */ #undef HAVE_NSS -/* Define to 1 if you have the `OpenSSL_add_all_digests' function. */ +/* Define to 1 if you have the 'OpenSSL_add_all_digests' function. */ #undef HAVE_OPENSSL_ADD_ALL_DIGESTS /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_BN_H -/* Define to 1 if you have the `OPENSSL_config' function. */ +/* Define to 1 if you have the 'OPENSSL_config' function. */ #undef HAVE_OPENSSL_CONFIG /* Define to 1 if you have the header file. */ @@ -521,10 +521,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_ERR_H -/* Define to 1 if you have the `OPENSSL_init_crypto' function. */ +/* Define to 1 if you have the 'OPENSSL_init_crypto' function. */ #undef HAVE_OPENSSL_INIT_CRYPTO -/* Define to 1 if you have the `OPENSSL_init_ssl' function. */ +/* Define to 1 if you have the 'OPENSSL_init_ssl' function. */ #undef HAVE_OPENSSL_INIT_SSL /* Define to 1 if you have the header file. */ @@ -539,10 +539,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_SSL_H -/* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */ +/* Define to 1 if you have the 'OSSL_PARAM_BLD_new' function. */ #undef HAVE_OSSL_PARAM_BLD_NEW -/* Define to 1 if you have the `poll' function. */ +/* Define to 1 if you have the 'poll' function. */ #undef HAVE_POLL /* Define to 1 if you have the header file. */ @@ -554,10 +554,10 @@ /* Have PTHREAD_PRIO_INHERIT. */ #undef HAVE_PTHREAD_PRIO_INHERIT -/* Define to 1 if the system has the type `pthread_rwlock_t'. */ +/* Define to 1 if the system has the type 'pthread_rwlock_t'. */ #undef HAVE_PTHREAD_RWLOCK_T -/* Define to 1 if the system has the type `pthread_spinlock_t'. */ +/* Define to 1 if the system has the type 'pthread_spinlock_t'. */ #undef HAVE_PTHREAD_SPINLOCK_T /* Define to 1 if you have the header file. */ @@ -566,101 +566,101 @@ /* Define if you have Python libraries and header files. */ #undef HAVE_PYTHON -/* Define to 1 if you have the `random' function. */ +/* Define to 1 if you have the 'random' function. */ #undef HAVE_RANDOM -/* Define to 1 if you have the `RAND_cleanup' function. */ +/* Define to 1 if you have the 'RAND_cleanup' function. */ #undef HAVE_RAND_CLEANUP /* If we have reallocarray(3) */ #undef HAVE_REALLOCARRAY -/* Define to 1 if you have the `recvmsg' function. */ +/* Define to 1 if you have the 'recvmsg' function. */ #undef HAVE_RECVMSG -/* Define to 1 if you have the `sendmsg' function. */ +/* Define to 1 if you have the 'sendmsg' function. */ #undef HAVE_SENDMSG -/* Define to 1 if you have the `setregid' function. */ +/* Define to 1 if you have the 'setregid' function. */ #undef HAVE_SETREGID -/* Define to 1 if you have the `setresgid' function. */ +/* Define to 1 if you have the 'setresgid' function. */ #undef HAVE_SETRESGID -/* Define to 1 if you have the `setresuid' function. */ +/* Define to 1 if you have the 'setresuid' function. */ #undef HAVE_SETRESUID -/* Define to 1 if you have the `setreuid' function. */ +/* Define to 1 if you have the 'setreuid' function. */ #undef HAVE_SETREUID -/* Define to 1 if you have the `setrlimit' function. */ +/* Define to 1 if you have the 'setrlimit' function. */ #undef HAVE_SETRLIMIT -/* Define to 1 if you have the `setsid' function. */ +/* Define to 1 if you have the 'setsid' function. */ #undef HAVE_SETSID -/* Define to 1 if you have the `setusercontext' function. */ +/* Define to 1 if you have the 'setusercontext' function. */ #undef HAVE_SETUSERCONTEXT -/* Define to 1 if you have the `SHA512_Update' function. */ +/* Define to 1 if you have the 'SHA512_Update' function. */ #undef HAVE_SHA512_UPDATE -/* Define to 1 if you have the `shmget' function. */ +/* Define to 1 if you have the 'shmget' function. */ #undef HAVE_SHMGET -/* Define to 1 if you have the `sigprocmask' function. */ +/* Define to 1 if you have the 'sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define to 1 if you have the `sleep' function. */ +/* Define to 1 if you have the 'sleep' function. */ #undef HAVE_SLEEP -/* Define to 1 if you have the `snprintf' function. */ +/* Define to 1 if you have the 'snprintf' function. */ #undef HAVE_SNPRINTF -/* Define to 1 if you have the `socketpair' function. */ +/* Define to 1 if you have the 'socketpair' function. */ #undef HAVE_SOCKETPAIR /* Using Solaris threads */ #undef HAVE_SOLARIS_THREADS -/* Define to 1 if you have the `srandom' function. */ +/* Define to 1 if you have the 'srandom' function. */ #undef HAVE_SRANDOM /* Define if you have the SSL libraries installed. */ #undef HAVE_SSL -/* Define to 1 if you have the `SSL_CTX_set_alpn_protos' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_alpn_protos' function. */ #undef HAVE_SSL_CTX_SET_ALPN_PROTOS -/* Define to 1 if you have the `SSL_CTX_set_alpn_select_cb' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_alpn_select_cb' function. */ #undef HAVE_SSL_CTX_SET_ALPN_SELECT_CB -/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_ciphersuites' function. */ #undef HAVE_SSL_CTX_SET_CIPHERSUITES -/* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_security_level' function. */ #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL -/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_evp_cb' +/* Define to 1 if you have the 'SSL_CTX_set_tlsext_ticket_key_evp_cb' function. */ #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB -/* Define to 1 if you have the `SSL_CTX_set_tmp_ecdh' function. */ +/* Define to 1 if you have the 'SSL_CTX_set_tmp_ecdh' function. */ #undef HAVE_SSL_CTX_SET_TMP_ECDH -/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ +/* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */ #undef HAVE_SSL_GET0_ALPN_SELECTED -/* Define to 1 if you have the `SSL_get0_peername' function. */ +/* Define to 1 if you have the 'SSL_get0_peername' function. */ #undef HAVE_SSL_GET0_PEERNAME -/* Define to 1 if you have the `SSL_get1_peer_certificate' function. */ +/* Define to 1 if you have the 'SSL_get1_peer_certificate' function. */ #undef HAVE_SSL_GET1_PEER_CERTIFICATE -/* Define to 1 if you have the `SSL_is_quic' function. */ +/* Define to 1 if you have the 'SSL_is_quic' function. */ #undef HAVE_SSL_IS_QUIC -/* Define to 1 if you have the `SSL_set1_host' function. */ +/* Define to 1 if you have the 'SSL_set1_host' function. */ #undef HAVE_SSL_SET1_HOST /* Define to 1 if you have the header file. */ @@ -681,7 +681,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strftime' function. */ +/* Define to 1 if you have the 'strftime' function. */ #undef HAVE_STRFTIME /* Define to 1 if you have the header file. */ @@ -690,39 +690,39 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcat' function. */ +/* Define to 1 if you have the 'strlcat' function. */ #undef HAVE_STRLCAT -/* Define to 1 if you have the `strlcpy' function. */ +/* Define to 1 if you have the 'strlcpy' function. */ #undef HAVE_STRLCPY -/* Define to 1 if you have the `strptime' function. */ +/* Define to 1 if you have the 'strptime' function. */ #undef HAVE_STRPTIME -/* Define to 1 if you have the `strsep' function. */ +/* Define to 1 if you have the 'strsep' function. */ #undef HAVE_STRSEP -/* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ +/* Define to 1 if 'ipi_spec_dst' is a member of 'struct in_pktinfo'. */ #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST -/* Define to 1 if `tokenlen' is a member of `struct ngtcp2_pkt_hd'. */ +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_pkt_hd'. */ #undef HAVE_STRUCT_NGTCP2_PKT_HD_TOKENLEN -/* Define to 1 if `max_tx_udp_payload_size' is a member of `struct +/* Define to 1 if 'max_tx_udp_payload_size' is a member of 'struct ngtcp2_settings'. */ #undef HAVE_STRUCT_NGTCP2_SETTINGS_MAX_TX_UDP_PAYLOAD_SIZE -/* Define to 1 if `tokenlen' is a member of `struct ngtcp2_settings'. */ +/* Define to 1 if 'tokenlen' is a member of 'struct ngtcp2_settings'. */ #undef HAVE_STRUCT_NGTCP2_SETTINGS_TOKENLEN -/* Define to 1 if `original_dcid_present' is a member of `struct +/* Define to 1 if 'original_dcid_present' is a member of 'struct ngtcp2_transport_params'. */ #undef HAVE_STRUCT_NGTCP2_TRANSPORT_PARAMS_ORIGINAL_DCID_PRESENT -/* Define to 1 if the system has the type `struct ngtcp2_version_cid'. */ +/* Define to 1 if the system has the type 'struct ngtcp2_version_cid'. */ #undef HAVE_STRUCT_NGTCP2_VERSION_CID -/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */ +/* Define to 1 if 'sun_len' is a member of 'struct sockaddr_un'. */ #undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN /* Define if you have Swig libraries and header files. */ @@ -782,16 +782,16 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TIME_H -/* Define to 1 if you have the `tzset' function. */ +/* Define to 1 if you have the 'tzset' function. */ #undef HAVE_TZSET /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `usleep' function. */ +/* Define to 1 if you have the 'usleep' function. */ #undef HAVE_USLEEP -/* Define to 1 if you have the `vfork' function. */ +/* Define to 1 if you have the 'vfork' function. */ #undef HAVE_VFORK /* Define to 1 if you have the header file. */ @@ -809,22 +809,22 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WINSOCK2_H -/* Define to 1 if `fork' works. */ +/* Define to 1 if 'fork' works. */ #undef HAVE_WORKING_FORK -/* Define to 1 if `vfork' works. */ +/* Define to 1 if 'vfork' works. */ #undef HAVE_WORKING_VFORK -/* Define to 1 if you have the `writev' function. */ +/* Define to 1 if you have the 'writev' function. */ #undef HAVE_WRITEV /* Define to 1 if you have the header file. */ #undef HAVE_WS2TCPIP_H -/* Define to 1 if you have the `X509_VERIFY_PARAM_set1_host' function. */ +/* Define to 1 if you have the 'X509_VERIFY_PARAM_set1_host' function. */ #undef HAVE_X509_VERIFY_PARAM_SET1_HOST -/* Define to 1 if you have the `_beginthreadex' function. */ +/* Define to 1 if you have the '_beginthreadex' function. */ #undef HAVE__BEGINTHREADEX /* If HMAC_Init_ex() returns void */ @@ -923,16 +923,16 @@ /* Shared data */ #undef SHARE_DIR -/* The size of `pthread_t', as computed by sizeof. */ +/* The size of 'pthread_t', as computed by sizeof. */ #undef SIZEOF_PTHREAD_T -/* The size of `size_t', as computed by sizeof. */ +/* The size of 'size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of 'time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T -/* The size of `unsigned long', as computed by sizeof. */ +/* The size of 'unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* define if (v)snprintf does not return length needed, (but length used) */ @@ -941,7 +941,7 @@ /* Define to 1 if libsodium supports sodium_set_misuse_handler */ #undef SODIUM_MISUSE_HANDLER -/* Define to 1 if all of the C90 standard headers exist (not just the ones +/* Define to 1 if all of the C89 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for backward compatibility; new code need not use it. */ #undef STDC_HEADERS @@ -1035,7 +1035,7 @@ /* Define this to enable SHA256 and SHA512 support. */ #undef USE_SHA2 -/* Enable extensions on AIX 3, Interix. */ +/* Enable extensions on AIX, Interix, z/OS. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif @@ -1096,11 +1096,15 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif +/* Enable extensions specified by C23 Annex F. */ +#ifndef __STDC_WANT_IEC_60559_EXT__ +# undef __STDC_WANT_IEC_60559_EXT__ +#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -1141,30 +1145,36 @@ /* Define if you want PyUnbound. */ #undef WITH_PYUNBOUND -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ +/* Define to 1 if 'lex' declares 'yytext' as a 'char *' by default, not a + 'char[]'. */ #undef YYTEXT_POINTER /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* Define to 1 if necessary to make fseeko visible. */ #undef _LARGEFILE_SOURCE -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ #undef _LARGE_FILES /* Enable for compile on Minix */ #undef _NETBSD_SOURCE +/* Number of bits in time_t, on hosts where this is settable. */ +#undef _TIME_BITS + +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +#undef __MINGW_USE_VC2005_COMPAT + /* defined to use gcc ansi snprintf and sscanf that understands %lld when compiled for windows. */ #undef __USE_MINGW_ANSI_STDIO -/* Define to empty if `const' does not conform to ANSI C. */ +/* Define to empty if 'const' does not conform to ANSI C. */ #undef const -/* Define to `int' if doesn't define. */ +/* Define as 'int' if doesn't define. */ #undef gid_t /* in_addr_t */ @@ -1173,28 +1183,28 @@ /* in_port_t */ #undef in_port_t -/* Define to `__inline__' or `__inline' if that's what the C compiler +/* Define to '__inline__' or '__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus #undef inline #endif -/* Define to `short' if does not define. */ +/* Define to 'short' if does not define. */ #undef int16_t -/* Define to `int' if does not define. */ +/* Define to 'int' if does not define. */ #undef int32_t -/* Define to `long long' if does not define. */ +/* Define to 'long long' if does not define. */ #undef int64_t -/* Define to `signed char' if does not define. */ +/* Define to 'signed char' if does not define. */ #undef int8_t *** 17319 LINES SKIPPED *** From nobody Tue Sep 16 13:59:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3Rd3rhmz67JvN; Tue, 16 Sep 2025 13:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3Rc6rTJz3Xjm; Tue, 16 Sep 2025 13:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031165; 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=BgMhQ9P+xJvoWVjnSQQUTh/UE4bMypOennYjxN8b/s0=; b=IDaRi5uNM3ZLr57Yu2XYH5xqAQETRHqllaSNLfNEcLfD66UvVKZEa8kEfcRCZIMsH+5dYr uwhRmevS331qwVeX422EcyDmqD+o35/MkKcNFKSRWGwKK0PlRtrkrjmSBgogFVF6DHn7Xq g/kPFbDiknP6F+BBXNi6XQomcExjsF+v/LPMGv5OcloJL7SZP0asFc40RxX+hGwWmoR30j /9nIGftZY6qGHknM49xtq2BAANn2wW/jQ6qs0FGdpgGVntI5SNgcHw5DsahyaVYeBitl40 TScX8BY7f4h60s8WS/j67G1PasPgQI2aQ7Dr+nRScQarxFdBNDLtxt5JcA+Nzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031165; 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=BgMhQ9P+xJvoWVjnSQQUTh/UE4bMypOennYjxN8b/s0=; b=GGF63IO42yCSomm8DhU7Mwck8Tg8h5PTKX+bPluJ4zQ1p7OWqzSuTykKqw3kysH0kMTq26 Pdvxh2ViLOZ4S1QomTs4+WBczTWu2LdyOMPmjGrct+BKPhuAqNxAUJ1pEBRQ0EdI8pncKh 0OqUE9BP3Q6r8vDcpXiQe7OZAuTVCBsva+8uqfMjtwPdGCTXPxgrvMIpUqj8kqgNNVvIIp 8yz7tYobiQxtoW30vY6UpkXjp6njV3kGJYYH+jQAa+xmAxe4NYp2Tv17EKoalBkjBRFhXB ssUSvewHWAHT14nBF1p1KR0l8IFZq8+ajFHmVt1Aprz56prMLdFwMNtMmerPig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031165; a=rsa-sha256; cv=none; b=UGAyO/GDvWIIu8Gd2/oJJFWryioGJIbWsF7Z5carYMgC6lwX6E3bATW7yQa1T4mGYkd6m/ dpzJAWmK2ar6liLC0vtUXL9sZhXbnCNZuObdM3nhOlSpju7KYxs5DkiryvlcsARwx8EJxm h3rOdoOxWNXVwrma6ou/VwX848PVWX17SS8NPEr3KqPSGpULTDkuMqQ7AH8qs4w5Rvx7GQ 2Cibqefn73qexboNYjvy/uwPAHrERRHAELN2/lvCDWaQRb4FxFPZLH+OrvTWTD/g1ZvMni WHaMTMle8B4dChxwW9GLa60ztGWDPolJfl5LKqRM27CxIXpw3MQccU8MgGP9Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3Rc6Hg2zjZF; Tue, 16 Sep 2025 13:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxOnY064974; Tue, 16 Sep 2025 13:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxOu1064971; Tue, 16 Sep 2025 13:59:24 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:24 GMT Message-Id: <202509161359.58GDxOu1064971@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e5c5d8f78ead - stable/13 - man: Add -l option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e5c5d8f78eade3a78825caf395c86fb9e7dccc82 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c5d8f78eade3a78825caf395c86fb9e7dccc82 commit e5c5d8f78eade3a78825caf395c86fb9e7dccc82 Author: Ingo Schwarze AuthorDate: 2025-09-07 20:52:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:55:22 +0000 man: Add -l option Add a -l option which causes man to interpret all arguments as paths to open directly rather than man pages to search for in MANPATH. See the PR for a detailed rationale. PR: 289245 MFC after: 1 week Reviewed by: ziaee, emaste Differential Revision: https://reviews.freebsd.org/D52385 (cherry picked from commit 14b61b2e931741281d0bfef426e9809f16006504) --- usr.bin/man/man.1 | 25 ++++++++++++++++++++----- usr.bin/man/man.sh | 31 +++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1 index 4bab5d78eea2..e524258cfbb4 100644 --- a/usr.bin/man/man.1 +++ b/usr.bin/man/man.1 @@ -31,7 +31,7 @@ .Nd display online manual documentation pages .Sh SYNOPSIS .Nm -.Op Fl adho +.Op Fl adhlo .Op Fl t | w .Op Fl M Ar manpath .Op Fl P Ar pager @@ -133,6 +133,15 @@ Display short help message and exit. .It Fl k Emulate .Xr apropos 1 . +.It Fl l +Interpret all arguments as absolute or relative filename(s) +of the manual page(s) to display. +No search is done and the options +.Fl M , +.Fl m , +and +.Fl S +are ignored. .It Fl m Ar arch Ns Op : Ns Ar machine Override the default architecture and machine settings allowing lookup of other platform specific manual pages. @@ -258,12 +267,15 @@ will search the following paths when considering section 4 manual pages in .Pa /usr/share/man/man4 .El .Ss Displaying Specific Manual Files -The +For compatibility reasons, .Nm -utility also supports displaying a specific manual page if passed a path -to the file as long as it contains a +will interpret any argument containing at least one .Ql / -character. +character as an absolute or relative path to a manual page to be +displayed. +This heuristic, made redundant by the more widely supported +.Fl l +option, is now deprecated and may be removed in future releases. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -390,6 +402,9 @@ manual page: $ man -w ls .Ed .Pp +Show a manual page in the current working directory: +.Pp +.Dl $ man -l man.1 .Sh SEE ALSO .Xr apropos 1 , .Xr intro 1 , diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 33be10cd5bd6..6bb260117078 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -495,13 +495,21 @@ man_display_page_groff() { # Usage: man_find_and_display page # Search through the manpaths looking for the given page. man_find_and_display() { - local found_page locpath p path sect + local found_page has_slash locpath p path sect # Check to see if it's a file. But only if it has a '/' in - # the filename. + # the filename or if -l was specified. case "$1" in - */*) if [ -f "$1" -a -r "$1" ]; then + */*) has_slash=yes + ;; + esac + if [ -n "$has_slash" -o -n "$lflag" ]; then + if [ -f "$1" -a -r "$1" ]; then decho "Found a usable page, displaying that" + if [ -z "$lflag" ]; then + echo "Opening a file directly is deprecated," \ + "use -l instead." >&2 + fi unset use_cat manpage="$1" setup_cattool "$manpage" @@ -510,9 +518,12 @@ man_find_and_display() { man_display_page fi return + elif [ -n "$lflag" ]; then + echo "Cannot read $1" >&2 + ret=1 + return fi - ;; - esac + fi IFS=: for sect in $MANSECT; do @@ -580,7 +591,7 @@ man_parse_opts() { local cmd_arg OPTIND=1 - while getopts 'M:P:S:adfhkm:op:tw' cmd_arg; do + while getopts 'M:P:S:adfhklm:op:tw' cmd_arg; do case "${cmd_arg}" in M) MANPATH=$OPTARG ;; P) MANPAGER=$OPTARG ;; @@ -590,6 +601,7 @@ man_parse_opts() { f) fflag=fflag ;; h) man_usage 0 ;; k) kflag=kflag ;; + l) lflag=lflag ;; m) mflag=$OPTARG ;; o) oflag=oflag ;; p) MANROFFSEQ=$OPTARG ;; @@ -602,12 +614,15 @@ man_parse_opts() { shift $(( $OPTIND - 1 )) # Check the args for incompatible options. - case "${fflag}${kflag}${tflag}${wflag}" in + case "${fflag}${kflag}${lflag}${tflag}${wflag}" in fflagkflag*) echo "Incompatible options: -f and -k"; man_usage ;; + fflag*lflag*) echo "Incompatible options: -f and -l"; man_usage ;; fflag*tflag*) echo "Incompatible options: -f and -t"; man_usage ;; fflag*wflag) echo "Incompatible options: -f and -w"; man_usage ;; - *kflagtflag*) echo "Incompatible options: -k and -t"; man_usage ;; + *kflaglflag*) echo "Incompatible options: -k and -l"; man_usage ;; + *kflag*tflag*) echo "Incompatible options: -k and -t"; man_usage ;; *kflag*wflag) echo "Incompatible options: -k and -w"; man_usage ;; + *lflag*wflag) echo "Incompatible options: -l and -w"; man_usage ;; *tflagwflag) echo "Incompatible options: -t and -w"; man_usage ;; esac From nobody Tue Sep 16 13:59:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3Rf46G6z67Jkb; Tue, 16 Sep 2025 13:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3Rf2qFCz3Xc3; Tue, 16 Sep 2025 13:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031166; 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=AmzGOLimnDMp0ZPkSvMODp2/owFiyIv2GkuMB4CKFho=; b=fqgqTobmrYNJYAIhVdUVVwJlI4IuFIbT9KQ9kusEbtqGcyvlGxqSWQgZN0NAlyfSth3np+ J4/EqH+Iz8zR9JaQyTpPsQbi34W4aHiOfSOLsPHRT39nH0kks27pCWnBgqtxmjisQlSSiN x890sF7VDiF8shcW4+Ayw0OuiIBodpq3E48g2zH6/eUYmzVkCQVjwsKCvWebhLcGXP7XBw 3/oZuP27ed5nddKnRYT6iiz7TMkiXu4U/Tu6nflwbzU56swBD8traBtff8gA4dh7Jp+Ad9 zPGjarMQeJp/svGId2741cd23bPcpO4iwqbgUnVpefW8Ig0vsvqnxa2IbZQ6Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031166; 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=AmzGOLimnDMp0ZPkSvMODp2/owFiyIv2GkuMB4CKFho=; b=pu9p7qvIDLHLc/FWUXdBRFkGNvMogRaAiwtRRcGuMUG7vAxN4T+8HXsePLHGHjVkaerCxO 8r39O0mM6Ds5hmL55es4QHlHJUxvMVwDa7nQLBEPq7w1YZtg6GcolZ3bgVOvnJvHCDnK5I o1VzD2BkI7oRrsIXvX0HPel4W79uSe9wxkeFvUMFUmhwvlWVXQweqTZcqV4xPNI/LumTDH xC+YJQgyh7+4B93FFoX3hd3Zc6WVMoWeny5Pthl4y/Fj0nzrGSbxjcVzntbAqHO+nAzXdK do7p/S9OW0PP5PW0cioW99JV4JX+y0BCyLLhnryPETmZzhAHFcJVj5YASZ7cKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031166; a=rsa-sha256; cv=none; b=oQ+RT/vwpt1WHSJJSUpsmftIdtm1Lzx11K2eXPn4+fFOTKt43JWXTBhpKsMaOQ/dfVxayN BJvKUPQiq72zsfZWf/7rSGi29+TEMGrO3r9wgdJTvqSSzuN5rqROT8kWLZ2EJOzqE7PHHz pZ782fZ3gcxJMb93wTXMmotY6TStFj6caot633A27cNDnsY2+l0NG1paLUO//PIvMmGcF8 NJ3hs74SwwJIVLABqEX4YKJDcNh7Ny3UDoBUllgXoomPx8uhuTUp2eFYtuKCQJjIGbllbj GzqpAZWeuiXAOW+3rXBFIp/OB+6fUybx7xybri6VSAL5s9WfL1Xtkc3qeOTc2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3Rf0B8Gzkfq; Tue, 16 Sep 2025 13:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxPTn065010; Tue, 16 Sep 2025 13:59:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxP5d065008; Tue, 16 Sep 2025 13:59:25 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:25 GMT Message-Id: <202509161359.58GDxP5d065008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: eafc54027d2e - stable/13 - src.sys.mk: Support src.conf in SRCTOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eafc54027d2ee6feac2114277d3c0f5131c9325f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eafc54027d2ee6feac2114277d3c0f5131c9325f commit eafc54027d2ee6feac2114277d3c0f5131c9325f Author: Dag-Erling Smørgrav AuthorDate: 2025-09-10 16:57:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:55:22 +0000 src.sys.mk: Support src.conf in SRCTOP If SRCCONF is not defined and src.conf exists at the top level of the source tree, use that instead of /etc/src.conf. MFC after: 3 days Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D52470 (cherry picked from commit dd8c666d8b78f6b9ddb691f0505837fa885ff3b4) UPDATING: mention the src.conf change Fixes: dd8c666d8b78 ("src.sys.mk: Support src.conf in SRCTOP") (cherry picked from commit ab2fea3f9a5a58f0ba90499ad3a8614e3dca0c5f) --- .gitignore | 1 + UPDATING | 5 +++++ share/man/man5/src.conf.5 | 9 ++++++--- share/mk/src.sys.mk | 4 ++++ sys/conf/kern.pre.mk | 4 ++++ tools/build/options/makeman | 7 +++++-- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 668b6d90483a..454340511754 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ cscope.in.out cscope.out cscope.po.out tags +/src.conf diff --git a/UPDATING b/UPDATING index a40ddb1d3670..84474463a407 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,11 @@ and/or ports. has changed. An NFS server that exports any of these file systems will need its clients to unmount and remount the exports. +20250916: + If SRCCONF is unset and a file named src.conf is present at + the top of the source tree, it will now be used instead of + /etc/src.conf. + 20240419: Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have been upgraded to 18.1.6. It is important that you run `make delete-old` diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 181b4fea466d..01721e786aa1 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd March 8, 2024 +.Dd September 16, 2025 .Dt SRC.CONF 5 .Os .Sh NAME @@ -30,8 +30,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index d5c2af0c559d..d563859586b0 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -6,7 +6,11 @@ .if !defined(_WITHOUT_SRCCONF) # Allow user to configure things that only effect src tree builds. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if !empty(SRCCONF) && \ (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && \ !target(_srcconf_included_) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 8728ac269dd6..c0af7ea7313f 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -8,7 +8,11 @@ # the rest of /usr/src, but they still always process SRCCONF even though # the normal mechanisms to prevent that (compiling out of tree) won't # work. To ensure they do work, we have to duplicate thee few lines here. +.if exists(${SRCTOP}/src.conf) +SRCCONF?= ${SRCTOP}/src.conf +.else SRCCONF?= /etc/src.conf +.endif .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_) .include "${SRCCONF}" _srcconf_included_: diff --git a/tools/build/options/makeman b/tools/build/options/makeman index 05a07f592b09..875d8cf16b9d 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -174,8 +174,11 @@ variables that control the aspects of how the system builds. .Pp The default location of .Nm -is -.Pa /etc/src.conf , +is the top level of the source tree, or +.Pa /etc/src.conf +if no +.Nm +is found in the source tree itself, though an alternative location can be specified in the .Xr make 1 variable From nobody Tue Sep 16 13:59:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR3Rg4fj3z67Jkc; Tue, 16 Sep 2025 13:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR3Rg1cZdz3XWP; Tue, 16 Sep 2025 13:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031167; 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=ZHLZTZeomVOfpnwBqSJLb5XFLb6m77L30oNzA4/eM9o=; b=hbCTB0Gqn7vl1ymXONTODDmV4BXYeny9SUZe7F42X8SHWKWj5ZfOk0vtjyvwDJnJQQ+/RY IG+z4JLuoo7FFckav4786hTCZM5kGJyu+74/JDZ8oT5Dga/FQgG3t3TWxNiIVpKDqnhMGD Ubha20jIHAdu2CvUdO/i4ic5qL/XwqtqRLGmwDIQ5hkTkPr4iWjEtA8/objFsQfMOkMQxY ZkbubfzLlknpty8Zlpf7zATQyYCUX3vzQYPJymebEjQEssxnMIrWrlq4VF7PBEwtvwf/9+ gtD2d9nGini7vI/Zcrt9xPrpNb47h7lzbilW+INElg/ccAfp32qaqZCO2ICkww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758031167; 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=ZHLZTZeomVOfpnwBqSJLb5XFLb6m77L30oNzA4/eM9o=; b=h1wFsMjuKmlRLPtDdtQzJ3jNyVtzhxD0YyZkup6uidCnYJncjGr3IvDBd4mvCCqkyeUBPg uu6njptK1KTDFwA8VTOrnvef9nBHW4sCpQe+qmoQMGw9eQOvbSUfne61cbQwVTLofI6Vdx LJEWBwDJVh2jl8+G+0rcs2qK1xqf4vPJugQujvBbw0o1KlmtI4dlIZmm8QH0AWtiSJBjjz enMZPFK0l0NuLNJ9hObvKY35+IplyAE1g3nHCMwGFQ3NbmFAHnZ+XszI2IjpKzo8DOimR5 uWrmxP8wFCy0Grqd/hUhhnU5E2MxuAqZbfEU0UE2v+fM03q3uSG+mtMJZhl0Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758031167; a=rsa-sha256; cv=none; b=Jp0Zy2X9I9Kcfu4l4ei4VhZNTQtfk/Lt6kY1ubpvyFi1JTLfLqn7bFAr65Ayn7hKhK7gIV UzEBiPMSS0x7qAhaJXpVyYWNRQxL3ropTgVVIO4uPXfcWe1y1pF/sZ3Uqe7mPAMmdZXeFS XYcvSI+b3XbdIroBZwhCKYkvuA5/3wLZMY+eIzEdPuLgI3grMSyaWUFDYOFe36YhaO1UJn 0QzDwPwUf26AKtX7UNcjPEYI7G8X4xWbP9KEep3vtTTzwxafMLSDC2OmsVrH45xfTTPW2G T7hiYgrkzBbaTugvgx68H7QLuLalwQ+LDbPlBPIL6qczzJrb9FuCQKs5JsyeJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR3Rg0rPBzkfr; Tue, 16 Sep 2025 13:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GDxRIC065046; Tue, 16 Sep 2025 13:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GDxR13065043; Tue, 16 Sep 2025 13:59:27 GMT (envelope-from git) Date: Tue, 16 Sep 2025 13:59:27 GMT Message-Id: <202509161359.58GDxR13065043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3ac71c45ffa9 - stable/13 - uptime: Mention libxo support in manual page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ac71c45ffa920d4d79d54813581f92442602cf7 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3ac71c45ffa920d4d79d54813581f92442602cf7 commit 3ac71c45ffa920d4d79d54813581f92442602cf7 Author: Dag-Erling Smørgrav AuthorDate: 2025-09-11 20:51:48 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-16 13:55:23 +0000 uptime: Mention libxo support in manual page MFC after: 3 days Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52489 (cherry picked from commit 55bd607b9930e5f61219007ad0a81801c8cfdbf3) --- usr.bin/w/uptime.1 | 18 ++++++++++++++++-- usr.bin/w/w.1 | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1 index 16c16c0b5318..b20e9066a470 100644 --- a/usr.bin/w/uptime.1 +++ b/usr.bin/w/uptime.1 @@ -27,7 +27,7 @@ .\" .\" @(#)uptime.1 8.2 (Berkeley) 4/18/94 .\" -.Dd August 18, 2020 +.Dd September 11, 2025 .Dt UPTIME 1 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nd show how long system has been running .Sh SYNOPSIS .Nm +.Op Fl -libxo .Sh DESCRIPTION The .Nm @@ -42,6 +43,17 @@ utility displays the current time, the length of time the system has been up, the number of users, and the load average of the system over the last 1, 5, and 15 minutes. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl -libxo +Generate output via +.Xr libxo 3 +in a selection of different human and machine readable formats. +See +.Xr xo_options 7 +for details on command line arguments. +.El .Sh FILES .Bl -tag -width /boot/kernel/kernel .It Pa /boot/kernel/kernel @@ -53,7 +65,9 @@ $ uptime 11:23AM up 3:01, 8 users, load averages: 21.09, 15.43, 12.79 .Ed .Sh SEE ALSO -.Xr w 1 +.Xr w 1 , +.Xr libxo 3 , +.Xr xo_options 7 .Sh HISTORY The .Nm diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1 index 7f0d83032d4b..584c5d1b7129 100644 --- a/usr.bin/w/w.1 +++ b/usr.bin/w/w.1 @@ -27,7 +27,7 @@ .\" .\" @(#)w.1 8.1 (Berkeley) 6/6/93 .\" -.Dd August 24, 2020 +.Dd September 11, 2025 .Dt W 1 .Os .Sh NAME @@ -56,7 +56,7 @@ user is on, the host from which the user is logged in, the time the user logged on, the time since the user last typed anything, and the name and arguments of the current process. .Pp -The options are as follows: +The following options are available: .Bl -tag -width indent .It Fl -libxo Generate output via From nobody Tue Sep 16 16:31:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6pf4YwXz67Z2f; Tue, 16 Sep 2025 16:31:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6pf3qg8z41hW; Tue, 16 Sep 2025 16:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040266; 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=5b7U7tRtMfLbumJT4t2hPVCnplnxST93RNHKKxvdMwM=; b=WEgNLFP8p2JbfCrjuQK93Mf/vchbBcHYHZOsdpT3L9odwIzfHcPC5ihuQI7R++FTyWreCO 07iRBKE4tjqE/e5CVvvevQTqChSGs3EBaIk+i+CbVHuLJkEgwGZjNA2n8uSAXlFz+bME2l HliJ9LLUAyvM+/Ja7i/7SvyEaf14WUUNfBgbeQfnbCDgh/Cj9YyU/WszEdqhDAr1kw5m7j intr34b/KzRCImQdQbGoAHn+LX/87p20ywU7qRu3pp+/d+/LmiyD4j2JCLTGWuf5kKVTqx DnmoTMDJ2v1+cAtz/GIqKP4BZH5a1wEGH4DXTQqR9OroEdumu+bf7ngmVyXyVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040266; 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=5b7U7tRtMfLbumJT4t2hPVCnplnxST93RNHKKxvdMwM=; b=lXLaWdAdbAhuLhFeSU0g753/2YXKaShFtHE9gYiXo/gQ5KNLZC/LsEBsxHtHYGfMax6bbH R20ht6ryd3TDOeu3o6uzdjjNOydo1Q1/IhuKgtZmijzcC0ZJ5Vc1LocxvWIVN/t2bbBhAZ lCItmGhos84So/bzHbElY6e/mBVent76NiaMYLpVOQyBVkw9X5z+E9vJsOL66j5WiFe34U QcMKZiIsmj5pkifQIH3rFQn34JwYnb8XGtwHbIuyG+MHpzGglf3m+Zi4/j/h++IZLbkXWF FNRbLhVfjzfvo01ooYOaoU3dJes3foShNnV+4lTgtAJf8tIdmKve+1zQ3hVNtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040266; a=rsa-sha256; cv=none; b=rF2yM1d/T3stWjUvH6I86SJ8SdYSkFDXtWy/bF6xv5+9T1yqJPL99BeAkWPNTi1reynNQ7 gbo7yqRPIhpS9EQWbyfZmXcf4kQ835jBH9HdBuhaKxt9kv2v4smOdg3MNdh5JA9Xsyy8eR SGCwP21T0whAZvJ8T5FSjxrJqAGtsPq2s5GqPqw0hB+6ddDDABfpCHF/mgTXRtUeix1CzE 895CshnFGIGm0ZqOGY7h2TrOWKNoR7NjyN85NKUs4fQz5KK7ev6Q82dKL5p3XM97k28wTV iGpKerCdFMdIMnjOZcHwyeDzG+uzLEozofnTqg914NEwaLMWrNYfyJnY0nQSug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6pf39f0zpVn; Tue, 16 Sep 2025 16:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGV61k058617; Tue, 16 Sep 2025 16:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGV6Vr058614; Tue, 16 Sep 2025 16:31:06 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:06 GMT Message-Id: <202509161631.58GGV6Vr058614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 99012995b4c6 - releng/14.3 - arm64: prevent panic when using syscall mux + large arg call (mmap) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 99012995b4c69ecc352047a41cf76ece50b25134 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=99012995b4c69ecc352047a41cf76ece50b25134 commit 99012995b4c69ecc352047a41cf76ece50b25134 Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:20:46 +0000 arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. Approved by: so Security: FreeBSD-EN-25:15.arm64 (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) (cherry picked from commit 17d87881a363c160e7e8cdb252d0261214c1a50b) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index de0ee9607ad1..5f35d01f9ac0 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -193,7 +193,7 @@ freebsd32_fetch_syscall_args(struct thread *td) register_t *ap; struct syscall_args *sa; int error, i, nap, narg; - unsigned int args[4]; + unsigned int args[6]; nap = 4; p = td->td_proc; From nobody Tue Sep 16 16:31:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6pg6t1qz67Z4n; Tue, 16 Sep 2025 16:31:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6pg4kDGz41Tl; Tue, 16 Sep 2025 16:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040267; 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=ChfOeV1LNxjrrpbf4e6kCOgoFv3Z2AWq8LLY1GOf9LE=; b=BQYRggBSiLp8aP5y0caAUxOURM61qoNUMVPo+vFJePo0UtZDY0rXVS69VneYlTfqDhIEL2 +BkzLe43h8tgHniBXNIii3slm36gaeB7cv2uU298EmJQfwcoy2P24pTXYrpVSLmjkNRF08 YJuzu32esgajvu0iN1LIDWoNp157Riif6tg8oAPTvziWUcZKdKNhjT/FPSvVXDoNAkHqx/ ah/a2O7C32MPlDUhELdZNfB0xxVTjuyy7kMlkkDuEp9DpjaXfWk3OP8cjWGrdjl5Il7Kua F6xuxT3x7j0ir903q9OrqFUe5C3mbfGw7KIWEeZVsQoBI6B4MIK9JVo6Lwz5Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040267; 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=ChfOeV1LNxjrrpbf4e6kCOgoFv3Z2AWq8LLY1GOf9LE=; b=cUNzfL0oVupfe4+tsgeu6t2qMzMWfy8QcIzVbeY/VSHU5pWIjniQgh2btaxzKEZ1aOaSmq /Vq+3MU3Lr7aw6UyW1T//rjSQy098w7So8LrOyIemJprBU7Bo+9cMNXKBFskfIny4J22vR xIXsnlxMYkyJqQIPO4as/sXuPbGF9hF9iCvW3vmxm3Y1PPe5zOSMEtc19TQnryuzQJm+gI bu+plBWVVVCxKvKVmeE2jZLPdl0QFQqyZoEMHORYddhYI81Cmf3khnOlzsFa4PcEauIf18 5sWAX2QOr7eF3uDwDWaw2l8ZwG0Ask+xTjTK8F6+FQvUHTSlFUOiGWQG+cBQaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040267; a=rsa-sha256; cv=none; b=wnu6QYp0Lt5GsbaAyioSR6lC95J9M/He0Ls4B4sP4sHMwdi0uvE+I1gVkItiWSxvpo9Tci 7SEKVAlUSi8OKxTMn7aK1QlR8Ni8Pnwbr8nq+n8i8o//7vIJbf7E3vD9mTwzVfA8hHygA7 t+ryV5ITgbhCtYbNq4+hdB10A0h3IlndnzEV63SmMEp5ILSvUmMC03ZQ/8IlVj485A/DbS 40ViCEh5+oXEYYkELibRfruj27IpA2+oEftBEJIiXhivSjmlcBlj1DMnP1+EuKC/EGMq14 Tu+xI3EtOumHO1hcuuCexdBL9C486Kh14EIFpfIosOYQYx7mnnDyd933LvF1Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6pg3qC5znWF; Tue, 16 Sep 2025 16:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGV7vB058650; Tue, 16 Sep 2025 16:31:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGV7R4058647; Tue, 16 Sep 2025 16:31:07 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:07 GMT Message-Id: <202509161631.58GGV7R4058647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: d1e981cbf3bd - releng/14.3 - vfs_syscalls.c: Fix handling of offset args for copy_file_range List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: d1e981cbf3bdfff5a3fb7a2d21d80c0ed747524d Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=d1e981cbf3bdfff5a3fb7a2d21d80c0ed747524d commit d1e981cbf3bdfff5a3fb7a2d21d80c0ed747524d Author: Rick Macklem AuthorDate: 2025-08-09 21:15:07 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:23:36 +0000 vfs_syscalls.c: Fix handling of offset args for copy_file_range Commit 197997a broke handling of the offset arguments to copy_file_range() when specified non-NULL. The code fails to update the offsets and, as such, a loop like: do { len = copy_file_range(infd, &inpos, outfd, &outpos, SSIZE_MAX, 0); } while (len > 0); becomes an infinite loop, just doing the same copy over and over again. This patch fixes it. The clause "(foffsets_locked || foffsets_set)" in the if is not actually needed for correctness, but I thought it made the code a little more readable and might avoid some static analyzer from throwing a "used before being set" for the savinoff and savoutoff variables. Approved by: so Security: FreeBSD-EN-25:16.vfs (cherry picked from commit 4046ad6bb0ee542a42d89a48a7d6a56564ed7f33) (cherry picked from commit 2fd0083fcc23f4c25860b8890292448720a5961c) --- sys/kern/vfs_syscalls.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 02908f76ef85..6756925416a3 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4908,11 +4908,12 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, size_t retlen; void *rl_rcookie, *rl_wcookie; off_t inoff, outoff, savinoff, savoutoff; - bool foffsets_locked; + bool foffsets_locked, foffsets_set; infp = outfp = NULL; rl_rcookie = rl_wcookie = NULL; foffsets_locked = false; + foffsets_set = false; error = 0; retlen = 0; @@ -4980,6 +4981,8 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, } foffset_lock_pair(infp1, &inoff, outfp1, &outoff, 0); foffsets_locked = true; + } else { + foffsets_set = true; } savinoff = inoff; savoutoff = outoff; @@ -5035,11 +5038,12 @@ out: vn_rangelock_unlock(invp, rl_rcookie); if (rl_wcookie != NULL) vn_rangelock_unlock(outvp, rl_wcookie); + if ((foffsets_locked || foffsets_set) && + (error == EINTR || error == ERESTART)) { + inoff = savinoff; + outoff = savoutoff; + } if (foffsets_locked) { - if (error == EINTR || error == ERESTART) { - inoff = savinoff; - outoff = savoutoff; - } if (inoffp == NULL) foffset_unlock(infp, inoff, 0); else @@ -5048,6 +5052,9 @@ out: foffset_unlock(outfp, outoff, 0); else *outoffp = outoff; + } else if (foffsets_set) { + *inoffp = inoff; + *outoffp = outoff; } if (outfp != NULL) fdrop(outfp, td); From nobody Tue Sep 16 16:31:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6pj1jdpz67ZBy; Tue, 16 Sep 2025 16:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6ph5KMQz41d0; Tue, 16 Sep 2025 16:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040268; 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=v/gCd88eKnk1GflWbfOmZsykHFKWgK0EOzMXOXuRCdk=; b=VlzyURYF3ukuEEZJG8s79AUM+EkB8Ek02eclhNR9I4KoVrTEzvKiOQxQxucd6mmW2WGR71 SsijmmNdA/M2+6AB0xO/fHD5r6zWym46SG1m98d0YXiRAw8RcgsHoS44ky0RRSIau/Y0a9 2hY1/tIH/dR4cLMhl3bIdmoiNLYXr6FTwDWBxO2tFBoI1Zjhu+MVwkXBpGLvqcfc5GIYo5 PpUWRYeKZdOF300SnwHS3SRF8DWPwDTJ/mxIBhI0xKZK9dggs+1+fIYCg5X3HuzKg/eCdU FDBaqi672otRy+K/FT+zr9YnDupjy1qGWvir9VSXQa9bKsXa4VYkVFGiF4Bv6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040268; 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=v/gCd88eKnk1GflWbfOmZsykHFKWgK0EOzMXOXuRCdk=; b=Re6WTY3C6GObeqn6hTEtopBa/GcyBHnqYemZZ6ec0t5RbB1tmYDoNIymJ0WI9GJ+yUAyyA myFUprJ0aQ6RMkq+D6uB+5JpW1Ba5vt2Y2L84Rjxq9MoaVApMQDAckVUoDv1dqIcyylncA eUowyfVwtlen9GL4ZnuPqECmYVT+d9N0SYP/EN0V2Ntd2obD0zul2AexLXiMAxwfqnHDJm OJuruwxZUF4AlVEtwbANEqEYULb/Z8z4ho/HMsfN/ehCoCzx0FZu8srDJfZTqMI5z1yvfw l6tjCJCoaPvFWqdgPbz1Zwzn98S/t5io13AOvzeO23scv1OsdW5HXfexy57Cog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040268; a=rsa-sha256; cv=none; b=F0eCuOFNu++ElpbNZLs4mu3DNi1xlpNc8YI3jNc5LJC9bWgDOkjeawpmE6uUSROwDer/eS 6d67yvxV8L3CCRK6CgsAJArya1X7dnyclWIYEE1i2J/KDvM8+rMzp/saWqgvOjBFRksvWk uXRPotZPwjKVFR8wpfTBwQVuAu4DaAcwnWLAx2JrhbGLXcGjt5Ifx3lQaT6hi5zc1zW+to UTkL496AySb5MQyX1lZTCRaN8HHskBBSq8T9XT4sOyTpVV13z7QoIeTkgvZQFcV7tRFfRU iV/pVSXBi6o68Q1fsKYpFEQ37vGoiuYO0ohJAg79CwhA32ss8te1Mcw1O7CwLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6ph4nwRzpMG; Tue, 16 Sep 2025 16:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGV880058684; Tue, 16 Sep 2025 16:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGV8kj058681; Tue, 16 Sep 2025 16:31:08 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:08 GMT Message-Id: <202509161631.58GGV8kj058681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: c07b1838f9c9 - releng/14.3 - bnxt: Fix BASE-T, 40G AOC, 1G-CX, autoneg and unknown media lists List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: c07b1838f9c9e31696716b188a832ec35003ec2d Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=c07b1838f9c9e31696716b188a832ec35003ec2d commit c07b1838f9c9e31696716b188a832ec35003ec2d Author: Kevin Bowling AuthorDate: 2025-06-14 23:46:05 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:24:43 +0000 bnxt: Fix BASE-T, 40G AOC, 1G-CX, autoneg and unknown media lists This was broken in c63d67e137f3, the early returns prevent building the media lists as expected. The BASE-T parts of the patch were suggested by "cyric@mm.st", while I am adding the additional 40G AOC, 1CX, autoneg and unknown PHY fixes based on code inspection. There may be additional work left here for Broadcom but this is certainly better than the returns. PR: 287395 Reported by: mickael.maillot@gmail.com, cyric@mm.st Tested by: Einar Bjarni Halldórsson Approved by: so Security: FreeBSD-EN-25:17.bnxt (cherry picked from commit 5e6e4f752833acc96f1efc893318d3f6b74b9689) (cherry picked from commit 33f65f12eba10588827a13d232337616f6f4facf) --- sys/dev/bnxt/bnxt_en/if_bnxt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/bnxt/bnxt_en/if_bnxt.c b/sys/dev/bnxt/bnxt_en/if_bnxt.c index eea956759e9e..169255c9433e 100644 --- a/sys/dev/bnxt/bnxt_en/if_bnxt.c +++ b/sys/dev/bnxt/bnxt_en/if_bnxt.c @@ -4609,34 +4609,34 @@ bnxt_add_media_types(struct bnxt_softc *softc) case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE: media_type = BNXT_MEDIA_AC; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASECX: media_type = BNXT_MEDIA_BASECX; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE: media_type = BNXT_MEDIA_BASET; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX: media_type = BNXT_MEDIA_BASEKX; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_SGMIIEXTPHY: media_type = BNXT_MEDIA_BASESGMII; - return; + break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN: /* Only Autoneg is supported for TYPE_UNKNOWN */ - return; + break; default: /* Only Autoneg is supported for new phy type values */ device_printf(softc->dev, "phy type %d not supported by driver\n", phy_type); - return; + break; } switch (link_info->sig_mode) { From nobody Tue Sep 16 16:31:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6pk4QYfz67ZF8; Tue, 16 Sep 2025 16:31: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6pj6HvTz422x; Tue, 16 Sep 2025 16:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040269; 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=buLs5cLoRx8QWcLq9PA8QrM9v5pFxeg0rZNQB2gEkP8=; b=TeD32rLTWNajqxkZOGUDqJ9flFavqYKqeI2tCNRiO2FHbHUAIMkC1ov5pFlySxc3HPKVMo nmcDpVsZUeWhARM+y/3zXtemzewh9pysjl4xMcLVaEe7w6nRLOxbWk2f6y3ILkLqIqwJV/ ODwHRFAlSIjTr9HB02sy0PZlpJBK9FPLpqKcjM04h1wTB+lLxKGpPEm8hy07MsZ+p9+jEg flskFngZm4u4CM4tS7IN8jiyjqF9rZP2ReK+RZSogDEXbGzAi5LCeaEHBS4YL45LQXX1g8 tBj4F+NSVrvJxJNjwjvgECi7RKP9mELOx0/JzYfa9nxeopA6hD1xmgty/QX5rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040269; 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=buLs5cLoRx8QWcLq9PA8QrM9v5pFxeg0rZNQB2gEkP8=; b=sJDBNwD2uMOky3ZtUz2jl6x4330SOk+SEekc4RYCYTbrHZ1MnrIpMHK13VH0pJB1RhmBiK L7l7uKgTWfyUlwcJAXoYlpOWXvow2/Z31VCK18VPP7qrs4cdYmGqRziRjgscHPRunINV0M jgZ+yEsPDfknlByJOd5oKJqTAVJUxG15EhtSgcqUscxevAHTL6hFKMuPeR+Xg7aLHfTQ06 RJ8SSe+W2ICxOwMuQB2mEs7Z0QflmmwD26dppgXAntWfjhiaqlRNkZphVXooUOWk85qSYb 7lJXJvuRwanRSM39beX6ifBM1EYPKgzXzk0jdZk3VBd2fOjf/9HkjsU0AFshWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040269; a=rsa-sha256; cv=none; b=D85sPLpSQL1XShQC52XtfgmNTYWn2SWOYCjv393KTcD16cx8R78H6bekgzicX+PRgZ5xEL peyVaAlhL+UfUYzSz+MBaUY4eEXXS8jZf1G2Zb8K2JkCduy6yh/cv6jaMYqIV+gDOe1xpy Ysh6IHlNUhOZ27dg8ZZ94A4c45dr4yVe6CU2gIyqFzDWgjANWHGWij+FiOSGe6OCnuAiVO UR0fm5pdZ2ius695ovMvRe+B1fKnV8RhxWpurpUo/SnczRVUAp6pWHeyFAcp77Xl8kOLcW FUDnsjW+Qfe4wL5vPa5lWSTSETejq90OSbJjTXh1ps6mcdfSpg+J0DwLkwZsnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6pj5plGznp7; Tue, 16 Sep 2025 16:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGV9JY058723; Tue, 16 Sep 2025 16:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGV9KM058720; Tue, 16 Sep 2025 16:31:09 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:09 GMT Message-Id: <202509161631.58GGV9KM058720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: ed55d0f2bc69 - releng/14.3 - Add UPDATING entries and bump version. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: ed55d0f2bc694315d6b906f18e18c059ecebcc18 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=ed55d0f2bc694315d6b906f18e18c059ecebcc18 commit ed55d0f2bc694315d6b906f18e18c059ecebcc18 Author: Gordon Tetlow AuthorDate: 2025-09-16 16:28:47 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-16 16:28:47 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 11 +++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 13a84a404535..31f8d97d4762 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,17 @@ 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. +20250916: + 14.2-RELEASE-p6 EN-25:15.arm64 + EN-25:16.vfs + EN-25:17.bnxt + + Fix arm64 syscall(2) allows unprivileged user to panic kernel. [EN-25:15.arm64] + + Fix copy_file_range(2) failing to set output parameters. [EN-25:16.vfs] + + Fix bnxt(4) failing to set media type in some cases. [EN-25:17.bnxt] + 20250808: 14.3-RELEASE-p2 EN-25:12.efi EN-25:13.wlan_tkip diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a8ec74cc1226..59e359d9f452 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.3" -BRANCH="RELEASE-p2" +BRANCH="RELEASE-p3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Sep 16 16:31:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6pv0XLzz67Yqh; Tue, 16 Sep 2025 16:31:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6pt4Zzmz42LP; Tue, 16 Sep 2025 16:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040278; 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=DprsT7BkUJDTnFr+FpMrUrQtIS5fGLfRSixusxNTn9I=; b=sJns3fnatnkR7jYDx0vyuaJUqRtarvJRrX0SWeFi0GtE56Wo5Hpn3rUpIMg7zs9cn9euPc XNwwIKzhnjGx/I/PbiOHNBgT7zvxKU/femYl/pwU0YR3PmHazB4pw9kwzp3ZiUjeCY4gEm P20vpug2Od8Ba03lOegHy9Y8OP/6+1f7lPjt/Y5P6YpHLoXsITMoaqo+4VOU8VncM+ZRAw WkyTWICFnZb4dTngr4eT4I6rhgFfaxfBm56DAiOo9kGgTvvV3gjwVfZW590zwk2CgBfM2b X6qPNl6tnU6/5VudJvTY6qJMPOOM7DuYe1PZ7bR92NvvGQ7hRmaPaPS2+xoQKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040278; 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=DprsT7BkUJDTnFr+FpMrUrQtIS5fGLfRSixusxNTn9I=; b=DOA4aURvF5vmTJaAXdt1fJJWu3LlGveuM35SDIy39Fjjrg2nwkEZQT8BvKLWX9gNb1GI9w 3bjitNfIV0Bf8Pwsw0KnVPd1HQsH/Gps/vRCAXfyfxUQrP2SFNnOVBulGsV1EX5HI11cep z0IPVfAoqPh3oqJxU4bLkaVPLMJMNMJ72hG7lzG55gXc6WF6uZYeOexoOkGndqgdUUEsTy j0Ha1GCRb5TPr5YCe5/Mlc2j6el7i6krNLG1v8uQDwVCS6F+fJux2AqTkH/IMcqHFfQz1g p0AD7qfH3RkBJ91cFC8rM+8lGPs6nhNbWnWG7tIxKrNGBjjx7kZQU2ayTpzJIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040278; a=rsa-sha256; cv=none; b=ipf0iYOtrl1VozXtsvCK8wYA1oI1x0981peq5wQ2HxDBGWphBFRim1SofkMWjP+Ky89ccB 0R3TDLlJCnEtcniJxl7mPNsmqnNYHb2cTic4muFogfmv7UB4EWCTl0fZg5mBexvJKPJy4d uIh5Qja2byGhEmwvmr9PhJJ6/GbFZ9tYxfBKbCnquWOoTc30q2hZ+CqC5BDmyYaskO5L1e oSuoph/ITjhjEfbBVfx+jK95qvIQ7N7/V9hDF+NZQ/ShkGpnt5WZ4MP7O2PH/uwD5aK8hy Mgk/xxQCPItHpJlgivMYUFyAfsLZ9io9zLbKuI7qhy7LV9svLIRNNWsZNYRZYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6pt46N6znpC; Tue, 16 Sep 2025 16:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGVIea062506; Tue, 16 Sep 2025 16:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGVIer062503; Tue, 16 Sep 2025 16:31:18 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:18 GMT Message-Id: <202509161631.58GGVIer062503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: f3ffa7eb382a - releng/14.2 - Add UPDATING entries and bump version. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: f3ffa7eb382a2b90816f94aa2fb2431688e0c2b8 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ffa7eb382a2b90816f94aa2fb2431688e0c2b8 commit f3ffa7eb382a2b90816f94aa2fb2431688e0c2b8 Author: Gordon Tetlow AuthorDate: 2025-09-16 16:28:35 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-16 16:28:35 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 36f7e4a7b151..5bf203683480 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ 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. +20250916: + 14.2-RELEASE-p6 EN-25:15.arm64 + + Fix arm64 syscall(2) allows unprivileged user to panic kernel. [EN-25:15.arm64] + 20250808: 14.2-RELEASE-p5 EN-25:14.route SA-25:07.libarchive diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 773335879171..18bd593fa59f 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.2" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Sep 16 16:31:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6ps4BKvz67Z6L; Tue, 16 Sep 2025 16:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6ps3JwCz422J; Tue, 16 Sep 2025 16:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040277; 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=zgAXAhUDuEKl5O88t4frYMrS2tu41pn4NNg+uwBNjM8=; b=W4NHb4o9NJY9xOLE4bFHneP8EVE8X2xk5VJYlr1XXIIqkaYZ9mwGTxKUJ0bJqiVqyiEOhd +KvKS89p2/KtFD/30bDoPs2Ft5pYzSiNM1y/bHqZML3GmnwMBShGwcDhs1AoG7wwiruHZx pRrBLGJPPKX7wfPWxJD8tqfUqXmHqWwUGBh/Xm6t8Gqc0vYRcB/jYsYdNMJr9/szf/R3K0 iLlUCt2HPMPPdINthIRZmSuMCe//6K+i6/Fcw0AfTb/11Q0834RPdRXO17KmdZcjyksGYr C1cQp2SQyq5QtGw1UGy/PWJC1UdOBF0ZAOMjbf2KenFuW/fDKicTL76JsMU0sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040277; 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=zgAXAhUDuEKl5O88t4frYMrS2tu41pn4NNg+uwBNjM8=; b=hu4VllLVuHYktCFqby87Vqq/nh8AlrJExHW0n1U7D0y8spJb8XT9Jhj0i1QgA2EDKh/imx 6/KHZ62+k9RZZ3g5D6JT5MwDUDtE8Fvk5XWlv4kQvfMAFLMn1ptGICpHTyBgpN31DeHLnK fjEDOdChsS+x9Nmmj32u3WrM+Ichc2EhOpBcroXxn7k0gdVUiIpo8B6RSbrIz2tAdA7N28 keu5vASsIWW61Uyh5f1dPHzVTbvi1hQnVZ5QgfhGv4IEZs6NIBbupAOTxw9/wGAMd1S5JG LqSLZxroNSClZcH6eMUZNivgXnIk5Ddbtjy/Hin/DRaTt9rm6eg26O2kpalS2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040277; a=rsa-sha256; cv=none; b=qRUlnjMcG8iyy8GK/XQ4T6fCfxvje9MOpbS4LBxFxH2Qx9/3dNkA8QiE5ATJh6yJdh3L3m Q+YZspKuwa7htdS2y/T/DkdyLYpHy3I8/QKxS/SlZ8rqRCSDocrIkIFSQdv8TuDXbGUNE2 243FJ2zg2oPSyGkWsRcq1obJlfa5/Un2lALsuBs9s2O5qRgHO/A9aNpIRiRdIgzO1ANDwJ 4R5nZXH8h0ixmp0kwX4JFKBDBfMRQLSZZtPQU1TEDSUTWvie5gaNDNJHxkAp27PdOlz6TF 9adFefy0vtcKrtmpnlhPI526NRkLbnN1lPptkQOMTlKFQXs74HXEqvOIyqdIzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6ps2vMqzpYD; Tue, 16 Sep 2025 16:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGVHCM062239; Tue, 16 Sep 2025 16:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGVHXp062236; Tue, 16 Sep 2025 16:31:17 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:17 GMT Message-Id: <202509161631.58GGVHXp062236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 722746b39e6e - releng/14.2 - arm64: prevent panic when using syscall mux + large arg call (mmap) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 722746b39e6ecaa4eeb36005c9bd69a9bcd68528 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=722746b39e6ecaa4eeb36005c9bd69a9bcd68528 commit 722746b39e6ecaa4eeb36005c9bd69a9bcd68528 Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:21:16 +0000 arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. Approved by: so Security: FreeBSD-EN-25:15.arm64 (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) (cherry picked from commit 17d87881a363c160e7e8cdb252d0261214c1a50b) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index de0ee9607ad1..5f35d01f9ac0 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -193,7 +193,7 @@ freebsd32_fetch_syscall_args(struct thread *td) register_t *ap; struct syscall_args *sa; int error, i, nap, narg; - unsigned int args[4]; + unsigned int args[6]; nap = 4; p = td->td_proc; From nobody Tue Sep 16 16:31:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6q3574kz67ZFS; Tue, 16 Sep 2025 16:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6q30jG4z42Sh; Tue, 16 Sep 2025 16:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040287; 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=YIEfrMrHBE+MggTpYRTces6cI63TCE1b3iJEt2bqfHU=; b=jZKXFvU3HzcVd6D7a9D0K8E9ON3V3zby8zwCgWGoWgN6NDB25dOm/a6dKS7rrIDvolqph6 J45E4kjRFN25dewNEmve72WJnysrM9rTylSWjHGlkG0tHSpQAVZYvPr0Yz+DIT/g8EAlss gGou3qzo5fKoDLlVinjZVnjxGXXMZ986HPKCtmK6XMpC8nu3JUZtQVZnvQqo8wuIeawuoA 79qh4MoO2aV018lEE1i9UtCFiBbAoMYvBFNrHX6QoWYYey0lBeqyLOXR2UA9GYbDSKMIVL wQjOPb8Sl+BAuDSetHl2JsrZWfIj/+7dnx5DpdMy/YBC9PzusLTORRjIKCQpOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040287; 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=YIEfrMrHBE+MggTpYRTces6cI63TCE1b3iJEt2bqfHU=; b=H8C16KT3mqywo4aab7ayNTprQG7P6xOoXfiggiNXVhuXGZCTR1/F/t5E56005YVbO8FeX4 jELg+5rjHv68af6PJP02XzbRw7S2QRrm7LAGqgZKJIJjLh88EcBlhJM8koa6dTa0qx3mOa h7QqKNDUiVqU9wQ/BouayanQZObzEhVYrIb/yE86JdanJzIjb1tHfG1gMZn4lng/3182D1 X3nsncEDWrjmtF3lmsdENtwpvMDIXtvhyJ1g+SOiGGuSlBIwLDOslWBAbeLdBbka+ZKDNP MUUsIoyagg4eZZARkGa/G5rhU4QJnS+L/fkSlX+dtcz1koaKmSFJGkHxkuscow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040287; a=rsa-sha256; cv=none; b=LuE+jkv+IAAvt9L9hFpGOtfsYNqmFkrgbYFLIuNFPod6qbs6cx8otubNq0/Js7aZZ5mJOJ qdAyeFNFTmGbjU4Xm93pKL0OubyH0llFWvrmgn1gJXWCDamFQYyuKl5T9x2R+KLHpZTWYd EddyjTy+HF+EqucOfXzgbb+X3vlXY6BFQoZ8W7URvmozBM+Ult5aiCA1zDV4K4WSHSw/av LEtxCizG+swfLf9DTf11kr/DnY2nglG141xFO4oFi7wxT38w4N6BMAHASbttptHNWs329h nt+EKkrKKo6oVPrj1tCqASRQ7hnSnlXGMk3kG5E7dL03lXI4++WZtzZ0L03Cdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6q26q23zpSh; Tue, 16 Sep 2025 16:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGVQcP062667; Tue, 16 Sep 2025 16:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGVQIP062664; Tue, 16 Sep 2025 16:31:26 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:26 GMT Message-Id: <202509161631.58GGVQIP062664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 751971e55454 - releng/13.5 - arm64: prevent panic when using syscall mux + large arg call (mmap) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: 751971e5545451114df20d809ead68bfe1d00915 Auto-Submitted: auto-generated The branch releng/13.5 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=751971e5545451114df20d809ead68bfe1d00915 commit 751971e5545451114df20d809ead68bfe1d00915 Author: John-Mark Gurney AuthorDate: 2025-08-18 20:25:37 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-14 00:22:42 +0000 arm64: prevent panic when using syscall mux + large arg call (mmap) if the syscall muxes are used, up to two additional arguments may be required. This means that the 8 required for mmap increases up to 10 (for __syscall). Sponsored by: Juniper Networks, Inc. Approved by: so Security: FreeBSD-EN-25:15.arm64 (cherry picked from commit 740b879c6ade531adebeba7cd2f261bbe650797f) (cherry picked from commit 98ac13c4baf5deb84010d632cb3b96dacd8c4eb6) --- sys/arm64/arm64/elf32_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 1c580e2b0de3..6392de73acff 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -190,7 +190,7 @@ freebsd32_fetch_syscall_args(struct thread *td) register_t *ap; struct syscall_args *sa; int error, i, nap, narg; - unsigned int args[4]; + unsigned int args[6]; nap = 4; p = td->td_proc; From nobody Tue Sep 16 16:31:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR6q42Xl9z67ZFT; Tue, 16 Sep 2025 16:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR6q40fgrz42Xv; Tue, 16 Sep 2025 16:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040288; 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=7fgSJkRidk5+6pj3b8/n3y/yJl2K7OxsqeJJJL263fE=; b=bio0DG8RfihAPF2herjdIUfRaMX6+i/q8PD2bqFRfWQ3Ol/urLKGHKGDkUB7RpgJqYbm+0 yJGdA0ATV73mzLHC+YObjMc+8u6jjpsN+v+Gb/4txJvOwwngVRSCmp9yyVo8vCfvkjVxtm vjpjRf89th+Q3k6XneA/VS1ySYTyKH8NzBLXSR60/TIaYLiuWs9yhwYYU/0YGntNEtz/tH HsilHMQFKid922kgF4Wor2A/iJXXO/7GIteboI6ZD5r++6Fq0CDi5P8iiFGerBTxkY3xOG Jy0sjCkoBKLK+QCUaartTqycmpkgJCeiraqLj0k1RG8dQgsrGWTdvgnB9lUy1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758040288; 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=7fgSJkRidk5+6pj3b8/n3y/yJl2K7OxsqeJJJL263fE=; b=rL/XDcw+oXtHeFC+4AVBSXYyQB3dCasUgRDnLZGAYV42pZUN25xZdYbZjg5c8mrF+IaDCc Jhn64J94u17iyCcwlKEoV2EmR3lPoJDBVJfUAAsOFL9BD7lutPY+dnhlhSC00wkc6gP2lo sfIWUvyTN/TgPTlBJswbkG3FTiSy3xYy5Y16XCVi8vzHAp7W154B15BlzxskSHuBEBT/+z i8EDlv4uyi5xrKik0YqY49K/SaGxW4FgJ9NkF+JBVuka5LmGAwemjFGeih/qp58LifcHwp qQ3xcf+3dNA+4C1uMKZsq7uEYejFAW8fh8C2CWOXZSn3dIQD2F1keyhN4Kh8RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758040288; a=rsa-sha256; cv=none; b=lrCYawVtzzhrl64YwCdG5aeTMC3TwIFTlBVFkeIAQqRDD+UbDljVmwlEOT59FkfJrPeRu6 dpiI8ctMKFghGYL1JzmY2Bb6GiuhtCT+wCLy+2IUxtF5tdfQHvluzhvIqE7QUTP0HR44Jb jsE4Rc4nfy1b5WifZFUBqlHTof+fpXd2yPncyoWgIg/Y0+8v2hZ9ItrJJKpddWH11cDlmG Y+bT1j4iIPLGfoS9b+Gpl/ADXAU9ZaGylP4O7t3fc418VvoDralvlySAeUNNyV2wkeMQfR 2+PKLE4iAxt2+NBCpb1AyOQ1K4AzXQuoCKWrnTZxYBX/Ov/uN1rtLrh9mM4MBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR6q401dSzpMw; Tue, 16 Sep 2025 16:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GGVRO7062707; Tue, 16 Sep 2025 16:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GGVRLQ062704; Tue, 16 Sep 2025 16:31:27 GMT (envelope-from git) Date: Tue, 16 Sep 2025 16:31:27 GMT Message-Id: <202509161631.58GGVRLQ062704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: e8acfa0be301 - releng/13.5 - Add UPDATING entries and bump version. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: e8acfa0be301a840585d0ab42af9ce5e334a59cc Auto-Submitted: auto-generated The branch releng/13.5 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=e8acfa0be301a840585d0ab42af9ce5e334a59cc commit e8acfa0be301a840585d0ab42af9ce5e334a59cc Author: Gordon Tetlow AuthorDate: 2025-09-16 16:28:16 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-16 16:28:16 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 5 +++++ sys/conf/newvers.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 98ab66444454..741ccf307151 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ 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. +20250916: + 13.5-RELEASE-p4 EN-25:15.arm64 + + Fix arm64 syscall(2) allows unprivileged user to panic kernel. [EN-25:15.arm64] + 20250808: 13.5-RELEASE-p3 SA-25:07.libarchive diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a58cc976112a..82dd69582b28 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.5" -BRANCH="RELEASE-p3" +BRANCH="RELEASE-p4" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Tue Sep 16 17:06:29 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR7bp09L9z67dXj for ; Tue, 16 Sep 2025 17:06:46 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic314-19.consmr.mail.gq1.yahoo.com (sonic314-19.consmr.mail.gq1.yahoo.com [98.137.69.82]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR7bm4dSmz4GGH for ; Tue, 16 Sep 2025 17:06:44 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=Ts9GVLEF; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.82 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1758042402; bh=jtYOwv0W3MYt9I3rGwpnrgww3NlLrBKe4B1gqfKkL0w=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=Ts9GVLEF5NB5MWs/jIuPsURtTJfZysjr39kSZ624eK9rEk1KhTSVhBgbGb2G7zdAuDxICVPcCJQT1cQy1YsQIfd7t0a3OPSANo/EOL1im+cDGN7Mw43Yb7KHiJXAFe5A2RooLJEO0UWnYDH4gpHPlok8vFoWb+FXDqHg05n0Pkmlh71BXQxEXSMbprCXndHI8oX5E+UOiBQ0sf0CaiTs8yutMz/HTm1uTTFTUwGH6DF2GV9yvonchbFWY0l1hQKZMnyFt/w35qHchr6VXmBj0L4nG6M5cp8J55p3LVaIrVY3HFZpP2ctXgWriDe9XdqhjLiMmUYVGL6jSUu4fVqGmA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1758042402; bh=2lHY+AqIM3Z1lGJd7XbYmdUkrgXjDNJBGnj8hP/mWK8=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=VMB6T6pMeawMAbSKHEWyfpAoVsFixSKygmnrNzvjRQeQrF8K70e/RQhs6tT/N+ifKK207B97neeb+Lp89bmkcOvsgD2hj7FYRttBhyahFXI4MegwMJlpP+1S6KKX0z0RKzHr6An0lH9awj6EGycrCnCkx0G5TUWQcrWGKSzthocORtRwncQX/xPn6CiXIORzVst9qxRQiGloLx3WLFhw0Xn+/AhJTWGDSNAqhcPVjYIkHlopOowSxMRfqbMpVuyAINOlMv0T4yS75fSWmE3ZUtDTRd3FkDEyCgYN1Dqnq+gy04OtWSgDdtKYw7afUwWy9d8U9uensnzTVXyfz8sJmQ== X-YMail-OSG: ozz2zkAVM1mW5gN5FzAK4Ohj.46HMeRQUXwVBDBgi6vV9_62osjvVCUHSUAD2KB 1iquHD8x1rvBDoIbt0zjp5Uy8qHStD6aDiU4I07hUk0SrSnmePmmJ8i1tCinqnBiwFS1YND0IcYS qIWBqAtNHETSLClVbyR0AQqD5mIZnfMskvpmdcckM.ZubKXirK0DCsP9XL3of2q_p8OzjlZ3flnU 56UC7bGWvz2_71oGmeJWEBeUad.X9iGrL0VfW4_5BrwvWqu9l4CVlqWbIKQblLzjVbfSkrb7WVQy 2wrPdiB1nhoWCNOdcouBZQNLVBjtORG1Xh5jNQYrz6AK5XmrYIaCLRKntkXxkfcnKvb4meYRJDOX E_GxzxPUufG1JOge6qx8oJc3AO9H.n1kpVECoAoGdN2isUv.Tfs_0WrMKCnwHzeWjaLm0t85pDl0 7_cLNW_6VHEvTRDHPmeP9k5pGWIJlGYgXNpdSCPpKtSGD1TTgFmkMSmsdt6rlaRPQD2hkxjDN3bs SvHVLoleoHOCGWaKJqh_uMkw1mlYtUwYR7RSU2Ji9kMn1fTeGV6VIm6eEAXWxELuW4Ep_KwMNH8k 64dupLhWcv09gCbaumRrNacBf2AHfq5jxNMmYgoNdYvnAM.lH7vDi8foKypD2UiZQPgBxh8ou2J. 6a.8N.JXJAidHyybzeZmvePGEK3CWIFTLNAICatXA8CsszpCGXQYX7G6yx89SBhPTFvXEg2i3Vsf hqIJCfbPd1dP8xxl0RVo5s1uO5rqG8eKOEV6FnmKxeH3a2MuVZMJ8b3pLrXSMEb9kEjt.7Npftq3 kJyZOYl.VHwIEdYDSfC.wGnaoZx.d4BolAeBP8bw2cLk.urBG3x0EJcHWDsi2kiaurMMNsp7v6eU pakrFwvb.cIi_YogBiBuNSU9lVsrHcX..wCEBIONNNBxijXjTvuFt6jOXG9gOcETOQi77MnTWMGc xZhMqqwc4OFTXDQMcDwkc01MiivfKYiWx4VdXDQFuYyrF96ZueAj6Pgz4BX43eCZ7LDbglqfp9gd BCH1TsHTlMcSzrbN5x5klrAhP14It9vUXADh1geDfPD7KRnFeA_C.qbUE4tUJui46snXa4RNGcu2 BEWi0pF8N5VORXfyoq46UlYqa_lxZJb9LkIQ4pCF1bAmmi0Y_ngD0DMwXliVnh2934.W8frI0IiZ oQB0URl4ueE2nXK0QBa1sD1qJ84t1Yi_McEUwba7Nx4tZunbjeeWMhcDmhmVMsTSmi4F5mK2hjnk yeZtDlkBL5vZc_YXdf7jalRjboKsy3ZsTetuEvWKUFiafxiRiNaoO6hCSrh5x67O0fUF54FFbvl. cYZkZA2mLiKdO3wjrt6mgOirc4xdrdsl7JD2MkDIlwtM4LgojlDt2w9TqbE6z0BElrlS6QBz46Rv N0Bn5xjVOEmzRhA8GfkBAWiYbKo27MwGrlBgeYi991hzgwTM73mSaRuTazwJezDD85DLpvYdeSm. VmTQ4XodzSINMXJy45rU87qRqb5zd0Keg0mG9LRwGyuTU0Nm6xgBBXlKt.sfdNfjwLfhr1nvZN9w fKuKkYgC4EpfhKp1dLqGAwCtMh9KOmDA9VTgaPPDf7fnRXPiCvM_LBLE0GDWsfNBX11CLU47XDtr H16t82_goGw13lgNvJZudVLo7yMjhLCk5uqNd.mSCQmlc5nZ7G_WLP92MfPLiQFYKy21yCcEAgAB 9UY2yKHnjVhudMukCj0PsbY8L2npNoUyw3q2iIEkd6UW6fL0gqiG5yWAoLq7fa2g36iLmtWdjTqm BDUObC_b2LF97opI2XEabEsdtp9nJH1XqA27qSLKy1DhYI4pzJNG_UwZd6tNUWcSztkWaaxuOwFQ RuTMKWycLEy03wUZ0misFveQbSz4ieBjVES5C9dVjqXisFdISLfZXaFgxHx6tClO.TVI.AtjMVnj W0zNoT6yn4ZoQ58ZCfr0wCe6tNXFZXgw6Bxab7fT_Tz6pKmeYhBFOlstzaL5t5YDnC4H0OJUOGEc cACnpsFVBivpNg0S.2qV5gjtYSLOomrkPLPhhpeXnSuXt14T3o9YMBeRso7FtfhSptr30duBCk3V 9ne3uxy2Z0tXSqUYcuzNO3qK1dQqyNY283sf4qa.B2rJosD0yyPfL5XqCcYPLpf0bw0_cSxYg1Ll SbhGxIWj_p0Cg65dYV0nR0OmN0TfpTZhVBYlQNa4m.CchOFAE0Va3WXmip4u4LQn42IEDxMWeCN9 MBfq0I3A2v6Myi0yOZndNBYqaAJhipr9AUuhUVD8Gp2WUt7ZtU.F_j7m0YsFFleriihabKy1I7R1 JZN4- X-Sonic-MF: X-Sonic-ID: 812223cb-dff3-4ad8-acbf-6fc82d7477cd Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.gq1.yahoo.com with HTTP; Tue, 16 Sep 2025 17:06:42 +0000 Received: by hermes--production-gq1-6f9f7cb74b-f2wdk (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID b95450f6ef0699ab2b896264cee26bfc; Tue, 16 Sep 2025 17:06:40 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: RE: git: ed55d0f2bc69 - releng/14.3 - Add UPDATING entries and bump version. Message-Id: <098B038B-0140-477E-8990-1E3F1881AEB3@yahoo.com> Date: Tue, 16 Sep 2025 10:06:29 -0700 To: gordon@freebsd.org, dev-commits-src-branches@freebsd.org X-Mailer: Apple Mail (2.3826.700.81) References: <098B038B-0140-477E-8990-1E3F1881AEB3.ref@yahoo.com> X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; DKIM_TRACE(0.00)[yahoo.com:+]; FREEMAIL_FROM(0.00)[yahoo.com]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-branches@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.82:from]; APPLE_MAILER_COMMON(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.82:from] X-Rspamd-Queue-Id: 4cR7bm4dSmz4GGH Gordon Tetlow wrote on Date: Tue, 16 Sep 2025 16:31:09 UTC: > The branch releng/14.3 has been updated by gordon: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Ded55d0f2bc694315d6b906f18e18c059= ecebcc18 >=20 > commit ed55d0f2bc694315d6b906f18e18c059ecebcc18 > Author: Gordon Tetlow > AuthorDate: 2025-09-16 16:28:47 +0000 > Commit: Gordon Tetlow > CommitDate: 2025-09-16 16:28:47 +0000 >=20 > Add UPDATING entries and bump version. > =20 > Approved by: so > --- > UPDATING | 11 +++++++++++ > sys/conf/newvers.sh | 2 +- > 2 files changed, 12 insertions(+), 1 deletion(-) >=20 > diff --git a/UPDATING b/UPDATING > index 13a84a404535..31f8d97d4762 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -12,6 +12,17 @@ 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. > =20 > +20250916: > + 14.2-RELEASE-p6 EN-25:15.arm64 14.3-RELEASE-p3 ? > + EN-25:16.vfs > + EN-25:17.bnxt > + > + Fix arm64 syscall(2) allows unprivileged user to panic kernel. = [EN-25:15.arm64] > + > + Fix copy_file_range(2) failing to set output parameters. = [EN-25:16.vfs] > + > + Fix bnxt(4) failing to set media type in some cases. = [EN-25:17.bnxt] > + > 20250808: > 14.3-RELEASE-p2 EN-25:12.efi > EN-25:13.wlan_tkip > diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh > index a8ec74cc1226..59e359d9f452 100644 > --- a/sys/conf/newvers.sh > +++ b/sys/conf/newvers.sh > @@ -53,7 +53,7 @@ > =20 > TYPE=3D"FreeBSD" > REVISION=3D"14.3" > -BRANCH=3D"RELEASE-p2" > +BRANCH=3D"RELEASE-p3" > if [ -n "${BRANCH_OVERRIDE}" ]; then > BRANCH=3D${BRANCH_OVERRIDE} > fi =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Tue Sep 16 17:34:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cR8DG6j0sz67hZF; Tue, 16 Sep 2025 17:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cR8DG6DFNz4PsX; Tue, 16 Sep 2025 17:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758044094; 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=hAB4Z0+SZboqfh4vyxix0RDfFCFsmTDJm/sdS+A46GQ=; b=CUwfyobfJE7wOeolzBtfo8j1sobSBUTJeAbZKhjE6ewpc9q0gdTrP6y+wU0BVTTX0wPFbT Am4XYihw3jgivIFGIA/QrqFq4LaogKusok6Oj2CKXQ806AJQRAxlc1nQsCvXvDgnl3fQ6T FzhMbxRzrO01pPih1tfVRJ9t1Zx2qLoyQJN9Qu9R0oDCyDjCa1I+PhVgNZGsZtYuCEQCtz 8aM30fE/2dR8NewpamBtYXljHQaw2PvTWiwWmgNsWUY0CYgSZjq/yrmZb2WHXF4D8vscE0 rcjws+0hs6sycnZhwiOwiS8mHJ4cmyxK3ikRz2WAjSDCcL07XGFrDPZNIXCpKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758044094; 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=hAB4Z0+SZboqfh4vyxix0RDfFCFsmTDJm/sdS+A46GQ=; b=LnbtkTOivcHyLO7NcbXXwshrxJLxdl2ffENa7sNp8IBTbDKtnjBAi+Qsrd223iTQtBN0Xo a8ZDbsDy25MrSDMFjk8S9OS2JqyBj69y8SlyoqrxnzsIdJOU/XvafjJyfaUl+3m7oNEOFl vx8kp4Y/XqhP+H97MG7sG8XwGJNR/B99vrieuDXgh3QhfCJH7+v6KCKS23uKXTe0TxS22i 2iRy65Xes08RF5lGObquLhtlvDl11BhdUGzh7gwyQZREQgjAHg0LjUL+mnb/CYZovqJHGy rozqWqsl0Yb5eoY48ARyElImgdctF5DwkcE6bx2o9CYdIT5IcQcHuifIQCiOGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758044094; a=rsa-sha256; cv=none; b=OAt5e4LzTwljfsUHXqtOAdf54NhqxznXJrcviAXVm3dzoLq8cqWXSgXv059HCWNuvIhVWx 8LQlIZ7I3ke6YoNIT/qHsSv5mPP6xI0OUuBNOalBHztxVkqeN79DoA31xAkD8aqhsOOP6H QEoNf08kGpDz1m+hRvXUikkYcL7MvNzdekT02Rcp7gE9Fj/t9Ey/kOocTzbDV8xKCIGJKj XeJy6vHEykuz0oN5plaoO9VGzu89hzBVfOekOGNSqh3UDEs8+lSJfXRX2GBVU9Y8H1mTp0 fdwhnsoaIeT1ZT8OL0VQRNrFEO0eRO6efEFP/D6wbZC2Ae7SbQiLdT4VrEcE9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cR8DG5ppCzr5V; Tue, 16 Sep 2025 17:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GHYsVc079497; Tue, 16 Sep 2025 17:34:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GHYsVZ079494; Tue, 16 Sep 2025 17:34:54 GMT (envelope-from git) Date: Tue, 16 Sep 2025 17:34:54 GMT Message-Id: <202509161734.58GHYsVZ079494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 79e4dfe2a5f7 - stable/15 - libc: Have memcmp test what the standard requires List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 79e4dfe2a5f7079608b92d2d1fe38838e7601323 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79e4dfe2a5f7079608b92d2d1fe38838e7601323 commit 79e4dfe2a5f7079608b92d2d1fe38838e7601323 Author: Ed Maste AuthorDate: 2024-11-20 16:47:35 +0000 Commit: Ed Maste CommitDate: 2025-09-16 17:34:32 +0000 libc: Have memcmp test what the standard requires libc's C memcmp currently returns the difference in byte values rather than just -1/0/1 as the AArch64 assembly implementation, many non- FreeBSD implementations, and compiler built-in optimizations do. It is a bug for a user to expect memcmp to return the difference in the byte values as the compiler is free to inline memcmp() with an implementation that does not do this. Change the test to validate only what the standard requires. PR: 289084 Reviewed by: markj, fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52502 (cherry picked from commit e0eaabb80d1724acf88f04acbc2ca13d42270863) --- lib/libc/tests/string/memcmp_test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/tests/string/memcmp_test.c b/lib/libc/tests/string/memcmp_test.c index 5286a0b994f3..fa2f498ccfaf 100644 --- a/lib/libc/tests/string/memcmp_test.c +++ b/lib/libc/tests/string/memcmp_test.c @@ -41,14 +41,14 @@ #endif /* - * On FreeBSD we demand that memcmp returns the difference between the - * characters at the first site of mismatch. However, ISO/IEC 9899:1990 - * only specifies that a number greater than, equal to, or less than - * zero shall be returned. If a unit test for this less strict - * behaviour is desired, define RES(x) to be (((x) > 0) - ((x) < 0)). + * On FreeBSD we previously demanded that memcmp returns the difference + * between the characters at the first site of mismatch. However, + * ISO/IEC 9899:1990 only specifies that a number greater than, equal + * to, or less than zero shall be returned. If a unit test for the + * more strict behaviour is desired, define RES(x) to be (x). */ #ifndef RES -#define RES(x) (x) +#define RES(x) (((x) > 0) - ((x) < 0)) #endif static int (*memcmp_fn)(const void *, const void *, size_t); From nobody Tue Sep 16 23:11:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRHhC36lSz67mC9; Tue, 16 Sep 2025 23:11:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRHhB5xqnz3qgt; Tue, 16 Sep 2025 23:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758064266; 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=bwy6QxUwmyOJivih1NkUAtK9562qDE88tP0hT/U7SWg=; b=wZKwRm4yptsIzzmMdDuCaJNlw207ftcWHpw3ZOwvooVxcaNbcBbe2WXCQR0mQRxLuJixkM i91cOa17mdMU0Dxl9AA66JPkVZd06y8L02Rgdx6sseei2enNkYOel3V9+nT+TryM6LqPwV RE7YqeSn6NdC4jMLBJrobw/8PkQdvu1/bQdIioTHXtgVmt7Z/cHVY8JLy+d41bpc4yiXWd saEehMMjxwDBvwrO3z9G5oUp9uDDXE4Ll8BSx05y/12QQte0XI3EBYpPhYHze/Mq70pcR6 /HlABGAkprgbacaETqq91f6q+QYtrmSr/bXD8zLAr8jn84bMGkpPVmLcoiOVWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758064266; 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=bwy6QxUwmyOJivih1NkUAtK9562qDE88tP0hT/U7SWg=; b=S3pmZus3DU+PDe9tZVlmn4PgQ0e4wh1xb+6Cw0LRDo+U5dQz170pOW35D0BQ5yuH9lsBWk QaoTlFcbUH1vo/jh2EmspI0sKX21P6dk/9j6Ulr9xEV7bI59h/CWR6PvGWelkL9S5N4Gt9 G82vj2hodO/zV09r/Ul067MsEEMmS9lyYIZqM1gmOYECYPgPVM+rRg0VMerW9CDM3eXEs4 0Y5c7BZUeiAJmp0vNhr2FZfYRILPf/wD6gRwTq+myyEJk+hp/PItHegzru6pQqKl9qN7Uo fe6t1ItTwpnx9I53winDDpjEIGM/jHbvgvRnklEKfx2x1vwIjEi2d8WP9bmguQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758064266; a=rsa-sha256; cv=none; b=wfUzSiBrzEcZU311Nl9SmRp29c2pz/a5IEFo6l4l7f/ERl81hExGDGNp8Vl/+X/UCuCiuP 9rD+G5SYq2Ani0R7EBiavYhxAyPa2SgCZpTb1K8OsLLPkyiVgtaMCVnWDOvT1PyY0Iz2bP Mixo43wJ2IKnk/rX0/QAzcU0lRG9BylrQ1lDLdjHSZRqUJkoqPGH0QlJFd6M7q89DFs75T UFeuujcp6qXJk4T+54Ll4wwyqKk1MsrZeCWH5zNJzo5h1CqbIJRp2gPIAvO7so8WqevawW ERbckNXkol0pCn1StcOmBQxjS0QGozrlbyjYrEky7VXcDCSgUt85ooClrxyxyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRHhB5Gfhz11Xt; Tue, 16 Sep 2025 23:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58GNB6fC009906; Tue, 16 Sep 2025 23:11:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58GNB6x6009903; Tue, 16 Sep 2025 23:11:06 GMT (envelope-from git) Date: Tue, 16 Sep 2025 23:11:06 GMT Message-Id: <202509162311.58GNB6x6009903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 30ad842dd970 - releng/14.3 - Correct release patch information. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 30ad842dd9704cb36ac4f00e90429b39407ca909 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=30ad842dd9704cb36ac4f00e90429b39407ca909 commit 30ad842dd9704cb36ac4f00e90429b39407ca909 Author: Gordon Tetlow AuthorDate: 2025-09-16 23:10:20 +0000 Commit: Gordon Tetlow CommitDate: 2025-09-16 23:10:20 +0000 Correct release patch information. Pointy hat to: gordon Approved by: so --- UPDATING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 31f8d97d4762..f118e838c926 100644 --- a/UPDATING +++ b/UPDATING @@ -13,7 +13,7 @@ Items affecting the ports and packages system can be found in and/or ports. 20250916: - 14.2-RELEASE-p6 EN-25:15.arm64 + 14.3-RELEASE-p3 EN-25:15.arm64 EN-25:16.vfs EN-25:17.bnxt From nobody Wed Sep 17 01:02:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRL956DGyz67w0M; Wed, 17 Sep 2025 01:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRL955W8Vz3CTJ; Wed, 17 Sep 2025 01:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758070969; 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=OvIvCaZGw7t5VF8hncxdWu65/hz6pkmCB1Bh/BUFXhA=; b=gkxPcGzsK+4YcPD4A+rxPnUeW6yKVlQj8jyHr1Zw0lkLiA0lhR4si5262M+8c0BK4Vfzls Cy0ZD+pp+VV5oerohJKf7U3Woh5vOHFvPwT2utQeRYHFYKgFCeGyRcHiVWg3Ydn5hVHved HpMeCXASo/b3qZuNTX07rgSHNprr7h83HCeOP+Nj2xQlSTyWdXCM1bRWmHfh4Of6pZizNw J1M7oLnZ6Jn27VlpA4nzjmfc1fXGZ24mKhKY1NhFuIwKBqUieo66KzWuAyonP2II5gOm6G hbfZkUyHqu9DDjLRLNc2fStk7HwTb1eKmSPV4EE20f439OTU8FcIxgmtjZ99Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758070969; 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=OvIvCaZGw7t5VF8hncxdWu65/hz6pkmCB1Bh/BUFXhA=; b=uLXn7xNd1vtukUawhxsPCgiid2N1rZ/1NvmfOM7KqmAPrRZ5NHozeynMYU8UPNqtqO33gV VTFDtGhkRMaHBAQe1M1lTaSxZ2X1umyaQ/oepp0VqdDeK0Y9tCBxBpW/XjqmJqKWDbiuV1 PIcXqLiavuzbkXvhJOqU6p3kOZwNp1Ug31xVkxt9cABAOzANvY/zma0IsBq79OFckhGVs7 /mNHhC6E+alZWVwPzXW2za7SMgYNFNlfO+ALgkDFimudU408BvnpNihc+rg/NCajwPntc+ hp5d2aEQIYUCtVariZtp6y81ZSMzIpNt8le2u1820haUmeAJwxXXtrq7hHz0JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758070969; a=rsa-sha256; cv=none; b=Fedrmi11uwp8J9fx4CHpKCLvdoDeMRrNRtN7uTrJkmdjYud9H0P7IVWZT2heTsSUm/rrFK HB6QerWnfVHj6z2voKpIR3AZLwMKzdclw/ENEu3luKx/0QYg3C6S/vIJLmP9p9YOpyFkVS 9v8CWVYWboXVjfi9xRfavHL2iXa2OI2p7+y1iTBkuLlrkAc3+g+ghxA1M52rUYLV22YQu9 /JR6BgvutLSjLGMDVFu2tv7h/h6vvA7kRqKgb4K21rtuEcwnKeQavjQy7YVhuidLms9TpN a2vudGtbNy5CdmH819pUZda4U29NXOpj7mgT5QMjR8WPxnfqHl47odKQKUOwOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRL9554rHz14S0; Wed, 17 Sep 2025 01:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58H12n1V023035; Wed, 17 Sep 2025 01:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58H12n6T023032; Wed, 17 Sep 2025 01:02:49 GMT (envelope-from git) Date: Wed, 17 Sep 2025 01:02:49 GMT Message-Id: <202509170102.58H12n6T023032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f9d8f808b23f - stable/15 - src.conf.5: Regen List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f9d8f808b23fb9f4ee257e0ed78ddc4fa6882967 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f9d8f808b23fb9f4ee257e0ed78ddc4fa6882967 commit f9d8f808b23fb9f4ee257e0ed78ddc4fa6882967 Author: Ed Maste AuthorDate: 2025-09-08 14:57:17 +0000 Commit: Ed Maste CommitDate: 2025-09-17 01:01:05 +0000 src.conf.5: Regen --- share/man/man5/src.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d251bf0cd9e7..648249148817 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1548,10 +1548,10 @@ Do not apply the Relocation Read-Only (RELRO) vulnerability mitigation. See also the .Va BIND_NOW option. -.It Va WITH_REPRODUCIBLE_BUILD -Exclude build metadata (such as the build time, user, or host) -from the kernel, boot loaders, and uname output, so that builds produce -bit-for-bit identical output. +.It Va WITHOUT_REPRODUCIBLE_BUILD +Include build metadata (such as the build time, user, and host) +in the kernel, boot loaders, and uname output. +Successive builds will not be bit-for-bit identical. .It Va WITHOUT_RESCUE Do not build .Xr rescue 8 . From nobody Wed Sep 17 02:45:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRNRs2sFjz684gx; Wed, 17 Sep 2025 02:45: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRNRs1w40z3RKc; Wed, 17 Sep 2025 02:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758077145; 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=cqNAOQkC7+WJhQyQPGK/19QQ8KrvBBYJGQD8xM71QtQ=; b=VV6zxpDUvdsseJilgoY3kpx3I0ST4vKjClstrp3uFVbO3J+lVHCJulzqrAkujqxqB9Ve5x Wg9DyaEfFJ2Eh2L3NV5hkW4XzgUUzieCt9hkwebIUmTCnpcvRu/obDl5NaUIOUrKEHF0qc fQbrKX6yjXAjYjUwxePEefH+l+YFNlWpzhDWJmRiHWYuielRQ1MGuXEfpaieIqnpVw73Rl j3cWhzF90+yBXxaglzJUlxw0GhbqfiKyeGdKOL7LwzSJDQ3N882/lo2eZ32TeukkHUq/8W 9lfgrB9AA1+Se4M3TBKkrLWGRIicO6xhmOvj+FXmGTSixenTpYeGZ1/Nul2Ghg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758077145; 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=cqNAOQkC7+WJhQyQPGK/19QQ8KrvBBYJGQD8xM71QtQ=; b=MMxibLweR8N7bz/92HN8CK+WUy2vIKJ4Qehtm2Hkpu6/6596dDSO4ZzvlPl28qw+LjQyjd JKciZS3/x9tbVPrIRey+HHTJ7/FZq/8vG3uDI9mH4gb4Y2QHkZySUDQL1lqNsNGaCgwt7J 1baNlLZ16pnRijYlCqvItK2GUIyB0SVWH0m0ilITKHVrHdRl+CT30BxShwDAoFeRNlefbb fD77HXKD2VkaisVprklHMUqLlNSAbigjsAnskyi0/Tda8LZxhE/0ne36StHAff/Lf0Q6jo a5J10b0PJ+cM/cnQm+DE6gh1boRBz88DedDE+4Mmh5OyIb97rsK52+EEG532uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758077145; a=rsa-sha256; cv=none; b=LfSDbMwBUmwn4NSxzN6WrRCppyG8pIkI92KSW61ykAqvq2GyAeh06sfyfKjXphRBMi2U39 dH8ZUr/PMc+E87oAlfHvVhcdou6m9wp/8w+Pzt+Grdcfa3tBJJRSxWHW5oa6RBNEGmJ4T7 hyCOKknxqRsrIgyTjAeAFsssAgBSpNiMeFOZE/4JK/Z5+XWeQKqXj9l+3D+oa+EvMT6My+ 9vI+qB2iO5ZqSSc2/LaHomFPpI8LvKVGMbbabxDHxBjNXWe0xGoxyCSbtgEpi5nR1pIYBj pBnafTcrizL80gG/MSvjUTMDBsNlOeiv4zqX0A6Gh568nfykgEtYvJG9cWpTyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRNRs1WNVz16jl; Wed, 17 Sep 2025 02:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58H2jjhU009326; Wed, 17 Sep 2025 02:45:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58H2jjOe009323; Wed, 17 Sep 2025 02:45:45 GMT (envelope-from git) Date: Wed, 17 Sep 2025 02:45:45 GMT Message-Id: <202509170245.58H2jjOe009323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 37de183f06e4 - stable/15 - release: CLEANDIRS += pkgdb List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 37de183f06e460901eda3418427569e65e74b7a7 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=37de183f06e460901eda3418427569e65e74b7a7 commit 37de183f06e460901eda3418427569e65e74b7a7 Author: Colin Percival AuthorDate: 2025-09-14 02:04:01 +0000 Commit: Colin Percival CommitDate: 2025-09-17 02:45:26 +0000 release: CLEANDIRS += pkgdb This directory gets created by pkgbase-stage.lua. MFC after: 3 days Sponsored by: https://www.patreon.com/c/cperciva (cherry picked from commit fa9ea99be6fb416cd0528e6a54053363775abe00) --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index d0177c8aae5f..d67bbb774062 100644 --- a/release/Makefile +++ b/release/Makefile @@ -128,7 +128,7 @@ CLEANFILES+= ${I}.xz .if defined(WITH_DVD) && !empty(WITH_DVD) CLEANFILES+= pkg-stage .endif -CLEANDIRS= dist pkgbase-repo pkgbase-repo-conf ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd +CLEANDIRS= dist pkgdb pkgbase-repo pkgbase-repo-conf ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd beforeclean: chflags -R noschg . .include From nobody Wed Sep 17 08:08:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRWcd54Dgz68SZ4; Wed, 17 Sep 2025 08:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRWcd4Ntrz3vpQ; Wed, 17 Sep 2025 08:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758096529; 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=oRv27sr61hcEWuJJ2qJ1bXP/b0BJp5aCuOC+QzC7jj0=; b=wxHbAngYDZ4fpsJza34mFPw2tHnDp4MOu47NZCbzy4tatYKRqGJr9p12kdWn1ZPgtrhNTf rEFwVk18Ve1h2NbB9Nl9ZRG3OnZa/C8qkN8TJRlo/kZzcBpfXuh8CT6DsC4Tr1P3jSjf6z WlwSj01J8ENnhQit0OFR6cbRhghKZlKD6CA5W1Arat8WNTnoZvc4b8b8by5NSlD6x46ysm hXp/VnXwauMSWtq6WY2QIxZZKau3MJ0GzUpe4Yswm7eMwQHxhBHtna6ExpoA5zaYPLkNS0 2HNJ7RMEXArN6VMpyCB4veQJxd5VjnyC9j65ziNOCQ9wpiyGcLfFFe4Tc4aTfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758096529; 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=oRv27sr61hcEWuJJ2qJ1bXP/b0BJp5aCuOC+QzC7jj0=; b=TNU0ivFY2RYXfSSLcTyaE5K7SyIO1YEWE4iH7omsBvTIBZIuzIiensPtsjLDVL0qekWLPo uDyhGr0oF7jhxCpkOSIKZjyo9RJYvxjq0C+Xb9IlsVCBg5j7n+7HSArfYwyvACgKzusqzD 6J4uydwJZZ//lvJ2kWM78VhRMPEySsOly1O9aB2oowEEMUzgLjeU1AJcSqwL1U4QRklM5c snpV83ExpNVn/hHOSbp04Ad13Unaztpfn3et4N6kAFLCaN/PhBh/WzAJkpafYhzbgCa1aE AF/W2Y4EUxptuv2+5cix8PlYRIw6nuIart/vDo5m2PPTJB08ljuiaTSn9YuMTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758096529; a=rsa-sha256; cv=none; b=OQg5rioV2ugVP+Ull+KUwmr+agBpv9/OQ9V3Io3CsC6v5sj6HA0Za4NqhHZhfPXGadRMAL xDNKsrmouTfuLrshPNRfXVVwJP8DQRJY/SyT3Y6Ti6EgRRJdyBThLXfVeq0J/uWX71LpET h1mf/RwteYRbn43yuXL1igtpKNGpnmUXdmVBOBJg8orSc0Y4CNfwjFNNZT092SOohRmzsZ 9p7DNGb9E2PJqzeZ0tfpa9HNNTF7ceuypsksHbRyvIG936BUsIoPC8b+srHk9YuNFJxU7L xRfdcecQK59+JPa+K+vWJSN9AW1Ha+SHw86hThj7G6rhRPCI6BS7ZVaBHL1UPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRWcd3dSvz2tj; Wed, 17 Sep 2025 08:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58H88nnQ013738; Wed, 17 Sep 2025 08:08:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58H88n84013735; Wed, 17 Sep 2025 08:08:49 GMT (envelope-from git) Date: Wed, 17 Sep 2025 08:08:49 GMT Message-Id: <202509170808.58H88n84013735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 6e00a34c7613 - stable/15 - ifconfig: also fix removing IPv6 addresses without netlink List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6e00a34c7613e02994e1caf4539e7c8f76992b95 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6e00a34c7613e02994e1caf4539e7c8f76992b95 commit 6e00a34c7613e02994e1caf4539e7c8f76992b95 Author: Kristof Provost AuthorDate: 2025-09-10 14:55:56 +0000 Commit: Kristof Provost CommitDate: 2025-09-17 08:08:16 +0000 ifconfig: also fix removing IPv6 addresses without netlink Reported by: bdrewery MFC after: 1 week See also: da50f49977cc4e6aae55cb2379313599249a8dd2 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit c8fb5a4d032b28dd97b9fa4a73f85a84d8d35fdd) --- sbin/ifconfig/af_inet6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index 7986edf490b4..e0f34f0c4d82 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -753,7 +753,7 @@ static struct afswtch af_inet6 = { #ifdef WITHOUT_NETLINK .af_difaddr = SIOCDIFADDR_IN6, .af_aifaddr = SIOCAIFADDR_IN6, - .af_ridreq = &in6_addreq, + .af_ridreq = &in6_ridreq, .af_addreq = &in6_addreq, .af_exec = af_exec_ioctl, #else From nobody Wed Sep 17 08:08:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRWcf4hcmz68SZ5; Wed, 17 Sep 2025 08:08:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRWcf369dz3w9B; Wed, 17 Sep 2025 08:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758096530; 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=wDUEv+M/GsuZLiF6TNFhcDGJZt9UuASzXLzS5gl268Y=; b=DXzn49KpS1OiWb0WHd5quf0O2UKqjVVipIigGDWpJtrHXyKfktcQF6KtZM2+afehMCNBBi Pu18koI95B069MLLv4ywpWWDhikaqB1RHpd61O4+4XKMh//+ONGBW+gBbE0Xb0/ARa13tI mCFBRjYsHhAQUmITFUBFKVOOkm5HquTZX4h6dGc9TUnAlwpreDf05pGt/Jh0YOLScrQrjB K4n4EFmQNJcP5S5aiaYFv30b/S9lHibUrrQq5ungCJi3fWLn9d5+gd503unHEuzmdn4+ti W7Gf58LiIPZHZ42fUJ5Vl2lpCkzj70FoayS6R3J33EgRaFTWZxJw9YGhWT9Cfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758096530; 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=wDUEv+M/GsuZLiF6TNFhcDGJZt9UuASzXLzS5gl268Y=; b=RteM2nFAPHEtJ47FxQ7cxcoTTm5dG6tS4lHJry8M/d6xE31FH0Wb0u89gnxk/g/+EWf5Nd 36JStKoRTnCU4FiLp0Fq4wVgibj58pvAKXfTkx3vGuibcXUl39UH7QY8cgXVYEgWokHl6j UCvphGMXNgoVzIq+Tn2DlkOpsEzYh3K2FF7cwSPlvscQEBhtx94lbmNzUUnG3wu4fvkFoC M53NABSlgwkeYOLgzLcUxV7xTEhiHCuReU2iGrjINpInALXVSMDgnpgX84qxyjzavEUmKa nxg7bD6ngUwCWtxYcfXjBur3fuQmnh4DVUT+ax16aphuVNdjuSUYIy8XFYqsbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758096530; a=rsa-sha256; cv=none; b=aAIE8yclOlsK5gk+HykmTfxC7IjSlyudPF2XKIt89EDB3311UwQ94+p2/X4989qxDXGrEX fWK09eNgYafs5CspqM3Nlh4QameQ51iqgxEnO6b5ZT9RE9lG5JrtJk3BEFswFWvvXBcKDC W53BjVDmIm0vmA1fZbB4ndToWHht5Hvdy/YBI9rc+kKrPqqwXMtpcSpNho689+rS1T3BQD +DuDr+IQ7YWb+2PUHMwZE4Ci5fTgRp+9DXcAACXOO1IDSVqjhdUl4OzwaZyFDtaBjpGpCM M9kVbtjRBmWEBBKnJm2btNm2WEUG7wbrEjhq3bV6BQUNNy3mxoSkdV5Vu5DSow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRWcf2RLRz37g; Wed, 17 Sep 2025 08:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58H88ohc013828; Wed, 17 Sep 2025 08:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58H88o66013825; Wed, 17 Sep 2025 08:08:50 GMT (envelope-from git) Date: Wed, 17 Sep 2025 08:08:50 GMT Message-Id: <202509170808.58H88o66013825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 44d7a8298eae - stable/14 - ifconfig: also fix removing IPv6 addresses without netlink List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44d7a8298eaee9df45b786176d5d85a37e095c94 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=44d7a8298eaee9df45b786176d5d85a37e095c94 commit 44d7a8298eaee9df45b786176d5d85a37e095c94 Author: Kristof Provost AuthorDate: 2025-09-10 14:55:56 +0000 Commit: Kristof Provost CommitDate: 2025-09-17 08:08:33 +0000 ifconfig: also fix removing IPv6 addresses without netlink Reported by: bdrewery MFC after: 1 week See also: da50f49977cc4e6aae55cb2379313599249a8dd2 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit c8fb5a4d032b28dd97b9fa4a73f85a84d8d35fdd) --- sbin/ifconfig/af_inet6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index 17dc068ee875..7aed391c7bf5 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -753,7 +753,7 @@ static struct afswtch af_inet6 = { #ifdef WITHOUT_NETLINK .af_difaddr = SIOCDIFADDR_IN6, .af_aifaddr = SIOCAIFADDR_IN6, - .af_ridreq = &in6_addreq, + .af_ridreq = &in6_ridreq, .af_addreq = &in6_addreq, .af_exec = af_exec_ioctl, #else From nobody Wed Sep 17 09:27:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRYMK4wZJz68YC4; Wed, 17 Sep 2025 09:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRYMK4MMTz45Mg; Wed, 17 Sep 2025 09:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758101245; 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=2kM6zxUYp2kxLV6DsEgvxHPStyl+nattae2VMc5BdOg=; b=g23IeYDFKy0W+lgskxEoP/G5a/Q9qOMeqnqkgcnZuDGQpddzoVbbUVLx4TpgPhoZH2bIZE ygSFahboLHXdoNQj2axQaLvuJuPbDDMab/j6CcfvSOrXGhPQ6YASBebdqy/Gh9W+xaxqLF q1Wzhk9SbD+UHdU4JFsO67MOAM7STFs2RgJm66Jd21vNlpxJLaFAMdDhqTbHnW1mVbhn69 OgnSIyoOgbAfTjRVBBBZDnZ55Sb5egRV02lXEG/UzVhZgZ5eEk0qzlsJZLO7YnEeZj8zoN QRD8ZSB8YCF0LoOcKI6PZjVi2bPeaQc2wUW7ef+tacNb1BUBUAGtNTvYXnihFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758101245; 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=2kM6zxUYp2kxLV6DsEgvxHPStyl+nattae2VMc5BdOg=; b=TYPUkD6HNPA9HVrUpIa2fZ9bGA8+B30obXuqH5zMLIGpj2oVsXCI1b0aWBHNxZCuVpgHs1 g4DIp1Ki1e9YSE/H+hL5Vr393E6k7UC81IzcX6LfxTBvyXQZIQ7tSrcj43C+R3BRtEOnFd luebV6GC/SPa4mgcx35PhFBhfuBtxU9IMY8Xfe83MtRXOn6t9JVdUaPzISNz/5APYba2ti 8cVoAVTsZxRxeiEe7/IudAUns9XuhKq/FetEDtWkXWra2Zr47Q9e/CC8hsYkUVQPHoLfpF M+hWbPA98dO1E2PLBSoaLTXoUva5VO8dDQBLjyf3MyhbkQa9Qkt+nWV6h0yK2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758101245; a=rsa-sha256; cv=none; b=IOjbV2jCSYNpr3bRhyhxULyPCrCqEPNtA8m/nKdAq6Zfdybh/vV5jX/Vh0rG5B50qbkx+S grm09+a6Dwc4p581sGKaK7EQq+E0ctorFA5xlLGpkBo0Ej5Xo/d3ZwrfMKy9pE7OL9DrKo mrfv7ZF22I3InEd+koeNfqA85oUfqlpTAPksKgQ4Ct+jXGHE+VI0d7JPrLOJKzJ3lilDvy XJKkk0k4OQpHb98Mx/ucmhSHfu/aK4WRnEcu+gNP0UcVJx8uk8JENdeTIBvD5YJL01xnCu kaAxWN3pdtPfXiFRvv1znE6wk6Fljl3AcmRhKGC/8YjqUmeBqC8GYHl7CiC/zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRYMK3xKWz4Cn; Wed, 17 Sep 2025 09:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58H9RPMC064604; Wed, 17 Sep 2025 09:27:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58H9RPVk064601; Wed, 17 Sep 2025 09:27:25 GMT (envelope-from git) Date: Wed, 17 Sep 2025 09:27:25 GMT Message-Id: <202509170927.58H9RPVk064601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0caba7093871 - stable/15 - sound: Honor CHN_F_NBIO List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0caba70938712aab819b6a8761f366ce804b3b22 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0caba70938712aab819b6a8761f366ce804b3b22 commit 0caba70938712aab819b6a8761f366ce804b3b22 Author: Damjan Jovanovic AuthorDate: 2025-09-15 17:42:41 +0000 Commit: Christos Margiolis CommitDate: 2025-09-17 09:27:06 +0000 sound: Honor CHN_F_NBIO If the device is opened with O_NONBLOCK, even though we check for it in order to set CHN_F_NBIO, the subsequent chn_reset() calls will clear all flags, except those set in CHN_F_RESET, which does not include CHN_F_NBIO. Add CHN_F_NBIO to CHN_F_RESET. Additionally, because primary channels can be reused, make sure we do not unintentionally keep CHN_F_NBIO set if the channel is re-opened, but without O_NONBLOCK. PR: 289441 MFC after: 2 days Reviewed by: christos, markj Differential Revision: https://reviews.freebsd.org/D52493 (cherry picked from commit e8b5025c3880b04c1c2139fe73b65fbd6deb41d4) --- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/dsp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index fab182b22774..9ad21d219001 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -408,7 +408,7 @@ enum { #define CHN_F_RESET (CHN_F_BUSY | CHN_F_DEAD | \ CHN_F_VIRTUAL | CHN_F_HAS_VCHAN | \ - CHN_F_VCHAN_DYNAMIC | \ + CHN_F_VCHAN_DYNAMIC | CHN_F_NBIO | \ CHN_F_PASSTHROUGH | CHN_F_EXCLUSIVE) #define CHN_F_MMAP_INVALID (CHN_F_DEAD | CHN_F_RUNNING) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index aa6ad4a59778..da38f52021ae 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -299,7 +299,7 @@ dsp_close(void *data) CHN_LOCK(rdch); chn_abort(rdch); /* won't sleep */ rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); + CHN_F_DEAD | CHN_F_EXCLUSIVE | CHN_F_NBIO); chn_reset(rdch, 0, 0); chn_release(rdch); if (rdch->flags & CHN_F_VIRTUAL) { @@ -323,7 +323,7 @@ dsp_close(void *data) CHN_LOCK(wrch); chn_flush(wrch); /* may sleep */ wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); + CHN_F_DEAD | CHN_F_EXCLUSIVE | CHN_F_NBIO); chn_reset(wrch, 0, 0); chn_release(wrch); if (wrch->flags & CHN_F_VIRTUAL) { From nobody Wed Sep 17 09:27:47 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRYMl3JZ4z68XnQ; Wed, 17 Sep 2025 09:27: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRYMl2N4Jz45kb; Wed, 17 Sep 2025 09:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758101267; 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=626fU9AlD754Zl3eFVG5Ch2Tffn/ZiMajzGGvXiOEQM=; b=O621bn+/XmkRrzF5KefudnyeCa92JFW5l/YirpQetCbWHaUd7D4hmroYwWGdrjlHKGb3T2 sNXMIsycSvRT80zfHwt48ed+znF/qgZkoC84eQyepOqVX2l/fCp8jmq8Z7gMp8pJcOFUHA 3CH3flogBapU2TuM0zRoZC6HHz1dOeR34ke2p4bXJ3ZM/sj69YsXobG32HkhqIjOsQKFi0 neP590DuqVmiXPScbDj5QYv6BdWu3C+9n5CuDwAL2gg9qgIjFLDxJJqlviSjJFf6ouj3nO anUVOW0SYkl22rs4ZpBTUGY98EItrmxPwHVqCqaj3pncNBj2tnOBXbPEl3W7uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758101267; 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=626fU9AlD754Zl3eFVG5Ch2Tffn/ZiMajzGGvXiOEQM=; b=b96JYH6kNEUYCb0kfHEdq8/qJtLHC5GDXc6mAWCyrllIKVE4dYQNTyFJ2Wg/YCFsuKoRoc 0y6L6cTPFrTfVtQ1l3NXU5TcPhEW2cAjTV1aBQyjajyXDxrPxlEv1SUo15gotkVmn1Ncj6 F2Xko6kEWGO1u5fLq/DbaVPfwWXiNFFHO77OwdV3+sP8MWFZjDYHSP5EBr+lkXzg27WXI9 6kaKsZbgkf8f9XG25SiTFlWENgGdaPFV0Qrkf6oWy80u1UkjmXLn6EP5FqHdY/zOwQ5wmY K0v1W1UHagIcCvrJbshA0xKz39Dq3/mzb8ozN1aJ+9KC6vvX+jr8DGe3q2zbgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758101267; a=rsa-sha256; cv=none; b=kCuZD766XHTIniW4SatWYIguHYDBb9aKE4yN1VpOzZwLAzbleR2X/6yNPIcwRtyEVjud4t VFwdyToGsDE9s2PfJyzCh0EUXV3VnvdqLwdF/qbXny1Utn6HbW8dNXdK0RPVYVFcRAjbK7 JWCdtH1O/Vkw3mw9SJKoUBGMLeENl7d9mkh7BCuaWOhlpToKtGGJEuFPbl5yVvznDtD+qN PR5iS45WqxyEMF9XFaKxcOcgnhmkbs4r4qeAdA4Nz6/SMzU4CUR5Qv2Hbf2V41JVtkDukN BI3dXaCtq7Q/+ac/e2iebElPOIl0RFH7/QaW4gojvJs5hsi1EKs9t2EoHhdclQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRYMl1shCz4Cp; Wed, 17 Sep 2025 09:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58H9RlZm064845; Wed, 17 Sep 2025 09:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58H9Rli2064842; Wed, 17 Sep 2025 09:27:47 GMT (envelope-from git) Date: Wed, 17 Sep 2025 09:27:47 GMT Message-Id: <202509170927.58H9Rli2064842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 123881aead72 - stable/14 - sound: Honor CHN_F_NBIO List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 123881aead724fefa38d4324d2d442ecc79942b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=123881aead724fefa38d4324d2d442ecc79942b2 commit 123881aead724fefa38d4324d2d442ecc79942b2 Author: Damjan Jovanovic AuthorDate: 2025-09-15 17:42:41 +0000 Commit: Christos Margiolis CommitDate: 2025-09-17 09:27:42 +0000 sound: Honor CHN_F_NBIO If the device is opened with O_NONBLOCK, even though we check for it in order to set CHN_F_NBIO, the subsequent chn_reset() calls will clear all flags, except those set in CHN_F_RESET, which does not include CHN_F_NBIO. Add CHN_F_NBIO to CHN_F_RESET. Additionally, because primary channels can be reused, make sure we do not unintentionally keep CHN_F_NBIO set if the channel is re-opened, but without O_NONBLOCK. PR: 289441 MFC after: 2 days Reviewed by: christos, markj Differential Revision: https://reviews.freebsd.org/D52493 (cherry picked from commit e8b5025c3880b04c1c2139fe73b65fbd6deb41d4) --- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/dsp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index fab182b22774..9ad21d219001 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -408,7 +408,7 @@ enum { #define CHN_F_RESET (CHN_F_BUSY | CHN_F_DEAD | \ CHN_F_VIRTUAL | CHN_F_HAS_VCHAN | \ - CHN_F_VCHAN_DYNAMIC | \ + CHN_F_VCHAN_DYNAMIC | CHN_F_NBIO | \ CHN_F_PASSTHROUGH | CHN_F_EXCLUSIVE) #define CHN_F_MMAP_INVALID (CHN_F_DEAD | CHN_F_RUNNING) diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index aa6ad4a59778..da38f52021ae 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -299,7 +299,7 @@ dsp_close(void *data) CHN_LOCK(rdch); chn_abort(rdch); /* won't sleep */ rdch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); + CHN_F_DEAD | CHN_F_EXCLUSIVE | CHN_F_NBIO); chn_reset(rdch, 0, 0); chn_release(rdch); if (rdch->flags & CHN_F_VIRTUAL) { @@ -323,7 +323,7 @@ dsp_close(void *data) CHN_LOCK(wrch); chn_flush(wrch); /* may sleep */ wrch->flags &= ~(CHN_F_RUNNING | CHN_F_MMAP | - CHN_F_DEAD | CHN_F_EXCLUSIVE); + CHN_F_DEAD | CHN_F_EXCLUSIVE | CHN_F_NBIO); chn_reset(wrch, 0, 0); chn_release(wrch); if (wrch->flags & CHN_F_VIRTUAL) { From nobody Wed Sep 17 13:36:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRfv74pQ1z67PbZ; Wed, 17 Sep 2025 13:36: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRfv745fqz3tBB; Wed, 17 Sep 2025 13:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758116211; 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=N7OCZkaGwVEyDrlb1nHj1TjzOVPCXDeJZ2igblGqKOQ=; b=JioWZqwps2wIb07rZYnVOUsjXeFjsH/+hBBPJ0BaRPdod5p5jgft6b3lC7iesb5nlHlZEy xWk8M30j/Ow6l5CqcFF0WNM7Fa3Ho5oJ6cdWReQfc7S6IMhc5EveZCRlJv4URL6tAIWkIH FZ5t1wcIp2dZwShvZAwMmkILqX8k9OQr9/OyUO0N30QW88cOJxVMw1OcWNBHBWRRrGUKqC Hm1kP6sMRKIIJ6shNpif5iubcFlFduEDvj7LR1N38IjgLwfevMlVrAXKwR6q7vxuj/VYW/ veiPNNB6Yc7yH87LXDjohQjTEK1b60NCt5nGAbHVwosQA26UZZAiu1XACRI6Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758116211; 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=N7OCZkaGwVEyDrlb1nHj1TjzOVPCXDeJZ2igblGqKOQ=; b=KRlBB4G9Sas7lCjhlZh3m7MMJNHc1NRCRRTJRsRzMhEixq3TIBgxwTrB+HVkCGtykeqVjF 9ojM1b+MFu/QJY/7KdTpCI8vsvoHGiYnYwNf6fAT57ZwWNGPKTZPOkKEY7I9CSsStxJrbm YlckJ9DG4wfBvDfjr+UGiuCTs22uehirnXt4JuOYjkJRmSm1rpNR9ZTEmIhHAsiy4pdXjT Phvy1rt/Rap115Ld+A9JGhFDQ1rsmKzOsv2q8AHissoFUTtlxj1uJWg6l3Cbe8qeOYObrJ x5/5r07PgoKCTDPAOm2FI/SI7VwZ45hbWrXYT9qETo931BIu4BZzQ9//cpzOgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758116211; a=rsa-sha256; cv=none; b=RuJQexcnY8MwpMGPU82xoPH2Y6xGjNUSn86kjuuhs9lO69PaK65nyH5of/PcCvSDQ1Ii5W UedWcZjaOSXjE6eJj/YrpejxMpBGHMz+rIZ3y1iGIoevz+RRoy5Kf51tKfaWupyofQ12Av TRmHxk8wh0PldBh5Od8mIYefITpfDHdNhEd9cfZk6uiIDmHqmZ6A6w1XlEMJ/s3MIHsHPr 2E7ZRsqnPMaovCDG/SYD+/4jUQtbcm//Dv3yNo5fqy0tfIPPfJphRsggDj6DcrWTXwSHej C/lPqYNMrB6ARShC6AW2x/jh90cA9wi2NyxqLs2/LhxBdJ+BPNuzgUKQkQEQ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRfv73LTSzC2q; Wed, 17 Sep 2025 13:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HDapiw034933; Wed, 17 Sep 2025 13:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HDapag034930; Wed, 17 Sep 2025 13:36:51 GMT (envelope-from git) Date: Wed, 17 Sep 2025 13:36:51 GMT Message-Id: <202509171336.58HDapag034930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 220584471931 - stable/14 - bsdinstall: Remove support for ZFS + MBR disk layouts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 220584471931fef807a6f59ce0397cfd6ac0f6fe Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=220584471931fef807a6f59ce0397cfd6ac0f6fe commit 220584471931fef807a6f59ce0397cfd6ac0f6fe Author: Ed Maste AuthorDate: 2025-06-25 01:19:12 +0000 Commit: Ed Maste CommitDate: 2025-09-17 13:35:55 +0000 bsdinstall: Remove support for ZFS + MBR disk layouts It hasn't worked for some time -- as reported in review D40816 "Installing FreeBSD with Auto ZFS + MBR has been broken ever since the move to OpenZFS with FreeBSD 13." It relied on the partition table and ZFS data overlapping in a very fragile way and is not a good idea. Reviewed by: jhb Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51028 (cherry picked from commit ee110941e35c4354baa2e5b6fd64d3025cff4b7e) --- usr.sbin/bsdinstall/scripts/zfsboot | 141 ++---------------------------------- 1 file changed, 8 insertions(+), 133 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 94eec0e20faa..8e3df4631abf 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -86,7 +86,7 @@ f_include $BSDCFG_SHARE/variable.subr # # Create a separate boot pool? -# NB: Automatically set when using geli(8) or MBR +# NB: Automatically set when using geli(8) # : ${ZFSBOOT_BOOT_POOL=} @@ -96,12 +96,12 @@ f_include $BSDCFG_SHARE/variable.subr : ${ZFSBOOT_BOOT_POOL_CREATE_OPTIONS:=} # -# Default name for boot pool when enabled (e.g., geli(8) or MBR) +# Default name for boot pool when enabled (e.g., geli(8)) # : ${ZFSBOOT_BOOT_POOL_NAME:=bootpool} # -# Default size for boot pool when enabled (e.g., geli(8) or MBR) +# Default size for boot pool when enabled (e.g., geli(8)) # : ${ZFSBOOT_BOOT_POOL_SIZE:=2g} @@ -790,7 +790,7 @@ zfs_create_diskpart() # Check for unknown partition scheme before proceeding further case "$ZFSBOOT_PARTITION_SCHEME" in - ""|MBR|GPT*) : known good ;; + ""|GPT*) : known good ;; *) f_dprintf "$funcname: %s is an unsupported partition scheme" \ "$ZFSBOOT_PARTITION_SCHEME" @@ -825,14 +825,11 @@ zfs_create_diskpart() # # Lay down the desired type of partition scheme # - local setsize mbrindex align_small align_big + local setsize align_small align_big # # If user has requested 4 K alignment, add these params to the # gpart add calls. With GPT, we align large partitions to 1 M for - # improved performance on SSDs. MBR does not always play well with gaps - # between partitions, so all alignment is only 4k for that case. - # With MBR, we align the BSD partition that contains the MBR, otherwise - # the system fails to boot. + # improved performance on SSDs. # if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then align_small="-a 4k" @@ -974,90 +971,6 @@ zfs_create_diskpart() /dev/$disk$targetpart ;; - MBR) f_dprintf "$funcname: Creating MBR layout..." - # - # Enable boot pool if encryption is desired - # - [ "$ZFSBOOT_GELI_ENCRYPTION" ] && ZFSBOOT_BOOT_POOL=1 - # - # 1. Create MBR layout (no labels) - # - f_eval_catch $funcname gpart "$GPART_CREATE" mbr $disk || - return $FAILURE - f_eval_catch $funcname gpart "$GPART_BOOTCODE" /boot/mbr \ - $disk || return $FAILURE - - # - # 2. Add freebsd slice with all available space - # - f_eval_catch $funcname gpart "$GPART_ADD_ALIGN" \ - "$align_small" freebsd $disk || return $FAILURE - f_eval_catch $funcname gpart "$GPART_SET_ACTIVE" 1 $disk || - return $FAILURE - # Pedantically nuke any old labels - f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \ - /dev/${disk}s1 - # Pedantically nuke any old scheme - f_eval_catch -d $funcname gpart "$GPART_DESTROY_F" ${disk}s1 - - # - # 3. Write BSD scheme to the freebsd slice - # - f_eval_catch $funcname gpart "$GPART_CREATE" BSD ${disk}s1 || - return $FAILURE - - # NB: ZFS pools will use s1a (no labels) - bootpart=s1a swappart=s1b targetpart=s1d mbrindex=4 - - # - # Always prepare a boot pool on MBR - # Do not align this partition, there must not be a gap - # - ZFSBOOT_BOOT_POOL=1 - f_eval_catch $funcname gpart \ - "$GPART_ADD_ALIGN_INDEX_WITH_SIZE" \ - "" 1 freebsd-zfs ${bootsize}b ${disk}s1 || - return $FAILURE - # Pedantically nuke any old labels - f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \ - /dev/$disk$bootpart - if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then - # Pedantically detach targetpart for later - f_eval_catch -d $funcname geli \ - "$GELI_DETACH_F" \ - /dev/$disk$targetpart - fi - - # - # 4. Add freebsd-swap partition - # - if [ ${swapsize:-0} -gt 0 ]; then - f_eval_catch $funcname gpart \ - "$GPART_ADD_ALIGN_INDEX_WITH_SIZE" \ - "$align_small" 2 freebsd-swap \ - ${swapsize}b ${disk}s1 || return $FAILURE - # Pedantically nuke any old labels on the swap - f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \ - /dev/${disk}s1b - fi - - # - # 5. Add freebsd-zfs partition for zroot - # - if [ "$ZFSBOOT_POOL_SIZE" ]; then - f_eval_catch $funcname gpart "$GPART_ADD_ALIGN_INDEX_WITH_SIZE" \ - "$align_small" $mbrindex freebsd-zfs $ZFSBOOT_POOL_SIZE ${disk}s1 || return $FAILURE - else - f_eval_catch $funcname gpart "$GPART_ADD_ALIGN_INDEX" \ - "$align_small" $mbrindex freebsd-zfs ${disk}s1 || return $FAILURE - fi - f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \ - /dev/$disk$targetpart # Pedantic - f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \ - /boot/zfsboot /dev/${disk}s1 count=1 || - return $FAILURE - ;; - esac # $ZFSBOOT_PARTITION_SCHEME # Update fstab(5) @@ -1102,7 +1015,7 @@ zfs_create_boot() local zroot_vdevtype="$2" local zroot_vdevs= # Calculated below local swap_devs= # Calculated below - local boot_vdevs= # Used for geli(8) and/or MBR layouts + local boot_vdevs= # Used for geli(8) layouts shift 2 # poolname vdev_type local disks="$*" disk local isswapmirror @@ -1191,7 +1104,6 @@ zfs_create_boot() f_dprintf "$funcname: With 4K sectors..." f_eval_catch $funcname sysctl "$SYSCTL_ZFS_MIN_ASHIFT_12" \ || return $FAILURE - sysctl kern.geom.part.mbr.enforce_chs=0 fi local n=0 for disk in $disks; do @@ -1415,40 +1327,6 @@ zfs_create_boot() "bootfs=\"$zroot_name/$zroot_bootfs\"" "$zroot_name" || return $FAILURE - # MBR boot loader touch-up - if [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then - # Export the pool(s) - f_dprintf "$funcname: Temporarily exporting ZFS pool(s)..." - f_eval_catch $funcname zpool "$ZPOOL_EXPORT" "$zroot_name" || - return $FAILURE - if [ "$ZFSBOOT_BOOT_POOL" ]; then - f_eval_catch $funcname zpool "$ZPOOL_EXPORT" \ - "$bootpool_name" || return $FAILURE - fi - - f_dprintf "$funcname: Updating MBR boot loader on disks..." - # Stick the ZFS boot loader in the "convenient hole" after - # the ZFS internal metadata - for disk in $disks; do - f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \ - /boot/zfsboot /dev/$disk$bootpart \ - "skip=1 seek=1024" || return $FAILURE - done - - # Re-import the ZFS pool(s) - f_dprintf "$funcname: Re-importing ZFS pool(s)..." - f_eval_catch $funcname zpool "$ZPOOL_IMPORT_WITH_OPTIONS" \ - "-o altroot=\"$BSDINSTALL_CHROOT\"" \ - "$zroot_name" || return $FAILURE - if [ "$ZFSBOOT_BOOT_POOL" ]; then - # Import the bootpool, but do not mount it yet - f_eval_catch $funcname zpool \ - "$ZPOOL_IMPORT_WITH_OPTIONS" \ - "-o altroot=\"$BSDINSTALL_CHROOT\" -N" \ - "$bootpool_name" || return $FAILURE - fi - fi - # Remount bootpool and create symlink(s) if [ "$ZFSBOOT_BOOT_POOL" ]; then f_eval_catch $funcname zfs "$ZFS_MOUNT" "$bootpool_name" || @@ -1793,7 +1671,7 @@ while :; do fi ;; ?" $msg_partition_scheme") - # Toggle between GPT (BIOS), GPT (UEFI) and MBR + # Toggle between partition schemes if [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT" -a \ "$ZFSBOOT_BOOT_TYPE" = "BIOS" ] then @@ -1805,9 +1683,6 @@ while :; do ZFSBOOT_PARTITION_SCHEME="GPT" ZFSBOOT_BOOT_TYPE="BIOS+UEFI" elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT" ]; then - ZFSBOOT_PARTITION_SCHEME="MBR" - ZFSBOOT_BOOT_TYPE="BIOS" - elif [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then ZFSBOOT_PARTITION_SCHEME="GPT + Active" ZFSBOOT_BOOT_TYPE="BIOS" elif [ "$ZFSBOOT_PARTITION_SCHEME" = "GPT + Active" ]; then From nobody Wed Sep 17 17:01:02 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRlQl0lJYz67jq9; Wed, 17 Sep 2025 17:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRlQl0Vrkz3l2H; Wed, 17 Sep 2025 17:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758128463; 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=fqhvkA3tc5Yo8zGIHdBECvL7Tejcd1NtMf4MOobnu8k=; b=g/NL+z2/SLaPYaCqBjVv9JMW3kLqv8AOg6QveuDjaIIRwBEjbtxDFA7aYQ/vol4ajvNQgx fndruc3IkG7Fpjphr1wJZUjSqXliq3YVOnJe5PyzakLIS9JDR6eBNv69NYZL9LNYU/WCYz gsSkF/zE2CtV4+jBWHlm1F1P/ctvYVZiKPARjszPMJc/SwfQhOyYmhYfzZLstQg/uBypq/ EtKaNau/+0HyXb4BUblwkUv9YzskbyBGXjQcJxaMQyzzIjc3PZT/AXvNFN+IOdOJvWx1Lx jsJ1FD7Sk0kRpJY9JFCQuLZC6Gbu8zZPshEzcAO9CESy3RSzUyy9kndGdzfMFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758128463; 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=fqhvkA3tc5Yo8zGIHdBECvL7Tejcd1NtMf4MOobnu8k=; b=Pn3BeJYHPUinGKEpGYaMH7FoVXDnDNAA8T/iT7HVKdM4jzLRp0Or4gEgku22MgyDl/4ktJ TtFAPldFNJL8RPlr3leftWzwT1A2xglCPl2k2Jjtv3Vq4J2DkWXWwA4jmi4ohIaygVdZab AlANU+224aO0pw3CAr3W7R4x2KUrMER4CvlvpwfBXaEm31eOilDKytccXj0tG1KVvc0KYs KVKzrbapLrJnIo7Wc0UoLZT/lPLP5X3IT0LDBX1dGHOymHG0HZmJSBu9umUVRG5RS999qY miTaJNLLbCEXkuUSyUYQBSbkRXmGBKSFAbBp9PjWLcU1sXsgZzr4G5xMpWmxJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758128463; a=rsa-sha256; cv=none; b=LQzijtcnRAQi/PGlMzaTRUuOfA1z09ZCuOjDMEaC0S5SvWUr4LUQHLk41s6HBNGs9eh0Jk O5Uh+pR5mv6jtsYI1owP8ZoJxSb24slkcsf7i9Ye225i9lDVWs4zgRR54uwKz/FoPErqyJ swrmyKntN7a0zdJyTd/YZ0FiItbzcoMKMOfrnnfkGSITz7KQ0fdeO2R878oRuU8c3j3zvj 8t7yr+deiLzfQ6C0vuh6Ma6e5DPbtU4zVAt4Q3uGUkZh94m8cPRECwA3Izs0K0VAyYwsfP AuEduhbZHh9K8oTE1pC1s8pSTOSv+LbMjX362fbvPw36wpVqOAJFl64M7NdZsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRlQl05cHzb3X; Wed, 17 Sep 2025 17:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HH12CM022704; Wed, 17 Sep 2025 17:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HH12GL022701; Wed, 17 Sep 2025 17:01:02 GMT (envelope-from git) Date: Wed, 17 Sep 2025 17:01:02 GMT Message-Id: <202509171701.58HH12GL022701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 4c178fe36e01 - stable/15 - contrib/bc upgrade to version 7.1.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4c178fe36e01f84f3c65f6953cbe8dbe5b3fc908 Auto-Submitted: auto-generated The branch stable/15 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=4c178fe36e01f84f3c65f6953cbe8dbe5b3fc908 commit 4c178fe36e01f84f3c65f6953cbe8dbe5b3fc908 Author: Stefan Eßer AuthorDate: 2025-09-11 14:16:39 +0000 Commit: Stefan Eßer CommitDate: 2025-09-17 16:25:56 +0000 contrib/bc upgrade to version 7.1.0 This update fixes a few bugs: - Improper response to double SIGINT with editline. - Not letting libedit handle terminal size changes. - A dc crash from improperly handling an error. - A duplicate check for reference arrays. - Build failures with GCC 15. Merge commit '682da5a0fdb2c38ecc3951047a882471d62aa1d1' (cherry picked from commit fdc4a7c8012b214986cfa2e2fb6d99731f004b1b) usr.bin/gh-bc: fix invocation of test scripts The “all.sh” script in version 7.1.0 accepts one less parameter for selecting the tests to be run. (cherry picked from commit 1a6ffcb27ddcfdc66c2ea58d6789b3d527f68ba9) usr.bin/gh-bc: update for version 7.1.0 Add extra defines required for bc-7.1.0 to the Makefiles. (cherry picked from commit 2d06844521ecd9e1298b53f13c18ffbfa97b1e28) --- contrib/bc/LICENSE.md | 4 +- contrib/bc/MAINTENANCE-TERMS.md | 80 + contrib/bc/Makefile.in | 285 +- contrib/bc/NEWS.md | 23 + contrib/bc/NOTICE.md | 2 +- contrib/bc/README.md | 21 +- contrib/bc/VERSION.txt | 1 + contrib/bc/build.gaml | 402 + contrib/bc/build.pkg.rig | 2345 ++++++ contrib/bc/build.rig | 575 ++ contrib/bc/compile_flags.txt | 3 + contrib/bc/configure.sh | 477 +- contrib/bc/gen/bc_help.txt | 4 +- contrib/bc/gen/dc_help.txt | 4 +- contrib/bc/gen/lib.bc | 2 +- contrib/bc/gen/lib2.bc | 115 +- contrib/bc/gen/strgen.c | 4 +- contrib/bc/gen/strgen.sh | 4 +- contrib/bc/include/args.h | 2 +- contrib/bc/include/bc.h | 8 +- contrib/bc/include/bcl.h | 2 +- contrib/bc/include/dc.h | 2 +- contrib/bc/include/file.h | 2 +- contrib/bc/include/history.h | 26 +- contrib/bc/include/lang.h | 6 +- contrib/bc/include/lex.h | 2 +- contrib/bc/include/library.h | 2 +- contrib/bc/include/num.h | 2 +- contrib/bc/include/opt.h | 2 +- contrib/bc/include/ossfuzz.h | 2 +- contrib/bc/include/parse.h | 2 +- contrib/bc/include/program.h | 16 +- contrib/bc/include/rand.h | 2 +- contrib/bc/include/read.h | 2 +- contrib/bc/include/status.h | 7 +- contrib/bc/include/vector.h | 2 +- contrib/bc/include/version.h | 42 - contrib/bc/include/vm.h | 3 +- contrib/bc/locales/de_DE.ISO8859-1.msg | 2 +- contrib/bc/locales/de_DE.UTF-8.msg | 2 +- contrib/bc/locales/en_US.msg | 2 +- contrib/bc/locales/es_ES.ISO8859-1.msg | 2 +- contrib/bc/locales/es_ES.UTF-8.msg | 2 +- contrib/bc/locales/fr_FR.ISO8859-1.msg | 2 +- contrib/bc/locales/fr_FR.UTF-8.msg | 2 +- contrib/bc/locales/ja_JP.UTF-8.msg | 2 +- contrib/bc/locales/ja_JP.eucJP.msg | 2 +- contrib/bc/locales/nl_NL.ISO8859-1.msg | 2 +- contrib/bc/locales/nl_NL.UTF-8.msg | 2 +- contrib/bc/locales/pl_PL.ISO8859-2.msg | 2 +- contrib/bc/locales/pl_PL.UTF-8.msg | 2 +- contrib/bc/locales/pt_PT.ISO8859-1.msg | 2 +- contrib/bc/locales/pt_PT.UTF-8.msg | 2 +- contrib/bc/locales/ru_RU.CP1251.msg | 2 +- contrib/bc/locales/ru_RU.CP866.msg | 2 +- contrib/bc/locales/ru_RU.ISO8859-5.msg | 2 +- contrib/bc/locales/ru_RU.KOI8-R.msg | 2 +- contrib/bc/locales/ru_RU.UTF-8.msg | 2 +- contrib/bc/locales/zh_CN.GB18030.msg | 2 +- contrib/bc/locales/zh_CN.GB2312.msg | 2 +- contrib/bc/locales/zh_CN.GBK.msg | 2 +- contrib/bc/locales/zh_CN.UTF-8.msg | 2 +- contrib/bc/locales/zh_CN.eucCN.msg | 2 +- contrib/bc/manuals/bc/A.1 | 15 +- contrib/bc/manuals/bc/A.1.md | 14 +- contrib/bc/manuals/bc/E.1 | 4 +- contrib/bc/manuals/bc/E.1.md | 4 +- contrib/bc/manuals/bc/EH.1 | 4 +- contrib/bc/manuals/bc/EH.1.md | 4 +- contrib/bc/manuals/bc/EHN.1 | 4 +- contrib/bc/manuals/bc/EHN.1.md | 4 +- contrib/bc/manuals/bc/EN.1 | 4 +- contrib/bc/manuals/bc/EN.1.md | 4 +- contrib/bc/manuals/bc/H.1 | 15 +- contrib/bc/manuals/bc/H.1.md | 14 +- contrib/bc/manuals/bc/HN.1 | 15 +- contrib/bc/manuals/bc/HN.1.md | 14 +- contrib/bc/manuals/bc/N.1 | 15 +- contrib/bc/manuals/bc/N.1.md | 14 +- contrib/bc/manuals/bcl.3 | 4 +- contrib/bc/manuals/bcl.3.md | 4 +- contrib/bc/manuals/build.md | 6 +- contrib/bc/manuals/dc/A.1 | 4 +- contrib/bc/manuals/dc/A.1.md | 4 +- contrib/bc/manuals/dc/E.1 | 4 +- contrib/bc/manuals/dc/E.1.md | 4 +- contrib/bc/manuals/dc/EH.1 | 4 +- contrib/bc/manuals/dc/EH.1.md | 4 +- contrib/bc/manuals/dc/EHN.1 | 4 +- contrib/bc/manuals/dc/EHN.1.md | 4 +- contrib/bc/manuals/dc/EN.1 | 4 +- contrib/bc/manuals/dc/EN.1.md | 4 +- contrib/bc/manuals/dc/H.1 | 4 +- contrib/bc/manuals/dc/H.1.md | 4 +- contrib/bc/manuals/dc/HN.1 | 4 +- contrib/bc/manuals/dc/HN.1.md | 4 +- contrib/bc/manuals/dc/N.1 | 4 +- contrib/bc/manuals/dc/N.1.md | 4 +- contrib/bc/project/README.md | 32 + contrib/bc/project/gitea.db | Bin 0 -> 86016 bytes contrib/bc/project/github_issues.json | 3667 ++++++++++ contrib/bc/project/github_prs.json | 7729 ++++++++++++++++++++ contrib/bc/project/issue10.md | 104 + contrib/bc/scripts/exec-install.sh | 2 +- contrib/bc/scripts/format.sh | 2 +- contrib/bc/scripts/functions.sh | 2 +- contrib/bc/scripts/karatsuba.py | 2 +- contrib/bc/scripts/link.sh | 2 +- contrib/bc/scripts/lint.sh | 2 +- contrib/bc/scripts/locale_install.sh | 2 +- contrib/bc/scripts/locale_uninstall.sh | 2 +- contrib/bc/scripts/os.c | 2 +- contrib/bc/scripts/release.pkg.yao | 1410 ++++ contrib/bc/scripts/sqrt_frac_guess.bc | 2 +- contrib/bc/scripts/sqrt_int_guess.bc | 2 +- contrib/bc/scripts/sqrt_random.bc | 2 +- contrib/bc/scripts/sqrt_random.sh | 2 +- contrib/bc/src/args.c | 2 +- contrib/bc/src/bc.c | 2 +- contrib/bc/src/bc_fuzzer.c | 3 +- contrib/bc/src/bc_lex.c | 2 +- contrib/bc/src/bc_parse.c | 2 +- contrib/bc/src/data.c | 142 +- contrib/bc/src/dc.c | 2 +- contrib/bc/src/dc_fuzzer.c | 3 +- contrib/bc/src/dc_lex.c | 2 +- contrib/bc/src/dc_parse.c | 2 +- contrib/bc/src/file.c | 5 +- contrib/bc/src/history.c | 16 +- contrib/bc/src/lang.c | 7 +- contrib/bc/src/lex.c | 2 +- contrib/bc/src/library.c | 2 +- contrib/bc/src/main.c | 3 +- contrib/bc/src/num.c | 3 +- contrib/bc/src/opt.c | 2 +- contrib/bc/src/parse.c | 2 +- contrib/bc/src/program.c | 67 +- contrib/bc/src/rand.c | 2 +- contrib/bc/src/read.c | 23 +- contrib/bc/src/vector.c | 2 +- contrib/bc/src/vm.c | 35 +- contrib/bc/tests/all.sh | 42 +- contrib/bc/tests/bc/all.txt | 131 +- contrib/bc/tests/bc/errors/39.txt | 1 + contrib/bc/tests/bc/lib2.txt | 477 -- contrib/bc/tests/bc/lib2_a2.txt | 18 + contrib/bc/tests/bc/lib2_a2_results.txt | 18 + contrib/bc/tests/bc/lib2_bytes.txt | 46 + contrib/bc/tests/bc/lib2_bytes_results.txt | 46 + contrib/bc/tests/bc/lib2_ceil.txt | 24 + contrib/bc/tests/bc/lib2_ceil_results.txt | 24 + contrib/bc/tests/bc/lib2_d2r.txt | 16 + contrib/bc/tests/bc/lib2_d2r_results.txt | 16 + contrib/bc/tests/bc/lib2_fac.txt | 6 + contrib/bc/tests/bc/lib2_fac_results.txt | 6 + contrib/bc/tests/bc/lib2_gcd.txt | 7 + contrib/bc/tests/bc/lib2_gcd_results.txt | 7 + contrib/bc/tests/bc/lib2_log.txt | 32 + contrib/bc/tests/bc/lib2_log_results.txt | 32 + contrib/bc/tests/bc/lib2_p.txt | 4 + contrib/bc/tests/bc/lib2_p_results.txt | 5 + contrib/bc/tests/bc/lib2_perm.txt | 9 + contrib/bc/tests/bc/lib2_perm_results.txt | 8 + contrib/bc/tests/bc/lib2_pi.txt | 5 + contrib/bc/tests/bc/lib2_pi_results.txt | 6 + contrib/bc/tests/bc/lib2_r.txt | 23 + contrib/bc/tests/bc/lib2_r2d.txt | 17 + contrib/bc/tests/bc/lib2_r2d_results.txt | 16 + contrib/bc/tests/bc/lib2_r_results.txt | 23 + contrib/bc/tests/bc/lib2_rand.txt | 11 + contrib/bc/tests/bc/lib2_rand_results.txt | 7 + contrib/bc/tests/bc/lib2_root.txt | 13 + contrib/bc/tests/bc/lib2_root_results.txt | 13 + contrib/bc/tests/bc/lib2_tan.txt | 30 + contrib/bc/tests/bc/lib2_tan_results.txt | 29 + contrib/bc/tests/bc/lib2_uint.txt | 218 + .../bc/{lib2_results.txt => lib2_uint_results.txt} | 256 - .../bc/tests/bc/scripts/{add.bc => add_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/add_00200.bc | 17 + contrib/bc/tests/bc/scripts/add_00300.bc | 17 + contrib/bc/tests/bc/scripts/add_00400.bc | 17 + contrib/bc/tests/bc/scripts/add_00500.bc | 17 + contrib/bc/tests/bc/scripts/add_00600.bc | 17 + contrib/bc/tests/bc/scripts/add_00700.bc | 17 + contrib/bc/tests/bc/scripts/add_00800.bc | 17 + contrib/bc/tests/bc/scripts/add_00900.bc | 17 + contrib/bc/tests/bc/scripts/add_01000.bc | 17 + contrib/bc/tests/bc/scripts/add_01100.bc | 17 + contrib/bc/tests/bc/scripts/add_01200.bc | 17 + contrib/bc/tests/bc/scripts/add_01300.bc | 17 + contrib/bc/tests/bc/scripts/add_01400.bc | 17 + contrib/bc/tests/bc/scripts/add_01500.bc | 17 + contrib/bc/tests/bc/scripts/add_01600.bc | 17 + contrib/bc/tests/bc/scripts/add_01700.bc | 17 + contrib/bc/tests/bc/scripts/add_01800.bc | 17 + contrib/bc/tests/bc/scripts/add_01900.bc | 17 + contrib/bc/tests/bc/scripts/add_02000.bc | 17 + contrib/bc/tests/bc/scripts/add_02100.bc | 17 + contrib/bc/tests/bc/scripts/add_02200.bc | 17 + contrib/bc/tests/bc/scripts/add_02300.bc | 17 + contrib/bc/tests/bc/scripts/add_02400.bc | 17 + contrib/bc/tests/bc/scripts/add_02500.bc | 17 + contrib/bc/tests/bc/scripts/add_02600.bc | 17 + contrib/bc/tests/bc/scripts/add_02700.bc | 17 + contrib/bc/tests/bc/scripts/add_02800.bc | 17 + contrib/bc/tests/bc/scripts/add_02900.bc | 17 + contrib/bc/tests/bc/scripts/add_03000.bc | 17 + contrib/bc/tests/bc/scripts/add_03100.bc | 17 + contrib/bc/tests/bc/scripts/add_03200.bc | 17 + contrib/bc/tests/bc/scripts/add_03300.bc | 17 + contrib/bc/tests/bc/scripts/add_03400.bc | 17 + contrib/bc/tests/bc/scripts/add_03500.bc | 17 + contrib/bc/tests/bc/scripts/add_03600.bc | 17 + contrib/bc/tests/bc/scripts/add_03700.bc | 17 + contrib/bc/tests/bc/scripts/add_03800.bc | 17 + contrib/bc/tests/bc/scripts/add_03900.bc | 17 + contrib/bc/tests/bc/scripts/add_04000.bc | 17 + contrib/bc/tests/bc/scripts/add_04100.bc | 17 + contrib/bc/tests/bc/scripts/add_04200.bc | 17 + contrib/bc/tests/bc/scripts/add_04300.bc | 17 + contrib/bc/tests/bc/scripts/add_04400.bc | 17 + contrib/bc/tests/bc/scripts/add_04500.bc | 17 + contrib/bc/tests/bc/scripts/add_04600.bc | 17 + contrib/bc/tests/bc/scripts/add_04700.bc | 17 + contrib/bc/tests/bc/scripts/add_04800.bc | 17 + contrib/bc/tests/bc/scripts/add_04900.bc | 17 + contrib/bc/tests/bc/scripts/add_05000.bc | 17 + contrib/bc/tests/bc/scripts/add_05100.bc | 17 + contrib/bc/tests/bc/scripts/add_05200.bc | 17 + contrib/bc/tests/bc/scripts/add_05300.bc | 17 + contrib/bc/tests/bc/scripts/add_05400.bc | 17 + contrib/bc/tests/bc/scripts/add_05500.bc | 17 + contrib/bc/tests/bc/scripts/add_05600.bc | 17 + contrib/bc/tests/bc/scripts/add_05700.bc | 17 + contrib/bc/tests/bc/scripts/add_05800.bc | 17 + contrib/bc/tests/bc/scripts/add_05900.bc | 17 + contrib/bc/tests/bc/scripts/add_06000.bc | 17 + contrib/bc/tests/bc/scripts/add_06100.bc | 17 + contrib/bc/tests/bc/scripts/add_06200.bc | 17 + contrib/bc/tests/bc/scripts/add_06300.bc | 17 + contrib/bc/tests/bc/scripts/add_06400.bc | 17 + contrib/bc/tests/bc/scripts/add_06500.bc | 17 + contrib/bc/tests/bc/scripts/add_06600.bc | 17 + contrib/bc/tests/bc/scripts/add_06700.bc | 17 + contrib/bc/tests/bc/scripts/add_06800.bc | 17 + contrib/bc/tests/bc/scripts/add_06900.bc | 17 + contrib/bc/tests/bc/scripts/add_07000.bc | 17 + contrib/bc/tests/bc/scripts/add_07100.bc | 17 + contrib/bc/tests/bc/scripts/add_07200.bc | 17 + contrib/bc/tests/bc/scripts/add_07300.bc | 17 + contrib/bc/tests/bc/scripts/add_07400.bc | 17 + contrib/bc/tests/bc/scripts/add_07500.bc | 17 + contrib/bc/tests/bc/scripts/add_07600.bc | 17 + contrib/bc/tests/bc/scripts/add_07700.bc | 17 + contrib/bc/tests/bc/scripts/add_07800.bc | 17 + contrib/bc/tests/bc/scripts/add_07900.bc | 17 + contrib/bc/tests/bc/scripts/add_08000.bc | 17 + contrib/bc/tests/bc/scripts/add_08100.bc | 17 + contrib/bc/tests/bc/scripts/add_08200.bc | 17 + contrib/bc/tests/bc/scripts/add_08300.bc | 17 + contrib/bc/tests/bc/scripts/add_08400.bc | 17 + contrib/bc/tests/bc/scripts/add_08500.bc | 17 + contrib/bc/tests/bc/scripts/add_08600.bc | 17 + contrib/bc/tests/bc/scripts/add_08700.bc | 17 + contrib/bc/tests/bc/scripts/add_08800.bc | 17 + contrib/bc/tests/bc/scripts/add_08900.bc | 17 + contrib/bc/tests/bc/scripts/add_09000.bc | 17 + contrib/bc/tests/bc/scripts/add_09100.bc | 17 + contrib/bc/tests/bc/scripts/add_09200.bc | 17 + contrib/bc/tests/bc/scripts/add_09300.bc | 17 + contrib/bc/tests/bc/scripts/add_09400.bc | 17 + contrib/bc/tests/bc/scripts/add_09500.bc | 17 + contrib/bc/tests/bc/scripts/add_09600.bc | 17 + contrib/bc/tests/bc/scripts/add_09700.bc | 17 + contrib/bc/tests/bc/scripts/add_09800.bc | 17 + contrib/bc/tests/bc/scripts/add_09900.bc | 17 + contrib/bc/tests/bc/scripts/add_10000.bc | 17 + contrib/bc/tests/bc/scripts/all.txt | 406 +- .../bc/scripts/{divide.bc => divide_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/divide_00200.bc | 23 + contrib/bc/tests/bc/scripts/divide_00300.bc | 23 + contrib/bc/tests/bc/scripts/divide_00400.bc | 23 + contrib/bc/tests/bc/scripts/divide_00500.bc | 23 + contrib/bc/tests/bc/scripts/divide_00600.bc | 23 + contrib/bc/tests/bc/scripts/divide_00700.bc | 23 + contrib/bc/tests/bc/scripts/divide_00800.bc | 23 + contrib/bc/tests/bc/scripts/divide_00900.bc | 23 + contrib/bc/tests/bc/scripts/divide_01000.bc | 23 + contrib/bc/tests/bc/scripts/divide_01100.bc | 23 + contrib/bc/tests/bc/scripts/divide_01200.bc | 23 + contrib/bc/tests/bc/scripts/divide_01300.bc | 23 + contrib/bc/tests/bc/scripts/divide_01400.bc | 23 + contrib/bc/tests/bc/scripts/divide_01500.bc | 23 + contrib/bc/tests/bc/scripts/divide_01600.bc | 23 + contrib/bc/tests/bc/scripts/divide_01700.bc | 23 + contrib/bc/tests/bc/scripts/divide_01800.bc | 23 + contrib/bc/tests/bc/scripts/divide_01900.bc | 23 + contrib/bc/tests/bc/scripts/divide_02000.bc | 23 + contrib/bc/tests/bc/scripts/divide_02100.bc | 23 + contrib/bc/tests/bc/scripts/divide_02200.bc | 23 + contrib/bc/tests/bc/scripts/divide_02300.bc | 23 + contrib/bc/tests/bc/scripts/divide_02400.bc | 23 + contrib/bc/tests/bc/scripts/divide_02500.bc | 23 + contrib/bc/tests/bc/scripts/divide_02600.bc | 23 + contrib/bc/tests/bc/scripts/divide_02700.bc | 23 + contrib/bc/tests/bc/scripts/divide_02800.bc | 23 + contrib/bc/tests/bc/scripts/divide_02900.bc | 23 + contrib/bc/tests/bc/scripts/divide_03000.bc | 23 + contrib/bc/tests/bc/scripts/divide_03100.bc | 23 + contrib/bc/tests/bc/scripts/divide_03200.bc | 23 + contrib/bc/tests/bc/scripts/divide_03300.bc | 23 + contrib/bc/tests/bc/scripts/divide_03400.bc | 23 + contrib/bc/tests/bc/scripts/divide_03500.bc | 23 + contrib/bc/tests/bc/scripts/divide_03600.bc | 23 + contrib/bc/tests/bc/scripts/divide_03700.bc | 23 + contrib/bc/tests/bc/scripts/divide_03800.bc | 23 + contrib/bc/tests/bc/scripts/divide_03900.bc | 23 + contrib/bc/tests/bc/scripts/divide_04000.bc | 23 + contrib/bc/tests/bc/scripts/divide_04100.bc | 23 + contrib/bc/tests/bc/scripts/divide_04200.bc | 23 + contrib/bc/tests/bc/scripts/divide_04300.bc | 23 + contrib/bc/tests/bc/scripts/divide_04400.bc | 23 + contrib/bc/tests/bc/scripts/divide_04500.bc | 23 + contrib/bc/tests/bc/scripts/divide_04600.bc | 23 + contrib/bc/tests/bc/scripts/divide_04700.bc | 23 + contrib/bc/tests/bc/scripts/divide_04800.bc | 23 + contrib/bc/tests/bc/scripts/divide_04900.bc | 23 + contrib/bc/tests/bc/scripts/divide_05000.bc | 23 + contrib/bc/tests/bc/scripts/divide_05100.bc | 23 + contrib/bc/tests/bc/scripts/divide_05200.bc | 23 + contrib/bc/tests/bc/scripts/divide_05300.bc | 23 + contrib/bc/tests/bc/scripts/divide_05400.bc | 23 + contrib/bc/tests/bc/scripts/divide_05500.bc | 23 + contrib/bc/tests/bc/scripts/divide_05600.bc | 23 + contrib/bc/tests/bc/scripts/divide_05700.bc | 23 + contrib/bc/tests/bc/scripts/divide_05800.bc | 23 + contrib/bc/tests/bc/scripts/divide_05900.bc | 23 + contrib/bc/tests/bc/scripts/divide_06000.bc | 23 + contrib/bc/tests/bc/scripts/divide_06100.bc | 23 + contrib/bc/tests/bc/scripts/divide_06200.bc | 23 + contrib/bc/tests/bc/scripts/divide_06300.bc | 23 + contrib/bc/tests/bc/scripts/divide_06400.bc | 23 + contrib/bc/tests/bc/scripts/divide_06500.bc | 23 + contrib/bc/tests/bc/scripts/divide_06600.bc | 23 + contrib/bc/tests/bc/scripts/divide_06700.bc | 23 + contrib/bc/tests/bc/scripts/divide_06800.bc | 23 + contrib/bc/tests/bc/scripts/divide_06900.bc | 23 + contrib/bc/tests/bc/scripts/divide_07000.bc | 23 + contrib/bc/tests/bc/scripts/divide_07100.bc | 23 + contrib/bc/tests/bc/scripts/divide_07200.bc | 23 + contrib/bc/tests/bc/scripts/divide_07300.bc | 23 + contrib/bc/tests/bc/scripts/divide_07400.bc | 23 + contrib/bc/tests/bc/scripts/divide_07500.bc | 23 + contrib/bc/tests/bc/scripts/divide_07600.bc | 23 + contrib/bc/tests/bc/scripts/divide_07700.bc | 23 + contrib/bc/tests/bc/scripts/divide_07800.bc | 23 + contrib/bc/tests/bc/scripts/divide_07900.bc | 23 + contrib/bc/tests/bc/scripts/divide_08000.bc | 23 + contrib/bc/tests/bc/scripts/divide_08100.bc | 23 + contrib/bc/tests/bc/scripts/divide_08200.bc | 23 + contrib/bc/tests/bc/scripts/divide_08300.bc | 23 + contrib/bc/tests/bc/scripts/divide_08400.bc | 23 + contrib/bc/tests/bc/scripts/divide_08500.bc | 23 + contrib/bc/tests/bc/scripts/divide_08600.bc | 23 + contrib/bc/tests/bc/scripts/divide_08700.bc | 23 + contrib/bc/tests/bc/scripts/divide_08800.bc | 23 + contrib/bc/tests/bc/scripts/divide_08900.bc | 23 + contrib/bc/tests/bc/scripts/divide_09000.bc | 23 + contrib/bc/tests/bc/scripts/divide_09100.bc | 23 + contrib/bc/tests/bc/scripts/divide_09200.bc | 23 + contrib/bc/tests/bc/scripts/divide_09300.bc | 23 + contrib/bc/tests/bc/scripts/divide_09400.bc | 23 + contrib/bc/tests/bc/scripts/divide_09500.bc | 23 + contrib/bc/tests/bc/scripts/divide_09600.bc | 23 + contrib/bc/tests/bc/scripts/divide_09700.bc | 23 + contrib/bc/tests/bc/scripts/divide_09800.bc | 23 + contrib/bc/tests/bc/scripts/divide_09900.bc | 23 + contrib/bc/tests/bc/scripts/divide_10000.bc | 23 + .../bc/scripts/{multiply.bc => multiply_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/multiply_00200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_00900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_01900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_02900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_03900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_04900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_05900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_06900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_07900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_08900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09000.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09100.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09200.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09300.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09400.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09500.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09600.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09700.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09800.bc | 20 + contrib/bc/tests/bc/scripts/multiply_09900.bc | 20 + contrib/bc/tests/bc/scripts/multiply_10000.bc | 20 + contrib/bc/tests/bc/scripts/parse.bc | 20 - contrib/bc/tests/bc/scripts/parse_02.bc | 19 + contrib/bc/tests/bc/scripts/parse_03.bc | 19 + contrib/bc/tests/bc/scripts/parse_04.bc | 19 + contrib/bc/tests/bc/scripts/parse_05.bc | 19 + contrib/bc/tests/bc/scripts/parse_06.bc | 19 + contrib/bc/tests/bc/scripts/parse_07.bc | 19 + contrib/bc/tests/bc/scripts/parse_08.bc | 19 + contrib/bc/tests/bc/scripts/parse_09.bc | 19 + contrib/bc/tests/bc/scripts/parse_11.bc | 19 + contrib/bc/tests/bc/scripts/parse_12.bc | 19 + contrib/bc/tests/bc/scripts/parse_13.bc | 19 + contrib/bc/tests/bc/scripts/parse_14.bc | 19 + contrib/bc/tests/bc/scripts/parse_15.bc | 19 + contrib/bc/tests/bc/scripts/parse_16.bc | 19 + contrib/bc/tests/bc/scripts/print.bc | 25 - contrib/bc/tests/bc/scripts/print_002.bc | 22 + contrib/bc/tests/bc/scripts/print_003.bc | 22 + contrib/bc/tests/bc/scripts/print_004.bc | 22 + contrib/bc/tests/bc/scripts/print_005.bc | 22 + contrib/bc/tests/bc/scripts/print_006.bc | 22 + contrib/bc/tests/bc/scripts/print_007.bc | 22 + contrib/bc/tests/bc/scripts/print_008.bc | 22 + contrib/bc/tests/bc/scripts/print_009.bc | 22 + contrib/bc/tests/bc/scripts/print_011.bc | 22 + contrib/bc/tests/bc/scripts/print_012.bc | 22 + contrib/bc/tests/bc/scripts/print_013.bc | 22 + contrib/bc/tests/bc/scripts/print_014.bc | 22 + contrib/bc/tests/bc/scripts/print_015.bc | 22 + contrib/bc/tests/bc/scripts/print_016.bc | 22 + contrib/bc/tests/bc/scripts/print_017.bc | 22 + contrib/bc/tests/bc/scripts/print_018.bc | 22 + contrib/bc/tests/bc/scripts/print_019.bc | 22 + contrib/bc/tests/bc/scripts/print_020.bc | 22 + contrib/bc/tests/bc/scripts/print_021.bc | 22 + contrib/bc/tests/bc/scripts/print_022.bc | 22 + contrib/bc/tests/bc/scripts/print_023.bc | 22 + contrib/bc/tests/bc/scripts/print_024.bc | 22 + contrib/bc/tests/bc/scripts/print_025.bc | 22 + contrib/bc/tests/bc/scripts/print_026.bc | 22 + contrib/bc/tests/bc/scripts/print_027.bc | 22 + contrib/bc/tests/bc/scripts/print_028.bc | 22 + contrib/bc/tests/bc/scripts/print_029.bc | 22 + contrib/bc/tests/bc/scripts/print_030.bc | 22 + contrib/bc/tests/bc/scripts/print_031.bc | 22 + contrib/bc/tests/bc/scripts/print_032.bc | 22 + contrib/bc/tests/bc/scripts/print_033.bc | 22 + contrib/bc/tests/bc/scripts/print_034.bc | 22 + contrib/bc/tests/bc/scripts/print_035.bc | 22 + contrib/bc/tests/bc/scripts/print_036.bc | 22 + contrib/bc/tests/bc/scripts/print_037.bc | 22 + contrib/bc/tests/bc/scripts/print_038.bc | 22 + contrib/bc/tests/bc/scripts/print_039.bc | 22 + contrib/bc/tests/bc/scripts/print_040.bc | 22 + contrib/bc/tests/bc/scripts/print_041.bc | 22 + contrib/bc/tests/bc/scripts/print_042.bc | 22 + contrib/bc/tests/bc/scripts/print_043.bc | 22 + contrib/bc/tests/bc/scripts/print_044.bc | 22 + contrib/bc/tests/bc/scripts/print_045.bc | 22 + contrib/bc/tests/bc/scripts/print_046.bc | 22 + contrib/bc/tests/bc/scripts/print_047.bc | 22 + contrib/bc/tests/bc/scripts/print_048.bc | 22 + contrib/bc/tests/bc/scripts/print_049.bc | 22 + contrib/bc/tests/bc/scripts/print_050.bc | 22 + contrib/bc/tests/bc/scripts/print_051.bc | 22 + contrib/bc/tests/bc/scripts/print_052.bc | 22 + contrib/bc/tests/bc/scripts/print_053.bc | 22 + contrib/bc/tests/bc/scripts/print_054.bc | 22 + contrib/bc/tests/bc/scripts/print_055.bc | 22 + contrib/bc/tests/bc/scripts/print_056.bc | 22 + contrib/bc/tests/bc/scripts/print_057.bc | 22 + contrib/bc/tests/bc/scripts/print_058.bc | 22 + contrib/bc/tests/bc/scripts/print_059.bc | 22 + contrib/bc/tests/bc/scripts/print_060.bc | 22 + contrib/bc/tests/bc/scripts/print_061.bc | 22 + contrib/bc/tests/bc/scripts/print_062.bc | 22 + contrib/bc/tests/bc/scripts/print_063.bc | 22 + contrib/bc/tests/bc/scripts/print_064.bc | 22 + contrib/bc/tests/bc/scripts/print_065.bc | 22 + contrib/bc/tests/bc/scripts/print_066.bc | 22 + contrib/bc/tests/bc/scripts/print_067.bc | 22 + contrib/bc/tests/bc/scripts/print_068.bc | 22 + contrib/bc/tests/bc/scripts/print_069.bc | 22 + contrib/bc/tests/bc/scripts/print_070.bc | 22 + contrib/bc/tests/bc/scripts/print_071.bc | 22 + contrib/bc/tests/bc/scripts/print_072.bc | 22 + contrib/bc/tests/bc/scripts/print_073.bc | 22 + contrib/bc/tests/bc/scripts/print_074.bc | 22 + contrib/bc/tests/bc/scripts/print_075.bc | 22 + contrib/bc/tests/bc/scripts/print_076.bc | 22 + contrib/bc/tests/bc/scripts/print_077.bc | 22 + contrib/bc/tests/bc/scripts/print_078.bc | 22 + contrib/bc/tests/bc/scripts/print_079.bc | 22 + contrib/bc/tests/bc/scripts/print_080.bc | 22 + contrib/bc/tests/bc/scripts/print_081.bc | 22 + contrib/bc/tests/bc/scripts/print_082.bc | 22 + contrib/bc/tests/bc/scripts/print_083.bc | 22 + contrib/bc/tests/bc/scripts/print_084.bc | 22 + contrib/bc/tests/bc/scripts/print_085.bc | 22 + contrib/bc/tests/bc/scripts/print_086.bc | 22 + contrib/bc/tests/bc/scripts/print_087.bc | 22 + contrib/bc/tests/bc/scripts/print_088.bc | 22 + contrib/bc/tests/bc/scripts/print_089.bc | 22 + contrib/bc/tests/bc/scripts/print_090.bc | 22 + contrib/bc/tests/bc/scripts/print_091.bc | 22 + contrib/bc/tests/bc/scripts/print_092.bc | 22 + contrib/bc/tests/bc/scripts/print_093.bc | 22 + contrib/bc/tests/bc/scripts/print_094.bc | 22 + contrib/bc/tests/bc/scripts/print_095.bc | 22 + contrib/bc/tests/bc/scripts/print_096.bc | 22 + contrib/bc/tests/bc/scripts/print_097.bc | 22 + contrib/bc/tests/bc/scripts/print_098.bc | 22 + contrib/bc/tests/bc/scripts/print_099.bc | 22 + contrib/bc/tests/bc/scripts/print_100.bc | 22 + .../bc/scripts/{subtract.bc => subtract_00100.bc} | 2 +- contrib/bc/tests/bc/scripts/subtract_00200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_00900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_01900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_02900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_03900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_04900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_05900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_06900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_07900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_08900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09000.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09100.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09200.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09300.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09400.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09500.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09600.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09700.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09800.bc | 17 + contrib/bc/tests/bc/scripts/subtract_09900.bc | 17 + contrib/bc/tests/bc/scripts/subtract_10000.bc | 17 + contrib/bc/tests/bc/timeconst.sh | 5 +- contrib/bc/tests/bcl.c | 2 +- contrib/bc/tests/dc/scripts/easter.dc | 49 + contrib/bc/tests/dc/scripts/easter.sh | 93 - contrib/bc/tests/dc/scripts/easter.txt | 5 + contrib/bc/tests/dc/scripts/prime.dc | 2 +- contrib/bc/tests/error.sh | 4 +- contrib/bc/tests/errors.sh | 4 +- contrib/bc/tests/extra_required.txt | 17 +- contrib/bc/tests/history.py | 4 +- contrib/bc/tests/history.sh | 2 +- contrib/bc/tests/other.sh | 593 -- contrib/bc/tests/read.sh | 166 - contrib/bc/tests/script.sh | 25 +- contrib/bc/tests/scripts.sh | 17 +- contrib/bc/tests/stdin.sh | 2 +- contrib/bc/tests/test.sh | 24 +- contrib/bc/vs/bc.vcxproj | 1 - contrib/bc/vs/bc.vcxproj.filters | 3 - contrib/bc/vs/bcl.vcxproj | 1 - contrib/bc/vs/bcl.vcxproj.filters | 3 - usr.bin/gh-bc/Makefile | 6 +- usr.bin/gh-bc/tests/Makefile | 9 +- 715 files changed, 28229 insertions(+), 3016 deletions(-) diff --git a/contrib/bc/LICENSE.md b/contrib/bc/LICENSE.md index c8f6758e6d4b..e5d44dee6dab 100644 --- a/contrib/bc/LICENSE.md +++ b/contrib/bc/LICENSE.md @@ -1,6 +1,6 @@ # License -Copyright (c) 2018-2024 Gavin D. Howard +Copyright (c) 2018-2025 Gavin D. Howard Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -60,7 +60,7 @@ The files `src/rand.c` and `include/rand.h` are under the following copyrights and license: Copyright (c) 2014-2017 Melissa O'Neill and PCG Project contributors
-Copyright (c) 2018-2024 Gavin D. Howard +Copyright (c) 2018-2025 Gavin D. Howard Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/contrib/bc/MAINTENANCE-TERMS.md b/contrib/bc/MAINTENANCE-TERMS.md new file mode 100644 index 000000000000..ef24202cc6c2 --- /dev/null +++ b/contrib/bc/MAINTENANCE-TERMS.md @@ -0,0 +1,80 @@ +# Maintenance Terms + +> Last Updated: 27 June 2025 + +The code, text, and other materials in this repository are provided as-is under +the terms of the repository's [`LICENSE.md`][0] file, as a gift to the commons +and the common good. In providing this software as-is, its author(s) admit no +further obligations from anyone using the software for any reason, particularly +with respect to: + +* Releases, +* Response time, +* Change review and integration, +* Disclosure schedules, +* Discretionary, proprietary or otherwise secretive communications, and +* Any other non-contractual obligations or conventions, regardless of their + presumed urgency or severity. + +Should anyone wish to make a contract with me (Gavin Howard) to ensure that work +he or she deems critical gets done, the terms are as follows: + +* Compute time will be charged at \$25/hr. +* My time will be charged at \$100/hr. +* All issues deemed critical by either me or the requester, that also change the + source code (anything in `gen`, `include`, or `src`) will require at least two + weeks of fuzzing without error. + * If errors are found, those hours will still be charged on top of the final + two weeks. +* All changes will require running the [release script][2] on Linux (GCC), Linux + (Clang), FreeBSD, OpenBSD, macOS, Windows. +* Any hours spent on bugs or code that have been, or are suspected to have been, + generated by "AI" will be charged double rates. + +Compute time includes, but is not limited to: + +* Fuzzing. +* Running my [release script][2]. +* Running tests and my [release script][2] on macOS. + +My time includes, but is not limited to: + +* Code review. +* Reading bug reports. +* Design. +* Coding. +* Any compute time that interferes with my ability to do any other work: + * Fuzzing makes my computer unusable, so fuzzing for the 8-12 hours of the + day that I could be working will be charged at \$100/hr. + * Same with running my [release script][2] because I run two instances on my + machine and two in VMs at the same time. + * Running my [release script][2] or any other compute time on Windows + because Windows blocks me from doing my main work on Linux. + * Any other instances of blocking compute time. + +All amounts will be billed by, and paid to, [Yzena, LLC][2]. Invoices will be +provided, including line items for what each hour was spent on. + +It is suggested that the following amounts be budgeted: + +* At least \$3000 for a non-critical issue or change. + + The release script takes about 10 hours, and I would need to run it once on + Linux (and others at the same time) and once on Windows, which is 20 hours. + Most of that won't be at the \$100/hr rate, but some probably will be. Then + an extra \$1000 for other work. + +* At least \$15,000 for a critical issue or change. + + The \$3000 above is the start, which leaves \$12,000. Fuzzing is expected to + cost \$11,400 (6 days a week, 8 hours a day, at \$100, the rest at \$25), and + rounded up to \$12,000 for good measure. + +--- + +This document is inspired by [Mike Hoye's Maintenance Terms][1]. + +[0]: LICENSE.md +[1]: https://github.com/mhoye/maintenance-terms +[2]: scripts/release.sh +[3]: https://yzena.com/ diff --git a/contrib/bc/Makefile.in b/contrib/bc/Makefile.in index c63dc242e79a..f8b120c1328e 100644 --- a/contrib/bc/Makefile.in +++ b/contrib/bc/Makefile.in @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2018-2024 Gavin D. Howard and contributors. +# Copyright (c) 2018-2025 Gavin D. Howard and contributors. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -38,6 +38,8 @@ GENDIR = $(ROOTDIR)/gen BUILDDIR = %%BUILDDIR%% +VERSION = %%VERSION%% + SRC = %%SRC%% OBJ = %%OBJ%% GCDA = %%GCDA%% @@ -99,17 +101,16 @@ BC_FUZZER_C = $(BIN)/$(BC)_fuzzer_C DC_FUZZER = $(BIN)/$(DC)_fuzzer_c DC_FUZZER_C = $(BIN)/$(DC)_fuzzer_C -BC_TEST_OUTPUTS = tests/bc_outputs BC_FUZZ_OUTPUTS = tests/fuzzing/bc_outputs1 tests/fuzzing/bc_outputs2 tests/fuzzing/bc_outputs3 -DC_TEST_OUTPUTS = tests/dc_outputs DC_FUZZ_OUTPUTS = tests/fuzzing/dc_outputs LIB = libbcl LIB_NAME = $(LIB).a LIBBC = $(BIN)/$(LIB_NAME) BCL = bcl -BCL_TEST = $(BIN)/$(BCL) -BCL_TEST_C = $(TESTSDIR)/$(BCL).c + +GENERATE_TESTS = %%GENERATE_TESTS%% +PROBLEMATIC_TESTS = %%PROBLEMATIC_TESTS%% MANUALS = manuals BC_MANPAGE_NAME = $(EXEC_PREFIX)$(BC)$(EXEC_SUFFIX).1 @@ -152,11 +153,11 @@ BC_ENABLE_EXTRA_MATH = %%EXTRA_MATH%% BC_ENABLE_NLS = %%NLS%% BC_EXCLUDE_EXTRA_MATH = %%EXCLUDE_EXTRA_MATH%% -BC_ENABLE_AFL = %%FUZZ%% -BC_ENABLE_OSSFUZZ = %%OSSFUZZ%% -BC_ENABLE_MEMCHECK = %%MEMCHECK%% +BC_ENABLE_AFL = 0 +BC_ENABLE_OSSFUZZ = 0 +BC_ENABLE_MEMCHECK = 0 -LIB_FUZZING_ENGINE = %%LIB_FUZZING_ENGINE%% +LIB_FUZZING_ENGINE = 0 BC_DEFAULT_BANNER = %%BC_DEFAULT_BANNER%% BC_DEFAULT_SIGINT_RESET = %%BC_DEFAULT_SIGINT_RESET%% @@ -189,10 +190,6 @@ KARATSUBA = $(SCRIPTSDIR)/karatsuba.py LOCALE_INSTALL = $(SCRIPTSDIR)/locale_install.sh LOCALE_UNINSTALL = $(SCRIPTSDIR)/locale_uninstall.sh -VALGRIND_ARGS = --error-exitcode=100 --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all - -TEST_STARS = *********************************************************************** - BC_NUM_KARATSUBA_LEN = %%KARATSUBA_LEN%% BC_DEFS0 = -DBC_DEFAULT_BANNER=$(BC_DEFAULT_BANNER) @@ -218,7 +215,7 @@ CPPFLAGS6 = $(CPPFLAGS5) -DBC_ENABLE_NLS=$(BC_ENABLE_NLS) CPPFLAGS7 = $(CPPFLAGS6) -D$(BC_ENABLE_EXTRA_MATH_NAME)=$(BC_ENABLE_EXTRA_MATH) CPPFLAGS8 = $(CPPFLAGS7) -DBC_ENABLE_HISTORY=$(BC_ENABLE_HISTORY) -DBC_ENABLE_LIBRARY=$(BC_ENABLE_LIBRARY) CPPFLAGS9 = $(CPPFLAGS8) -DBC_ENABLE_MEMCHECK=$(BC_ENABLE_MEMCHECK) -DBC_ENABLE_AFL=$(BC_ENABLE_AFL) -CPPFLAGS = $(CPPFLAGS9) -DBC_ENABLE_OSSFUZZ=$(BC_ENABLE_OSSFUZZ) +CPPFLAGS = -DVERSION=$(VERSION) $(CPPFLAGS9) -DBC_ENABLE_OSSFUZZ=$(BC_ENABLE_OSSFUZZ) CFLAGS = $(CPPFLAGS) $(BC_DEFS) $(DC_DEFS) %%CPPFLAGS%% %%CFLAGS%% LDFLAGS = %%LDFLAGS%% @@ -293,236 +290,10 @@ help: @printf ' check alias for `make test`\n' @printf ' clean removes all build files\n' @printf ' clean_config removes all build files as well as the generated Makefile\n' - @printf ' clean_tests removes all build files, the generated Makefile,\n' - @printf ' and generated tests\n' @printf ' install installs binaries to "%s%s"\n' "$(DESTDIR)" "$(BINDIR)" @printf ' and (if enabled) manpages to "%s%s"\n' "$(DESTDIR)" "$(MAN1DIR)" - @printf ' karatsuba runs the karatsuba script (requires Python 3)\n' - @printf ' karatsuba_test runs the karatsuba script while running tests\n' - @printf ' (requires Python 3)\n' @printf ' uninstall uninstalls binaries from "%s%s"\n' "$(DESTDIR)" "$(BINDIR)" @printf ' and (if enabled) manpages from "%s%s"\n' "$(DESTDIR)" "$(MAN1DIR)" - @printf ' test runs the test suite\n' - @printf ' test_bc runs the bc test suite, if bc has been built\n' - @printf ' test_dc runs the dc test suite, if dc has been built\n' - @printf ' time_test runs the test suite, displaying times for some things\n' - @printf ' time_test_bc runs the bc test suite, displaying times for some things\n' - @printf ' time_test_dc runs the dc test suite, displaying times for some things\n' - @printf ' timeconst runs the test on the Linux timeconst.bc script,\n' - @printf ' if it exists and bc has been built\n' - -run_all_tests: bc_all_tests timeconst_all_tests dc_all_tests - -run_all_tests_np: bc_all_tests_np timeconst_all_tests dc_all_tests_np - -bc_all_tests: - %%BC_ALL_TESTS%% - -bc_all_tests_np: - %%BC_ALL_TESTS_NP%% - -timeconst_all_tests: - %%TIMECONST_ALL_TESTS%% - -dc_all_tests: - %%DC_ALL_TESTS%% - -dc_all_tests_np: - %%DC_ALL_TESTS_NP%% - -history_all_tests: - %%HISTORY_TESTS%% - -check: test - -test: %%TESTS%% *** 37561 LINES SKIPPED *** From nobody Wed Sep 17 19:34:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpqZ0vsyz67wN9; Wed, 17 Sep 2025 19:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpqY5spXz49rV; Wed, 17 Sep 2025 19:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137657; 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=y44u378TNKHeJ2JPpOV/sU6WrGWbBq3NHu+7DFQIZCI=; b=o5k1lH7Vd0eMOfdOMuKHk8+fsziDDrisMFKo0tlxI5RcrJm9xHFYm9E7DnHx4a+K0AXWtU pWrujPwfAMtOJHfetyla5Vq0ycwJmkObUZgtOLD2+4Y3Ck6xYqkS0Hh+YAy3Nev7p2XmEr vYpOS6g+xWTPxxWNaA6oRZ3t+3t70WJvGPWu+qB4VSevh///mql8gxJoNPTaOatGzu/LVI SgOvwPT9/PJN2/b53OM25ZO87Qt8l+ENFMKscbp4J12Y8JBTvE3YcwKvhNs+EIeiFYe5gU rCYV5W+QXV4OLe1rVC2QSDezkVVcosSyey1obG740BdKYNvVZVtnbdirAcpDAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137657; 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=y44u378TNKHeJ2JPpOV/sU6WrGWbBq3NHu+7DFQIZCI=; b=br7FGYwN3MViNzkkw36y7qyPq9RugissG+q9pUAp7G00IwkQ/hyqJKo/r8VTsIqPWut3mJ tVk62dWp1zaJS5qbJrEEJNlt8sf4NZBwVyctKpcaoT6boFLsIessDXp3jx+KAbovQkAbBf f9owietLTjme99DiFguowAqlNWy0zw9exJp9QWawYjEUV97h2Im0g0hw0GdELoKN3grIjT ZuAvSkkdiMt+3za+5XA+fULx4+L7O9oRdYNU8b9CPutThH5ZiGNTCiRM4P8sxTZ8H9HyTQ TaQaxYFBxaYmy3ug0eb5OUiQBzHYC0kQX3bzKRyJj+xs1RE/uOPMPEEf6b77GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137657; a=rsa-sha256; cv=none; b=TPtxwibHwK1ZRWXxeb9GFRVf457ADXq7fJ4T52sBdN3faAedgm0q+mxLIXH53M86C0yTn3 gTsgCvdUdT8siyZNTsH+3WY1SXqCRL49aPZLyJ/AIbL1Ku1BgMO8NKGhWddNa061Hz7dj/ eCmgkOHi2lHKNesAaQCSlf4L8m2m/3rWtOKNbYYtIngC1IcBtM/Ux/a2azC5c+dcj9uMHF pcss6sU5tjzY22QAHuF2LimkTTL1MfAgTONIyxjd2qV2J8uIPR4HBSQNctVyy2FyC0V0qf umqoub+eSczs+itTVaexiVlkuqdRPhSewALlDaRxLa04wQw4VY+ojUafcy5MHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpqY59wfzg8M; Wed, 17 Sep 2025 19:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJYHxA014060; Wed, 17 Sep 2025 19:34:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJYHBH014057; Wed, 17 Sep 2025 19:34:17 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:34:17 GMT Message-Id: <202509171934.58HJYHBH014057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7a7f44d61815 - stable/15 - nuageinit: Remove duplicate description of users.{user}.groups List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7a7f44d61815928be4103800de300dca07e0c4d7 Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7a7f44d61815928be4103800de300dca07e0c4d7 commit 7a7f44d61815928be4103800de300dca07e0c4d7 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:47:07 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:33:56 +0000 nuageinit: Remove duplicate description of users.{user}.groups Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D52436 (cherry picked from commit 9f3330f5224ea2384a1c7d79a5b1f2784f7c14b6) --- libexec/nuageinit/nuageinit.7 | 2 -- 1 file changed, 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index f27b8bc06042..bfa028fe3fa3 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -296,8 +296,6 @@ The encrypted password for the user. .It Ic plain_text_passwd The password in plain text for the user. Ignored if an encrypted password is already provided. -.It Ic groups -The list of other groups the user should belong to. .It Ic locked Boolean to determine if the user account should be locked. .It Ic sudo From nobody Wed Sep 17 19:34:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpqb0GFKz67wll; Wed, 17 Sep 2025 19:34:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpqZ64b4z49rX; Wed, 17 Sep 2025 19:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137658; 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=+cSwhbrh/try63qaLapVdRpTUVJYqh5RCRPapRXj9Ts=; b=nplBedDdnBv/YWWU4TcHGQcJ2ym+WJ1W5eNWuNU+VBdBvzZ54R23MmuNDfrap7Vqv/OjZV 5C+qCEU5qafEjnzEs8eays3ZVxn3EqvmQM1B7hgx5f0jrE5+gbMeBiJdb4sRnvasEr6bQ9 G5Tjghzhg9aabMfhfWXHOMnXA2fxYEMac0sd44T9W+4iYsvSwivPev4k5WiYk/qnV3tNGu G/nOZCTloT/c+nmqnfDv7nkpofpGUyyzZfBurFXn/eXdfjHlVxt5H1vlyBUUeXCn+r+BaL OBnaClzoMIHadz4jhA7uwFc4+h8FwtdE/FoEmJnfMTOvz7jS2SQvZCxmdjSCTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137658; 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=+cSwhbrh/try63qaLapVdRpTUVJYqh5RCRPapRXj9Ts=; b=EfGNlI9OUml1ozjDYYGEMNTDc+1UqJpkO5R1Db41kf8fBfp/wK4eihspcLV9PaPpeO5PLT 8tYCIO5DwuIiIQPMD+tHmhHa3HPxhoCz0ucCn9PH8hDKNbsrBBY2Yilu5zSKC7OvcSg4l2 xWM+PPaIrzB2R+uSuulrkBDQtJ2RLw7jAGJgddTOCG57W7Yblj0YLeaf9DuwW8i9vKTE0w P/oB9AiIn5EnrDQpo6FbGr+MBTb+HE/lYdDvtlBBdma2QvBUBDDgJUvpFxlwo/vFkw3Y10 hm09W7/YeXahLYYVHKdGbkHDV61ySbKV+hcd0G3ltUbenwFvYgouwLsgng0RhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137658; a=rsa-sha256; cv=none; b=gJZEjtHQEnG8hA2XeOo9FwlHDGAqx7MQNgjmRVj6TZxsu4ALcxENigWZszeX8dPc9EqIR0 b5fYlIJJZ9b+lR6EV+7rjxg9Z4PgSNqq9C3vWFN9P6jMb6esddialnIVtAxC7WolQ1Ijcf 8o08Wd8q+VZeUAbpX4fgecEus/erE8mU8SSJFkP0DU3qBZvYgZu1Ye7goj+MqGMzDy+8qd MOrvw6XIfakcy/ZuS5e/Rk2LVpogVFO7eomLxS1ot6HNt7YT7DzNxERQIJCqxbZ4WTXjn4 +LCydkQLISVt9jt+Yh7pZlL4ZAgHoqH8ffWNrej2wQMhxzwOgQfu75v8S/2gxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpqZ5Ymszgfw; Wed, 17 Sep 2025 19:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJYIqb014093; Wed, 17 Sep 2025 19:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJYIwY014090; Wed, 17 Sep 2025 19:34:18 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:34:18 GMT Message-Id: <202509171934.58HJYIwY014090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: a00410fa19e9 - stable/15 - nuageinit: chmod sudoers directory instead of chmod (again) sudoers file List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a00410fa19e987a47deac1a61c115549a90b6ea5 Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a00410fa19e987a47deac1a61c115549a90b6ea5 commit a00410fa19e987a47deac1a61c115549a90b6ea5 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:49:56 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:33:56 +0000 nuageinit: chmod sudoers directory instead of chmod (again) sudoers file * Set mode of sudoers to 0440. Reviewed by: bapt@, jlduran@ Approved by: bapt@, jlduran@ Differential Revision: https://reviews.freebsd.org/D52438 (cherry picked from commit a5cc9b7b96dcba4d3ee98f2eb58c3f389590ddf0) --- libexec/nuageinit/nuage.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 48f54b120615..22140dd06fe5 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -311,10 +311,10 @@ local function addsudo(pwd) end f:close() if chmodsudoers then - chmod(sudoers, "0640") + chmod(sudoers, "0440") end if chmodsudoersd then - chmod(sudoers, "0740") + chmod(sudoers_dir, "0750") end end From nobody Wed Sep 17 19:34:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpqc2Ks4z67wnm; Wed, 17 Sep 2025 19:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpqb6qzTz4BQb; Wed, 17 Sep 2025 19:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137660; 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=YloFoES+ZsXRCGKH9TLg8kjUT/AMlxxgiz11mcMvZLw=; b=TG4ttIarxLaLzL0nBMu6kvJfmC7YhwfwmTLm51l1X2kEo2pv5YsHYEgJMXPw6l1Mk7qycs Bx56VlC922ndeiKozC8jdjxbTME/uLNL5/o5bghy5Hn9aOWh6TSh9oKVP6X/unGSjvDtUu 46XHwlQTLnXQPbXbLa9Dq8w+SCIY05/y8PjTaCS6539kny98KeE2W+nJ1QAnxsNMet7DbJ 3PKBoJ7eNwbZ95qIhYip55pmTGU7ra0rYM3k46aeHbGNKkv5AWHiUjUZLUh/JPTqI4WTtE bCbnj7RE1/t2cK/H1alNGylmuDCkLv0oqWpcSFQG1VnolFoqZPtfUCra0/Oaew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137660; 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=YloFoES+ZsXRCGKH9TLg8kjUT/AMlxxgiz11mcMvZLw=; b=E6RhKcLGv89h4ckCjKVSvMlmuc919Y2rTexntHI9O3t+oIVgdkV2lOTI9fqO4iKosV4g5M KYorts1dcEe5LX7roiOknoGICBCESCN4ZkRvw32RotbocdKHZ156cUvM9KHNciycELGWqG Y1djKHeS/rO1SBC6BUMu9/yO5ddDx3kPe91GVNeLAVYTqLHC4AuM3tpgzxz6B0uSZepOmq gYlNvYzUfjasGA0bbJmA0iBTGYnpCubpLu5knS/K8QksCA2Ca8N6dEBa0bddLc1Qu4Iip1 GfBcl1fB+nBN7j/OucwKSk4rEaXNZH0dbqbJXjdONkYaxB+xAOMvtMbDgfc13g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137660; a=rsa-sha256; cv=none; b=Q0JJ9Fz0o/eu+/dGIdXBfdbajAS5W/EE4YGNMSXxly9Fd/wMyS+A7X5LMn/0RC1jYceKso eHRRx0ThLDsy/Ojuug4/jM+JXJsgKX+G+kZl33CtsHFhwRB2grpNlvHOxurAS16BBZ6SAM 9wKeh3khxnldG/jkmXA/2ULvJv5Cd9LCkHnZXrIinfwsDBywe+ZzRWicN1aT1TdaEPd9MR Iq/SeCQ3glLPCpWEVfEo2uiCxds/7kCYo6EFdGBJJc789gbOuGubRsd6PTNwgEaD64xDPG DDwLO1OnrG7JZ3wkbwpgLtCJmq5tQxBTck9SOwI6BC3+NmCuqu3m5SbhskRmiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpqb69r4zg3t; Wed, 17 Sep 2025 19:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJYJ6Z014132; Wed, 17 Sep 2025 19:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJYJD2014129; Wed, 17 Sep 2025 19:34:19 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:34:19 GMT Message-Id: <202509171934.58HJYJD2014129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: dd293fbc084b - stable/15 - nuageinit: Add me to copyright list List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: dd293fbc084bca9cda1305ac0ae5a6a0d2dbd17a Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=dd293fbc084bca9cda1305ac0ae5a6a0d2dbd17a commit dd293fbc084bca9cda1305ac0ae5a6a0d2dbd17a Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 17:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:33:57 +0000 nuageinit: Add me to copyright list Approved by: bapt@ (cherry picked from commit 18555060dcae4cad8f2f8968142fc02a2571377b) --- libexec/nuageinit/nuage.lua | 1 + libexec/nuageinit/nuageinit | 1 + libexec/nuageinit/nuageinit.7 | 1 + libexec/nuageinit/tests/nuage.sh | 1 + libexec/nuageinit/tests/nuageinit.sh | 1 + libexec/nuageinit/tests/utils.sh | 1 + 6 files changed, 6 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 22140dd06fe5..b042698f97e7 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -2,6 +2,7 @@ -- SPDX-License-Identifier: BSD-2-Clause -- -- Copyright(c) 2022-2025 Baptiste Daroussin +-- Copyright(c) 2025 Jesús Daniel Colmenares Oviedo local unistd = require("posix.unistd") local sys_stat = require("posix.sys.stat") diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 70b27cb33d87..c94eb822ba0f 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -3,6 +3,7 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright(c) 2022-2025 Baptiste Daroussin +-- Copyright(c) 2025 Jesús Daniel Colmenares Oviedo local nuage = require("nuage") local ucl = require("ucl") diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index bfa028fe3fa3..fd82eb84574d 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -1,6 +1,7 @@ .\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2025 Baptiste Daroussin +.\" Copyright (c) 2025 Jesús Daniel Colmenares Oviedo .\" .Dd June 26, 2025 .Dt NUAGEINIT 7 diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index b709d25532ff..57d83b62928a 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -1,5 +1,6 @@ #- # Copyright (c) 2022-2025 Baptiste Daroussin +# Copyright (c) 2025 Jesús Daniel Colmenares Oviedo # # SPDX-License-Identifier: BSD-2-Clause # diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 98593f7d75b0..619df019cc4f 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -1,5 +1,6 @@ #- # Copyright (c) 2022-2025 Baptiste Daroussin +# Copyright (c) 2025 Jesús Daniel Colmenares Oviedo # # SPDX-License-Identifier: BSD-2-Clause # diff --git a/libexec/nuageinit/tests/utils.sh b/libexec/nuageinit/tests/utils.sh index 26f117d81d60..76cd7e045473 100644 --- a/libexec/nuageinit/tests/utils.sh +++ b/libexec/nuageinit/tests/utils.sh @@ -1,5 +1,6 @@ #- # Copyright (c) 2022 Baptiste Daroussin +# Copyright (c) 2025 Jesús Daniel Colmenares Oviedo # # SPDX-License-Identifier: BSD-2-Clause # From nobody Wed Sep 17 19:34:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpqd3lj1z67wk1; Wed, 17 Sep 2025 19:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpqd22N2z4Bdh; Wed, 17 Sep 2025 19:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137661; 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=4/b6bLE/y3QPGegxu77yxJlwY3R1Feh3WKkFxoldIUs=; b=YWSFRcEaknHsimUUymosyvzOPZtBLDAk1qefyWL3Gsjbqcum9fTFgMm7HQ/7QTHreWrYIt U5hF8rs0ooMZzDqlhWDKbgA/4ltDvAeDJeWFcKxzJE+tBpyQ3kRPO5s2XLRz2AAIPvkHEE jt3PknDccOc2UbgjaApMDuSl+T83Zt/BSsmauzl3PuQaz2W4HRLSjep5vU5HOpWJYJYaTf UZv1NpE7HvdZekMcHTaRRmHQBU030IALc3zKSr0GXlhmrxfcG8CUWPfaaulhFmOgNGu5LG j7f/W1p/+yESua9JJxWhgHsCHzhalv5wBBOs1fU0Z4wtECpRR6/2EWG6Ph0Bng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137661; 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=4/b6bLE/y3QPGegxu77yxJlwY3R1Feh3WKkFxoldIUs=; b=wJa0ZfBnsMVUO31nClKKAvl34LdS9yDU7kZZ8JCWRcYBCTX6xSNi+u7T1PjXviO59eEJS2 OYtZyN4UAwgjTTbV32FZ05mKOod92n/6t0T9ExAtIun4g5s/kzuWdDmnQwtzWx2bUCFRzg luvcLyOs4GgW3y2KQfh/kx5hoziyESUzH2Os/AnFJNXU9kRTlSw++728TMqQ7x39MVSZCn 9H4GfMiy57guX0GlQ/Voiq2c2GrTxi2uyMafesQMsruABf0k8yUrFbjfnETt1FECyOqftI nlfUDcqi7Smq761CmCZm7KxyPZHG2JNiD02KGQEgxfM5ue9bZLC3HXy6SIiPGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137661; a=rsa-sha256; cv=none; b=dLOsRP8IZoEEfnuXo1Uabh3rTh75RdKLqH1M9hVn+Edc4gLiPbedT7hcifJX1gPZftUxz6 eKVzS7kBGzEeBeSpTcZrvyzwCIe+Pcumhw5AwxX+hlfGLSUu33nO0E0LWyX4mk0iyKZ40a VM77XGjRQo4+kIWry+luMybe5vTrOKU2RMTNUcojPH+HpWzsO2vevWHSngoCDOE6rwsxmo SeN8x5e0GPPbJ0s6IPxChKI+qVlKvvGmPbIEfkews2R3jKZKOEDR9IjDN+5xEWLMyf05/s o7oSQwL9iL0X/1LmDGIGy3CY1qF6DvUYES3Cg3uMX8usE4+uwr7Ic6JaJO0T8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpqd00tVzg3v; Wed, 17 Sep 2025 19:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJYKE9014168; Wed, 17 Sep 2025 19:34:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJYKqw014165; Wed, 17 Sep 2025 19:34:20 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:34:20 GMT Message-Id: <202509171934.58HJYKqw014165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 4a01ddbcd66e - stable/15 - nuageinit: Allow the use of network parameters from network-config List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4a01ddbcd66eeabd821e6cfba45f9f2825450ef2 Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4a01ddbcd66eeabd821e6cfba45f9f2825450ef2 commit 4a01ddbcd66eeabd821e6cfba45f9f2825450ef2 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:52:30 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:33:57 +0000 nuageinit: Allow the use of network parameters from network-config To better comply with the cloud-init specification, we need to support the configuration of network-related parameters from the network-config file, which is common in most deployments. Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D52419 (cherry picked from commit 95230b248f6412c2d1c416c1e9795c3192cdf750) --- libexec/nuageinit/nuageinit | 31 ++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit.7 | 7 +++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c94eb822ba0f..5541f6d0f164 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -583,6 +583,26 @@ local function config2_network(p) routing:close() end +local function parse_network_config() + local nc_file = ni_path .. "/network-config" + local nc_file_attr = lfs.attributes(nc_file) + if nc_file_attr == nil then + return + end + local f, err = io.open(nc_file) + if err then + nuage.err("error parsing nocloud network-config: " .. err) + end + local obj = yaml.load(f:read("*a")) + f:close() + if not obj then + nuage.err("error parsing nocloud network-config") + end + local netobj = {} + netobj["network"] = obj + return netobj +end + if citype == "config-2" then local parser = ucl.parser() local res, err = parser:parse_file(ni_path .. "/meta_data.json") @@ -679,7 +699,16 @@ if line == "#cloud-config" then end for i = 1, #calls_table do - calls_table[i](obj) + if citype == "nocloud" and calls_table[i] == network_config then + netobj = parse_network_config() + if netobj == nil then + network_config(obj) + else + network_config(netobj) + end + else + calls_table[i](obj) + end end elseif line:sub(1, 2) == "#!" then -- delay for execution at rc.local time -- diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index fd82eb84574d..e5da5cf342e1 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -183,6 +183,13 @@ configuration in .Pa /etc/ssh/sshd_config .It Ic network Network configuration parameters. +.Pp +Specifying the following parameters from a file named +.Pa network-config +takes precedence over their specification from the +.Ic network +parameter of +.Pa user-data Ns . .Bl -tag -width "ethernets" .It Ic ethernets Mapping representing a generic configuration for existing network interfaces. From nobody Wed Sep 17 19:34:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpqf4jpBz67wnq; Wed, 17 Sep 2025 19:34: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpqf16pTz4B7r; Wed, 17 Sep 2025 19:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137662; 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=uZBXQzqk0Vh2cA6bpxsm9MyUDqBv614P+Kd4077wx7Y=; b=vc4BYlVUx/TjLmUZNttYe6jvcZeUh7sjqciAQyRU4EOhim+JnHfvlbB7mcYWdhFu55J5i4 dplL353/WXC2ntn+rXl1meMaZWker1ZJeL60b7kIMhkocDxL1CqAXCPEt3vDiQw1Z5HMzl OREt9ANXikyo97meVjIiabv6iYrvocUO9Ce16LOqKCTD2bI4xAEsuuUDTjVn3XWNK6HHdv kUoHLcsbMksjyB5v+XtNxjAMX0XM2NmcwnoWAl0Ktj9zmLRN/wx3EbCEywL+xo4NIjzum+ CtKL2uPyhW3P777ypP7LksUnb5wqH3XsBZlrb9eQNPcpDo2c83/Z7b7wmcfLwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137662; 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=uZBXQzqk0Vh2cA6bpxsm9MyUDqBv614P+Kd4077wx7Y=; b=nVYb7+jfFBA1dToGNWn8PH+1aNvySws3CdrI2HHfEKB/Q8WiLNmmJ6m/8rKYNI577j4mND XoC93IXSn98e1Y6h9xQMB3vR7p0AbB+lvxPn1UcNBEZ8B/gUjz1TFeFRDfe/hsKrrS6msj Q8OmO7EsMniR7GZSyffMNV5hMfmATRF1gMzs0XpdRhoBbVErZIwQTQ9qEuC7vDQQQFIDQZ z8EJJ9krAhGYogAOiI7OS4abQeUbt2YZsBuGX0N0WPhKBL7POC4ynfkQ+lRGlrCDDtWG+J Jsiz1YUuXdHn3rjiKtPOiw2gsWWl+EhFakFwQ0E5EaUtWf6E5fZpoEAURcvy3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137662; a=rsa-sha256; cv=none; b=lb/JvE3bmGrzrqDjcheoJuj/Pup5OTbkEvK1MHIzOhB1NcsDc7PA7DJ/f9EwgEY4kZWK6c aaV/LweUfz3XyQ9yNNj7eOeCQkFnz2heQ0oFTp784P+yNYcjBs8+L+kLKWuhgvtV67cYcW qd8M39gAyctoZEFTMaA2SE/pQhM5f5HGWlSgtcep1jFL19Nk80RT/mJAVg+rRjOPgqVOZP A6VHksM6F66R6UBLFNMQIOJOamwd0XuD2mIm1fNIgUySlNFFPKMKh/KyKkBqV3WpC76LeI lrHHnVubNEa5QWwAfadApo6kmXJIySBugGtQvJCxzdlVx/tHkbejb2OrEMRI9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpqf0ZrDzgQX; Wed, 17 Sep 2025 19:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJYLJT014202; Wed, 17 Sep 2025 19:34:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJYLfV014199; Wed, 17 Sep 2025 19:34:21 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:34:21 GMT Message-Id: <202509171934.58HJYLfV014199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 24e5700d4707 - stable/15 - nuageinit: Add doas support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 24e5700d470718f5c729cc69a62d67bd1ca8a8f4 Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=24e5700d470718f5c729cc69a62d67bd1ca8a8f4 commit 24e5700d470718f5c729cc69a62d67bd1ca8a8f4 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:54:24 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:33:57 +0000 nuageinit: Add doas support * Set mode of etc directory to 0755. * Use user.localbase sysctl instead of /usr/local. * Add test case for doas. * Set ${LOCALBASE} instead of /usr/local in nuageinit(7) man page. Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D52437 (cherry picked from commit 9a829e865697e623a046800545be7781a117125e) --- libexec/nuageinit/nuage.lua | 62 +++++++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit | 3 ++ libexec/nuageinit/nuageinit.7 | 9 +++++- libexec/nuageinit/tests/nuageinit.sh | 12 ++++++- 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index b042698f97e7..ef3cfd994fe1 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -8,6 +8,17 @@ local unistd = require("posix.unistd") local sys_stat = require("posix.sys.stat") local lfs = require("lfs") +local function getlocalbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local localbase = f:read("*l") + f:close() + if localbase == nil or localbase:len() == 0 then + -- fallback + localbase = "/usr/local" + end + return localbase +end + local function decode_base64(input) local b = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' input = string.gsub(input, '[^'..b..'=]', '') @@ -277,11 +288,59 @@ local function addsshkey(homedir, key) end end +local function adddoas(pwd) + local chmodetcdir = false + local chmoddoasconf = false + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local localbase = getlocalbase() + local etcdir = localbase .. "/etc" + if root then + etcdir= root .. etcdir + end + local doasconf = etcdir .. "/doas.conf" + local doasconf_attr = lfs.attributes(doasconf) + if doasconf_attr == nil then + chmoddoasconf = true + local dirattrs = lfs.attributes(etcdir) + if dirattrs == nil then + local r, err = mkdir_p(etcdir) + if not r then + return nil, err .. " (creating " .. etcdir .. ")" + end + chmodetcdir = true + end + end + local f = io.open(doasconf, "a") + if not f then + warnmsg("impossible to open " .. doasconf) + return + end + if type(pwd.doas) == "string" then + local rule = pwd.doas + rule = rule:gsub("%%u", pwd.name) + f:write(rule .. "\n") + elseif type(pwd.doas) == "table" then + for _, str in ipairs(pwd.doas) do + local rule = str + rule = rule:gsub("%%u", pwd.name) + f:write(rule .. "\n") + end + end + f:close() + if chmoddoasconf then + chmod(doasconf, "0640") + end + if chmodetcdir then + chmod(etcdir, "0755") + end +end + local function addsudo(pwd) local chmodsudoersd = false local chmodsudoers = false local root = os.getenv("NUAGE_FAKE_ROOTDIR") - local sudoers_dir = "/usr/local/etc/sudoers.d" + local localbase = getlocalbase() + local sudoers_dir = localbase .. "/etc/sudoers.d" if root then sudoers_dir= root .. sudoers_dir end @@ -585,6 +644,7 @@ local n = { update_packages = update_packages, upgrade_packages = upgrade_packages, addsudo = addsudo, + adddoas = adddoas, addfile = addfile } diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 5541f6d0f164..29340a3d91ea 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -140,6 +140,9 @@ local function users(obj) if u.sudo then nuage.addsudo(u) end + if u.doas then + nuage.adddoas(u) + end else nuage.warn("invalid type : " .. type(u) .. " for users entry number " .. n) end diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index e5da5cf342e1..b527c984970c 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -308,7 +308,14 @@ Ignored if an encrypted password is already provided. Boolean to determine if the user account should be locked. .It Ic sudo A string or an array of strings which should be appended to -.Pa /usr/local/etc/sudoers.d/90-nuageinit-users +.Pa ${LOCALBASE}/etc/sudoers.d/90-nuageinit-users +.It Ic doas +A string or an array of strings which should be appended to +.Pa ${LOCALBASE}/etc/doas.conf +.Pp +Instead of hardcoding the username, you can use +.Sy %u Ns , +which will be replaced by the current username. .El .Pp A special case exist: if the entry is a simple string with the value diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 619df019cc4f..2b7c5226c97a 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -120,12 +120,16 @@ users: gecos: Foo B. Bar primary_group: foobar sudo: ALL=(ALL) NOPASSWD:ALL + doas: permit persist %u as root groups: users passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ - name: bla sudo: - "ALL=(ALL) NOPASSWD:/usr/sbin/pw" - "ALL=(ALL) ALL" + doas: + - "deny %u as foobar" + - "permit persist %u as root cmd whoami" EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet @@ -148,7 +152,13 @@ EOF sed -i "" "s/freebsd:.*:1001/freebsd:freebsd:1001/" "${PWD}"/etc/master.passwd atf_check -o file:expectedpasswd cat "${PWD}"/etc/master.passwd atf_check -o file:expectedgroup cat "${PWD}"/etc/group - atf_check -o inline:"foobar ALL=(ALL) NOPASSWD:ALL\nbla ALL=(ALL) NOPASSWD:/usr/sbin/pw\nbla ALL=(ALL) ALL\n" cat ${PWD}/usr/local/etc/sudoers.d/90-nuageinit-users + localbase=`sysctl -ni user.localbase 2> /dev/null` + if [ -z "${localbase}" ]; then + # fallback + localbase="/usr/local" + fi + atf_check -o inline:"foobar ALL=(ALL) NOPASSWD:ALL\nbla ALL=(ALL) NOPASSWD:/usr/sbin/pw\nbla ALL=(ALL) ALL\n" cat "${PWD}/${localbase}/etc/sudoers.d/90-nuageinit-users" + atf_check -o inline:"permit persist foobar as root\ndeny bla as foobar\npermit persist bla as root cmd whoami\n" cat "${PWD}/${localbase}/etc/doas.conf" } nocloud_network_head() From nobody Wed Sep 17 19:35:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRprQ2sFDz67wrN; Wed, 17 Sep 2025 19:35:02 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRprQ0fyXz4D6K; Wed, 17 Sep 2025 19:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137702; 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=sax5acQ9RE6ES2G35Wv9pOUufojtN3FzWLpIqtk8JAo=; b=uz1hMGv99CfF42CSIoIbfeaelwvjt8FnO7DFRMVLLB84vD90Br3a3az8blKalVYOsHRGJX +/Ed3bwm5+e9C/siwEdU1pqEPz46xHBmpAS8DGswIGQFaiJ0pBJu8treYZDUvA7FqF/nPj ABGJprgi+Z39dnzxTvEG61/9O+DIZNY5rMMbWRprQQK+KTxJZd8Kxj5BA8KDv8ed2ZSM9f pKVG+sJ0Z2WQrLybAeVib9lovjYp7X9CvezL274+4kLkZDJYEO48mA1XevDeZbe97uMp+5 XpqwBEy6Fl4RwooYvgFhag1zSM2fy1hQy2JV1YBuO3GIRLo14TMcl4Akl14kXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137702; 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=sax5acQ9RE6ES2G35Wv9pOUufojtN3FzWLpIqtk8JAo=; b=R84z5ThPB3EFv7qTWJRfD57cqPh9/UV2ywq1+kMeBMsd5buR5mGgbybXnh7bS+KmIoxZRA xZ6kH5B7mQU63GGjPcfwinpJ6ckH0hWTiRbArl+lTdkLZcMmR8ahsHjapRC1TX3P2xElq+ 8lT0ZfHSmNlnZhBTNXRKCvRL7Fyhbladg+ylVsUyknWlTAVTs3wMQuACggLbaURxhkmDeE IOvEPdmHpKLGv39eB/O6ovlqdLx07mBK3iyBQS1j2Sl2sim0hzNBK3Qeoi6CdcPVN7hdis 81cimHFehirIekS5UAk6dD3j9QIe3Yvp1QU1rY+QtydfjtEyorJ4PQ3MQhNEoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137702; a=rsa-sha256; cv=none; b=V5fAYXQvS4nLpdhWLnci4H8LHTBg0lsBZnlryIl8qez/pZ9movS2b4cuxd7nE8j1camQBB NDaOSwOpQoDJiJW/ucBFDdgtkDbjO5npA7f6RAEn0aJBRV/cPYOtKSfw04oJkhsMYfit8Y nvQyxRvLTfp+kptkGa80vOQ37LEJn+LPIVZg1pFQZD8QP28WouwNqHhDshcO+qqDHUYZ7L QwrL5X/x++9OqNsmBozXYypWmdKfM42D8UWNAKzu2Okt/m/M73Zf+iYegHI7B60yiQKHJz kGM2aDLSfx0IlsbZvWW68jh71oPS4bb3r33zsOPjGF3gPZnB35OFN8DMSJ/Edg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRprQ0Czpzg3x; Wed, 17 Sep 2025 19:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJZ18E014614; Wed, 17 Sep 2025 19:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJZ1eI014611; Wed, 17 Sep 2025 19:35:01 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:35:01 GMT Message-Id: <202509171935.58HJZ1eI014611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c3f0a93e70c6 - stable/15 - pci_vendors: update to 2025-07-11 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c3f0a93e70c6011015c6ebe5ddf1c99de57392e3 Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c3f0a93e70c6011015c6ebe5ddf1c99de57392e3 commit c3f0a93e70c6011015c6ebe5ddf1c99de57392e3 Author: Baptiste Daroussin AuthorDate: 2025-09-11 07:53:32 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:34:47 +0000 pci_vendors: update to 2025-07-11 (cherry picked from commit 2e72bd422956f831ec7e54255bd12fb721887f4a) --- share/misc/pci_vendors | 1005 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 914 insertions(+), 91 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 6dfe12dfc8ad..6fb8865340a0 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2025.03.09 -# Date: 2025-03-09 03:15:02 +# Version: 2025.07.11 +# Date: 2025-07-11 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -114,6 +114,8 @@ 0b70 NVMe DC SSD [Yorktown controller] 2b59 NVMe DC SSD [Atomos Prime] 025e 0008 NVMe DC SSD U.2-SFF 15mm [D7-PS1010] + 025e 000c NVMe DC SSD E1.S 9.5mm [D7-PS1010] + 025e 000d NVMe DC SSD E1.S 15mm [D7-PS1010] 025e 0019 NVMe DC SSD E3.S-1T 7.5mm [D7-PS1010] 025e 0108 NVMe DC SSD U.2-SFF 15mm [D7-PS1030] 025e 0119 NVMe DC SSD E3.S-1T 7.5mm [D7-PS1030] @@ -154,6 +156,14 @@ 0202 GP202 0721 Sapphire, Inc. 0731 Jingjia Microelectronics Co Ltd + 1100 JM1100 + 0731 1101 JM1100-C + 0731 1102 JM1100-II + 0731 1103 JM1100-I + 0731 1104 JM1100-M + 0731 1105 JM1100-Y + 0731 1106 JM1100-EI + 0731 1107 JM1100-EM 7200 JM7200 Series GPU 0731 7201 JM7201 0731 7202 JM7202 @@ -191,6 +201,9 @@ 0731 930b JH930-M 0731 930c JH930 930b JH930-M + f011 JM1100-IV + f111 JM1100-MV + ff11 JM1100-YV 0777 Ubiquiti Networks, Inc. 0795 Wired Inc. 6663 Butane II (MPEG2 encoder board) @@ -642,7 +655,7 @@ 1bd4 000e 6G SAS2008IR 1bd4 000f 6G SAS2008IT SA5248 1bd4 0010 6G SAS2008IR SA5248 - 4c52 96c8 LRSA96C8 8-Port SATA3(6Gb/s)Exchange Adapter (with Raid) + 4c52 96c8 LRSA96C8 8-Port SATA3 (6Gb/s) Exchange Adapter (with RAID) 8086 350f RMS2LL040 RAID Controller 8086 3700 SSD 910 Series 0073 MegaRAID SAS 2008 [Falcon] @@ -775,6 +788,9 @@ 1000 30a0 SAS9300-8e 1000 30e0 SAS9300-8i 1000 3130 SAS 9300-16i + 1000 3170 SAS9302-16e +# IBM SAS3008 HBA controller + 1014 0457 9302-8i [N2215] 1028 1f45 HBA330 Adapter 1028 1f46 12Gbps HBA 1028 1f53 HBA330 Mini @@ -869,6 +885,9 @@ 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 1028 22d2 PERC H975i Front 1028 22d3 PERC H975i Adapter + 1028 23cb PERC H975i Front + 1028 23cd PERC H975i Adapter + 1028 2446 PERC H976i Front 1d49 020b ThinkSystem 460-16e SAS/SATA PCIe Gen5 24Gb HBA 00b5 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx # 9760W 32 internal port RAID controller @@ -883,6 +902,11 @@ 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter # 9700 16 external port Storage controller 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter + 1028 22d2 PERC H975i Front - Virtual + 1028 22d3 PERC H975i Adapter - Virtual + 1028 23cb PERC H975i Front - Virtual + 1028 23cd PERC H975i Adapter - Virtual + 1028 2446 PERC H976i Front - Virtual # Broadcom next-gen MPT PCIe switch 00b8 Fusion-MPT Switch SAS50xx/SAS51xx 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) @@ -1293,12 +1317,12 @@ 15ff Fenghuang [Zhongshan Subor Z+] 1607 Arden 1636 Renoir [Radeon Vega Series / Radeon Vega Mobile Series] - 1637 Renoir Radeon High Definition Audio Controller + 1637 Renoir/Cezanne HDMI/DP Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 # Used in the Steam Deck LCD 163f VanGogh [AMD Custom GPU 0405] - 1640 Rembrandt Radeon High Definition Audio Controller + 1640 Radeon High Definition Audio Controller [Rembrandt/Strix] 164c Lucienne 164d Rembrandt 164e Raphael @@ -1306,8 +1330,9 @@ 1681 Rembrandt [Radeon 680M] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s - 1900 Phoenix3 - 1901 Phoenix4 + 1900 HawkPoint1 + 1901 HawkPoint2 + 1902 Krackan2 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 3151 RV380 GL [FireMV 2400] @@ -3054,6 +3079,7 @@ 1458 22ed Radeon RX 560 148c 2381 Radeon RX 560 1682 9560 Radeon RX 560 + 1849 5037 PHANTOM G R RX550 2G/M/ASRK 1da2 e348 Radeon RX 560 1da2 e367 Radeon RX 550 640SP 6800 Wimbledon XT [Radeon HD 7970M] @@ -3284,6 +3310,7 @@ 1002 6b76 AMD Radeon RX Vega 56 8GB # ROG-STRIX-RXVEGA64-O8G-GAMING 1043 04c4 Radeon RX Vega 64 + 1043 0555 ROG STRIX RX Vega 56 8GB 1458 230c Radeon RX VEGA 56 GAMING OC 8G 1da2 e376 Radeon RX VEGA 56 Pulse 8GB OC HBM2 6880 Lexington [Radeon HD 6550M] @@ -3993,6 +4020,7 @@ 1da2 e410 Sapphire NITRO+ RX 5700 XT 1da2 e411 Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5500M] + 106b 0210 Radeon Pro 5300M 7341 Navi 14 [Radeon Pro W5500] 7347 Navi 14 [Radeon Pro W5500M] 734f Navi 14 [Radeon Pro W5300M] @@ -4085,6 +4113,7 @@ 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] + 148c 2427 RX 7800 XT [Hellhound / Red Devil] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC 7481 Navi 33 [Radeon Graphics] @@ -4093,14 +4122,20 @@ 7489 Navi 33 [Radeon Pro W7500] 748b Navi 33 [Radeon Graphics] 7499 Navi 33 [Radeon RX 7400/7300/Pro W7400] + 749f Navi 33 [Radeon RX 7500] 74a0 Aqua Vanjaram [Instinct MI300A] 74a1 Aqua Vanjaram [Instinct MI300X] 74a2 Aqua Vanjaram [Instinct MI308X] 74a5 Aqua Vanjaram [Instinct MI325X] 74a9 Aqua Vanjaram [Instinct MI300X HF] 74b5 Aqua Vanjaram [Instinct MI300X VF] + 74b9 Aqua Vanjaram [Instinct MI325X VF] 74bd Aqua Vanjaram [Instinct MI300X HF] - 7550 Navi 48 [RX 9070/9070 XT] + 7550 Navi 48 [Radeon RX 9070/9070 XT/9070 GRE] + 148c 2435 Reaper Radeon RX 9070 XT 16GB GDDR6 (RX9070XT 16G-A) + 1da2 e490 Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT] + 7551 Navi 48 [Radeon AI PRO R9700] + 7590 Navi 44 [Radeon RX 9060 XT] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4505,6 +4540,7 @@ ab28 Navi 21/23 HDMI/DP Audio Controller ab30 Navi 31 HDMI/DP Audio ab38 Navi 10 HDMI Audio + ab40 Navi 48 HDMI/DP Audio Controller ac00 Theater 506 World-Wide Analog Decoder ac01 Theater 506 World-Wide Analog Decoder ac02 TV Wonder HD 600 PCIe @@ -4948,6 +4984,7 @@ 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A) 04ed Internal Shared Memory (ISM) virtual PCI device 0611 4769 Cryptographic Adapter + 06a2 4770 Cryptographic Adapter 06a7 Spyre Accelerator 06a8 Spyre Accelerator Virtual Function 3022 QLA3022 Network Adapter @@ -5295,6 +5332,8 @@ 1514 Family 14h Processor Root Port 1515 Family 14h Processor Root Port 1516 Family 14h Processor Root Port + 151c USB4 Router 0 + 151d USB4 Router 1 1530 Family 16h Processor Function 0 1531 Family 16h Processor Function 1 1532 Family 16h Processor Function 2 @@ -5364,6 +5403,12 @@ 1583 Family 16h (Models 30h-3fh) Processor Function 3 1584 Family 16h (Models 30h-3fh) Processor Function 4 1585 Family 16h (Models 30h-3fh) Processor Function 5 + 1587 Strix Halo USB 3.1 xHCI + 1588 Strix Halo USB 3.1 xHCI + 1589 Strix Halo USB 3.1 xHCI + 158b Strix Halo USB 3.1 xHCI + 158d Strix Halo USB4 Host Router + 158e Strix Halo USB4 Host Router 1590 Amur/Nolan HT Configuration 1591 Amur/Nolan Address Maps 1592 Amur/Nolan DRAM Configuration @@ -5410,7 +5455,7 @@ 15dc Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus B ea50 ce19 mCOM10-L1900 15de Raven/Raven2/FireFlight HD Audio Controller - 15df Family 17h (Models 10h-1fh) Platform Security Processor + 15df Raven/Raven2/FireFlight/Renoir/Cezanne Platform Security Processor 1043 876b PRIME Motherboard 17aa 5124 ThinkPad E595 ea50 ce19 mCOM10-L1900 @@ -5424,7 +5469,7 @@ 1043 876b PRIME Motherboard 17aa 5124 ThinkPad E595 ea50 ce19 mCOM10-L1900 - 15e2 ACP/ACP3X/ACP6x Audio Coprocessor + 15e2 Audio Coprocessor 17aa 5124 ThinkPad E595 ea50 ce19 mCOM10-L1900 15e3 Family 17h/19h/1ah HD Audio Controller @@ -5653,9 +5698,11 @@ 43c8 400 Series Chipset SATA Controller 43d5 400 Series Chipset USB 3.1 xHCI Compliant Host Controller 43e9 500 Series Chipset Switch Upstream Port + 43ea 500 Series Chipset Switch Downstream Port 43eb 500 Series Chipset SATA Controller # or ASM106X Serial ATA Controller 1b21 1062 ASM1062 Serial ATA Controller + 43ec A520 Series Chipset USB 3.1 XHCI Controller 43ee 500 Series Chipset USB 3.1 XHCI Controller # maybe 1b21 1142 ASM1042A USB 3.0 Host Controller @@ -5663,6 +5710,7 @@ 43f5 600 Series Chipset PCIe Switch Downstream Port 43f6 600 Series Chipset SATA Controller 43f7 600 Series Chipset USB 3.2 Controller + 43fc 800 Series Chipset USB 3.x XHCI Controller 43fd 800 Series Chipset USB 3.x XHCI Controller 57a3 Matisse PCIe GPP Bridge 57a4 Matisse PCIe GPP Bridge @@ -5998,6 +6046,7 @@ 1028 1f24 PERC S300 Controller # NV-RAM Adapter used in Dell DR appliances 0073 NV-RAM Adapter + 0c46 PERC S160 RAID controller 1028 PCIe Bridge riser 2600 ENT NVMe RT1 1028 215e ENT NVMe RT1 RI 3.84TB @@ -7225,6 +7274,7 @@ 8004 DTL-H2500 [Playstation development board] 8009 CXD1947Q i.LINK Controller 800c DTL-H800 [PS1 sound development board] + 800d DVBK-2000(E) DV Still Image Capture Board 8039 CXD3222 i.LINK Controller 8047 PS2 TOOL MRP 8056 Rockwell HCF 56K modem @@ -7796,6 +7846,7 @@ 103c 1939 QMH2672 16Gb Dual Port Fibre Channel Adapter 103c 8002 3830C 16G Fibre Channel Host Bus Adapter 1077 0241 QLE2670 16Gb Single Port Fibre Channel Adapter + 1077 0249 QLE2672 16Gb Dual Port Fibre Channel Adapter 2071 ISP2714-based 16/32Gb Fibre Channel to PCIe Adapter 1077 0283 QLE2764 Quad Port 32Gb Fibre Channel to PCIe Adapter 1077 029e QLE2694 Quad Port 16Gb Fibre Channel to PCIe Adapter @@ -7864,6 +7915,8 @@ 1077 0167 QME2572 Dual Port FC8 HBA Mezzanine 1590 00fc StoreFabric 84Q 8Gb Quad Port Fibre Channel Host Bus Adapter 2971 ISP2684 + 2981 32G SFP28 EP2744 Apatter + 1bd4 00b0 32G SFP28 EP2744 Apatter 3022 ISP4022-based Ethernet NIC 3032 ISP4032-based Ethernet IPv6 NIC 4010 ISP4010-based iSCSI TOE HBA @@ -9404,13 +9457,16 @@ 8664 PEX 8664 64-lane, 16-Port PCI Express Gen 2 (5.0 GT/s) Switch 8680 PEX 8680 80-lane, 20-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch 8696 PEX 8696 96-lane, 24-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch + 8714 PEX 8714 12-Lane, 5-Port PCI Express Gen 3 (8 GT/s) Switch 8717 PEX 8717 16-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch with DMA 8718 PEX 8718 16-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch + 8723 PEX 8723 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch 8724 PEX 8724 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch, 19 x 19mm FCBGA 4c52 9234 LRNV9324 2-port Built-in 8643 NVMe Exchange Adapter 4c52 9524 LRNV9524 2-port M.2 NVMe SSD Exchange Adapter 8725 PEX 8725 24-Lane, 10-Port PCI Express Gen 3 (8.0 GT/s) Multi-Root Switch with DMA 8732 PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch + 8733 PEX 8733 32-Lane, 19-Port PCI Express Gen 3 (8 GT/s) Switch 8734 PEX 8734 32-lane, 8-Port PCI Express Gen 3 (8.0GT/s) Switch 8747 PEX 8747 48-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch 4c52 9347 LRNV9347L 2-port Built-in 8643 NVMe Switching Adapter @@ -9418,6 +9474,9 @@ 8748 PEX 8748 48-Lane, 12-Port PCI Express Gen 3 (8 GT/s) Switch, 27 x 27mm FCBGA 8749 PEX 8749 48-Lane, 18-Port PCI Express Gen 3 (8.0 GT/s) Multi-Root Switch with DMA 4c52 9349 LRNV9349 8-port SFF-8643 NVMe SSD Exchange Adapter + 8764 PEX 8764 64-Lane, 16-Port PCI Express Gen 3 (8 GT/s) Switch + 8780 PEX 8780 80-Lane, 20-Port PCI Express Gen 3 (8 GT/s) Switch + 8796 PEX8796 96-Lane, 24-Port PCIe Gen 3 (8.0 GT/s) Switch 87a0 PEX PCI Express Switch NT0 Port Link Interface 87a1 PEX PCI Express Switch NT1 Port Link Interface 87b0 PEX PCI Express Switch NT0 Port Virtual Interface @@ -9576,11 +9635,15 @@ 1517 000f ECDR-GC314-PMC Receiver 1885 0700 Tsunami FPGA PMC with Altera Stratix S40 1885 0701 Tsunami FPGA PMC with Altera Stratix S30 + 9712 PEX9712 12-Lane, 5-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch 9733 PEX 9733 33-lane, 9-port PCI Express Gen 3 (8.0 GT/s) Switch 1d49 0001 ThinkSystem 1610-4P NVMe Switch Adapter 1d49 0002 ThinkSystem 810-4P NVMe Switch Adapter 9749 PEX 9749 49-lane, 13-port PCI Express Gen 3 (8.0 GT/s) Switch 1d49 0004 ThinkSystem 1610-8P NVMe Switch Adapter + 9765 PEX9765 65-Lane, 17-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch + 9781 PEX9781 81-Lane, 21-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch + 9797 PEX9781 97-Lane, 25-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch a100 Blackmagic Design DeckLink bb04 B&B 3PCIOSD1A Isolated PCI Serial c001 CronyxOmega-PCI (8-port RS232) @@ -11982,6 +12045,8 @@ 0fa0 GK11x [GK11x_FPGA] 0fa5 GK11x 0fa7 GK11x [Tegra on x86 (PEATRANS)] + 0fae Tegra X1 PCIe x4 Root Complex + 0faf Tegra X1 PCIe x1 Root Complex 0fb0 GM200 High Definition Audio 0fb8 GP108 High Definition Audio Controller 0fb9 GP107GL High Definition Audio Controller @@ -12178,6 +12243,8 @@ 10c3 GT218 [GeForce 8400 GS Rev. 3] 10c5 GT218 [GeForce 405] 10d8 GT218 [NVS 300] + 10e5 Parker PCIe x4 Root Complex + 10e6 Parker PCIe x1 Root Complex 10ef GP102 HDMI Audio Controller 10f0 GP104 High Definition Audio Controller 10f1 GP106 High Definition Audio Controller @@ -12860,7 +12927,7 @@ 1aed TU116 USB Type-C UCSI Controller 1aef GA102 High Definition Audio Controller 1af1 GA100 [A100 NVSwitch] - 1b00 GP102 [TITAN X] + 1b00 GP102 [TITAN X Pascal] 1b01 GP102 [GeForce GTX 1080 Ti 10GB] 1b02 GP102 [TITAN Xp] 1b04 GP102 @@ -13184,11 +13251,16 @@ 228e GA106 High Definition Audio Controller 2291 GA107 High Definition Audio Controller 2296 Tegra PCIe Endpoint Virtual Network + 229a Orin PCIe x8 Root Complex + 229c Orin PCIe x4/x8 Endpoint/Root Complex + 229e Orin PCIe x1 Root Complex 22a3 GH100 [H100 NVSwitch] 22ba AD102 High Definition Audio Controller 22bc AD104 High Definition Audio Controller 22bd AD106M High Definition Audio Controller 22be AD107 High Definition Audio Controller + 22d8 THOR Processor PCI Express Root Port + 22e6 THOR Processor PCI Express x16 Controller 2302 GH100 230e GH100 [H20 NVL16] 2313 GH100 [H100 CNX] @@ -13376,31 +13448,53 @@ 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] 2900 GB100 [Reserved Dev ID A] 2901 GB100 [B200] - 2920 GB100 [TS4] + 2920 GB100 [TS4 / B100] + 2924 GB100 + 2925 GB100 + 293d GB100 2940 GB100 [Reserved Dev ID B] 2941 GB100 [HGX GB200] + 297e GB100 2980 GB102 [Reserved Dev ID A] 29bc GB102 [B100] 29c0 GB102 [Reserved Dev ID B] + 29f1 GB102 + 2b00 TA1090SA [THOR] 2b85 GB202 [GeForce RTX 5090] 2b87 GB202 [GeForce RTX 5090 D] + 2bb1 GB202GL [RTX PRO 6000 Blackwell Workstation Edition] + 2bb3 GB202GL [RTX PRO 5000 Blackwell] + 2bb4 GB202GL [RTX PRO 6000 Blackwell Max-Q Workstation Edition] + 2bb5 GB202GL [RTX PRO 6000 Blackwell Server Edition] 2c02 GB203 [GeForce RTX 5080] 2c05 GB203 [GeForce RTX 5070 Ti] 2c18 GB203M / GN22 [GeForce RTX 5090 Max-Q / Mobile] 2c19 GB203M / GN22 [GeForce RTX 5080 Max-Q / Mobile] 2c2c GB6-256(N22W-ES-A1) + 2c31 GB203GL [RTX PRO 4500 Blackwell] + 2c34 GB203GL [RTX PRO 4000 Blackwell] + 2c38 GB203GLM [RTX PRO 5000 Blackwell Generation Laptop GPU] + 2c39 GB203GLM [RTX PRO 4000 Blackwell Generation Laptop GPU] 2c58 GB203M / GN22-X11 [GeForce RTX 5090 Max-Q / Mobile] 2c59 GB203M / GN22-X9 [GeForce RTX 5080 Max-Q / Mobile] - 2d18 AD108M [GeForce RTX 5070 Max-Q / Mobile] - 2d19 AD108M [GeForce RTX 5060 Max-Q / Mobile] + 2d04 GB206 [GeForce RTX 5060 Ti] + 2d05 GB206 [GeForce RTX 5060] + 2d18 GB206M [GeForce RTX 5070 Max-Q / Mobile] + 2d19 GB206M [GeForce RTX 5060 Max-Q / Mobile] 2d2c GB6-128 (N22Y-ES-A1) - 2d58 AD108M [GeForce RTX 5070 Max-Q / Mobile] - 2d59 AD108M [GeForce RTX 5060 Max-Q / Mobile] - 2d98 AD108M [GeForce RTX 5050 Max-Q / Mobile] - 2dd8 AD108M [GeForce RTX 5050 Max-Q / Mobile] - 2f04 GN22 [GeForce RTX 5070] - 2f18 AD108M [GeForce RTX 5070 Ti Max-Q / Mobile] - 2f58 AD108M [GeForce RTX 5070 Ti Max-Q / Mobile] + 2d39 GB206GLM [RTX PRO 2000 Blackwell Generation Laptop GPU] + 2d58 GB206M [GeForce RTX 5070 Max-Q / Mobile] + 2d59 GB206M [GeForce RTX 5060 Max-Q / Mobile] + 2d83 GB207 [GeForce RTX 5050] + 2d98 GB207M [GeForce RTX 5050 Max-Q / Mobile] + 2db8 GB207GLM [RTX PRO 1000 Blackwell Generation Laptop GPU] + 2db9 GB207GLM [RTX PRO 500 Blackwell Generation Laptop GPU] + 2dd8 GB207M [GeForce RTX 5050 Max-Q / Mobile] + 2e2a GB20B + 2f04 GB205 [GeForce RTX 5070] + 2f18 GB205M [GeForce RTX 5070 Ti Mobile] + 2f38 GB205GLM [RTX PRO 3000 Blackwell Generation Laptop GPU] + 2f58 GB205M [GeForce RTX 5070 Ti Mobile] 31c0 GB110 3340 GB120 10df Emulex Corporation @@ -13554,6 +13648,7 @@ 0860 CA91C860 [QSpan] 0862 CA91C862A [QSpan-II] 8111 Tsi381 PCIe to PCI Bridge + 8113 89HPEB383 PCIe-to-PCI Bridge 8260 CA91L8200B [Dual PCI PowerSpan II] 8261 CA91L8260B [Single PCI PowerSpan II] a108 Tsi109 Host Bridge for Dual PowerPC @@ -13623,6 +13718,7 @@ 5227 RTS5227 PCI Express Card Reader 17aa 220e ThinkPad T440p 17aa 2214 ThinkPad X240 + 5228 RTS5288 PCIe SD UHS-I Card Reader controller 5229 RTS5229 PCI Express Card Reader 1025 0813 Aspire R7-571 103c 194e ProBook 455 G1 Notebook @@ -13646,7 +13742,8 @@ 1028 0c06 Precision 3580 17aa 224f ThinkPad X1 Carbon 5th Gen 5260 RTS5260 PCI Express Card Reader - 5261 RTS5261 PCI Express Card Reader + 5261 RTS5261 PCIe SD Express Card Reader controller + 5264 RTS5264 PCIe SD UHS-II & SD Express Card Reader controller 5286 RTS5286 PCI Express Card Reader 5287 RTL8411B PCI Express Card Reader 1025 1094 Acer Aspire E5-575G @@ -13658,6 +13755,7 @@ 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 5770 RTS5770DL NVMe SSD Controller (DRAM-less) + 5771 RTS5771 NVMe SSD Controller (DRAM-less) 5772 RTS5772DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) @@ -13856,6 +13954,7 @@ 103c 831b Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported) 17aa 5124 ThinkPad E595 17aa b023 ThinkPad E595 + b851 RTL8851BE PCIe 802.11ax Wireless Network Controller b852 RTL8852BE PCIe 802.11ax Wireless Network Controller b85b RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R] c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter @@ -14078,6 +14177,8 @@ 000b EMU20k2 [Sound Blaster X-Fi Titanium Series] 1102 0041 SB0880 [SoundBlaster X-Fi Titanium PCI-e] 1102 0062 SB1270 [SoundBlaster X-Fi Titanium HD] + 0010 CA0132 Sound Core3D [Sound Blaster AE-7] + 1102 0081 Sound Blaster AE-7 0012 CA0132 Sound Core3D [Sound Blaster Recon3D / Z-Series / Sound BlasterX AE-5 Plus] 1102 0010 SB1570 SB Audigy Fx 1102 0191 CA0132 Sound Core3D - CA0113 [ Sound BlasterX AE-5 Plus] @@ -14252,7 +14353,7 @@ 0585 VT82C585VP [Apollo VP1/VPX] 0586 VT82C586/A/B PCI-to-ISA [Apollo VP] 1106 0000 MVP3 ISA Bridge - 0591 VT8237A SATA 2-Port Controller + 0591 VT8237A Integrated SATA RAID Controller 0595 VT82C595 [Apollo VP2] 0596 VT82C596 ISA [Mobile South] 1106 0000 VT82C596/A/B PCI to ISA Bridge @@ -14610,6 +14711,7 @@ 3372 VT8237S PCI to ISA Bridge 337a VT8237A PCI to PCI Bridge 337b VT8237A Host Bridge + 3401 VT6325 Firewire Controller 3402 VT8261 PCI to ISA Bridge 3403 VT6315 Series Firewire Controller 1043 8374 M5A88-V EVO @@ -14622,7 +14724,11 @@ 3456 VX11 Standard Host Bridge 345b VX11 Miscellaneous Bus 3483 VL805/806 xHCI USB 3.0 Controller + 365a VT3365 Card Reader Host Controller + 365b VT3365 SDIO Host Controller 3a01 VX11 Graphics [Chrome 645/640] + 401a VT6325 Card Reader Host Controller + 401b VT6325 SDIO PCI-E Host Controller 4149 VIA VT6420 (ATA133) Controller 4204 K8M800 Host Bridge 4208 PT890 Host Bridge @@ -14657,17 +14763,18 @@ 5324 CX700M2/VX700/VX800/820-Series Serial ATA & EIDE-Controller 5327 P4M890 I/O APIC Interrupt Controller 5336 K8M890CE I/O APIC Interrupt Controller + 5337 VT8237A Integrated SATA Controller 5340 PT900 I/O APIC Interrupt Controller 5351 VT3351 I/O APIC Interrupt Controller 5353 VX800/VX820 APIC and Central Traffic Control 5364 CN896/VN896/P4M900 I/O APIC Interrupt Controller - 5372 VT8237/8251 Serial ATA Controller + 5372 VT8237S SATA Controller 5409 VX855/VX875 APIC and Central Traffic Control 5410 VX900 Series APIC and Central Traffic Control 5419 VN1000 I/O APIC Interrupt Controller 6100 VT85C100A [Rhine II] 6122 VN1000 Graphics [Chrome 520 IGP] - 6287 SATA RAID Controller + 6287 VT8251 AHCI SATA Controller 6290 K8M890CE Host Bridge 6327 P4M890 Security Device 6353 VX800/VX820 Scratch Registers @@ -14699,6 +14806,7 @@ 7351 VT3351 Host Bridge 7353 VX800/VX820 North-South Module Interface Control 7364 CN896/VN896/P4M900 Host Bridge + 7372 VT8237S SATA RAID Controller 7409 VX855/VX875 North-South Module Interface Control 7410 VX900 Series North-South Module Interface Control 19da a179 ZBOX nano VD01 @@ -14730,8 +14838,10 @@ 9000 VT8261 IDE Controller [StorX IDE Controller - 9000] 9001 VX900 Series Serial-ATA Controller 9040 VT8261 SATA Controller [StorX RAID Controller - 9040] + 9041 VX900/VX11 SATA Controller [StorX RAID Controller - 9041] 9082 Standard AHCI 1.0 SATA Controller - 9140 HDMI Audio Device + 9140 VX11 Graphics [Chrome 645/640] HDMI Audio Device + 9170 VX900 Graphics [Chrome9 HD] HDMI Audio Device 9201 USB3.0 Controller 9380 Ncore Coprocessor for Centaur CNS 9530 VX800/820/900/VT8261 Series Secure Digital Memory Card Controller @@ -15943,6 +16053,7 @@ 0115 XG4 NVMe SSD Controller 0116 XG5 NVMe SSD Controller 1179 0001 XG5 NVMe SSD Controller + 0119 XD5 NVMe SSD Controller 011a XG6 NVMe SSD Controller 0404 DVD Decoder card 0406 Tecra Video Capture device @@ -16144,7 +16255,7 @@ 103c 30cc Pavilion dv6700 103c 30cf Pavilion dv9668eg Laptop 17aa 20c5 ThinkPad R61 - 17aa 20c7 ThinkPad R61 + 17aa 20c7 ThinkPad R61/T400 0841 R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394 0843 R5C843 MMC Host Controller 1025 0121 Aspire 5920G @@ -16592,6 +16703,8 @@ 11bc Network Peripherals Inc 0001 NP-PCI 11bd Pinnacle Systems Inc. + 0015 FireWire Controller + 0023 Studio 700 002e PCTV 40i 0040 Royal TS Function 1 11bd 0044 PCTV 2000i Dual DVB-T Pro PCI Tuner 1 @@ -16893,6 +17006,10 @@ 11f7 Scientific Atlanta # née PMC-Sierra Inc. 11f8 Microchip Technology + 4036 PM40036 Switchtec PFX 36xG4 Fanout PCIe Switch + 4052 PM40052 Switchtec PFX 52xG4 Fanout PCIe Switch + 4084 PM40084 Switchtec PFX 84xG4 Fanout PCIe Switch + 4128 PM41028 Switchtec PSX 28xG4 Programmable PCIe Switch 5000 PM50100 Switchtec PFX 100xG5 Fanout PCIe Switch 5028 PM50028 Switchtec PFX 28xG5 Fanout PCIe Switch 5036 PM50036 Switchtec PFX 36xG5 Fanout PCIe Switch @@ -17220,6 +17337,8 @@ 1233 Bus-Tech, Inc. # nee Risq Modular Systems, Inc. 1235 SMART Modular Technologies + c241 CXA-4F1W + 1028 2382 4-DIMM Add In Card 1236 Sigma Designs Corporation 0000 RealMagic64/GX 6401 REALmagic 64/GX (SD 6425) @@ -17476,6 +17595,7 @@ 2261 SM2261XT x2 NVMe SSD Controller (DRAM-less) 2262 SM2262/SM2262EN SSD Controller 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers + 2268 SM2268XT (DRAM-less) NVMe SSD Controller 2269 SM2269XT (DRAM-less) NVMe SSD Controller 8366 SM8366 NVMe SSD Controller [MonTitan] 1270 Olympus Optical Co., Ltd. @@ -18454,6 +18574,7 @@ 5416 2550 NVMe SSD (DRAM-less) 5425 2500 NVMe SSD (DRAM-less) 5427 2650 NVMe SSD (DRAM-less) + 5428 4600 NVMe SSD 5429 2600 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -18528,6 +18649,8 @@ 0b22 UP-200 Powered 2 port RS-232 card 0b23 UP-200 Powered 2 port RS-232 card 0ba1 UC-101 1 + 1 port RS-232 card + 0ba2 UC-101 1 + 1 port RS-232 card + 0ba3 UC-101 1 + 1 port RS-232 card 0bc1 UC-203 1 + 1 port RS-232 + LPT card 0bc2 UC-203 1 + 1 port RS-232 + LPT card 0be1 UC-146 LPT card @@ -18539,6 +18662,8 @@ 0c22 UP-880 Powered 2 port RS-232 card 0c23 UP-880 Powered 2 port RS-232 card 0c41 UC-368 4 port RS-422/485 Opto Isolated card + 0c42 UC-368 4 port RS-422/485 Opto Isolated card + 0c43 UC-368 4 port RS-422/485 Opto Isolated card 0ca1 UC-253 2 port RS-232 card 0d21 UC-260 4 port RS-232 card 0d41 UC-836 4 port RS-232 card @@ -18578,6 +18703,10 @@ 401d PX-475 1 port RS-232 + LPT card (Serial port) 401e PX-803 Powered 1 + 1 port RS-232 card 401f PX-475 1 port RS-232 + LPT card (LPT port) + 4020 XC-157 LPT ExpressCard + 4021 XC-475 1 port RS-232 + LPT ExpressCard (Serial port) + 4022 XC-475 1 port RS-232 + LPT ExpressCard (LPT port) + 4026 XC-235 1 port RS-232 ExpressCard 4027 IX-100 1 port RS-232 card 4028 IX-200 2 port RS-232 card 4029 IX-400 4 port RS-232 card @@ -20294,6 +20423,8 @@ a80d NVMe SSD Controller PM9C1a (DRAM-less) a80e NVMe SSD Controller PM9D3a a80f BM9C1 QLC NVME SSD (DRAM-less) + a810 NVMe SSD 9100 PRO [PM9E1] + a811 BM9H1 NVME SSD (DRAM-less) a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -20469,6 +20600,7 @@ 1458 Gigabyte Technology Co., Ltd 1002 Aourus Radeon RX6900XT Xtreme Waterforce WB 16G 22e8 Ellesmere [Radeon RX 480] + 2425 Radeon RX 9070 GAMING OC 16G 3483 USB 3.0 Controller (VIA VL80x-based xHCI Controller) 1459 DOOIN Electronics 145a Escalate Networks Inc @@ -20657,6 +20789,7 @@ 14c3 MEDIATEK Corp. 0608 MT7921K (RZ608) Wi-Fi 6E 80MHz 0616 MT7922 802.11ax PCI Express Wireless Network Adapter + 0717 MT7925 (RZ717) Wi-Fi 7 160MHz 4d75 T700 5G Modem [5G Solution 5000] 7603 MT7603E 802.11bgn PCI Express Wireless Network Adapter 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter @@ -22155,6 +22288,7 @@ 9300 Universal Exhaust Gas Oxygen Sensor Simulator 9310 Digital Programmable Resistor 9320 Arria 10 FPGA Card + 9330 Cyclone V FPGA Card 9350 Analog Input Card 1543 SILICON Laboratories 3052 Intel 537 [Winmodem] @@ -22417,6 +22551,15 @@ 0290 SagittaZ 0292 Arcus3 Flash Recovery 0293 Arcus3 RMA + 0294 Ophy 2.1 (SagittaZ) +# Sagitta + 0296 OPHY2.6 +# Sagitta + 0298 OPHY3.0 +# Sagitta + 029a OPHY3.1 +# Sagitta + 029c OPHY3.5 02a0 Quantum-6 in Flash Recovery Mode 02a1 Quantum-6 RMA 02a2 Spectrum-7 in Flash Recovery Mode @@ -22503,6 +22646,7 @@ # NIC-ETH540F-3S-2P OCP3.0 2x10G Card 193d 1084 NIC-ETH540F-3S-2P 1e81 0c10 25GbE dual-port SFP28, PCIe3.0 x8 [3SC10] + 1f3f 0c10 25GbE dual-port SFP28, PCIe3.0 x8, 3SC10 1016 MT27710 Family [ConnectX-4 Lx Virtual Function] 1017 MT27800 Family [ConnectX-5] 117c 00b1 FastFrame N311 Single-port 10Gb Ethernet Adapter @@ -22529,6 +22673,7 @@ 193d 1035 NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter 1bd4 00ac O252MCX6Lx 1bd4 00ae S252MCX6Lx + 1f3f 0c11 25GbE dual-port SFP28, PCIe4.0 x8, 3SC1125GbE dual-port SFP28, PCIe4.0 x8, 3SC11 1ff9 00ad ENFM6251-SP2 1ff9 00af ENPM6251-SP2 1020 MT28860 @@ -22688,7 +22833,7 @@ 5014 WD PC SN540 / Green SN350 NVMe SSD 1 TB (DRAM-less) 5015 PC SN740 NVMe SSD (DRAM-less) 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) - 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD + 5017 WD SN560/SN740/SN770/SN5000 NVMe SSD 5019 WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD 501a SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less) 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) @@ -22699,12 +22844,16 @@ 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5034 WD PC SN5000S M.2 2230 NVMe SSD (DRAM-less) + 5035 WD PC SN5000S M.2 2242 NVMe SSD (DRAM-less) 5036 WD PC SN5000S M.2 2280 NVMe SSD (DRAM-less) 5041 WD Blue SN580 NVMe SSD (DRAM-less) 5042 WD Black SN770M NVMe SSD (DRAM-less) + 5044 WD PC SN7100S NVMe SSD (DRAM-less) 5045 WD_BLACK SN7100 NVMe SSD (DRAM-less) 5046 SanDisk Extreme NVMe SSD (DRAM-less) 5049 SN8000S NVMe SSD + 504a WD Blue SN5000 NVMe SSD (DRAM-less) + 5050 WD PC SN8050S / WD_BLACK SN8100 NVMe SSD 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -23843,6 +23992,8 @@ 010c SM8350 PCIe Root Complex [Snapdragon 888] 010e SC8280XP PCI Express Root Port 0110 SM8475 PCIe Root Complex [Snapdragon 8+ Gen 1] + 0111 SC8380XP PCIe Root Complex [Snapdragon X / X Plus / X Elite] + 0113 SM8550/SM8650 PCIe Root Complex [Snapdragon 8 Gen 2/Gen 3] 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] @@ -23851,6 +24002,7 @@ 0400 Datacenter Technologies QDF2432 PCI Express Root Port 0401 Datacenter Technologies QDF2400 PCI Express Root Port 1000 QCS405 PCIe Root Complex + 1003 IPQ6018 PCIe Root Complex 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter @@ -24714,6 +24866,14 @@ 0441 T4240 without security 0446 T4160 with security 0447 T4160 without security + 0820 T1040 with security + 0821 T1040 without security + 0824 T1042 with security + 0825 T1042 without security + 0828 T1020 with security + 0829 T1020 without security + 082c T1022 with security + 082d T1022 without security 0830 T2080 with security 0831 T2080 without security 0838 T2081 with security @@ -24851,15 +25011,18 @@ 5016 E16 PCIe4 NVMe Controller 5018 E18 PCIe4 NVMe Controller 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) + 5020 PS5020-E20 (X1) PCIe4 NVMe Controller 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) 5026 PS5026-E26 PCIe5 NVMe Controller 5027 PS5027-E27T PCIe4 NVMe Controller (DRAM-less) 5031 PS5031-E31T PCIe5 NVMe Controller + 5302 PS5302-X2 PCIe5 NVMe Controller 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile 198a Nallatech Ltd. 1993 Innominate Security Technologies AG +1998 Toyou Feiji Electronics Co., Ltd. 1999 A-Logics a900 AM-7209 Video Processor 199a Pulse-LINK, Inc. @@ -25015,6 +25178,8 @@ a126 HiSilicon SDI NVMe Storage Controller a127 HiSilicon SDI Accelerator a12a HiSilicon Add-on PCI-PCI Bridge + a12d HiSilicon Embedded PMU + a12e HiSilicon Embedded PCIe PTT a220 HNS GE Network Controller a221 HNS GE/10GE/25GE Network Controller 19e5 0454 TM280 @@ -25102,6 +25267,12 @@ 1a3b AzureWave 1112 AR9285 Wireless Network Adapter (PCI-Express) 1a3e Micro-Research Finland Oy + 132c MTCA Event Receiver 300 + 152c CompactPCI Event Receiver 300 + 172c PCI Express Event Receiver 300 + 192c CompactPCI Event Receiver TG 300 + 232c MTCA Event Master 300 + 252c CompactPCI Event Generator 300 1a41 Tilera Corp. 0001 TILE64 processor 0002 TILEPro processor @@ -25323,19 +25494,83 @@ 1005 Virtio RNG 1009 Virtio filesystem 1041 Virtio 1.0 network device + 1af4 1100 QEMU 1042 Virtio 1.0 block device + 1af4 1100 QEMU 1043 Virtio 1.0 console + 1af4 1100 QEMU 1044 Virtio 1.0 RNG - 1045 Virtio 1.0 memory balloon + 1af4 1100 QEMU + 1045 Virtio 1.0 balloon + 1af4 1100 QEMU + 1046 Virtio 1.0 ioMemory + 1af4 1100 QEMU + 1047 Virtio 1.0 remote processor messaging + 1af4 1100 QEMU 1048 Virtio 1.0 SCSI - 1049 Virtio 1.0 filesystem + 1af4 1100 QEMU + 1049 Virtio 9P transport + 1af4 1100 QEMU + 104a Virtio 1.0 WLAN MAC + 1af4 1100 QEMU + 104b Virtio 1.0 remoteproc serial link + 1af4 1100 QEMU + 104d Virtio 1.0 memory balloon + 1af4 1100 QEMU 1050 Virtio 1.0 GPU + 1af4 1100 QEMU + 1051 Virtio 1.0 clock/timer + 1af4 1100 QEMU 1052 Virtio 1.0 input + 1af4 1100 QEMU 1053 Virtio 1.0 socket - 1058 virtio-mem - 105a Virtio file system - 1110 Inter-VM shared memory - 1af4 1100 QEMU Virtual Machine + 1af4 1100 QEMU + 1054 Virtio 1.0 crypto + 1af4 1100 QEMU + 1055 Virtio 1.0 signal distribution device + 1af4 1100 QEMU + 1056 Virtio 1.0 pstore device + 1af4 1100 QEMU + 1057 Virtio 1.0 IOMMU + 1af4 1100 QEMU + 1058 Virtio 1.0 mem + 1af4 1100 QEMU + 1059 Virtio 1.0 sound + 1af4 1100 QEMU + 105a Virtio 1.0 file system + 1af4 1100 QEMU + 105b Virtio 1.0 pmem + 1af4 1100 QEMU + 105c Virtio 1.0 rpmb + 1af4 1100 QEMU + 105d Virtio 1.0 mac80211-hwsim + 1af4 1100 QEMU + 105e Virtio 1.0 video encoder + 1af4 1100 QEMU + 105f Virtio 1.0 video decoder + 1af4 1100 QEMU + 1060 Virtio 1.0 SCMI + 1af4 1100 QEMU + 1061 Virtio 1.0 nitro secure module + 1af4 1100 QEMU + 1062 Virtio 1.0 I2C adapter + 1af4 1100 QEMU + 1063 Virtio 1.0 watchdog + 1af4 1100 QEMU + 1064 Virtio 1.0 can + 1af4 1100 QEMU + 1065 Virtio 1.0 dmabuf + 1af4 1100 QEMU + 1066 Virtio 1.0 parameter server + 1af4 1100 QEMU + 1067 Virtio 1.0 audio policy + 1af4 1100 QEMU + 1068 Virtio 1.0 Bluetooth + 1af4 1100 QEMU + 1069 Virtio 1.0 GPIO + 1af4 1100 QEMU + 1110 QEMU Inter-VM shared memory device + 1af4 1100 QEMU 1af5 Netezza Corp. 1afa J & W Electronics Co., Ltd. 1b00 Montage Technology Co., Ltd. @@ -25427,6 +25662,7 @@ 000b QEMU PCIe Expander bridge 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller + 000e QEMU PCIe-to-PCI bridge 0010 QEMU NVM Express Controller 0011 QEMU PVPanic device 0013 QEMU UFS Host Controller @@ -25475,16 +25711,20 @@ 1028 2196 ROR-N1 1028 2286 BOSS-N1 DC-MHS 1028 2287 BOSS-N1 Modular DC-MHS + 1028 23b0 eBOSS-N1 DC-MHS 1b4b 2241 Santa Cruz NVMe Host Adapter 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit + 207d 0800 TrustRAID B310n + 207d 0801 TrustRAID B260s 4c52 9541 LRNV9541 2-port M.2 NVMe Raid Adapter 2b42 88W8997 2.4/5 GHz Dual-Band 2x2 Wi-Fi® 5 (802.11ac) + Bluetooth® 5.3 Solution 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 2b44 NXP 88W9098 Wi-Fi 6 (ax) MAC #2 2b45 NXP 88W9098 Bluetooth 5.3 9120 88SE9120 SATA 6Gb/s Controller + 9122 88SE912x SATA 6Gb/s Controller [AHCI mode] 9123 88SE9123 PCIe SATA 6.0 Gb/s controller dc93 600e DC-6xxe series SATA 6G controller 9125 88SE9125 PCIe SATA 6.0 Gb/s controller @@ -25493,14 +25733,19 @@ 9130 88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo 1043 8438 P8P67 Deluxe Motherboard 9170 88SE9170 PCIe 2.0 x1 2-port SATA 6 Gb/s Controller + 9171 88SE9171 PCIe 2.0 x1 1-port SATA 6 Gb/s Controller 9172 88SE9172 SATA 6Gb/s Controller 9178 88SE9170 PCIe SATA 6Gb/s Controller - 917a 88SE9172 SATA III 6Gb/s RAID Controller + 917a 88SE9172 SATA III 6Gb/s Controller [IDE mode] 9182 88SE9182 PCIe 2.0 x2 2-port SATA 6 Gb/s Controller 9183 88SS9183 PCIe SSD Controller + 9186 88SE9186 6Gb/s SATA 6Gb/s Controller [AHCI mode] + 918a 88SE9182 PCIe SATA 6 Gb/s controller [IDE mode] 9192 88SE9172 SATA III 6Gb/s RAID Controller 91a0 88SE912x SATA 6Gb/s Controller [IDE mode] + 91a3 88SE9128 PCIe SATA 6 Gb/s controller [IDE mode] 91a4 88SE912x IDE Controller + 91b0 88SE9172 SATA 6 Gb/s controller [IDE mode] 9215 88SE9215 PCIe 2.0 x1 4-port SATA 6 Gb/s Controller 9220 88SE9220 PCIe 2.0 x2 2-port SATA 6 Gb/s RAID Controller 9230 88SE9230 PCIe 2.0 x2 4-port SATA 6 Gb/s RAID Controller @@ -25560,6 +25805,7 @@ 1009 FL1009 USB 3.0 Host Controller 1100 FL1100 USB 3.0 Host Controller 16b8 6e31 Allegro Pro USB 3.0 PCIe + 1400 USB 3.0 Host Controller 1b74 OpenVox Communication Co. Ltd. 0115 D115P/D115E Single-port E1/T1 card d130 D130P/D130E Single-port E1/T1 card (3rd GEN) @@ -25721,6 +25967,9 @@ 5021 FireCuda 520 SSD # 1TB 5026 FireCuda 540 SSD + 5027 LaCie Rugged SSD Pro5 + 5100 PCIe Gen3 SSD + 5101 PCIe Gen5 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -25782,6 +26031,8 @@ 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 100f NS6500G2UXXXX,NS6600G2UXXXX NVME SSD *** 1453 LINES SKIPPED *** From nobody Wed Sep 17 19:35:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRprP1d8jz67wtN; Wed, 17 Sep 2025 19:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRprN6fQrz4DFd; Wed, 17 Sep 2025 19:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137700; 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=drPHsTUoFf/G2LHXhSS4RWuyT6f26z2jVXWJ1JHgPfc=; b=C4wrPPD+gAp+Xmj9foK58sAIq3MgxjyNDaEeptlfIEpNSxABY7ZRLOalEtvK0cDT8vHbIp pEB6+hsPeEaJg2I97FsNMyQuief+4hzWWpVW/RuThnNnCSJ3DlLYs+TfOadUX58Ep9epac iu0f4LFzSRnT8SQB+4x8QJFUqqExKzfr1fmxky/+Zl7sVA1NPae/XszfEx8fdEFsHCbBIa NKLbxzgRDNOJJeUW5P/jjkyrvD5cO6/CzgKYs7jo6Lxc2vBP13StS/+hFMKiQhMNmzymWZ 7uVjKscJiYEbdzeYmJSlec4YiPk19wCG/loNMiTL/khAvLr2UjM1sdu33V5XoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137700; 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=drPHsTUoFf/G2LHXhSS4RWuyT6f26z2jVXWJ1JHgPfc=; b=XF2bET3m3SK2bBe4CBIUGiDVeHqxQ0QZT95P0HQcclNdGkbaq/SUPDf70GFEtiQBOnY9x9 OLTnU5uzpSR62DDQzt5O9rDap4vL068IIFW/misvPp0OP4UnGD5wfHKOYkcZxCxKG6JnLU w/ZVbR9WkOrodnUirWUtIqamJGAAyl2vj8fKcM3DezH/ldCYA3Ou4W5b5BMMyCUZpsVIXc vMh+BT/qQZnUn9oAF/SNITio1iUZjNu7AWtTJphpISy2qyNl0E7KmBtnL99g4zIpnCSkvn /Ejblq8xp0gUJWtk8ouQetbHXnVn7ySRkZndG72wJ+NeqR6ttC2Bb6ADCQYxrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137700; a=rsa-sha256; cv=none; b=EgHoZOYwAZ3h3EbqP0UgmcdrJYlj9QpnTaup3HywTwwqfeSZ3H+QBwJYHXAEn/AJAH6sv6 O+/JtCrwsZ1K4MQeS/Afo2qOSq3qRxeGFVQOQgA4GYVzZ7vqA0vQK84FBGWcYe0XO3Awf7 hsu4iRgNvFwFEn6imUkGgLvfCv1yFXZs2ZgZF27/hIkDVZMYBhWvk7H5Z1JvbNCgVVN6Ms P3+1VPGeFU2txkx6mtQOV96PgEYOYqCHH/cYWrRXX6woX5Vz5X6LQhel8AIxtpKfGV1L4B f30Puzk7x48FSIYDjbbIGWDI9gBZxny++nNwiRS0Uzid1fn3YcWxh8qXRlt7Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRprN6FD1zg3w; Wed, 17 Sep 2025 19:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJZ0e2014576; Wed, 17 Sep 2025 19:35:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJZ0PZ014573; Wed, 17 Sep 2025 19:35:00 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:35:00 GMT Message-Id: <202509171935.58HJZ0PZ014573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ab41f840e701 - stable/15 - pkg(7): Add support for pkg+ prefix to bootstrap pubkey List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab41f840e701caa4557166bd466396062adc2e88 Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ab41f840e701caa4557166bd466396062adc2e88 commit ab41f840e701caa4557166bd466396062adc2e88 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-09-11 07:01:54 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:34:46 +0000 pkg(7): Add support for pkg+ prefix to bootstrap pubkey MFC After: 1 day Sponsored by: Amn Afzar Hoopad Inc Differencial Revision: https://reviews.freebsd.org/D52418 (cherry picked from commit 08b8843137b8be3f71608400907cb38bcda14965) --- usr.sbin/pkg/pkg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 7899fbaeaf09..7b0a67e69a4c 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -889,7 +889,7 @@ bootstrap_pkg(bool force, const char *fetchOpts, struct repository *repo) getenv("TMPDIR") ? getenv("TMPDIR") : _PATH_TMP, bootstrap_name); snprintf(url, MAXPATHLEN, "%s/Latest/%s.pubkeysig", - repo->url, bootstrap_name); + packagesite, bootstrap_name); if ((fd_sig = fetch_to_fd(repo, url, tmpsig, fetchOpts)) == -1) { fprintf(stderr, "Signature for pkg not " From nobody Wed Sep 17 19:35:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRprR3lPcz67wrR; Wed, 17 Sep 2025 19:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRprR1VfXz4DFk; Wed, 17 Sep 2025 19:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137703; 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=x/v6NXpWk/PA9H8R+mD5Dd1r1JQxBaAduhkWqHLbOTo=; b=P3LL/nG7p5LvTROV0SZ6CEGKGuTsHHviDt4H4YvuOXGjNvFtO7s1Ax1nT80j4tAoxy0BCI jFSfTol+wJBu8Ds7meLGNMHWcFE8KqcYo2Queya3cmV/7A/AbROJcgwi9TDBvvdo9SfZV+ O2H5RL9Oiroi1N11S5NwCgn/TpvkeoU0YIwLnqHLApzOgZe8JYKZdnnlv+1+fhpE/44OuH 5V5RyGMFjdOSt6IVREaBgowHVA/AcWF2wiIBGOIphy7FFq7mj/WcluRrTRzN4YongZaVD7 qLrhJzA6FjtOA5P1UKrfYakmKrbeOvKRuC1k9MseiaI+t8feYv4evQ8pG0exmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137703; 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=x/v6NXpWk/PA9H8R+mD5Dd1r1JQxBaAduhkWqHLbOTo=; b=G/QoDDO8J+UwW3CYh4/vCT9VHol/KI5qk2bljVjm3bNG0q0QKJ0l05xmS6setPfBIhUha2 qzXdLg72A0vQskcJgQzTVvZ23Y7lkgfuYuhMV9xjC2qnGct9Vzvm1YdeoI3yTuUHNdcrbl aFol1ClmVmb850Yo6//5/RzN21LeItYfE29AgipO74Ta7GUxB2vpZYpK7b+DYM/tTzfA7w 03I9jIy+vl7zCdSAeHnJDcFqvqBusxGWscl0jqlbCk4Tdk1/4rDaHsl1yvL6hMoiZIA3T0 EJhLu+0K7C3m0k2Rr3/Pz7ZRTXqP2tqSNU7MQUw852hrJpC0NRTmIddJz2NpTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137703; a=rsa-sha256; cv=none; b=qGQiJ+a28BolnHQ6hJ4hR9WcZYtN/4fQzm47tiWfnhYEntufpVOa9D/CE8ig4pr8Da1A3G UfvWmmoPHOz/0fZP5e0CoBXVe76Mf26O96lJtcPPXSTpYqwnnkx4f6r/P+75zGkSZTD6XK GfThSM2wc+OD2QsNGL2PZ9tFnbRv1UAJ1+E/yQDTkuSBHWYpNASeqSU3CZiEDKuNZk6mb8 658u3VVWzON7XzGS8ywYYNSM78tCq6Wub+30Ky1AKf0nB4AgdREp6890bdITls129T0o74 jR8qwe/3Z+axze59r+K64ohONEzmrZv/afVThcgSx5Z2LIwjFxj/Ydo1j6+uzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRprR1648zgQZ; Wed, 17 Sep 2025 19:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJZ3ux014649; Wed, 17 Sep 2025 19:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJZ3rv014646; Wed, 17 Sep 2025 19:35:03 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:35:03 GMT Message-Id: <202509171935.58HJZ3rv014646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3767aeec35c9 - stable/15 - usb_vendors: update to 2025-07-26 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3767aeec35c92780ac635a5b4ccdf8d7b4c661cd Auto-Submitted: auto-generated The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3767aeec35c92780ac635a5b4ccdf8d7b4c661cd commit 3767aeec35c92780ac635a5b4ccdf8d7b4c661cd Author: Baptiste Daroussin AuthorDate: 2025-09-11 07:54:17 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:34:47 +0000 usb_vendors: update to 2025-07-26 (cherry picked from commit 70afc95fc6ecec6edabf5b1e8b060bb0b29ebd55) --- share/misc/usb_vendors | 57 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/share/misc/usb_vendors b/share/misc/usb_vendors index 3e72fe4045e6..1878f503b676 100644 --- a/share/misc/usb_vendors +++ b/share/misc/usb_vendors @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2025.04.01 -# Date: 2025-04-01 20:34:02 +# Version: 2025.07.26 +# Date: 2025-07-26 20:34:01 # # Vendors, devices and interfaces. Please keep sorted. @@ -59,6 +59,8 @@ 0112 Card Reader 017c MLK 145f Trust Deskset +019c mek + 0042 mek_42 0200 TP-Link 0201 MA180 UMTS Modem 0204 Chipsbank Microelectronics Co., Ltd @@ -69,6 +71,9 @@ 0231 Sonuus Limited 02ad HUMAX Co., Ltd. 138c PVR Mass Storage +0300 Ajazz + 1010 Akp153E Desktop Controller + 1020 AKP153R Desktop Controller 0303 Mini Automation Controller 0324 OCZ Technology Inc bc06 OCZ ATV USB 2.0 Flash Drive @@ -95,7 +100,7 @@ 0015 ATAPI Enclosure 2123 SiPix StyleCam Deluxe 8004 Aox 99001 -03e9 Thesys Microelectronics +03e9 Melexis (formerly Thesys Microelectronics) 03ea Data Broadcasting Corp. 03eb Atmel Corp. 0902 4-Port Hub @@ -257,6 +262,8 @@ 0423 HS-COMBO Cardreader 042a LaserJet M1132 MFP 0441 Prime [NW280AA, G8X92AA] + 046b Dock G5 + 0483 Engage Go 10 Tablet 0504 DeskJet 885c 0505 ScanJet 2100c 0507 DVD+RW @@ -266,6 +273,7 @@ 0517 LaserJet 1000 051d Bluetooth Interface 052a LaserJet M1212nf MFP + 0583 Engage Go 10 Tablet 0601 ScanJet 6300c 0604 DeskJet 840c 0605 ScanJet 2200c @@ -275,6 +283,7 @@ 0624 Bluetooth Dongle 0641 X1200 Optical Mouse 0653 DeskJet 3700 series + 0683 Engage Go 10 Tablet 0701 ScanJet 5300c/5370c 0704 DeskJet 825c 0705 ScanJet 4400c @@ -325,6 +334,7 @@ 1102 PhotoSmart 240 series 1104 DeskJet 959c 1105 ScanJet 5470c/5490c + 110c Pocket Media Drive 1111 OfficeJet v60 1116 Jornada 568 Pocket PC 1117 LaserJet 1300n @@ -1013,6 +1023,7 @@ 3000 Optical dual-touch panel 3001 Optical Touch Screen 3008 Optical Touch Screen + 4033 HD Webcam a060 HD Webcam 0409 NEC Corp. 0011 PC98 Series Layout Keyboard Mouse @@ -1029,6 +1040,7 @@ 004e SuperScript 1400 Series 004f Wireless Keyboard with One-touch start buttons 0050 7-port hub + 0056 uPD720133 IDE bridge 0058 HighSpeed Hub 0059 HighSpeed Hub 005a HighSpeed Hub @@ -1486,6 +1498,7 @@ 4095 Live! Cam Sync HD [VF0770] 4097 Live! Cam Chat HD [VF0700/VF0790] 4099 Creative VF0800 [RealSense Camera SR300] + 40a3 Live! Cam V3 2K [VF-0900] 4100 Nomad Jukebox 2 4101 Nomad Jukebox 3 4102 NOMAD MuVo^2 @@ -1959,6 +1972,7 @@ 010d 3500-4500 series 010f 6500 series 0142 X3650 (Printer, Scanner, Copier) + 01bd S800 Series Scanner 01fa S310 series 020e RICOH Aficio SP 4410SF 4303 Xerox WorkCentre Pro 412 @@ -1982,6 +1996,7 @@ 9a10 34UC88-B 9a11 34UC88-B 9a39 27UP850 - WK.AEUDCSN - External Monitor 4K + 9a57 UltraGear Monitor 9c01 LGE Sync 043f RadiSys Corp. 0440 Eizo Nanao Corp. @@ -2007,6 +2022,7 @@ 044d Siemens Nixdorf AG 044e Alps Electric Co., Ltd 1104 Japanese Keyboard + 1218 Electric Touchpad 2002 MD-5500 Printer 2014 Bluetooth Device 3001 UGTZ4 Bluetooth @@ -2737,6 +2753,8 @@ 0180 Strait 3.0 01a4 MC 2.1 Mouse 01a6 MX BOARD 2.0S FL RGB DE Keyboard + 0201 Smart Board 1150 + 0202 Smart Terminal 1150 b090 Keyboard b091 Mouse c099 Stream Keyboard TKL @@ -2851,6 +2869,7 @@ 08dd QuickCam for Notebooks 08e0 QuickCam Express 08e1 Labtec Webcam + 08e4 C505e HD Webcam 08e5 C920 PRO HD Webcam 08f0 QuickCam Messenger 08f1 QuickCam Express @@ -3002,6 +3021,7 @@ c08e G MX518 Gaming Mouse (MU0053) c092 G102/G203 LIGHTSYNC Gaming Mouse c093 M500s Optical Mouse + c09d G102 LIGHTSYNC Gaming Mouse c101 UltraX Media Remote c110 Harmony 785/880/885 Remote c111 Harmony 525 Remote @@ -3060,6 +3080,7 @@ c24d G710 Gaming Keyboard c24e G500s Laser Gaming Mouse c24f G29 Driving Force Racing Wheel [PS3] + c251 GamePanel for Dell XPS M1730 c260 G29 Driving Force Racing Wheel [PS4] c262 G920 Driving Force Racing Wheel c281 WingMan Force @@ -3073,6 +3094,7 @@ c295 Momo Force Steering Wheel c298 Driving Force Pro c299 G25 Racing Wheel + c29a Driving Force GT c29b G27 Racing Wheel c29c Speed Force Wireless Wheel for Wii c2a0 Wingman Force Feedback Mouse @@ -3110,6 +3132,7 @@ c335 G910 Orion Spectrum Mechanical Keyboard c336 G213 Prodigy Gaming Keyboard c33a G413 Gaming Keyboard + c33e G915 Mechanical Keyboard c33f G815 Mechanical Keyboard c401 TrackMan Marble Wheel c402 Marble Mouse (2-button) @@ -3359,6 +3382,7 @@ 047c Dell Computer Corp. ffff UPS Tower 500W LV 047d Kensington + 00f2 VeriMark Desktop 1001 Mouse*in*a*Box 1002 Expert Mouse Pro 1003 Orbit TrackBall @@ -3558,6 +3582,7 @@ 0485 Nokia Monitors 0486 ASUS Computers, Inc. 0185 EeePC T91MT HID Touch Panel + 573c Xreal Light Microcontroller 0487 Stewart Connector 0488 Cirque Corp. 0489 Foxconn / Hon Hai @@ -3663,6 +3688,7 @@ 1033 DGX-505 1037 PSR-E403 103c MOTIF-RACK ES + 1045 MM6 1054 S90XS Keyboard/Music Synthesizer 160f P-105 1613 Clavinova CLP535 @@ -3892,9 +3918,11 @@ 106d S750 Printer 106e S820D 1070 S530D + 1071 Sony MPR-501 1072 I850 Printer 1073 I550 Printer 1074 S330 Printer + 1075 Sony MPR-505 1076 i70 1077 i950 107a S830D @@ -4053,6 +4081,7 @@ 178a PIXMA MG3600 Series 178d PIXMA MG6853 180b PIXMA MG3000 series + 183b PIXMA MG3110 Series 1856 PIXMA TS6250 1900 CanoScan LiDE 90 1901 CanoScan 8800F @@ -4060,6 +4089,7 @@ 1905 CanoScan LiDE 200 1906 CanoScan 5600F 1907 CanoScan LiDE 700F + 1908 CanoScan 9000F 1909 CanoScan LiDE 110 190a CanoScan LiDE 210 190d CanoScan 9000F Mark II @@ -4621,6 +4651,7 @@ 0434 D610 0436 D810 043f D5600 + 0455 Z50II 0f03 PD-10 Wireless Printer Adapter 4000 Coolscan LS 40 ED 4001 LS 50 ED/Coolscan V ED @@ -4907,11 +4938,19 @@ 0891 Stylus Office BX535WD 0892 Stylus Office BX935FWD 0893 EP-774A + 08d1 L220/L360 Series 0e03 Thermal Receipt Printer [TM-T20] + 0e31 Thermal Receipt Printer [TM-L100] 1114 XP-440 [Expression Home Small-in-One Printer] 1115 ES-0133 [Expression Home XP-342] 1129 ET-4750 [WorkForce ET-4750 EcoTank All-in-One] 1168 Workforce WF-7820/7840 Series + 1186 ET-2820 Series [ET-2820 EcoTank All-in-One] + 118a ET-2810/L3250 Series [EcoTank ET-2810/L3250] + 118b ET-2850/L4260 Series [EcoTank ET-2850/L4260] + 11b0 XP-4200 Series [Expression Home XP-4200] + 11b9 ET-2830/L3550 Series [EcoTank ET-2830/L3550] + 11c8 ET-2860/L3270 Series [EcoTank ET-2860/L3270] 04b9 Rainbow Technologies, Inc. 0300 SafeNet USB SuperPro/UltraPro 1000 iKey 1000 Token @@ -4996,6 +5035,9 @@ 1303 i3 Micro Module 1304 i3 Module 1305 i3 Multi Sensing Module + 1400 Javelin Module Recovery + 1401 Javelin Module + 1500 Gas sensor demo board 04c1 U.S. Robotics (3Com) 0020 56K Voice Pro 0022 56K Voice Pro @@ -5034,7 +5076,9 @@ 11f3 fi-6130Z 125a PalmSecure Sensor Device - MP 132e fi-7160 + 1526 PalmSecure-F Pro 159f ScanSnap iX1500 + 15ff Fi-8170 Document Scanner [Ricoh fi-8170: High Performance Desktop Scanner - PFU] 200f Sigma DP2 (Mass Storage) 2010 Sigma DP2 (PictBridge) 201d SATA 3.0 6Gbit/s Adaptor [GROOVY] @@ -5067,6 +5111,7 @@ 300f Atheros AR3012 Bluetooth 3014 Qualcomm Atheros Bluetooth 3015 Qualcomm Atheros QCA9377 Bluetooth + 3802 MediaTek Bluetooth MT7921 7022 HP HD Webcam 7025 HP HD Webcam 7046 TOSHIBA Web Camera - HD @@ -15333,6 +15378,12 @@ 0e23 Liou Yuane Enterprise Co., Ltd 0e25 VinChip Systems, Inc. 0e26 J-Phone East Co., Ltd +0e2c Materialise Motion NV + 0012 footscan pressure plate (0.5m) + 0013 footscan pressure plate (1.0m) + 0018 footscan 2D interface box + 0020 footscan pressure plate (1.5m) + 002d footscan heavy duty pressure plate (1.0m) 0e2e Brady Worldwide, Inc. 000b BMP 51 000c BMP 61 From nobody Wed Sep 17 19:37:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpv00zwtz67wpf; Wed, 17 Sep 2025 19:37: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpv00Gyfz4DqT; Wed, 17 Sep 2025 19:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137836; 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=9DP/e1DT/62ihFXl8qmJq9SmFzxPwxY2SRfccOVI3O4=; b=fi64YYiUj4DVo8rQTRmeZW0VtnjXoomV1d7fHvDngncK/U+T+22qdQ0U9dQNA2aejmm+Oj vzrNLYuKadDrLkcxTPSzSM/MqJjpL9u0K55iUN6RrIkIOvyTxVOaxdTyenjEaz77pnwo+W ozSfYuG1mNITSQQo9lrFfSzUGS04srZ7gu4KRIr2E8kzMAeTDMTU6mkwp4fT9f7Neq9OZ6 OEhnMvAFTRhzXTPNZIOLbrmjbgNI5xbgkiNvXFOdyTzUG1Vt0DQqyK6mHyXyQdTisBitmr xMZi0TzZj6qfJ5OM9vbCMShKjHCdoiuyKlbbE87EHnftmr5N3Dm9B+qtldzchg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137836; 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=9DP/e1DT/62ihFXl8qmJq9SmFzxPwxY2SRfccOVI3O4=; b=TYE8NO3iygY/DSfpXID1scZ3f2tbEnyD4sieHRh1vCE7TWR1pqdQekt07QT6hDnbytthgA RLATjOqzM9crK8Y5RunfnYDPSXQDdcY23nnw+xmiEwmlIgD8WHZjvAlffsDUS5NGMfkz+a af1qqsGgCIodj/vYF7dh3AqiXmTrV5a28L2iA+zG8xxXaFZ6nzrBjXusfNkWkD/fGO9K5H JpbHXOaGjTPLpDh04IWl6e0CwIQX5xr40jr7qRve9BWQaLxVJTY7WCxBXE14yymzBJZILg uS2Os2Cr8L8YYaKAp15NQBWR2Nj7etZAKSUpdiSpQXuH3vs6uL/qjD8cOn/rSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137836; a=rsa-sha256; cv=none; b=PsU1R4Yt0EVfv6dsvu1ckOm4CDxvrAC0xc6W5EsaQDahQACtyhLp7btcGxAiUXJ1TssgFZ 23gG2DOrtY+VoO1GjV72hmveMQFUXFENSMamhENz7BxfE2IA5rfCp/gnz7T++zUMavKp9Z KPpdikrp31bLDpV0WbhENe7ykUQmUB/wTiB5sg8dGfJClselqWjlTD3cuUmsiTEB9yNaSk m4LRi18fEXC4t7QdDLquMcMlkJfKRrFKeVyZlO7h53XjTyPlOqNKwOGY/+48c1y0gzO7Ow 7Yds6Ep8pyVoh8I80mXLq2kRqdtYDri4ONoTdUeaoBfFFXv/o7pp4tq8ARs1cA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRptz6jQgzgg0; Wed, 17 Sep 2025 19:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJbFa1015438; Wed, 17 Sep 2025 19:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJbFq0015435; Wed, 17 Sep 2025 19:37:15 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:37:15 GMT Message-Id: <202509171937.58HJbFq0015435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 673f8232146a - stable/14 - pkg(7): Add support for pkg+ prefix to bootstrap pubkey List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 673f8232146a0c9beb481988b06eeae6f08d934d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=673f8232146a0c9beb481988b06eeae6f08d934d commit 673f8232146a0c9beb481988b06eeae6f08d934d Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-09-11 07:01:54 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:36:30 +0000 pkg(7): Add support for pkg+ prefix to bootstrap pubkey MFC After: 1 day Sponsored by: Amn Afzar Hoopad Inc Differencial Revision: https://reviews.freebsd.org/D52418 (cherry picked from commit 08b8843137b8be3f71608400907cb38bcda14965) --- usr.sbin/pkg/pkg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index 9617fcacf4a6..1ff0961fb39e 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -901,7 +901,7 @@ bootstrap_pkg(bool force, const char *fetchOpts, struct repository *repo) getenv("TMPDIR") ? getenv("TMPDIR") : _PATH_TMP, bootstrap_name); snprintf(url, MAXPATHLEN, "%s/Latest/%s.pubkeysig", - repo->url, bootstrap_name); + packagesite, bootstrap_name); if ((fd_sig = fetch_to_fd(repo, url, tmpsig, fetchOpts)) == -1) { fprintf(stderr, "Signature for pkg not " From nobody Wed Sep 17 19:37:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpv10KrVz67x0m; Wed, 17 Sep 2025 19:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpv06zQvz4DqX; Wed, 17 Sep 2025 19:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137836; 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=zF6LVjK4tmW9LCemD/MxesIu4FXaER1bYofeBOidtCs=; b=LnSHaRwYVcWM/c8JO3GJug4oURa8uRKeQ3DLzRwVpg0jqcpqXFREWN9gNlS2BgXOjCAjZ7 tagZrC2gk/v11n6CpyJgE5kFY5MojJlutEeCOSa/q2eBKcvxxq9ZfrfYl9Kj6l0sV3Lniz zlsdjxm3KV/fpDOrZtJcTVGWF95slTnCQddvFkuBGRMic0fkSrv0/ZQPpAGsJ1Wfd1shPj CqJ+wdban6gzAI+msvcMTmNDbLx//AtrkxYHMj4Ztsfb+Q44B8vnyQvMRRSg/kXdf4LGbJ VWYWf8ivf4qxot0kGfC30Pdi4lqBntOQnAiT2IqEdx+zzJR7/Y5+Vy4ga9QvNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137836; 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=zF6LVjK4tmW9LCemD/MxesIu4FXaER1bYofeBOidtCs=; b=DmqEpetwkTWtLPP+uvh4xElZpdRNO/FKofxUGaj5KvOqnrdabbyhvH4tDqkCS/G+ncJz4B LM+Zx7aBeCouHsYTvYCOVBlyhxT6Ty33yP6Ux9pNJW2Hxb3tgL16IT+EkLiXzOZmTxSUN5 v0CJgIh8eWuosC3V/Uzr8PJq2UL7K0N0PnPBkOKQ6zP5FeQbJcQl2eC90cbO6TdpPz1BQa jITxo1T6e/cCYcfPbgqZuc/X9zXCE8i2WZC6DI/bxHNPLgr+fLLR36kr7iJ/w9FUsCp76G lQOlaGZQttrFUmRxi4b4vFy0Yfqt+tShNQyAnGdBKCqIQbjtoEy2FDS99lHgIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137836; a=rsa-sha256; cv=none; b=A9cN39wbzOs78fMLbD/Faj3rREBvcqJ+jr1X2Fm+wwRq4lk90+fHZNwHSQzcHdXVlvKytg uXpH1FHpBVHdDjlF9mjQWNcOa6Sqt0xv1s9Yhkqelbd+3bHEEPx1p/QNfUEIfs60PRrDun /T6NFHxjmdc4k+vVEzFlinvl3JbxQrT/cMBO6ExSHEQ2TU/qItWOjDyWFuvyN6tJMF3EOL lGCHkwPeAhXCzbmWShsPLs1MSII8j0DHOP1Tfmx8ulAQZqEVypjMX6VI044cqsrwQeF+Mc RcJISUyCqnm2cG8bceS2kEv0qZRv/MRYYvw/kuwg/qZ8JZcq6Cv/zPWWCBbWTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpv06Yx6zgB8; Wed, 17 Sep 2025 19:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJbGxZ015470; Wed, 17 Sep 2025 19:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJbGwQ015467; Wed, 17 Sep 2025 19:37:16 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:37:16 GMT Message-Id: <202509171937.58HJbGwQ015467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 30e3f9665eb0 - stable/14 - pci_vendors: update to 2025-07-11 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 30e3f9665eb033f923f81703cd7c6feeabe327c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=30e3f9665eb033f923f81703cd7c6feeabe327c4 commit 30e3f9665eb033f923f81703cd7c6feeabe327c4 Author: Baptiste Daroussin AuthorDate: 2025-09-11 07:53:32 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:36:30 +0000 pci_vendors: update to 2025-07-11 (cherry picked from commit 2e72bd422956f831ec7e54255bd12fb721887f4a) --- share/misc/pci_vendors | 1005 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 914 insertions(+), 91 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 6dfe12dfc8ad..6fb8865340a0 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2025.03.09 -# Date: 2025-03-09 03:15:02 +# Version: 2025.07.11 +# Date: 2025-07-11 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -114,6 +114,8 @@ 0b70 NVMe DC SSD [Yorktown controller] 2b59 NVMe DC SSD [Atomos Prime] 025e 0008 NVMe DC SSD U.2-SFF 15mm [D7-PS1010] + 025e 000c NVMe DC SSD E1.S 9.5mm [D7-PS1010] + 025e 000d NVMe DC SSD E1.S 15mm [D7-PS1010] 025e 0019 NVMe DC SSD E3.S-1T 7.5mm [D7-PS1010] 025e 0108 NVMe DC SSD U.2-SFF 15mm [D7-PS1030] 025e 0119 NVMe DC SSD E3.S-1T 7.5mm [D7-PS1030] @@ -154,6 +156,14 @@ 0202 GP202 0721 Sapphire, Inc. 0731 Jingjia Microelectronics Co Ltd + 1100 JM1100 + 0731 1101 JM1100-C + 0731 1102 JM1100-II + 0731 1103 JM1100-I + 0731 1104 JM1100-M + 0731 1105 JM1100-Y + 0731 1106 JM1100-EI + 0731 1107 JM1100-EM 7200 JM7200 Series GPU 0731 7201 JM7201 0731 7202 JM7202 @@ -191,6 +201,9 @@ 0731 930b JH930-M 0731 930c JH930 930b JH930-M + f011 JM1100-IV + f111 JM1100-MV + ff11 JM1100-YV 0777 Ubiquiti Networks, Inc. 0795 Wired Inc. 6663 Butane II (MPEG2 encoder board) @@ -642,7 +655,7 @@ 1bd4 000e 6G SAS2008IR 1bd4 000f 6G SAS2008IT SA5248 1bd4 0010 6G SAS2008IR SA5248 - 4c52 96c8 LRSA96C8 8-Port SATA3(6Gb/s)Exchange Adapter (with Raid) + 4c52 96c8 LRSA96C8 8-Port SATA3 (6Gb/s) Exchange Adapter (with RAID) 8086 350f RMS2LL040 RAID Controller 8086 3700 SSD 910 Series 0073 MegaRAID SAS 2008 [Falcon] @@ -775,6 +788,9 @@ 1000 30a0 SAS9300-8e 1000 30e0 SAS9300-8i 1000 3130 SAS 9300-16i + 1000 3170 SAS9302-16e +# IBM SAS3008 HBA controller + 1014 0457 9302-8i [N2215] 1028 1f45 HBA330 Adapter 1028 1f46 12Gbps HBA 1028 1f53 HBA330 Mini @@ -869,6 +885,9 @@ 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 1028 22d2 PERC H975i Front 1028 22d3 PERC H975i Adapter + 1028 23cb PERC H975i Front + 1028 23cd PERC H975i Adapter + 1028 2446 PERC H976i Front 1d49 020b ThinkSystem 460-16e SAS/SATA PCIe Gen5 24Gb HBA 00b5 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx # 9760W 32 internal port RAID controller @@ -883,6 +902,11 @@ 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter # 9700 16 external port Storage controller 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter + 1028 22d2 PERC H975i Front - Virtual + 1028 22d3 PERC H975i Adapter - Virtual + 1028 23cb PERC H975i Front - Virtual + 1028 23cd PERC H975i Adapter - Virtual + 1028 2446 PERC H976i Front - Virtual # Broadcom next-gen MPT PCIe switch 00b8 Fusion-MPT Switch SAS50xx/SAS51xx 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) @@ -1293,12 +1317,12 @@ 15ff Fenghuang [Zhongshan Subor Z+] 1607 Arden 1636 Renoir [Radeon Vega Series / Radeon Vega Mobile Series] - 1637 Renoir Radeon High Definition Audio Controller + 1637 Renoir/Cezanne HDMI/DP Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 # Used in the Steam Deck LCD 163f VanGogh [AMD Custom GPU 0405] - 1640 Rembrandt Radeon High Definition Audio Controller + 1640 Radeon High Definition Audio Controller [Rembrandt/Strix] 164c Lucienne 164d Rembrandt 164e Raphael @@ -1306,8 +1330,9 @@ 1681 Rembrandt [Radeon 680M] 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s - 1900 Phoenix3 - 1901 Phoenix4 + 1900 HawkPoint1 + 1901 HawkPoint2 + 1902 Krackan2 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 3151 RV380 GL [FireMV 2400] @@ -3054,6 +3079,7 @@ 1458 22ed Radeon RX 560 148c 2381 Radeon RX 560 1682 9560 Radeon RX 560 + 1849 5037 PHANTOM G R RX550 2G/M/ASRK 1da2 e348 Radeon RX 560 1da2 e367 Radeon RX 550 640SP 6800 Wimbledon XT [Radeon HD 7970M] @@ -3284,6 +3310,7 @@ 1002 6b76 AMD Radeon RX Vega 56 8GB # ROG-STRIX-RXVEGA64-O8G-GAMING 1043 04c4 Radeon RX Vega 64 + 1043 0555 ROG STRIX RX Vega 56 8GB 1458 230c Radeon RX VEGA 56 GAMING OC 8G 1da2 e376 Radeon RX VEGA 56 Pulse 8GB OC HBM2 6880 Lexington [Radeon HD 6550M] @@ -3993,6 +4020,7 @@ 1da2 e410 Sapphire NITRO+ RX 5700 XT 1da2 e411 Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5500M] + 106b 0210 Radeon Pro 5300M 7341 Navi 14 [Radeon Pro W5500] 7347 Navi 14 [Radeon Pro W5500M] 734f Navi 14 [Radeon Pro W5300M] @@ -4085,6 +4113,7 @@ 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] + 148c 2427 RX 7800 XT [Hellhound / Red Devil] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC 7481 Navi 33 [Radeon Graphics] @@ -4093,14 +4122,20 @@ 7489 Navi 33 [Radeon Pro W7500] 748b Navi 33 [Radeon Graphics] 7499 Navi 33 [Radeon RX 7400/7300/Pro W7400] + 749f Navi 33 [Radeon RX 7500] 74a0 Aqua Vanjaram [Instinct MI300A] 74a1 Aqua Vanjaram [Instinct MI300X] 74a2 Aqua Vanjaram [Instinct MI308X] 74a5 Aqua Vanjaram [Instinct MI325X] 74a9 Aqua Vanjaram [Instinct MI300X HF] 74b5 Aqua Vanjaram [Instinct MI300X VF] + 74b9 Aqua Vanjaram [Instinct MI325X VF] 74bd Aqua Vanjaram [Instinct MI300X HF] - 7550 Navi 48 [RX 9070/9070 XT] + 7550 Navi 48 [Radeon RX 9070/9070 XT/9070 GRE] + 148c 2435 Reaper Radeon RX 9070 XT 16GB GDDR6 (RX9070XT 16G-A) + 1da2 e490 Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT] + 7551 Navi 48 [Radeon AI PRO R9700] + 7590 Navi 44 [Radeon RX 9060 XT] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4505,6 +4540,7 @@ ab28 Navi 21/23 HDMI/DP Audio Controller ab30 Navi 31 HDMI/DP Audio ab38 Navi 10 HDMI Audio + ab40 Navi 48 HDMI/DP Audio Controller ac00 Theater 506 World-Wide Analog Decoder ac01 Theater 506 World-Wide Analog Decoder ac02 TV Wonder HD 600 PCIe @@ -4948,6 +4984,7 @@ 1014 04fc PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A) 04ed Internal Shared Memory (ISM) virtual PCI device 0611 4769 Cryptographic Adapter + 06a2 4770 Cryptographic Adapter 06a7 Spyre Accelerator 06a8 Spyre Accelerator Virtual Function 3022 QLA3022 Network Adapter @@ -5295,6 +5332,8 @@ 1514 Family 14h Processor Root Port 1515 Family 14h Processor Root Port 1516 Family 14h Processor Root Port + 151c USB4 Router 0 + 151d USB4 Router 1 1530 Family 16h Processor Function 0 1531 Family 16h Processor Function 1 1532 Family 16h Processor Function 2 @@ -5364,6 +5403,12 @@ 1583 Family 16h (Models 30h-3fh) Processor Function 3 1584 Family 16h (Models 30h-3fh) Processor Function 4 1585 Family 16h (Models 30h-3fh) Processor Function 5 + 1587 Strix Halo USB 3.1 xHCI + 1588 Strix Halo USB 3.1 xHCI + 1589 Strix Halo USB 3.1 xHCI + 158b Strix Halo USB 3.1 xHCI + 158d Strix Halo USB4 Host Router + 158e Strix Halo USB4 Host Router 1590 Amur/Nolan HT Configuration 1591 Amur/Nolan Address Maps 1592 Amur/Nolan DRAM Configuration @@ -5410,7 +5455,7 @@ 15dc Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus B ea50 ce19 mCOM10-L1900 15de Raven/Raven2/FireFlight HD Audio Controller - 15df Family 17h (Models 10h-1fh) Platform Security Processor + 15df Raven/Raven2/FireFlight/Renoir/Cezanne Platform Security Processor 1043 876b PRIME Motherboard 17aa 5124 ThinkPad E595 ea50 ce19 mCOM10-L1900 @@ -5424,7 +5469,7 @@ 1043 876b PRIME Motherboard 17aa 5124 ThinkPad E595 ea50 ce19 mCOM10-L1900 - 15e2 ACP/ACP3X/ACP6x Audio Coprocessor + 15e2 Audio Coprocessor 17aa 5124 ThinkPad E595 ea50 ce19 mCOM10-L1900 15e3 Family 17h/19h/1ah HD Audio Controller @@ -5653,9 +5698,11 @@ 43c8 400 Series Chipset SATA Controller 43d5 400 Series Chipset USB 3.1 xHCI Compliant Host Controller 43e9 500 Series Chipset Switch Upstream Port + 43ea 500 Series Chipset Switch Downstream Port 43eb 500 Series Chipset SATA Controller # or ASM106X Serial ATA Controller 1b21 1062 ASM1062 Serial ATA Controller + 43ec A520 Series Chipset USB 3.1 XHCI Controller 43ee 500 Series Chipset USB 3.1 XHCI Controller # maybe 1b21 1142 ASM1042A USB 3.0 Host Controller @@ -5663,6 +5710,7 @@ 43f5 600 Series Chipset PCIe Switch Downstream Port 43f6 600 Series Chipset SATA Controller 43f7 600 Series Chipset USB 3.2 Controller + 43fc 800 Series Chipset USB 3.x XHCI Controller 43fd 800 Series Chipset USB 3.x XHCI Controller 57a3 Matisse PCIe GPP Bridge 57a4 Matisse PCIe GPP Bridge @@ -5998,6 +6046,7 @@ 1028 1f24 PERC S300 Controller # NV-RAM Adapter used in Dell DR appliances 0073 NV-RAM Adapter + 0c46 PERC S160 RAID controller 1028 PCIe Bridge riser 2600 ENT NVMe RT1 1028 215e ENT NVMe RT1 RI 3.84TB @@ -7225,6 +7274,7 @@ 8004 DTL-H2500 [Playstation development board] 8009 CXD1947Q i.LINK Controller 800c DTL-H800 [PS1 sound development board] + 800d DVBK-2000(E) DV Still Image Capture Board 8039 CXD3222 i.LINK Controller 8047 PS2 TOOL MRP 8056 Rockwell HCF 56K modem @@ -7796,6 +7846,7 @@ 103c 1939 QMH2672 16Gb Dual Port Fibre Channel Adapter 103c 8002 3830C 16G Fibre Channel Host Bus Adapter 1077 0241 QLE2670 16Gb Single Port Fibre Channel Adapter + 1077 0249 QLE2672 16Gb Dual Port Fibre Channel Adapter 2071 ISP2714-based 16/32Gb Fibre Channel to PCIe Adapter 1077 0283 QLE2764 Quad Port 32Gb Fibre Channel to PCIe Adapter 1077 029e QLE2694 Quad Port 16Gb Fibre Channel to PCIe Adapter @@ -7864,6 +7915,8 @@ 1077 0167 QME2572 Dual Port FC8 HBA Mezzanine 1590 00fc StoreFabric 84Q 8Gb Quad Port Fibre Channel Host Bus Adapter 2971 ISP2684 + 2981 32G SFP28 EP2744 Apatter + 1bd4 00b0 32G SFP28 EP2744 Apatter 3022 ISP4022-based Ethernet NIC 3032 ISP4032-based Ethernet IPv6 NIC 4010 ISP4010-based iSCSI TOE HBA @@ -9404,13 +9457,16 @@ 8664 PEX 8664 64-lane, 16-Port PCI Express Gen 2 (5.0 GT/s) Switch 8680 PEX 8680 80-lane, 20-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch 8696 PEX 8696 96-lane, 24-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch + 8714 PEX 8714 12-Lane, 5-Port PCI Express Gen 3 (8 GT/s) Switch 8717 PEX 8717 16-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch with DMA 8718 PEX 8718 16-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch + 8723 PEX 8723 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch 8724 PEX 8724 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch, 19 x 19mm FCBGA 4c52 9234 LRNV9324 2-port Built-in 8643 NVMe Exchange Adapter 4c52 9524 LRNV9524 2-port M.2 NVMe SSD Exchange Adapter 8725 PEX 8725 24-Lane, 10-Port PCI Express Gen 3 (8.0 GT/s) Multi-Root Switch with DMA 8732 PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch + 8733 PEX 8733 32-Lane, 19-Port PCI Express Gen 3 (8 GT/s) Switch 8734 PEX 8734 32-lane, 8-Port PCI Express Gen 3 (8.0GT/s) Switch 8747 PEX 8747 48-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch 4c52 9347 LRNV9347L 2-port Built-in 8643 NVMe Switching Adapter @@ -9418,6 +9474,9 @@ 8748 PEX 8748 48-Lane, 12-Port PCI Express Gen 3 (8 GT/s) Switch, 27 x 27mm FCBGA 8749 PEX 8749 48-Lane, 18-Port PCI Express Gen 3 (8.0 GT/s) Multi-Root Switch with DMA 4c52 9349 LRNV9349 8-port SFF-8643 NVMe SSD Exchange Adapter + 8764 PEX 8764 64-Lane, 16-Port PCI Express Gen 3 (8 GT/s) Switch + 8780 PEX 8780 80-Lane, 20-Port PCI Express Gen 3 (8 GT/s) Switch + 8796 PEX8796 96-Lane, 24-Port PCIe Gen 3 (8.0 GT/s) Switch 87a0 PEX PCI Express Switch NT0 Port Link Interface 87a1 PEX PCI Express Switch NT1 Port Link Interface 87b0 PEX PCI Express Switch NT0 Port Virtual Interface @@ -9576,11 +9635,15 @@ 1517 000f ECDR-GC314-PMC Receiver 1885 0700 Tsunami FPGA PMC with Altera Stratix S40 1885 0701 Tsunami FPGA PMC with Altera Stratix S30 + 9712 PEX9712 12-Lane, 5-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch 9733 PEX 9733 33-lane, 9-port PCI Express Gen 3 (8.0 GT/s) Switch 1d49 0001 ThinkSystem 1610-4P NVMe Switch Adapter 1d49 0002 ThinkSystem 810-4P NVMe Switch Adapter 9749 PEX 9749 49-lane, 13-port PCI Express Gen 3 (8.0 GT/s) Switch 1d49 0004 ThinkSystem 1610-8P NVMe Switch Adapter + 9765 PEX9765 65-Lane, 17-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch + 9781 PEX9781 81-Lane, 21-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch + 9797 PEX9781 97-Lane, 25-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch a100 Blackmagic Design DeckLink bb04 B&B 3PCIOSD1A Isolated PCI Serial c001 CronyxOmega-PCI (8-port RS232) @@ -11982,6 +12045,8 @@ 0fa0 GK11x [GK11x_FPGA] 0fa5 GK11x 0fa7 GK11x [Tegra on x86 (PEATRANS)] + 0fae Tegra X1 PCIe x4 Root Complex + 0faf Tegra X1 PCIe x1 Root Complex 0fb0 GM200 High Definition Audio 0fb8 GP108 High Definition Audio Controller 0fb9 GP107GL High Definition Audio Controller @@ -12178,6 +12243,8 @@ 10c3 GT218 [GeForce 8400 GS Rev. 3] 10c5 GT218 [GeForce 405] 10d8 GT218 [NVS 300] + 10e5 Parker PCIe x4 Root Complex + 10e6 Parker PCIe x1 Root Complex 10ef GP102 HDMI Audio Controller 10f0 GP104 High Definition Audio Controller 10f1 GP106 High Definition Audio Controller @@ -12860,7 +12927,7 @@ 1aed TU116 USB Type-C UCSI Controller 1aef GA102 High Definition Audio Controller 1af1 GA100 [A100 NVSwitch] - 1b00 GP102 [TITAN X] + 1b00 GP102 [TITAN X Pascal] 1b01 GP102 [GeForce GTX 1080 Ti 10GB] 1b02 GP102 [TITAN Xp] 1b04 GP102 @@ -13184,11 +13251,16 @@ 228e GA106 High Definition Audio Controller 2291 GA107 High Definition Audio Controller 2296 Tegra PCIe Endpoint Virtual Network + 229a Orin PCIe x8 Root Complex + 229c Orin PCIe x4/x8 Endpoint/Root Complex + 229e Orin PCIe x1 Root Complex 22a3 GH100 [H100 NVSwitch] 22ba AD102 High Definition Audio Controller 22bc AD104 High Definition Audio Controller 22bd AD106M High Definition Audio Controller 22be AD107 High Definition Audio Controller + 22d8 THOR Processor PCI Express Root Port + 22e6 THOR Processor PCI Express x16 Controller 2302 GH100 230e GH100 [H20 NVL16] 2313 GH100 [H100 CNX] @@ -13376,31 +13448,53 @@ 28f8 AD107GLM [RTX 2000 Ada Generation Embedded GPU] 2900 GB100 [Reserved Dev ID A] 2901 GB100 [B200] - 2920 GB100 [TS4] + 2920 GB100 [TS4 / B100] + 2924 GB100 + 2925 GB100 + 293d GB100 2940 GB100 [Reserved Dev ID B] 2941 GB100 [HGX GB200] + 297e GB100 2980 GB102 [Reserved Dev ID A] 29bc GB102 [B100] 29c0 GB102 [Reserved Dev ID B] + 29f1 GB102 + 2b00 TA1090SA [THOR] 2b85 GB202 [GeForce RTX 5090] 2b87 GB202 [GeForce RTX 5090 D] + 2bb1 GB202GL [RTX PRO 6000 Blackwell Workstation Edition] + 2bb3 GB202GL [RTX PRO 5000 Blackwell] + 2bb4 GB202GL [RTX PRO 6000 Blackwell Max-Q Workstation Edition] + 2bb5 GB202GL [RTX PRO 6000 Blackwell Server Edition] 2c02 GB203 [GeForce RTX 5080] 2c05 GB203 [GeForce RTX 5070 Ti] 2c18 GB203M / GN22 [GeForce RTX 5090 Max-Q / Mobile] 2c19 GB203M / GN22 [GeForce RTX 5080 Max-Q / Mobile] 2c2c GB6-256(N22W-ES-A1) + 2c31 GB203GL [RTX PRO 4500 Blackwell] + 2c34 GB203GL [RTX PRO 4000 Blackwell] + 2c38 GB203GLM [RTX PRO 5000 Blackwell Generation Laptop GPU] + 2c39 GB203GLM [RTX PRO 4000 Blackwell Generation Laptop GPU] 2c58 GB203M / GN22-X11 [GeForce RTX 5090 Max-Q / Mobile] 2c59 GB203M / GN22-X9 [GeForce RTX 5080 Max-Q / Mobile] - 2d18 AD108M [GeForce RTX 5070 Max-Q / Mobile] - 2d19 AD108M [GeForce RTX 5060 Max-Q / Mobile] + 2d04 GB206 [GeForce RTX 5060 Ti] + 2d05 GB206 [GeForce RTX 5060] + 2d18 GB206M [GeForce RTX 5070 Max-Q / Mobile] + 2d19 GB206M [GeForce RTX 5060 Max-Q / Mobile] 2d2c GB6-128 (N22Y-ES-A1) - 2d58 AD108M [GeForce RTX 5070 Max-Q / Mobile] - 2d59 AD108M [GeForce RTX 5060 Max-Q / Mobile] - 2d98 AD108M [GeForce RTX 5050 Max-Q / Mobile] - 2dd8 AD108M [GeForce RTX 5050 Max-Q / Mobile] - 2f04 GN22 [GeForce RTX 5070] - 2f18 AD108M [GeForce RTX 5070 Ti Max-Q / Mobile] - 2f58 AD108M [GeForce RTX 5070 Ti Max-Q / Mobile] + 2d39 GB206GLM [RTX PRO 2000 Blackwell Generation Laptop GPU] + 2d58 GB206M [GeForce RTX 5070 Max-Q / Mobile] + 2d59 GB206M [GeForce RTX 5060 Max-Q / Mobile] + 2d83 GB207 [GeForce RTX 5050] + 2d98 GB207M [GeForce RTX 5050 Max-Q / Mobile] + 2db8 GB207GLM [RTX PRO 1000 Blackwell Generation Laptop GPU] + 2db9 GB207GLM [RTX PRO 500 Blackwell Generation Laptop GPU] + 2dd8 GB207M [GeForce RTX 5050 Max-Q / Mobile] + 2e2a GB20B + 2f04 GB205 [GeForce RTX 5070] + 2f18 GB205M [GeForce RTX 5070 Ti Mobile] + 2f38 GB205GLM [RTX PRO 3000 Blackwell Generation Laptop GPU] + 2f58 GB205M [GeForce RTX 5070 Ti Mobile] 31c0 GB110 3340 GB120 10df Emulex Corporation @@ -13554,6 +13648,7 @@ 0860 CA91C860 [QSpan] 0862 CA91C862A [QSpan-II] 8111 Tsi381 PCIe to PCI Bridge + 8113 89HPEB383 PCIe-to-PCI Bridge 8260 CA91L8200B [Dual PCI PowerSpan II] 8261 CA91L8260B [Single PCI PowerSpan II] a108 Tsi109 Host Bridge for Dual PowerPC @@ -13623,6 +13718,7 @@ 5227 RTS5227 PCI Express Card Reader 17aa 220e ThinkPad T440p 17aa 2214 ThinkPad X240 + 5228 RTS5288 PCIe SD UHS-I Card Reader controller 5229 RTS5229 PCI Express Card Reader 1025 0813 Aspire R7-571 103c 194e ProBook 455 G1 Notebook @@ -13646,7 +13742,8 @@ 1028 0c06 Precision 3580 17aa 224f ThinkPad X1 Carbon 5th Gen 5260 RTS5260 PCI Express Card Reader - 5261 RTS5261 PCI Express Card Reader + 5261 RTS5261 PCIe SD Express Card Reader controller + 5264 RTS5264 PCIe SD UHS-II & SD Express Card Reader controller 5286 RTS5286 PCI Express Card Reader 5287 RTL8411B PCI Express Card Reader 1025 1094 Acer Aspire E5-575G @@ -13658,6 +13755,7 @@ 5763 RTS5763DL NVMe SSD Controller (DRAM-less) 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 5770 RTS5770DL NVMe SSD Controller (DRAM-less) + 5771 RTS5771 NVMe SSD Controller (DRAM-less) 5772 RTS5772DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) @@ -13856,6 +13954,7 @@ 103c 831b Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported) 17aa 5124 ThinkPad E595 17aa b023 ThinkPad E595 + b851 RTL8851BE PCIe 802.11ax Wireless Network Controller b852 RTL8852BE PCIe 802.11ax Wireless Network Controller b85b RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R] c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter @@ -14078,6 +14177,8 @@ 000b EMU20k2 [Sound Blaster X-Fi Titanium Series] 1102 0041 SB0880 [SoundBlaster X-Fi Titanium PCI-e] 1102 0062 SB1270 [SoundBlaster X-Fi Titanium HD] + 0010 CA0132 Sound Core3D [Sound Blaster AE-7] + 1102 0081 Sound Blaster AE-7 0012 CA0132 Sound Core3D [Sound Blaster Recon3D / Z-Series / Sound BlasterX AE-5 Plus] 1102 0010 SB1570 SB Audigy Fx 1102 0191 CA0132 Sound Core3D - CA0113 [ Sound BlasterX AE-5 Plus] @@ -14252,7 +14353,7 @@ 0585 VT82C585VP [Apollo VP1/VPX] 0586 VT82C586/A/B PCI-to-ISA [Apollo VP] 1106 0000 MVP3 ISA Bridge - 0591 VT8237A SATA 2-Port Controller + 0591 VT8237A Integrated SATA RAID Controller 0595 VT82C595 [Apollo VP2] 0596 VT82C596 ISA [Mobile South] 1106 0000 VT82C596/A/B PCI to ISA Bridge @@ -14610,6 +14711,7 @@ 3372 VT8237S PCI to ISA Bridge 337a VT8237A PCI to PCI Bridge 337b VT8237A Host Bridge + 3401 VT6325 Firewire Controller 3402 VT8261 PCI to ISA Bridge 3403 VT6315 Series Firewire Controller 1043 8374 M5A88-V EVO @@ -14622,7 +14724,11 @@ 3456 VX11 Standard Host Bridge 345b VX11 Miscellaneous Bus 3483 VL805/806 xHCI USB 3.0 Controller + 365a VT3365 Card Reader Host Controller + 365b VT3365 SDIO Host Controller 3a01 VX11 Graphics [Chrome 645/640] + 401a VT6325 Card Reader Host Controller + 401b VT6325 SDIO PCI-E Host Controller 4149 VIA VT6420 (ATA133) Controller 4204 K8M800 Host Bridge 4208 PT890 Host Bridge @@ -14657,17 +14763,18 @@ 5324 CX700M2/VX700/VX800/820-Series Serial ATA & EIDE-Controller 5327 P4M890 I/O APIC Interrupt Controller 5336 K8M890CE I/O APIC Interrupt Controller + 5337 VT8237A Integrated SATA Controller 5340 PT900 I/O APIC Interrupt Controller 5351 VT3351 I/O APIC Interrupt Controller 5353 VX800/VX820 APIC and Central Traffic Control 5364 CN896/VN896/P4M900 I/O APIC Interrupt Controller - 5372 VT8237/8251 Serial ATA Controller + 5372 VT8237S SATA Controller 5409 VX855/VX875 APIC and Central Traffic Control 5410 VX900 Series APIC and Central Traffic Control 5419 VN1000 I/O APIC Interrupt Controller 6100 VT85C100A [Rhine II] 6122 VN1000 Graphics [Chrome 520 IGP] - 6287 SATA RAID Controller + 6287 VT8251 AHCI SATA Controller 6290 K8M890CE Host Bridge 6327 P4M890 Security Device 6353 VX800/VX820 Scratch Registers @@ -14699,6 +14806,7 @@ 7351 VT3351 Host Bridge 7353 VX800/VX820 North-South Module Interface Control 7364 CN896/VN896/P4M900 Host Bridge + 7372 VT8237S SATA RAID Controller 7409 VX855/VX875 North-South Module Interface Control 7410 VX900 Series North-South Module Interface Control 19da a179 ZBOX nano VD01 @@ -14730,8 +14838,10 @@ 9000 VT8261 IDE Controller [StorX IDE Controller - 9000] 9001 VX900 Series Serial-ATA Controller 9040 VT8261 SATA Controller [StorX RAID Controller - 9040] + 9041 VX900/VX11 SATA Controller [StorX RAID Controller - 9041] 9082 Standard AHCI 1.0 SATA Controller - 9140 HDMI Audio Device + 9140 VX11 Graphics [Chrome 645/640] HDMI Audio Device + 9170 VX900 Graphics [Chrome9 HD] HDMI Audio Device 9201 USB3.0 Controller 9380 Ncore Coprocessor for Centaur CNS 9530 VX800/820/900/VT8261 Series Secure Digital Memory Card Controller @@ -15943,6 +16053,7 @@ 0115 XG4 NVMe SSD Controller 0116 XG5 NVMe SSD Controller 1179 0001 XG5 NVMe SSD Controller + 0119 XD5 NVMe SSD Controller 011a XG6 NVMe SSD Controller 0404 DVD Decoder card 0406 Tecra Video Capture device @@ -16144,7 +16255,7 @@ 103c 30cc Pavilion dv6700 103c 30cf Pavilion dv9668eg Laptop 17aa 20c5 ThinkPad R61 - 17aa 20c7 ThinkPad R61 + 17aa 20c7 ThinkPad R61/T400 0841 R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394 0843 R5C843 MMC Host Controller 1025 0121 Aspire 5920G @@ -16592,6 +16703,8 @@ 11bc Network Peripherals Inc 0001 NP-PCI 11bd Pinnacle Systems Inc. + 0015 FireWire Controller + 0023 Studio 700 002e PCTV 40i 0040 Royal TS Function 1 11bd 0044 PCTV 2000i Dual DVB-T Pro PCI Tuner 1 @@ -16893,6 +17006,10 @@ 11f7 Scientific Atlanta # née PMC-Sierra Inc. 11f8 Microchip Technology + 4036 PM40036 Switchtec PFX 36xG4 Fanout PCIe Switch + 4052 PM40052 Switchtec PFX 52xG4 Fanout PCIe Switch + 4084 PM40084 Switchtec PFX 84xG4 Fanout PCIe Switch + 4128 PM41028 Switchtec PSX 28xG4 Programmable PCIe Switch 5000 PM50100 Switchtec PFX 100xG5 Fanout PCIe Switch 5028 PM50028 Switchtec PFX 28xG5 Fanout PCIe Switch 5036 PM50036 Switchtec PFX 36xG5 Fanout PCIe Switch @@ -17220,6 +17337,8 @@ 1233 Bus-Tech, Inc. # nee Risq Modular Systems, Inc. 1235 SMART Modular Technologies + c241 CXA-4F1W + 1028 2382 4-DIMM Add In Card 1236 Sigma Designs Corporation 0000 RealMagic64/GX 6401 REALmagic 64/GX (SD 6425) @@ -17476,6 +17595,7 @@ 2261 SM2261XT x2 NVMe SSD Controller (DRAM-less) 2262 SM2262/SM2262EN SSD Controller 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers + 2268 SM2268XT (DRAM-less) NVMe SSD Controller 2269 SM2269XT (DRAM-less) NVMe SSD Controller 8366 SM8366 NVMe SSD Controller [MonTitan] 1270 Olympus Optical Co., Ltd. @@ -18454,6 +18574,7 @@ 5416 2550 NVMe SSD (DRAM-less) 5425 2500 NVMe SSD (DRAM-less) 5427 2650 NVMe SSD (DRAM-less) + 5428 4600 NVMe SSD 5429 2600 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -18528,6 +18649,8 @@ 0b22 UP-200 Powered 2 port RS-232 card 0b23 UP-200 Powered 2 port RS-232 card 0ba1 UC-101 1 + 1 port RS-232 card + 0ba2 UC-101 1 + 1 port RS-232 card + 0ba3 UC-101 1 + 1 port RS-232 card 0bc1 UC-203 1 + 1 port RS-232 + LPT card 0bc2 UC-203 1 + 1 port RS-232 + LPT card 0be1 UC-146 LPT card @@ -18539,6 +18662,8 @@ 0c22 UP-880 Powered 2 port RS-232 card 0c23 UP-880 Powered 2 port RS-232 card 0c41 UC-368 4 port RS-422/485 Opto Isolated card + 0c42 UC-368 4 port RS-422/485 Opto Isolated card + 0c43 UC-368 4 port RS-422/485 Opto Isolated card 0ca1 UC-253 2 port RS-232 card 0d21 UC-260 4 port RS-232 card 0d41 UC-836 4 port RS-232 card @@ -18578,6 +18703,10 @@ 401d PX-475 1 port RS-232 + LPT card (Serial port) 401e PX-803 Powered 1 + 1 port RS-232 card 401f PX-475 1 port RS-232 + LPT card (LPT port) + 4020 XC-157 LPT ExpressCard + 4021 XC-475 1 port RS-232 + LPT ExpressCard (Serial port) + 4022 XC-475 1 port RS-232 + LPT ExpressCard (LPT port) + 4026 XC-235 1 port RS-232 ExpressCard 4027 IX-100 1 port RS-232 card 4028 IX-200 2 port RS-232 card 4029 IX-400 4 port RS-232 card @@ -20294,6 +20423,8 @@ a80d NVMe SSD Controller PM9C1a (DRAM-less) a80e NVMe SSD Controller PM9D3a a80f BM9C1 QLC NVME SSD (DRAM-less) + a810 NVMe SSD 9100 PRO [PM9E1] + a811 BM9H1 NVME SSD (DRAM-less) a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -20469,6 +20600,7 @@ 1458 Gigabyte Technology Co., Ltd 1002 Aourus Radeon RX6900XT Xtreme Waterforce WB 16G 22e8 Ellesmere [Radeon RX 480] + 2425 Radeon RX 9070 GAMING OC 16G 3483 USB 3.0 Controller (VIA VL80x-based xHCI Controller) 1459 DOOIN Electronics 145a Escalate Networks Inc @@ -20657,6 +20789,7 @@ 14c3 MEDIATEK Corp. 0608 MT7921K (RZ608) Wi-Fi 6E 80MHz 0616 MT7922 802.11ax PCI Express Wireless Network Adapter + 0717 MT7925 (RZ717) Wi-Fi 7 160MHz 4d75 T700 5G Modem [5G Solution 5000] 7603 MT7603E 802.11bgn PCI Express Wireless Network Adapter 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter @@ -22155,6 +22288,7 @@ 9300 Universal Exhaust Gas Oxygen Sensor Simulator 9310 Digital Programmable Resistor 9320 Arria 10 FPGA Card + 9330 Cyclone V FPGA Card 9350 Analog Input Card 1543 SILICON Laboratories 3052 Intel 537 [Winmodem] @@ -22417,6 +22551,15 @@ 0290 SagittaZ 0292 Arcus3 Flash Recovery 0293 Arcus3 RMA + 0294 Ophy 2.1 (SagittaZ) +# Sagitta + 0296 OPHY2.6 +# Sagitta + 0298 OPHY3.0 +# Sagitta + 029a OPHY3.1 +# Sagitta + 029c OPHY3.5 02a0 Quantum-6 in Flash Recovery Mode 02a1 Quantum-6 RMA 02a2 Spectrum-7 in Flash Recovery Mode @@ -22503,6 +22646,7 @@ # NIC-ETH540F-3S-2P OCP3.0 2x10G Card 193d 1084 NIC-ETH540F-3S-2P 1e81 0c10 25GbE dual-port SFP28, PCIe3.0 x8 [3SC10] + 1f3f 0c10 25GbE dual-port SFP28, PCIe3.0 x8, 3SC10 1016 MT27710 Family [ConnectX-4 Lx Virtual Function] 1017 MT27800 Family [ConnectX-5] 117c 00b1 FastFrame N311 Single-port 10Gb Ethernet Adapter @@ -22529,6 +22673,7 @@ 193d 1035 NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter 1bd4 00ac O252MCX6Lx 1bd4 00ae S252MCX6Lx + 1f3f 0c11 25GbE dual-port SFP28, PCIe4.0 x8, 3SC1125GbE dual-port SFP28, PCIe4.0 x8, 3SC11 1ff9 00ad ENFM6251-SP2 1ff9 00af ENPM6251-SP2 1020 MT28860 @@ -22688,7 +22833,7 @@ 5014 WD PC SN540 / Green SN350 NVMe SSD 1 TB (DRAM-less) 5015 PC SN740 NVMe SSD (DRAM-less) 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) - 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD + 5017 WD SN560/SN740/SN770/SN5000 NVMe SSD 5019 WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD 501a SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less) 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) @@ -22699,12 +22844,16 @@ 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5034 WD PC SN5000S M.2 2230 NVMe SSD (DRAM-less) + 5035 WD PC SN5000S M.2 2242 NVMe SSD (DRAM-less) 5036 WD PC SN5000S M.2 2280 NVMe SSD (DRAM-less) 5041 WD Blue SN580 NVMe SSD (DRAM-less) 5042 WD Black SN770M NVMe SSD (DRAM-less) + 5044 WD PC SN7100S NVMe SSD (DRAM-less) 5045 WD_BLACK SN7100 NVMe SSD (DRAM-less) 5046 SanDisk Extreme NVMe SSD (DRAM-less) 5049 SN8000S NVMe SSD + 504a WD Blue SN5000 NVMe SSD (DRAM-less) + 5050 WD PC SN8050S / WD_BLACK SN8100 NVMe SSD 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -23843,6 +23992,8 @@ 010c SM8350 PCIe Root Complex [Snapdragon 888] 010e SC8280XP PCI Express Root Port 0110 SM8475 PCIe Root Complex [Snapdragon 8+ Gen 1] + 0111 SC8380XP PCIe Root Complex [Snapdragon X / X Plus / X Elite] + 0113 SM8550/SM8650 PCIe Root Complex [Snapdragon 8 Gen 2/Gen 3] 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] @@ -23851,6 +24002,7 @@ 0400 Datacenter Technologies QDF2432 PCI Express Root Port 0401 Datacenter Technologies QDF2400 PCI Express Root Port 1000 QCS405 PCIe Root Complex + 1003 IPQ6018 PCIe Root Complex 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter @@ -24714,6 +24866,14 @@ 0441 T4240 without security 0446 T4160 with security 0447 T4160 without security + 0820 T1040 with security + 0821 T1040 without security + 0824 T1042 with security + 0825 T1042 without security + 0828 T1020 with security + 0829 T1020 without security + 082c T1022 with security + 082d T1022 without security 0830 T2080 with security 0831 T2080 without security 0838 T2081 with security @@ -24851,15 +25011,18 @@ 5016 E16 PCIe4 NVMe Controller 5018 E18 PCIe4 NVMe Controller 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) + 5020 PS5020-E20 (X1) PCIe4 NVMe Controller 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) 5026 PS5026-E26 PCIe5 NVMe Controller 5027 PS5027-E27T PCIe4 NVMe Controller (DRAM-less) 5031 PS5031-E31T PCIe5 NVMe Controller + 5302 PS5302-X2 PCIe5 NVMe Controller 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile 198a Nallatech Ltd. 1993 Innominate Security Technologies AG +1998 Toyou Feiji Electronics Co., Ltd. 1999 A-Logics a900 AM-7209 Video Processor 199a Pulse-LINK, Inc. @@ -25015,6 +25178,8 @@ a126 HiSilicon SDI NVMe Storage Controller a127 HiSilicon SDI Accelerator a12a HiSilicon Add-on PCI-PCI Bridge + a12d HiSilicon Embedded PMU + a12e HiSilicon Embedded PCIe PTT a220 HNS GE Network Controller a221 HNS GE/10GE/25GE Network Controller 19e5 0454 TM280 @@ -25102,6 +25267,12 @@ 1a3b AzureWave 1112 AR9285 Wireless Network Adapter (PCI-Express) 1a3e Micro-Research Finland Oy + 132c MTCA Event Receiver 300 + 152c CompactPCI Event Receiver 300 + 172c PCI Express Event Receiver 300 + 192c CompactPCI Event Receiver TG 300 + 232c MTCA Event Master 300 + 252c CompactPCI Event Generator 300 1a41 Tilera Corp. 0001 TILE64 processor 0002 TILEPro processor @@ -25323,19 +25494,83 @@ 1005 Virtio RNG 1009 Virtio filesystem 1041 Virtio 1.0 network device + 1af4 1100 QEMU 1042 Virtio 1.0 block device + 1af4 1100 QEMU 1043 Virtio 1.0 console + 1af4 1100 QEMU 1044 Virtio 1.0 RNG - 1045 Virtio 1.0 memory balloon + 1af4 1100 QEMU + 1045 Virtio 1.0 balloon + 1af4 1100 QEMU + 1046 Virtio 1.0 ioMemory + 1af4 1100 QEMU + 1047 Virtio 1.0 remote processor messaging + 1af4 1100 QEMU 1048 Virtio 1.0 SCSI - 1049 Virtio 1.0 filesystem + 1af4 1100 QEMU + 1049 Virtio 9P transport + 1af4 1100 QEMU + 104a Virtio 1.0 WLAN MAC + 1af4 1100 QEMU + 104b Virtio 1.0 remoteproc serial link + 1af4 1100 QEMU + 104d Virtio 1.0 memory balloon + 1af4 1100 QEMU 1050 Virtio 1.0 GPU + 1af4 1100 QEMU + 1051 Virtio 1.0 clock/timer + 1af4 1100 QEMU 1052 Virtio 1.0 input + 1af4 1100 QEMU 1053 Virtio 1.0 socket - 1058 virtio-mem - 105a Virtio file system - 1110 Inter-VM shared memory - 1af4 1100 QEMU Virtual Machine + 1af4 1100 QEMU + 1054 Virtio 1.0 crypto + 1af4 1100 QEMU + 1055 Virtio 1.0 signal distribution device + 1af4 1100 QEMU + 1056 Virtio 1.0 pstore device + 1af4 1100 QEMU + 1057 Virtio 1.0 IOMMU + 1af4 1100 QEMU + 1058 Virtio 1.0 mem + 1af4 1100 QEMU + 1059 Virtio 1.0 sound + 1af4 1100 QEMU + 105a Virtio 1.0 file system + 1af4 1100 QEMU + 105b Virtio 1.0 pmem + 1af4 1100 QEMU + 105c Virtio 1.0 rpmb + 1af4 1100 QEMU + 105d Virtio 1.0 mac80211-hwsim + 1af4 1100 QEMU + 105e Virtio 1.0 video encoder + 1af4 1100 QEMU + 105f Virtio 1.0 video decoder + 1af4 1100 QEMU + 1060 Virtio 1.0 SCMI + 1af4 1100 QEMU + 1061 Virtio 1.0 nitro secure module + 1af4 1100 QEMU + 1062 Virtio 1.0 I2C adapter + 1af4 1100 QEMU + 1063 Virtio 1.0 watchdog + 1af4 1100 QEMU + 1064 Virtio 1.0 can + 1af4 1100 QEMU + 1065 Virtio 1.0 dmabuf + 1af4 1100 QEMU + 1066 Virtio 1.0 parameter server + 1af4 1100 QEMU + 1067 Virtio 1.0 audio policy + 1af4 1100 QEMU + 1068 Virtio 1.0 Bluetooth + 1af4 1100 QEMU + 1069 Virtio 1.0 GPIO + 1af4 1100 QEMU + 1110 QEMU Inter-VM shared memory device + 1af4 1100 QEMU 1af5 Netezza Corp. 1afa J & W Electronics Co., Ltd. 1b00 Montage Technology Co., Ltd. @@ -25427,6 +25662,7 @@ 000b QEMU PCIe Expander bridge 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller + 000e QEMU PCIe-to-PCI bridge 0010 QEMU NVM Express Controller 0011 QEMU PVPanic device 0013 QEMU UFS Host Controller @@ -25475,16 +25711,20 @@ 1028 2196 ROR-N1 1028 2286 BOSS-N1 DC-MHS 1028 2287 BOSS-N1 Modular DC-MHS + 1028 23b0 eBOSS-N1 DC-MHS 1b4b 2241 Santa Cruz NVMe Host Adapter 1b96 4000 WD_BLACK AN1500 NVMe SSD 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit + 207d 0800 TrustRAID B310n + 207d 0801 TrustRAID B260s 4c52 9541 LRNV9541 2-port M.2 NVMe Raid Adapter 2b42 88W8997 2.4/5 GHz Dual-Band 2x2 Wi-Fi® 5 (802.11ac) + Bluetooth® 5.3 Solution 2b43 NXP 88W9098 Wi-Fi 6 (ax) MAC #1 2b44 NXP 88W9098 Wi-Fi 6 (ax) MAC #2 2b45 NXP 88W9098 Bluetooth 5.3 9120 88SE9120 SATA 6Gb/s Controller + 9122 88SE912x SATA 6Gb/s Controller [AHCI mode] 9123 88SE9123 PCIe SATA 6.0 Gb/s controller dc93 600e DC-6xxe series SATA 6G controller 9125 88SE9125 PCIe SATA 6.0 Gb/s controller @@ -25493,14 +25733,19 @@ 9130 88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo 1043 8438 P8P67 Deluxe Motherboard 9170 88SE9170 PCIe 2.0 x1 2-port SATA 6 Gb/s Controller + 9171 88SE9171 PCIe 2.0 x1 1-port SATA 6 Gb/s Controller 9172 88SE9172 SATA 6Gb/s Controller 9178 88SE9170 PCIe SATA 6Gb/s Controller - 917a 88SE9172 SATA III 6Gb/s RAID Controller + 917a 88SE9172 SATA III 6Gb/s Controller [IDE mode] 9182 88SE9182 PCIe 2.0 x2 2-port SATA 6 Gb/s Controller 9183 88SS9183 PCIe SSD Controller + 9186 88SE9186 6Gb/s SATA 6Gb/s Controller [AHCI mode] + 918a 88SE9182 PCIe SATA 6 Gb/s controller [IDE mode] 9192 88SE9172 SATA III 6Gb/s RAID Controller 91a0 88SE912x SATA 6Gb/s Controller [IDE mode] + 91a3 88SE9128 PCIe SATA 6 Gb/s controller [IDE mode] 91a4 88SE912x IDE Controller + 91b0 88SE9172 SATA 6 Gb/s controller [IDE mode] 9215 88SE9215 PCIe 2.0 x1 4-port SATA 6 Gb/s Controller 9220 88SE9220 PCIe 2.0 x2 2-port SATA 6 Gb/s RAID Controller 9230 88SE9230 PCIe 2.0 x2 4-port SATA 6 Gb/s RAID Controller @@ -25560,6 +25805,7 @@ 1009 FL1009 USB 3.0 Host Controller 1100 FL1100 USB 3.0 Host Controller 16b8 6e31 Allegro Pro USB 3.0 PCIe + 1400 USB 3.0 Host Controller 1b74 OpenVox Communication Co. Ltd. 0115 D115P/D115E Single-port E1/T1 card d130 D130P/D130E Single-port E1/T1 card (3rd GEN) @@ -25721,6 +25967,9 @@ 5021 FireCuda 520 SSD # 1TB 5026 FireCuda 540 SSD + 5027 LaCie Rugged SSD Pro5 + 5100 PCIe Gen3 SSD + 5101 PCIe Gen5 SSD 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -25782,6 +26031,8 @@ 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 100f NS6500G2UXXXX,NS6600G2UXXXX NVME SSD *** 1453 LINES SKIPPED *** From nobody Wed Sep 17 19:37:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpv26RWHz67wmK; Wed, 17 Sep 2025 19:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpv21RjNz4F0G; Wed, 17 Sep 2025 19:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137838; 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=asa12NtUUIORoBIznPaD9OsHSqyDSKi5MtqqaJ6UkaE=; b=MERIoAIZQHj5p33f2P/T1CyD2DFKQ2lWIOAkkaha0kAErbka10Nm7Df0nactPJIwRJGk4t 34Ia16cSCaA5WvaSGl8NYThWeVgQ8ANoxGuL/K/bS5LWxRDVrA9syjdv9IVn6zJY2cOLbx VIAThrCR1z1H1Jv55wL0wzTWxt1oWZrvcpxnK2UXFetZkK66A9n3sR96Aj5UwjXb4yG72N fG+dGJm2Q4VqOU4fpnchaiLDvmpVKk/IT5EV4j6AK2Oq4g2RBNkzwaUW9TSAaqu+CwSXDQ cDM8FUpyS+uZQQVfWM0ICaDaoMxeik4/Uqt4NOrandWtayHFk4aU9PpRu9oA1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137838; 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=asa12NtUUIORoBIznPaD9OsHSqyDSKi5MtqqaJ6UkaE=; b=lGohdObKWXmHvgV/2kuBWg7Kz1WnCSzHn/uKV/IE2mwqjd9XceghIrf/dsZ/1T0j4m5851 INX4pJdydQLZVfhxaQJHDAUXdwRLVsPQmPsMHQRTug8aFkY/U1jZKv7aCK5TpobdnJLW+i tX/Pazp3e6LUe1KWlF8JB1rnlq0hDZMtT/rrTcekJObOLEpyYFrhYwU7ckIPD1lam+bV5L PYjC4dDHN7fO09z++1gfLhNeHaP78VCFW51O5dfemEwNxrJPhG/NOtzs6udunZ4XXjvooe 6+P5HAk0O2RrPGduhTRXBShDO/lKXQHGyBYHZzyWqa6hjb3Mvq8mX4XiO3f7tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137838; a=rsa-sha256; cv=none; b=H+YFHi7CT/MQJ0xGPL78KfLEWqrVk6mTRBdFlpJfVdcSAy06cTQzVx9flyW2sfwh2wMRvC Sk+3VuRp6En/M5rNdrfKjcqzCpC8niWLNsLBzVJo6b3JJFSiFrXbWGhoFplpPwcY86cJYj IQqk8Q0X2JfeeHRHxKnIs1GQOkcvk6btoe0aICrhrOATEkpLZYTVJS6FOwQcgM/yjBaLft cmJbmW3575E7ShoTNlVRjQV3+FV/tgCKPL5ogV3C7JjFMFHo7bwEeQXCqT3SVRWN39CI0u qm+1VDpZ874HFsp7L53z46ivOKzBmqC2RRMRwcL8WMcFFlVag++m82e1ZPvuNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpv20ms5zg8N; Wed, 17 Sep 2025 19:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJbInC015509; Wed, 17 Sep 2025 19:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJbHod015506; Wed, 17 Sep 2025 19:37:17 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:37:17 GMT Message-Id: <202509171937.58HJbHod015506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c73d38aef140 - stable/14 - usb_vendors: update to 2025-07-26 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c73d38aef1407362b8987e6badcb7fb555a12774 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c73d38aef1407362b8987e6badcb7fb555a12774 commit c73d38aef1407362b8987e6badcb7fb555a12774 Author: Baptiste Daroussin AuthorDate: 2025-09-11 07:54:17 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:36:30 +0000 usb_vendors: update to 2025-07-26 (cherry picked from commit 70afc95fc6ecec6edabf5b1e8b060bb0b29ebd55) --- share/misc/usb_vendors | 57 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/share/misc/usb_vendors b/share/misc/usb_vendors index 3e72fe4045e6..1878f503b676 100644 --- a/share/misc/usb_vendors +++ b/share/misc/usb_vendors @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2025.04.01 -# Date: 2025-04-01 20:34:02 +# Version: 2025.07.26 +# Date: 2025-07-26 20:34:01 # # Vendors, devices and interfaces. Please keep sorted. @@ -59,6 +59,8 @@ 0112 Card Reader 017c MLK 145f Trust Deskset +019c mek + 0042 mek_42 0200 TP-Link 0201 MA180 UMTS Modem 0204 Chipsbank Microelectronics Co., Ltd @@ -69,6 +71,9 @@ 0231 Sonuus Limited 02ad HUMAX Co., Ltd. 138c PVR Mass Storage +0300 Ajazz + 1010 Akp153E Desktop Controller + 1020 AKP153R Desktop Controller 0303 Mini Automation Controller 0324 OCZ Technology Inc bc06 OCZ ATV USB 2.0 Flash Drive @@ -95,7 +100,7 @@ 0015 ATAPI Enclosure 2123 SiPix StyleCam Deluxe 8004 Aox 99001 -03e9 Thesys Microelectronics +03e9 Melexis (formerly Thesys Microelectronics) 03ea Data Broadcasting Corp. 03eb Atmel Corp. 0902 4-Port Hub @@ -257,6 +262,8 @@ 0423 HS-COMBO Cardreader 042a LaserJet M1132 MFP 0441 Prime [NW280AA, G8X92AA] + 046b Dock G5 + 0483 Engage Go 10 Tablet 0504 DeskJet 885c 0505 ScanJet 2100c 0507 DVD+RW @@ -266,6 +273,7 @@ 0517 LaserJet 1000 051d Bluetooth Interface 052a LaserJet M1212nf MFP + 0583 Engage Go 10 Tablet 0601 ScanJet 6300c 0604 DeskJet 840c 0605 ScanJet 2200c @@ -275,6 +283,7 @@ 0624 Bluetooth Dongle 0641 X1200 Optical Mouse 0653 DeskJet 3700 series + 0683 Engage Go 10 Tablet 0701 ScanJet 5300c/5370c 0704 DeskJet 825c 0705 ScanJet 4400c @@ -325,6 +334,7 @@ 1102 PhotoSmart 240 series 1104 DeskJet 959c 1105 ScanJet 5470c/5490c + 110c Pocket Media Drive 1111 OfficeJet v60 1116 Jornada 568 Pocket PC 1117 LaserJet 1300n @@ -1013,6 +1023,7 @@ 3000 Optical dual-touch panel 3001 Optical Touch Screen 3008 Optical Touch Screen + 4033 HD Webcam a060 HD Webcam 0409 NEC Corp. 0011 PC98 Series Layout Keyboard Mouse @@ -1029,6 +1040,7 @@ 004e SuperScript 1400 Series 004f Wireless Keyboard with One-touch start buttons 0050 7-port hub + 0056 uPD720133 IDE bridge 0058 HighSpeed Hub 0059 HighSpeed Hub 005a HighSpeed Hub @@ -1486,6 +1498,7 @@ 4095 Live! Cam Sync HD [VF0770] 4097 Live! Cam Chat HD [VF0700/VF0790] 4099 Creative VF0800 [RealSense Camera SR300] + 40a3 Live! Cam V3 2K [VF-0900] 4100 Nomad Jukebox 2 4101 Nomad Jukebox 3 4102 NOMAD MuVo^2 @@ -1959,6 +1972,7 @@ 010d 3500-4500 series 010f 6500 series 0142 X3650 (Printer, Scanner, Copier) + 01bd S800 Series Scanner 01fa S310 series 020e RICOH Aficio SP 4410SF 4303 Xerox WorkCentre Pro 412 @@ -1982,6 +1996,7 @@ 9a10 34UC88-B 9a11 34UC88-B 9a39 27UP850 - WK.AEUDCSN - External Monitor 4K + 9a57 UltraGear Monitor 9c01 LGE Sync 043f RadiSys Corp. 0440 Eizo Nanao Corp. @@ -2007,6 +2022,7 @@ 044d Siemens Nixdorf AG 044e Alps Electric Co., Ltd 1104 Japanese Keyboard + 1218 Electric Touchpad 2002 MD-5500 Printer 2014 Bluetooth Device 3001 UGTZ4 Bluetooth @@ -2737,6 +2753,8 @@ 0180 Strait 3.0 01a4 MC 2.1 Mouse 01a6 MX BOARD 2.0S FL RGB DE Keyboard + 0201 Smart Board 1150 + 0202 Smart Terminal 1150 b090 Keyboard b091 Mouse c099 Stream Keyboard TKL @@ -2851,6 +2869,7 @@ 08dd QuickCam for Notebooks 08e0 QuickCam Express 08e1 Labtec Webcam + 08e4 C505e HD Webcam 08e5 C920 PRO HD Webcam 08f0 QuickCam Messenger 08f1 QuickCam Express @@ -3002,6 +3021,7 @@ c08e G MX518 Gaming Mouse (MU0053) c092 G102/G203 LIGHTSYNC Gaming Mouse c093 M500s Optical Mouse + c09d G102 LIGHTSYNC Gaming Mouse c101 UltraX Media Remote c110 Harmony 785/880/885 Remote c111 Harmony 525 Remote @@ -3060,6 +3080,7 @@ c24d G710 Gaming Keyboard c24e G500s Laser Gaming Mouse c24f G29 Driving Force Racing Wheel [PS3] + c251 GamePanel for Dell XPS M1730 c260 G29 Driving Force Racing Wheel [PS4] c262 G920 Driving Force Racing Wheel c281 WingMan Force @@ -3073,6 +3094,7 @@ c295 Momo Force Steering Wheel c298 Driving Force Pro c299 G25 Racing Wheel + c29a Driving Force GT c29b G27 Racing Wheel c29c Speed Force Wireless Wheel for Wii c2a0 Wingman Force Feedback Mouse @@ -3110,6 +3132,7 @@ c335 G910 Orion Spectrum Mechanical Keyboard c336 G213 Prodigy Gaming Keyboard c33a G413 Gaming Keyboard + c33e G915 Mechanical Keyboard c33f G815 Mechanical Keyboard c401 TrackMan Marble Wheel c402 Marble Mouse (2-button) @@ -3359,6 +3382,7 @@ 047c Dell Computer Corp. ffff UPS Tower 500W LV 047d Kensington + 00f2 VeriMark Desktop 1001 Mouse*in*a*Box 1002 Expert Mouse Pro 1003 Orbit TrackBall @@ -3558,6 +3582,7 @@ 0485 Nokia Monitors 0486 ASUS Computers, Inc. 0185 EeePC T91MT HID Touch Panel + 573c Xreal Light Microcontroller 0487 Stewart Connector 0488 Cirque Corp. 0489 Foxconn / Hon Hai @@ -3663,6 +3688,7 @@ 1033 DGX-505 1037 PSR-E403 103c MOTIF-RACK ES + 1045 MM6 1054 S90XS Keyboard/Music Synthesizer 160f P-105 1613 Clavinova CLP535 @@ -3892,9 +3918,11 @@ 106d S750 Printer 106e S820D 1070 S530D + 1071 Sony MPR-501 1072 I850 Printer 1073 I550 Printer 1074 S330 Printer + 1075 Sony MPR-505 1076 i70 1077 i950 107a S830D @@ -4053,6 +4081,7 @@ 178a PIXMA MG3600 Series 178d PIXMA MG6853 180b PIXMA MG3000 series + 183b PIXMA MG3110 Series 1856 PIXMA TS6250 1900 CanoScan LiDE 90 1901 CanoScan 8800F @@ -4060,6 +4089,7 @@ 1905 CanoScan LiDE 200 1906 CanoScan 5600F 1907 CanoScan LiDE 700F + 1908 CanoScan 9000F 1909 CanoScan LiDE 110 190a CanoScan LiDE 210 190d CanoScan 9000F Mark II @@ -4621,6 +4651,7 @@ 0434 D610 0436 D810 043f D5600 + 0455 Z50II 0f03 PD-10 Wireless Printer Adapter 4000 Coolscan LS 40 ED 4001 LS 50 ED/Coolscan V ED @@ -4907,11 +4938,19 @@ 0891 Stylus Office BX535WD 0892 Stylus Office BX935FWD 0893 EP-774A + 08d1 L220/L360 Series 0e03 Thermal Receipt Printer [TM-T20] + 0e31 Thermal Receipt Printer [TM-L100] 1114 XP-440 [Expression Home Small-in-One Printer] 1115 ES-0133 [Expression Home XP-342] 1129 ET-4750 [WorkForce ET-4750 EcoTank All-in-One] 1168 Workforce WF-7820/7840 Series + 1186 ET-2820 Series [ET-2820 EcoTank All-in-One] + 118a ET-2810/L3250 Series [EcoTank ET-2810/L3250] + 118b ET-2850/L4260 Series [EcoTank ET-2850/L4260] + 11b0 XP-4200 Series [Expression Home XP-4200] + 11b9 ET-2830/L3550 Series [EcoTank ET-2830/L3550] + 11c8 ET-2860/L3270 Series [EcoTank ET-2860/L3270] 04b9 Rainbow Technologies, Inc. 0300 SafeNet USB SuperPro/UltraPro 1000 iKey 1000 Token @@ -4996,6 +5035,9 @@ 1303 i3 Micro Module 1304 i3 Module 1305 i3 Multi Sensing Module + 1400 Javelin Module Recovery + 1401 Javelin Module + 1500 Gas sensor demo board 04c1 U.S. Robotics (3Com) 0020 56K Voice Pro 0022 56K Voice Pro @@ -5034,7 +5076,9 @@ 11f3 fi-6130Z 125a PalmSecure Sensor Device - MP 132e fi-7160 + 1526 PalmSecure-F Pro 159f ScanSnap iX1500 + 15ff Fi-8170 Document Scanner [Ricoh fi-8170: High Performance Desktop Scanner - PFU] 200f Sigma DP2 (Mass Storage) 2010 Sigma DP2 (PictBridge) 201d SATA 3.0 6Gbit/s Adaptor [GROOVY] @@ -5067,6 +5111,7 @@ 300f Atheros AR3012 Bluetooth 3014 Qualcomm Atheros Bluetooth 3015 Qualcomm Atheros QCA9377 Bluetooth + 3802 MediaTek Bluetooth MT7921 7022 HP HD Webcam 7025 HP HD Webcam 7046 TOSHIBA Web Camera - HD @@ -15333,6 +15378,12 @@ 0e23 Liou Yuane Enterprise Co., Ltd 0e25 VinChip Systems, Inc. 0e26 J-Phone East Co., Ltd +0e2c Materialise Motion NV + 0012 footscan pressure plate (0.5m) + 0013 footscan pressure plate (1.0m) + 0018 footscan 2D interface box + 0020 footscan pressure plate (1.5m) + 002d footscan heavy duty pressure plate (1.0m) 0e2e Brady Worldwide, Inc. 000b BMP 51 000c BMP 61 From nobody Wed Sep 17 19:38:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpw95n4Sz67wpm; Wed, 17 Sep 2025 19:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpw94WYMz4Fm2; Wed, 17 Sep 2025 19:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137897; 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=CuXULzuRj/PfvoNifVYrj3cwCUsNRn5K34Jp2GcPSQI=; b=Jg3P1FOrn388NY8yjI+U4J3qX5cMVg06fGdiTCR0V02z6VNxrgQFNCCNBxLc/uAu2zEmqQ p4pf2NEo4Dbu8zm86cyzsiRrijQRrbfIwQKUSGZhNzbcbeOMB1RFSrBkarHzkd+e9IoVnN 6Hl2jku/WdoIMlTWEcRGG+T39Km1P+aXKJCu55uFnf2zhkpqAOUfbrVJEAY9ygtbv2zZ1i upqS1fKIV3ko5bqL4LMF6M5q8DU/aHw7zWNjB8xga6Wr4kwsLrhlex+yGPqwOvpQa5fCeO /qVe/TkRVOStBoce8IWpgdsokpZFtHz81rNKQDnPmisrR7ddMjTj0pG3TFNMMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137897; 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=CuXULzuRj/PfvoNifVYrj3cwCUsNRn5K34Jp2GcPSQI=; b=Gsin8eg/o+5Jn7itVHhNerqaZL4r2tK/0L7dXFYAtRVZkzZSwnP0v5jhYWRNB5aQ2fPU0K HBw3pjIbjQRe+J6AaXSL7Wf0szs03HhfEwIJ6nhD918l6X995+HJiege2HSmYAr3NetL0H U1Zm1Xvfuo7ptrU+HaiYO9CBKCjhZ9kNcK4z07Rkhx4881EVEZUEa3wvgaAxvr/btON14Q h8FZh0aB9ngkFdsZZukNT96WW9QWgKka0DdEHl5tAxc3I6msZtk/VCJe7KUQbqpFm0GgK0 nAK1CPYuH+FBHpRtwRg/A65kIjmaT2XUehW6Pt2iC11zFf2lUM8lK6cEHoIXLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137897; a=rsa-sha256; cv=none; b=G4CEZCxP7pMNVbN4KUuyIwpU9O7cWvh9JXNxzyQIQDU1Vj3LaL2gIwjokFmZLx72HqvVkb Da238c8pI4EJguE8MsOyCbfZuf8Ds3J5scs5FLH7CeuvV5dCpeDr7mtPcuu+b4trzWXQYF HcL8VCFQO35884P03dQa3TPB9KiUqugdhugc8qllnkA3yWt4RMCuQ6b3Lc6pmYXg3nEgzH r/V8tt1QpIAQL2ojSJ25yM1az0r+jniFLsB1f/9A9WurOG0POY6Y3BzUmeXoIMPnn5F+4I v5mr69uR3kXEohfJal3/2PjrEesNKjBG6AoT5uJkFrnghYilJMBXUpmhcv2z8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpw945wVzgSq; Wed, 17 Sep 2025 19:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJcHMh016062; Wed, 17 Sep 2025 19:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJcHuk016059; Wed, 17 Sep 2025 19:38:17 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:38:17 GMT Message-Id: <202509171938.58HJcHuk016059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 65f42f894b1b - stable/14 - mac_do(4): fix typo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 65f42f894b1b7541e43984c7b18c7fd6f05461ee Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=65f42f894b1b7541e43984c7b18c7fd6f05461ee commit 65f42f894b1b7541e43984c7b18c7fd6f05461ee Author: Baptiste Daroussin AuthorDate: 2025-06-27 11:29:34 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:37:20 +0000 mac_do(4): fix typo Reported by: des (cherry picked from commit d0c8733997079a54828ad2222517427d9447dbaf) --- share/man/man4/mac_do.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/mac_do.4 b/share/man/man4/mac_do.4 index fb165dfe5a1a..4dcb54c89673 100644 --- a/share/man/man4/mac_do.4 +++ b/share/man/man4/mac_do.4 @@ -44,7 +44,7 @@ It supports per-jail configuration. .Pp Currently, the .Nm -policy module only produces effects to processes spwaned from the +policy module only produces effects to processes spawned from the .Pa /usr/bin/mdo executable, please see .Xr mdo 1 From nobody Wed Sep 17 19:38:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRpwB5yxxz67ws3; Wed, 17 Sep 2025 19:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRpwB59vzz4FjQ; Wed, 17 Sep 2025 19:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137898; 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=gA8HWYFyZ5Smu29+St6/iypxnZFZD2dsNnURT4lst5c=; b=sx0rIbToKvSPHg2g8QAI1j30FaWfBA9B2VqYwH7VH3+OOjWEG5xgt6hgvBrXK45fmHMzVP XbxryVV+sluiVVf2LOl9tPSdSmvfV9LFZUPwSqtpQDaZVRjUWYmVcFuP+EEbutam5fXDy+ HGzmUaTSx53JnzHJyqYepybBK7LFJBBHtXV5sTqmINhT+UXRDDSwoTNg0tTKSnKFzSzPhL G2T+cCyQj2bSgmqHQg7xKcpKMssgDrTZJrRDepJeHl6VWaaTyvmWwhxK0oaNtySLskNNRj s2jy7tilCqdeqUKU/xRwpGI3rCNlsKpvZnUuTlVvZdNT17s50yBTj1UBvguNxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758137898; 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=gA8HWYFyZ5Smu29+St6/iypxnZFZD2dsNnURT4lst5c=; b=l2SNwqExw2cNTiw4mBHxLlGIXJlZEXoLZiYkYCR4wvImyDNToThc2oe5jVclxAJbBubL+5 QS/qr/wjVGK2u+NX9MbOMF6dcx8IrVUxXHihSaKk2t2kCwlVnxL1vKI8omUi3SrDRheSt5 59ze6/uMidmdT/PKSgYqsGSvcAWrTD3GKYv1ffWBUrXOcZyagdqn9ployQZdKVqyhrS3+p aT/5y5jvqRZejqrVOa1gk2HMWtDpv7FRrxXu65R7uYV0v1olvizrivm9GfxZXDfvn6SxGV n+0uL66nmSQNGPbLmpCk8yewRJmUsTx7RhsGGamH1+cHUWPlRL1yj9twzhHcog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758137898; a=rsa-sha256; cv=none; b=WoNBF9sVZP61AxBqd3rwKZn44u7TzbrXfnXvKQ32lyoSlRBDYfZHWk/pnY4qckhcd1ECjY ko7uoNEXoAXbHhhmpVVNlNgS+m9LfcQe5djocGukEZ47DZkaUi7Dv9hc5XFlxTPduMlzOc 7uAOmY/VPw1YNI4hELr3p5MJl2nVrVHOd5NPfmt+Qdgpuk6jbyOw2PG+YbofMtledwfrV5 ZVvxfy/SKAExnzB335DkmuM9bOQFf7hGhRRy+/fvHe1exgXJy3vzb/+hraD19i5ueRriXp ZZFmFUs3EW3QUvHeF8OLWC4e+4yDrSi8sqN4DyMcR97CumOOnv5ZMEJhbuQZxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRpwB4nhXzgg1; Wed, 17 Sep 2025 19:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJcIC8016094; Wed, 17 Sep 2025 19:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJcI3n016091; Wed, 17 Sep 2025 19:38:18 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:38:18 GMT Message-Id: <202509171938.58HJcI3n016091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 08e259e39236 - stable/14 - timeout(1): add license header to unit test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08e259e3923696b6a93e11cb32f53bab7a24db00 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=08e259e3923696b6a93e11cb32f53bab7a24db00 commit 08e259e3923696b6a93e11cb32f53bab7a24db00 Author: Baptiste Daroussin AuthorDate: 2025-09-03 09:52:46 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:38:02 +0000 timeout(1): add license header to unit test Requested by: kevans (cherry picked from commit 245f2abf94889d3fd69360c4f49532074ff25fbf) --- bin/timeout/tests/timeout_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/timeout/tests/timeout_test.sh b/bin/timeout/tests/timeout_test.sh index b1bf69968e84..88dbaa808043 100644 --- a/bin/timeout/tests/timeout_test.sh +++ b/bin/timeout/tests/timeout_test.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright (c) 2014 Baptiste Daroussin atf_test_case nominal nominal_head() From nobody Wed Sep 17 19:42:20 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq0r4w5Mz67xNS; Wed, 17 Sep 2025 19:42: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0r4ZFTz4GY4; Wed, 17 Sep 2025 19:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138140; 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=B0lNd5WDG13hCrEVh2WnVp4rPF1+5k+iMf2V8CivmbE=; b=vK6hmw+uB/112PiUI0LutCcXQ6Zg5m5MLn4GdS95BkpO9ID05HE0VEVaW2xE4JBr72HQJn xhzKB4Uj1yav7IcXWwzmsiK6anUOzuFCl9NPYD5AS0/apDwtwagE+uUasFtDGiRgeAccjz hn6VaE2gRCMxbJ+Pw4unUUfgN7ex6qHSp/Jy+k+Yv9K/NcrCgAcaHfG1O/O4n0B4w2cXeX EolB4b1gfCSitB58TQbRESZ7b6tBquXehliZWLjS+cJS1kAazCsNwp09QFJ/nV8XnR6Syj MA+x5UqDrltOMxjHEYffWtmH4p5i7BNvRI48Sf7zWLPXeU2cmFYKk6SW1ln58g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138140; 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=B0lNd5WDG13hCrEVh2WnVp4rPF1+5k+iMf2V8CivmbE=; b=ZPw8REEq/7YU4CH72dTsqU1lr86HoYDTpBmQGSMfyFK7qUzvGE+Nvibo8aSJMO2HuXhd9Y LnvnJFFa5BWv3qxaoMBASTT1y84fgTpfzriiMwPJpVvUsDe8ZJd+kCniMbk4hX1+RJhYUH NLwXE2FR/O3LPDE98UqphOsz94SdpP+8DS0Zb6YbeLr580XsIDs+M5Pjit8pmNdeKQD8v+ uD1SkN4tewgvwjJSlcj1cfr07GWQSHFhNhFcruVcTg3Q9lxtY44BRTdVTE9gKIlV4waM3h GQDF9nqELjIxcsEv2qGAZsXnE74/4vsqn6AU5wb1QOyl29yB9DVLHgdcto15Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138140; a=rsa-sha256; cv=none; b=pJMxKLAr6f8r+Jq1bBkGrbW43nxIv5RVS5J7U/5OsNvZ+AM7BN8UkifBdv5wpILjFIvv8k s7V2ct85VdjDPbbVqnw60KGHceXQF0WtnuzH4G8peXvNlnOOJTFIX5m83ZgGA+UBiVsoG1 FjKA0jHAuWqKlYJRrJrGnbhKSokckh9mRqflx+2vgJGSYsS1rCS2MzbGahstZW5Lp6jeM+ SiOkWYoYKExYuftxEKATd49G9/65Zj+9vTx5elsp5JkiURWdtD+bU4tWApZEL8ICRamlpU sVBvQ10vIvXqFgS6jc+rivM0sB5tSwrD3h9nwoobbqL/6BVj5vts8aLR6w1cTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0r42Cgzggm; Wed, 17 Sep 2025 19:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgKIW032004; Wed, 17 Sep 2025 19:42:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgKSe032001; Wed, 17 Sep 2025 19:42:20 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:20 GMT Message-Id: <202509171942.58HJgKSe032001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 3a680e954469 - stable/14 - nuageinit: Improvements for nuageinit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a680e9544696c8ea434a7ed60dbaae693e5af7f Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3a680e9544696c8ea434a7ed60dbaae693e5af7f commit 3a680e9544696c8ea434a7ed60dbaae693e5af7f Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-08-22 18:14:18 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:39:23 +0000 nuageinit: Improvements for nuageinit - Fix 'pkg update' usage: - The function 'nuage:run_pkg_cmd(...)' adds the flag '-y', which does not make sense with some commands such as 'pkg update', causing an error when updating the repository catalogs. - Fix typo 'ssh-authorized-keys -> ssh_authorized_keys' in 'nuageinit(7)' man page. - Document 'ssh_authorized_keys' parameter. - Use device configuration ID when no 'match' rule is specified: - This is the default behavior of cloud-init when no match rule is specified, so the device is configured anyway (even if it does not exist). This greatly simplifies things, since in many cases 'if_vtnet(4)' is used, so there is no need to perform a comparison with the MAC address. - Document 'network' parameter: - Add example to 'EXAMPLES' section. - Set 'gateway[46]' only when 'addresses' is specified: - To comply with the cloud-init specification, 'gateway4' and 'gateway6' must only take effect when 'addresses' (or static configuration) is specified. - Use a separate function to check 'match' rules: - This way, we can easily add new logic to new types of rules. - Implement 'network.ethernets.{id}.match.name' parameter: - But unlike cloud-init, which works with glob expressions (although it depends on the network backend), this implementation takes advantage of Lua pattern-matching expressions. Also note that previously we were only concerned with one interface matching, however, to be cloud-init-compliant, we need to configure the matching interfaces (one or more). - Set default router only once. - Implement 'network.ethernets.{id}.wakeonlan' parameter. - Implement 'network.ethernets.{id}.set-name' parameter. - Implement 'network.ethernets.{id}.match.driver' parameter: - Rename 'get_ifaces(...)' function as 'get_ifaces_by_mac(...)'. - Add get_ifaces_by_driver(...) function. - Implement 'network.ethernets.{id}.mtu' parameter. - Implement 'nameservers' parameter. - Use 'resolvconf(8)' to manipulate 'resolv.conf(5)'. - Use 'tzsetup(8)' to set time zone. Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D51643 (cherry picked from commit ba5df7a2d03cd5624b1825ca8d4c39dcaace7796) --- libexec/nuageinit/nuage.lua | 20 ++- libexec/nuageinit/nuageinit | 238 ++++++++++++++++++++++++++++---- libexec/nuageinit/nuageinit.7 | 92 +++++++++++- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/nuage.sh | 9 ++ libexec/nuageinit/tests/nuageinit.sh | 4 +- libexec/nuageinit/tests/settimezone.lua | 5 + 7 files changed, 335 insertions(+), 34 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 493ae11d6ca7..48f54b120615 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -451,6 +451,23 @@ local function chpasswd(obj) end end +local function settimezone(timezone) + if timezone == nil then + return + end + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then + root = "/" + end + + f, _, rc = os.execute("tzsetup -s -C " .. root .. " " .. timezone) + + if not f then + warnmsg("Impossible to configure time zone ( rc = " .. rc .. " )") + return + end +end + local function pkg_bootstrap() if os.getenv("NUAGE_RUN_TESTS") then return true @@ -480,7 +497,7 @@ local function install_package(package) end local function run_pkg_cmd(subcmd) - local cmd = "pkg " .. subcmd .. " -y" + local cmd = "env ASSUME_ALWAYS_YES=yes pkg " .. subcmd if os.getenv("NUAGE_RUN_TESTS") then print(cmd) return true @@ -556,6 +573,7 @@ local n = { dirname = dirname, mkdir_p = mkdir_p, sethostname = sethostname, + settimezone = settimezone, adduser = adduser, addgroup = addgroup, addsshkey = addsshkey, diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 0fcdc7274db3..70b27cb33d87 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -46,7 +46,15 @@ local function open_config(name) return openat("/etc/rc.conf.d", name) end -local function get_ifaces() +local function open_resolv_conf() + return openat("/etc", "resolv.conf") +end + +local function open_resolvconf_conf() + return openat("/etc", "resolvconf.conf") +end + +local function get_ifaces_by_mac() local parser = ucl.parser() -- grab ifaces local ns = io.popen("netstat -i --libxo json") @@ -77,6 +85,10 @@ local function sethostname(obj) end end +local function settimezone(obj) + nuage.settimezone(obj.timezone) +end + local function groups(obj) if obj.groups == nil then return end @@ -171,6 +183,59 @@ local function ssh_authorized_keys(obj) end end +local function nameservers(interface, obj) + local resolvconf_conf_handler = open_resolvconf_conf() + + if obj.search then + local with_space = false + + resolvconf_conf_handler:write('search_domains="') + + for _, d in ipairs(obj.search) do + if with_space then + resolvconf_conf_handler:write(" " .. d) + else + resolvconf_conf_handler:write(d) + with_space = true + end + end + + resolvconf_conf_handler:write('"\n') + end + + if obj.addresses then + local with_space = false + + resolvconf_conf_handler:write('name_servers="') + + for _, a in ipairs(obj.addresses) do + if with_space then + resolvconf_conf_handler:write(" " .. a) + else + resolvconf_conf_handler:write(a) + with_space = true + end + end + + resolvconf_conf_handler:write('"\n') + end + + resolvconf_conf_handler:close() + + local resolv_conf = root .. "/etc/resolv.conf" + + resolv_conf_attr = lfs.attributes(resolv_conf) + + if resolv_conf_attr == nil then + resolv_conf_handler = open_resolv_conf() + resolv_conf_handler:close() + end + + if not os.execute("resolvconf -a " .. interface .. " < " .. resolv_conf) then + nuage.warn("Failed to execute resolvconf(8)") + end +end + local function install_packages(packages) if not nuage.pkg_bootstrap() then nuage.warn("Failed to bootstrap pkg, skip installing packages") @@ -187,6 +252,85 @@ local function install_packages(packages) end end +local function list_ifaces() + local proc = io.popen("ifconfig -l") + local raw_ifaces = proc:read("*a") + proc:close() + local ifaces = {} + for i in raw_ifaces:gmatch("[^%s]+") do + table.insert(ifaces, i) + end + return ifaces +end + +local function get_ifaces_by_driver() + local proc = io.popen("ifconfig -D") + local drivers = {} + local last_interface = nil + for line in proc:lines() do + local interface = line:match("^([%S]+): ") + + if interface then + last_interface = interface + end + + local driver = line:match("^[%s]+drivername: ([%S]+)$") + + if driver then + drivers[driver] = last_interface + end + end + proc:close() + + return drivers +end + +local function match_rules(rules) + -- To comply with the cloud-init specification, all rules must match and a table + -- with the matching interfaces must be returned. This changes the way we initially + -- thought about our implementation, since at first we only needed one interface, + -- but cloud-init performs actions on a group of matching interfaces. + local interfaces = {} + if rules.macaddress then + local ifaces = get_ifaces_by_mac() + local interface = ifaces[rules.macaddress] + if not interface then + nuage.warn("not interface matching by MAC address: " .. rules.macaddress) + return + end + interfaces[interface] = 1 + end + if rules.name then + local match = false + for _, i in pairs(list_ifaces()) do + if i:match(rules.name) then + match = true + interfaces[i] = 1 + end + end + if not match then + nuage.warn("not interface matching by name: " .. rules.name) + return + end + end + if rules.driver then + local match = false + local drivers = get_ifaces_by_driver() + for d in pairs(drivers) do + if d:match(rules.driver) then + match = true + interface = drivers[d] + interfaces[interface] = 1 + end + end + if not match then + nuage.warn("not interface matching by driver: " .. rules.driver) + return + end + end + return interfaces +end + local function write_files(files, defer) if not files then return @@ -210,41 +354,76 @@ end local function network_config(obj) if obj.network == nil then return end - local ifaces = get_ifaces() local network = open_config("network") local routing = open_config("routing") local ipv6 = {} - for _, v in pairs(obj.network.ethernets) do - if not v.match then - goto next + local set_defaultrouter = true + local set_defaultrouter6 = true + local set_nameservers = true + for i, v in pairs(obj.network.ethernets) do + local interfaces = {} + if v.match then + interfaces = match_rules(v.match) + + if next(interfaces) == nil then + goto next + end + else + interfaces[i] = 1 end - if not v.match.macaddress then - goto next + local extra_opts = "" + if v.wakeonlan then + extra_opts = extra_opts .. " wol" end - if not ifaces[v.match.macaddress] then - nuage.warn("not interface matching: " .. v.match.macaddress) - goto next + if v.mtu then + if type(v.mtu) == "number" then + mtu = tostring(v.mtu) + else + mtu = v.mtu + end + if mtu:match("%d") then + extra_opts = extra_opts .. " mtu " .. mtu + else + nuage.warn("MTU is not set because the specified value is invalid: " .. mtu) + end end - local interface = ifaces[v.match.macaddress] - if v.dhcp4 then - network:write("ifconfig_" .. interface .. '="DHCP"\n') - elseif v.addresses then - for _, a in pairs(v.addresses) do - if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then - network:write("ifconfig_" .. interface .. '="inet ' .. a .. '"\n') - else - network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. a .. '"\n') - ipv6[#ipv6 + 1] = interface + for interface in pairs(interfaces) do + if v.match and v.match.macaddress and v["set-name"] then + local ifaces = get_ifaces_by_mac() + local matched = ifaces[v.match.macaddress] + if matched and matched == interface then + network:write("ifconfig_" .. interface .. '_name=' .. v["set-name"] .. '\n') + interface = v["set-name"] + end + end + if v.dhcp4 then + network:write("ifconfig_" .. interface .. '="DHCP"' .. extra_opts .. '\n') + elseif v.addresses then + for _, a in pairs(v.addresses) do + if a:match("^(%d+)%.(%d+)%.(%d+)%.(%d+)") then + network:write("ifconfig_" .. interface .. '="inet ' .. a .. extra_opts .. '"\n') + else + network:write("ifconfig_" .. interface .. '_ipv6="inet6 ' .. a .. extra_opts .. '"\n') + ipv6[#ipv6 + 1] = interface + end + end + if set_nameservers and v.nameservers then + set_nameservers = false + nameservers(interface, v.nameservers) + end + if set_defaultrouter and v.gateway4 then + set_defaultrouter = false + routing:write('defaultrouter="' .. v.gateway4 .. '"\n') + end + if v.gateway6 then + if set_defaultrouter6 then + set_defaultrouter6 = false + routing:write('ipv6_defaultrouter="' .. v.gateway6 .. '"\n') + end + routing:write("ipv6_route_" .. interface .. '="' .. v.gateway6) + routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') end end - end - if v.gateway4 then - routing:write('defaultrouter="' .. v.gateway4 .. '"\n') - end - if v.gateway6 then - routing:write('ipv6_defaultrouter="' .. v.gateway6 .. '"\n') - routing:write("ipv6_route_" .. interface .. '="' .. v.gateway6) - routing:write(" -prefixlen 128 -interface " .. interface .. '"\n') end ::next:: end @@ -316,7 +495,7 @@ local function config2_network(p) end local obj = parser:get_object() - local ifaces = get_ifaces() + local ifaces = get_ifaces_by_mac() if not ifaces then nuage.warn("no network interfaces found") return @@ -468,6 +647,7 @@ f:close() if line == "#cloud-config" then local pre_network_calls = { sethostname, + settimezone, groups, create_default_user, ssh_keys, diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 327ce160e151..604d8a2221ca 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -143,6 +143,11 @@ Specify a fully qualified domain name for the instance. Specify the hostname of the instance if .Qq Ic fqdn is not set. +.It Ic timezone +Sets the system timezone based on the value provided. +.Pp +See also +.Xr tzfile 3 Ns . .It Ic groups An array of strings or objects to be created: .Bl -bullet @@ -176,6 +181,81 @@ boolean which determines the value of the configuration in .Pa /etc/ssh/sshd_config .It Ic network +Network configuration parameters. +.Bl -tag -width "ethernets" +.It Ic ethernets +Mapping representing a generic configuration for existing network interfaces. +.Pp +Each key is an interface name that is only used when no +.Sy match +rule is specified. +If +.Sy match +rules are specified, an arbitrary name can be used +.Po e.g.: id0 Pc Ns . +.Bl -tag -width "nameservers" +.It Ic match +This selects a subset of available physical devices by various hardware properties. +The following configuration will then apply to all matching devices, as soon as +they appear. All specified properties must match. The following properties for +creating matches are supported: +.Bl -tag -width "macaddress" +.It Ic macaddress +.No Device's MAC address in the form Sy xx:xx:xx:xx:xx:xx Ns . +Letters should be lowercase. +.It Ic name +Current interface name. Lua pattern-matching expressions are supported. +.It Ic driver +Interface driver name and unit number of the interface. Lua pattern-natching expressions +are supported. +.El +.It Ic set-name +When matching on unique properties such as MAC, match rules can be written so that they +match only one device. Then this property can be used to give that device a more +specific/desirable/nicer name than the default. +.Pp +While multiple properties can be used in a match, +.Sy macaddress +is required for nuageinit to perform the rename. +.It Ic mtu +The MTU key represents a device's Maximum Transmission Unit, the largest size packet +or frame. +.It Ic wakeonlan +Enable wake on LAN. Off by default. +.It Ic dhcp4 +Configure the interface to use DHCP. +.Pp +This takes precedence over +.Sy addresses +when both are specified. +.It Ic addresses +List of strings representing IPv4 or IPv6 addresses. +.It Ic gateway4 +Set default gateway for IPv4, for manual address configuration. This requires setting +.Sy addresses +too. +.Pp +Since only one default router can be configured at a time, this parameter is applied +when processing the first entry, and any others are silently ignored. +.It Ic gateway6 +Set default gateway for IPv6, for manual address configuration. This requires setting +.Sy addresses +too. +.Pp +Since only one default router can be configured at a time, this parameter is applied +when processing the first entry, and any others are silently ignored. +.It Ic nameservers +Set DNS servers and search domains, for manual address configuration. +.Pp +There are two supported fields: +.Bl -tag -width "addresses" +.It Ic search +Search list for host-name lookup. +.It Ic addresses +List of IPv4 or IPv6 name server addresses that the resolver should query. +.El +.El +.El .It Ic runcmd An array of commands to be run at the end of the boot process .It Ic packages @@ -186,7 +266,7 @@ Update the remote package metadata. Upgrade the packages installed to their latest version. .It Ic users Specify a list of users to be created: -.Bl -tag -width "plain_text_passwd" +.Bl -tag -width "ssh_authorized_keys" .It Ic name Name of the user. .It Ic gecos @@ -201,6 +281,8 @@ The list of other groups the user should belong to. A boolean which determines if the home directory should be created or not. .It Ic shell The shell that should be used for the user. +.It Ic ssh_authorized_keys +List of SSH keys for the user. .It Ic passwd The encrypted password for the user. .It Ic plain_text_passwd @@ -287,7 +369,7 @@ users: - name: user gecos: Foo B. Bar sudo: ALL=(ALL) NOPASSWD:ALL - ssh-authorized-keys: + ssh_authorized_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAr... packages: - neovim @@ -303,6 +385,12 @@ ssh_keys: ... -----END OPENSSH PRIVATE KEY----- ed25519_public: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK+MH4E8KO32N5CXRvXVqvyZVl0+6ue4DobdhU0FqFd+ +network: + ethernets: + vtnet0: + addresses: + - 192.168.8.2/24 + gateway4: 192.168.8.1 .Ed .Sh SEE ALSO .Xr kenv 2 , diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index 0b813dbd98be..0f5b10bc7280 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -8,6 +8,7 @@ ${PACKAGE}FILES+= adduser.lua ${PACKAGE}FILES+= dirname.lua ${PACKAGE}FILES+= err.lua ${PACKAGE}FILES+= sethostname.lua +${PACKAGE}FILES+= settimezone.lua ${PACKAGE}FILES+= warn.lua ${PACKAGE}FILES+= addfile.lua diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 91260fc33a2f..4409b1ff5853 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -7,11 +7,20 @@ export NUAGE_FAKE_ROOTDIR="$PWD" atf_test_case sethostname +atf_test_case settimezone atf_test_case addsshkey atf_test_case adduser atf_test_case addgroup atf_test_case addfile +settimezone_body() +{ + atf_check /usr/libexec/flua $(atf_get_srcdir)/settimezone.lua + if [ ! -f etc/localtime ]; then + atf_fail "localtime not written" + fi +} + sethostname_body() { atf_check /usr/libexec/flua $(atf_get_srcdir)/sethostname.lua diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 849f1c258b62..98593f7d75b0 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -815,7 +815,7 @@ config2_userdata_update_packages_body() package_update: true EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg update -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"env ASSUME_ALWAYS_YES=yes pkg update\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_upgrade_packages_body() @@ -829,7 +829,7 @@ config2_userdata_upgrade_packages_body() package_upgrade: true EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -o inline:"pkg upgrade -y\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check -o inline:"env ASSUME_ALWAYS_YES=yes pkg upgrade\n" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet } config2_userdata_shebang_body() diff --git a/libexec/nuageinit/tests/settimezone.lua b/libexec/nuageinit/tests/settimezone.lua new file mode 100644 index 000000000000..a8cacf09f4e7 --- /dev/null +++ b/libexec/nuageinit/tests/settimezone.lua @@ -0,0 +1,5 @@ +#!/usr/libexec/flua + +local n = require("nuage") + +n.settimezone("UTC") From nobody Wed Sep 17 19:42:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq0t0byVz67wvk; Wed, 17 Sep 2025 19:42: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0s5QYvz4Gq5; Wed, 17 Sep 2025 19:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138141; 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=TfBaHF/j4nEl5zJF/dsJ3zg3aqKBkQgmXPpn3RM/qhA=; b=TebREKr//Xf0wbsAsN2yaBJnKL41F06Mp881K9e1WSgTJt4vh6gFuXWYzQZRXURsM2WzIt 8qRnVIvjOJkx9eimbQQBJb+vmrvlkPx4wShA9dV7vb4yEOvlgiVTv3u9C/rGjikiIxjoWx +dPKO6rKKy2J5a33A9Pe2CpwKiMuzGGBnpDAhdjmP8bIYlUWcYyVVByOaVMRi8KE6zo2la tfgtZBdXy8l1DRmGCaPKiIpX9EG2nX30/x11WoPFXzCErMwEklnRPQZLj4B2THG19KQoS+ +8zhZHy6YdNqQQLXNSmZ/OFkIoUSKZH/vjVu5Ez3z5/4F3huxmxuNjcPbOw4zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138141; 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=TfBaHF/j4nEl5zJF/dsJ3zg3aqKBkQgmXPpn3RM/qhA=; b=QpXE1RYpP0DH+r5cg0oJRx8SkFVOuOPxJ+muOtCLH0vBcF0AFCK75J7Vt6nJA4th4AvxJY umGGz3ki42nTPsXIoNOkNx44x07mijbEkys1cG8/S7sj1Qa0gTlA2Bq89Da+YQfuavlpdC JDoDTL90ZeEoLpRXBnATiTTIHrX7mVAWBJ6PrQHxM4lVn4iP5DJhRsVtNdN6Rm9ge0zgFv pJPa0tqiu0oD5t6IXs+WBDnV3kNlS1s9OHyPR5hHFXhwAyfqo7EDf9pmbopt1NFGXA0kDs D3Ole8WNQNdvpnwNym4Tdk/GRwwSMis96dyBrhqMR0EfOun2ldNJsP029txc5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138141; a=rsa-sha256; cv=none; b=tfPMFmy4AtTfxxGqPHlguLxwfNctTl9WYj+j1puWmVe1/xZHDa/YI4Ez9tZLwj6P/jtlds 3NmW/q0x8R7sVeAbHc9GmtANEEiOGTaoS65nIHQZCsnwWQMo1/u4HQS5Qr6RWapiuKoKil xTaMLudpONhOfOe/XtDdnBGV7ItM5e3jutyoXvOJw9rjgDgrtEf8O/lzKLkBaGx2KxUPf/ MtFaYWjof5cp+tBJTKDp1m/mTHHNPDDI5idT0pnMJB3Ibr3R4QJ5tjLffXTSLOz1cAoNaL O8K0pklrmVlQUVzL/Uwe83A24wp3ZJYk3EPWXaNpZxP/VHYEWSO/1V3LPSQkTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0s4t1Dzg8t; Wed, 17 Sep 2025 19:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgL2u032037; Wed, 17 Sep 2025 19:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgLK8032034; Wed, 17 Sep 2025 19:42:21 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:21 GMT Message-Id: <202509171942.58HJgLK8032034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 918e1973ff27 - stable/14 - nuageinit: Remove duplicate description of users.{user}.groups List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 918e1973ff277512aac4f58e67bd9b1bfa913ec8 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=918e1973ff277512aac4f58e67bd9b1bfa913ec8 commit 918e1973ff277512aac4f58e67bd9b1bfa913ec8 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:47:07 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:39:23 +0000 nuageinit: Remove duplicate description of users.{user}.groups Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D52436 (cherry picked from commit 9f3330f5224ea2384a1c7d79a5b1f2784f7c14b6) --- libexec/nuageinit/nuageinit.7 | 2 -- 1 file changed, 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 604d8a2221ca..85504116de30 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -288,8 +288,6 @@ The encrypted password for the user. .It Ic plain_text_passwd The password in plain text for the user. Ignored if an encrypted password is already provided. -.It Ic groups -The list of other groups the user should belong to. .It Ic locked Boolean to determine if the user account should be locked. .It Ic sudo From nobody Wed Sep 17 19:42:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq0v1sSVz67xNY; Wed, 17 Sep 2025 19:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0t6MKGz4Gb6; Wed, 17 Sep 2025 19:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138142; 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=JipEyRdKeislH+pA/Mmie+CcW/eWcsOe5G3HcPCNIrU=; b=I75Z8HD9nQu7eLxqbChgMWIztZ/BnRSwPImLjdjy2oNsOzT9Ei7b1apINtUJ2JMrBUltYu CRtIPm0bSg7LB9nLUuS+cN701IuRHZzdQVT++53fEt2ix62/FrUgBVegIZox6xOIUdhq3G PxQT6MHEyq1nXLz3xsF8LlY02Z3HuzmvxKyxrSe0aZwSo+7/X/werxmr4gvJbk35d2d1la wlxGRQu0bA4njUzuCPdVckft6q/FF64BjxwTqTwRg7BGEWsjBLiUq/FaIi+sGrQXeJzW3U QCiRTTIgN7o20pa6YiCcJiFG0vdYtbeTeZAZQlHe+wvhQYSlk49BjY/NR5MJqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138142; 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=JipEyRdKeislH+pA/Mmie+CcW/eWcsOe5G3HcPCNIrU=; b=BfFwHbA6CRV3rEXjX4CZzfnxYmJ46whmiE59SLrFUQBXlgLRztyEyBuQbpLXd5eFVhD3sc cBWndEP64gWIZbJ1jUPpnFCZyh4cOvSKerM3cg3d8BuNOJdE1fdsqCFzIZNH/k3p2XAPvi X0jhlE2aI2aOX2RXFxf5VLBNF44mWyIsALcUvuL9Af9MjyseWNw6+8zx45QvL3R+hwj0jv CzIjGYtFtBoF3Fjj4yHWFxrunTlnre7lDkgt5I+zNYpw6ZAU+dF5s7r24d2f/CZoeEPS6E FZcQZbI1LEiahycWpP5tSrmD0kIlkRg4x1dZi2SBt+Z3Ujq8UITQD9BQ0dyRDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138142; a=rsa-sha256; cv=none; b=HuBI2zyO0BR9VOZKeHmfUMGSzwR7yR+fGKOfCCxq1k07NlNK5wRGNrj5RKMM9sQ7z4lVCr iw4mX6eE1OmP9b8oiD41d76uCoK8sTjS8gfl/EkakThnMefTDlbEW2FfUWL5Qds6alzIdr w9nj9Ro5164Ea4/vBf8fPn2UdRJOfsJhY5dCO3mmuGVURq6EKGWDdXoUvpQAZB6iKiBNAP EtiC8nlycZGq/0uQoHKk5J0siBBosHEH8nipiDhID6y59miMLgKOZmDxXa860f121Al1kt K4LhaUgJ7oJFnAw95P+C+r7hHG/hrMSXeiKYklV0kiPtjpCw8FQBMhr+G54ktg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0t5smpzggq; Wed, 17 Sep 2025 19:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgMwI032077; Wed, 17 Sep 2025 19:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgMFb032074; Wed, 17 Sep 2025 19:42:22 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:22 GMT Message-Id: <202509171942.58HJgMFb032074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 5d8efb8f2578 - stable/14 - nuageinit: chmod sudoers directory instead of chmod (again) sudoers file List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5d8efb8f2578a1d94ef81c5157df1754f5dd13ab Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5d8efb8f2578a1d94ef81c5157df1754f5dd13ab commit 5d8efb8f2578a1d94ef81c5157df1754f5dd13ab Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:49:56 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:39:23 +0000 nuageinit: chmod sudoers directory instead of chmod (again) sudoers file * Set mode of sudoers to 0440. Reviewed by: bapt@, jlduran@ Approved by: bapt@, jlduran@ Differential Revision: https://reviews.freebsd.org/D52438 (cherry picked from commit a5cc9b7b96dcba4d3ee98f2eb58c3f389590ddf0) --- libexec/nuageinit/nuage.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 48f54b120615..22140dd06fe5 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -311,10 +311,10 @@ local function addsudo(pwd) end f:close() if chmodsudoers then - chmod(sudoers, "0640") + chmod(sudoers, "0440") end if chmodsudoersd then - chmod(sudoers, "0740") + chmod(sudoers_dir, "0750") end end From nobody Wed Sep 17 19:42:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq0w4FHrz67x94; Wed, 17 Sep 2025 19:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0v70wrz4GYQ; Wed, 17 Sep 2025 19:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138144; 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=mFQFVynAgBe6VQr99iHcN9xF5DCFDaxsEcXCER8pnKw=; b=JOqZBTTboecQqRHQNjfetk6TpAITOQubBJ9XpKRXprLV7YWg7We8AveHrj2FLli8v5pEwT oZcDJHWpXPYShjidO7CXZfTZyyjaKEMgMIcNVcugBvFV0/ITO7if0+3O0Vu6igYhmPQgCa R2XlW0NMtG+LnfVH0bhCq/ynvq2htuvM3AVqtKoQ437NediaQBPbyY+SAW7WeW3OpS6opm Sv2uY1rqbFj3DvtzkAWFbn29TK67v8Rk1U58k/HLlu+1mKzs1hSIVXgeunZpvgmHzjJjdj DLUvV0QBmc5OAxTZvMGDtf/aoeMaQH5u1/QsgmRGgjfcnbNpSVDF5XK/Q6LLEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138144; 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=mFQFVynAgBe6VQr99iHcN9xF5DCFDaxsEcXCER8pnKw=; b=Z7ySgcczHrWOTH6yH8WrJghinxL+A78WRlEiopZC2RoZy6Lt7waVsPnRsSzc8t0CFRnpuO njVoTCsyBQwbZvjIVCbqAi75v4ZtGqgSL2gQYGq1O2kVD4SFfxSCPND8z9AunVgvx3fl1h JsroOcy7tXmLJBfNruCNnhI+wFZ6yRW+ZBhb32Wr5g4oFZeBNRCuDGLitkuFS68Bay/PZy /YjRqak72ETw8ilBmezoCV0roTMxZtwRFx4aIkrTtyAzvgufC5sB2fp5erwhpUGnl5M/1m z7vbT7PGf2olu23qx1EJ/lfNgbQZfHeQZ1J8RLcVJN0NkwCMtZGeA075SL352Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138144; a=rsa-sha256; cv=none; b=Nqq1fw8CF9K95sIJx05/V8plBDzgNJ9vY53RE+hiwe+34ehCVdIDYwLYNKnboTRVOQXBN4 EA2e8nYKRANbk2rnjgPJMunmRsWbgflnpw72LaSsArR2MMvneGQs04aEOm2v0QyYWx2u4U qf/8WWTqKLFe8m3kGUWc8JbH/NZZpRZ7vfX98+7510bFUb2ihyU74g7bv9B0DF7B8jOjdf N5sO5UrieLqi2H/4/HUsFal5hxOTkzk5xuwmP7vjHYYk/AZezKbFB8emvbV+34WatwT+LJ tN4U+Jv2/47ppOFq8tf15jzskgRRtTGQAPfwyTMghSvuIh5/BqOFyd4pWeCPRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0v6WBnzgvL; Wed, 17 Sep 2025 19:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgNQh032111; Wed, 17 Sep 2025 19:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgNK8032108; Wed, 17 Sep 2025 19:42:23 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:23 GMT Message-Id: <202509171942.58HJgNK8032108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d9843a40f8b1 - stable/14 - nuageinit: Add me to copyright list List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9843a40f8b15b8be1594615b609fe3e7b828b9d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d9843a40f8b15b8be1594615b609fe3e7b828b9d commit d9843a40f8b15b8be1594615b609fe3e7b828b9d Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 17:00:41 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:39:24 +0000 nuageinit: Add me to copyright list Approved by: bapt@ (cherry picked from commit 18555060dcae4cad8f2f8968142fc02a2571377b) --- libexec/nuageinit/nuage.lua | 1 + libexec/nuageinit/nuageinit | 1 + libexec/nuageinit/nuageinit.7 | 1 + libexec/nuageinit/tests/nuage.sh | 1 + libexec/nuageinit/tests/nuageinit.sh | 1 + libexec/nuageinit/tests/utils.sh | 1 + 6 files changed, 6 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 22140dd06fe5..b042698f97e7 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -2,6 +2,7 @@ -- SPDX-License-Identifier: BSD-2-Clause -- -- Copyright(c) 2022-2025 Baptiste Daroussin +-- Copyright(c) 2025 Jesús Daniel Colmenares Oviedo local unistd = require("posix.unistd") local sys_stat = require("posix.sys.stat") diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 70b27cb33d87..c94eb822ba0f 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -3,6 +3,7 @@ -- SPDX-License-Identifier: BSD-2-Clause-FreeBSD -- -- Copyright(c) 2022-2025 Baptiste Daroussin +-- Copyright(c) 2025 Jesús Daniel Colmenares Oviedo local nuage = require("nuage") local ucl = require("ucl") diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 85504116de30..f02829618f44 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -1,6 +1,7 @@ .\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2025 Baptiste Daroussin +.\" Copyright (c) 2025 Jesús Daniel Colmenares Oviedo .\" .Dd June 26, 2025 .Dt NUAGEINIT 7 diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 4409b1ff5853..e286360922db 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -1,5 +1,6 @@ #- # Copyright (c) 2022-2025 Baptiste Daroussin +# Copyright (c) 2025 Jesús Daniel Colmenares Oviedo # # SPDX-License-Identifier: BSD-2-Clause # diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 98593f7d75b0..619df019cc4f 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -1,5 +1,6 @@ #- # Copyright (c) 2022-2025 Baptiste Daroussin +# Copyright (c) 2025 Jesús Daniel Colmenares Oviedo # # SPDX-License-Identifier: BSD-2-Clause # diff --git a/libexec/nuageinit/tests/utils.sh b/libexec/nuageinit/tests/utils.sh index 26f117d81d60..76cd7e045473 100644 --- a/libexec/nuageinit/tests/utils.sh +++ b/libexec/nuageinit/tests/utils.sh @@ -1,5 +1,6 @@ #- # Copyright (c) 2022 Baptiste Daroussin +# Copyright (c) 2025 Jesús Daniel Colmenares Oviedo # # SPDX-License-Identifier: BSD-2-Clause # From nobody Wed Sep 17 19:42:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq0x3nDHz67xNZ; Wed, 17 Sep 2025 19:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0x1Gx8z4GnN; Wed, 17 Sep 2025 19:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138145; 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=MfuZ35f4zVM1bUkJph7NITkaxO+QnD5yfoP+KDhzmOs=; b=Kam33lw4mEVs0fysFnYeL5CIDzJGl06RZpNHC8xMD2mvKt3KrbOUxsLVI5gtxdhrPN7sJx wzqH8H/+RPsdRLOjCiEYS7OMhtKCnkqYBzgV/7Se+wgJ0cXMNCjfTep8wkUIndnxyG26lJ kDmcPHDMzFutz+yBngJ1jV/SaTKW7RESPyBjb6jDRr6UBpCs5fIzYnF/pb/H+Ah85z1cGY kxEV1NDx3cPvRpEa6WivYPcaCa5VoN2PZ4uls0nYllnkEsILZrNEcb3pSbcqWLRmMBY5Xv M+9rBpzX751oApEaqJxktGIxEpuwawoCz87Ch9fZVyrUhAmIBpad/txMGlf9YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138145; 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=MfuZ35f4zVM1bUkJph7NITkaxO+QnD5yfoP+KDhzmOs=; b=f5S/SLjpqlxSqlajzwVbaEqH8euv+pg2uOWl2c8vA2bvEvJYgiJSCSRoYIeZ1eyfBmyQdZ bSqc5bniK2fQ+yRL7IirkPUfhqp8Cr1cuh1m0cxto8IIqQMZEHoPmV0hxpC36DE4sUUsEG insNKuF5F7iatCizlsVdlZ0Yz4uq9NOXP3Dd/s4IaA8vZ1uXayRqrzI+cj9BeCteC1lGlo 5EIuI8dxJe6iB30Zuv1pj5L81U3A8FTI7fr8uahxQz5/obll0r1ejgcnoznbKPfaOuCx5w vBQkRCXS2e3xKHP39Khz4vnvfbBZrQflU4HuKNT0SpMcI8NOyoKfcQ2Fd+kAiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138145; a=rsa-sha256; cv=none; b=ETBGZ53/GYw1EnqXCvdG36lBs/EN3fJvI7KohM61p2EbgVnbzpPyi4klnfi4iuOfXw/GzZ i0zCnP1NAgYIpQCLoJcGgTMWuNQdWqmAaxCL+Ika2tQWHlIDvINe1NubVQV+auGZfvGmh7 5qN1X45Y0mu9Q6r42Ae+6LBOphp2gdaxum2A9c2Mc6NNmyGsObeGBNSbpL6urCHknmiIlo QJ6XbLSBYGOz+FFxkjiY2cGu1/L9xYb62hF/SbgAuZNMAq52spQsGQyxsUdkG+k2W3Zcwa m8jkJTj1+yuPo92/azRFC0TfixIsNeaWt1tZ9XrTRIo8a3tBJ/S30x+5QJRE1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0x0f7wzg8x; Wed, 17 Sep 2025 19:42:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgOnQ032145; Wed, 17 Sep 2025 19:42:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgOlb032142; Wed, 17 Sep 2025 19:42:24 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:24 GMT Message-Id: <202509171942.58HJgOlb032142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: bf187f6ac5b1 - stable/14 - nuageinit: Allow the use of network parameters from network-config List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf187f6ac5b198d51b3db80c8876fc70ce75b162 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bf187f6ac5b198d51b3db80c8876fc70ce75b162 commit bf187f6ac5b198d51b3db80c8876fc70ce75b162 Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:52:30 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:39:24 +0000 nuageinit: Allow the use of network parameters from network-config To better comply with the cloud-init specification, we need to support the configuration of network-related parameters from the network-config file, which is common in most deployments. Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D52419 (cherry picked from commit 95230b248f6412c2d1c416c1e9795c3192cdf750) --- libexec/nuageinit/nuageinit | 31 ++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit.7 | 7 +++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c94eb822ba0f..5541f6d0f164 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -583,6 +583,26 @@ local function config2_network(p) routing:close() end +local function parse_network_config() + local nc_file = ni_path .. "/network-config" + local nc_file_attr = lfs.attributes(nc_file) + if nc_file_attr == nil then + return + end + local f, err = io.open(nc_file) + if err then + nuage.err("error parsing nocloud network-config: " .. err) + end + local obj = yaml.load(f:read("*a")) + f:close() + if not obj then + nuage.err("error parsing nocloud network-config") + end + local netobj = {} + netobj["network"] = obj + return netobj +end + if citype == "config-2" then local parser = ucl.parser() local res, err = parser:parse_file(ni_path .. "/meta_data.json") @@ -679,7 +699,16 @@ if line == "#cloud-config" then end for i = 1, #calls_table do - calls_table[i](obj) + if citype == "nocloud" and calls_table[i] == network_config then + netobj = parse_network_config() + if netobj == nil then + network_config(obj) + else + network_config(netobj) + end + else + calls_table[i](obj) + end end elseif line:sub(1, 2) == "#!" then -- delay for execution at rc.local time -- diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index f02829618f44..8d9aac3d3809 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -183,6 +183,13 @@ configuration in .Pa /etc/ssh/sshd_config .It Ic network Network configuration parameters. +.Pp +Specifying the following parameters from a file named +.Pa network-config +takes precedence over their specification from the +.Ic network +parameter of +.Pa user-data Ns . .Bl -tag -width "ethernets" .It Ic ethernets Mapping representing a generic configuration for existing network interfaces. From nobody Wed Sep 17 19:42:26 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq0y4C42z67xJK; Wed, 17 Sep 2025 19:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0y223gz4GYh; Wed, 17 Sep 2025 19:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138146; 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=moOf/piqOQn1EU2BnCZPckYH7Rmr7VFHt7QBWm++d7Y=; b=KthkUYSa7c1Nj8R3CxzbTs18wRYjrIiSeHbDaPYbtDCsShmKRxg0XLJbdoeutgJVSzsu65 fk+egUqVMlN5bWXqznKan2ib6+9V6iJLqREwv8+7YJyIubWzMKM3AVkA6OJWb6ffr5Sr0E 4RxpIyYuEqmfOMCMrjZmlul5yANYlaXKFjrsBMyOcaTx6Gee7k3gNf4Ojln9O0yajQ9/DB qzcVAjq6+57b3RXIGgzTG3AavAL1FaFjwhSTucdSqfk69zrVuviI8gdYSCGy6QNMoj58Jq FP3FWUx8MJiF1xnhbD9u1JOGz9hsKlo/JSQhOZ2lAgLIwB4PwfwwbQVOrcKaeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138146; 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=moOf/piqOQn1EU2BnCZPckYH7Rmr7VFHt7QBWm++d7Y=; b=LjoBgfj1JYYXttCWL2+G9cd1NJHgHCUeqav+DzazdHDcAjYo7KooRCcCZB5h7BSut5swvs hJIqsHG7r/LuJCtJtAxKofYufMAe6Eh3g5C+kowWOiW0MxCPIk5vBNFk0JlKH6LAEMwybx xwmztcH/0/JJCUoUob31NeXDRDarB2oIo45F05ztIprwh0c5A8TwQbT1BC5UaaAwJvtThV XUAOK2+UVsON12Rx2J8fUY+4mXJ2m46qd20pyuz3NSJlb4t4yerN3Kwx59GpR7OyDLe+vV mT4QfZTqR9PB032K4EecFSzAwlM5aaz0XJHi3JT7m8vjqZ4UP9D/zPZZaR5Ilw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138146; a=rsa-sha256; cv=none; b=U6oYHrVFIhU9KLYncSmjf6UnuKZ87LuiAQXugrjhrpS9XgDc+8wUdVcoBS7tlLiUYp5dA6 xvh5G2II+DBJnWJWOcAuvuhZgrmdG5IMpAirJaC0dHy9FadzccqX5dXBo2nDPRQg+ddyBF +iw6pPMcgSNi9OEnlWtH3YeTaRYC//8bJ0J7Ue0Hhf1lJpGvryHb5N8aGDFB6bH1sm1XEi Wz10gE0pw6GbBTblc1rbieq0TvnWYKmd8ebR6WJ045lB1fVmy4Fdb6UE2VpFMXoFrLFCdq TazgdzrQ4TVUiC4ejNP79HKVgZ2JhwkEbUlDsaZlP6WBmqBTiheUNRhM7uwJzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0y1Xd7zggr; Wed, 17 Sep 2025 19:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgQT4032178; Wed, 17 Sep 2025 19:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgQ6X032175; Wed, 17 Sep 2025 19:42:26 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:26 GMT Message-Id: <202509171942.58HJgQ6X032175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ea186b76c675 - stable/14 - nuageinit.7: grammar fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea186b76c675ac05e4ece3eddd2d301a80e9547d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ea186b76c675ac05e4ece3eddd2d301a80e9547d commit ea186b76c675ac05e4ece3eddd2d301a80e9547d Author: Maxim Konovalov AuthorDate: 2025-08-22 18:57:03 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:40:59 +0000 nuageinit.7: grammar fixes (cherry picked from commit 95b0be1118b1a24ceb1b59ecd936aaa155d828bd) --- libexec/nuageinit/nuageinit.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 8d9aac3d3809..dac5527b75b7 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -299,7 +299,7 @@ Ignored if an encrypted password is already provided. .It Ic locked Boolean to determine if the user account should be locked. .It Ic sudo -A string or an array of strings which which should be appended to +A string or an array of strings which should be appended to .Pa /usr/local/etc/sudoers.d/90-nuageinit-users .El .Pp @@ -339,7 +339,7 @@ It accepts the following keys for each objects: The content to be written to the file. If this key is not existing then an empty file will be created. .It Ic encoding -Specifiy the encoding used for content. +Specify the encoding used for content. If not specified, then plain text is considered. Only .Ar b64 From nobody Wed Sep 17 19:42:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq0z5bYYz67x2g; Wed, 17 Sep 2025 19:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq0z2q6qz4GR6; Wed, 17 Sep 2025 19:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138147; 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=qFSFvaOEa2fbR9jZLMmMwdI4KWukH8XSm33PfLHCx9s=; b=I4CjgOWyptfmZtw+0zli74OeELEdrCj1wSdeAkSAk1C6wZvSWqVDCOzl3P+BkICtWnvZ5g /+bIV2jifkrl44oFj+FNaTpTD4Fh62l/1ysTRIPPwePSTjz2kR78PqiHlWLNnW6zob2xCx oQUK7xtqRZOJgL7ivwo1YXbvcu8/YHh1XfHoXfyslVZkZ5t1z30p6CoGLJ4F9yIjML145d lVmOLm2ePeCe1UnATsxoxsd7qZpOXea8n7XDzONTounzniTzw9U4JmS1ZNq13eieDwacZ0 xVlRZXAStUluDiWLsJ1mqIeZEo2B7v4TbZkxV/YCIfTxvfU7KZneb7ZWNKYVdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138147; 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=qFSFvaOEa2fbR9jZLMmMwdI4KWukH8XSm33PfLHCx9s=; b=K4zwykzWNo2HpPZXvXLulVhDqRryA2AV3bFVMDSXN6BtYJOeA1aHkDY7ULfk5BDwSU2AbC x22M/9ci3gg4cBdkG9uFb4qFxZeNgk8QsqxfrVmqE//lkESY+MzuYSagTAfN2drIOIuScw djdd+d7SXNMRclDz0aV1DDUUVSkaFutXAC7IhyynXJuFFQrnja0UwxtFlavv/TNr9IRnlG TselXh+MuF7TaKpmEuO4QGi+XC7Fk3AttvOxz+QRMauKKKlw1yC+POUgdNckrjn9FTGgg6 LWlqPVr4bTlokbo/Ja4yXFStLG29Y54S+NyLfcAOGfImVo38SVqlr613578FPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138147; a=rsa-sha256; cv=none; b=EJY34T2zYTNRGAIgRd0rFi5PjoV36yB89XPO00mRCc/UeSBkYsr0th6+carXpwIm6bShEM Hstg4nbGGtC0q2DRiJVJz130ZgveprUHWVwhfKZKVfaMRrFQ90xcQtXMlo+qCRx6huQDpv Nus40AtpliW/mpC7KDh4qfqJjnuGPsXtDLzMcQD9jhkMh0Q49IwzbBWMegIvxkRNz3WlIu puLBuq5UDlDZjGwS12qZLfwcuGeKdRyGLk1UzbXCpq3z3wusJEDp/tIp71lVMJI4+JqfSv OSQ3y+RphevpdnW4tRjVcc4QOPvKPvgRTNuMj92o+y5pFgDPUeJExloYStd+tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq0z2KzZzgBb; Wed, 17 Sep 2025 19:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgRBF032916; Wed, 17 Sep 2025 19:42:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgRFo032905; Wed, 17 Sep 2025 19:42:27 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:27 GMT Message-Id: <202509171942.58HJgRFo032905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f0588c1cd8d9 - stable/14 - nuageinit.7: put each sentence on a new line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0588c1cd8d92f692f18debaf66a90c95e037022 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f0588c1cd8d92f692f18debaf66a90c95e037022 commit f0588c1cd8d92f692f18debaf66a90c95e037022 Author: Maxim Konovalov AuthorDate: 2025-08-22 19:06:45 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:40:59 +0000 nuageinit.7: put each sentence on a new line (cherry picked from commit a7f19968ae5d5e7e5feba85d04698050fcaf784f) --- libexec/nuageinit/nuageinit.7 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index dac5527b75b7..e5da5cf342e1 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -205,21 +205,26 @@ rules are specified, an arbitrary name can be used .It Ic match This selects a subset of available physical devices by various hardware properties. The following configuration will then apply to all matching devices, as soon as -they appear. All specified properties must match. The following properties for +they appear. +All specified properties must match. +The following properties for creating matches are supported: .Bl -tag -width "macaddress" .It Ic macaddress .No Device's MAC address in the form Sy xx:xx:xx:xx:xx:xx Ns . Letters should be lowercase. .It Ic name -Current interface name. Lua pattern-matching expressions are supported. +Current interface name. +Lua pattern-matching expressions are supported. .It Ic driver -Interface driver name and unit number of the interface. Lua pattern-natching expressions +Interface driver name and unit number of the interface. +Lua pattern-natching expressions are supported. .El .It Ic set-name When matching on unique properties such as MAC, match rules can be written so that they -match only one device. Then this property can be used to give that device a more +match only one device. +Then this property can be used to give that device a more specific/desirable/nicer name than the default. .Pp While multiple properties can be used in a match, @@ -229,7 +234,8 @@ is required for nuageinit to perform the rename. The MTU key represents a device's Maximum Transmission Unit, the largest size packet or frame. .It Ic wakeonlan -Enable wake on LAN. Off by default. +Enable wake on LAN. +Off by default. .It Ic dhcp4 Configure the interface to use DHCP. .Pp @@ -239,14 +245,16 @@ when both are specified. .It Ic addresses List of strings representing IPv4 or IPv6 addresses. .It Ic gateway4 -Set default gateway for IPv4, for manual address configuration. This requires setting +Set default gateway for IPv4, for manual address configuration. +This requires setting .Sy addresses too. .Pp Since only one default router can be configured at a time, this parameter is applied when processing the first entry, and any others are silently ignored. .It Ic gateway6 -Set default gateway for IPv6, for manual address configuration. This requires setting +Set default gateway for IPv6, for manual address configuration. +This requires setting .Sy addresses too. .Pp From nobody Wed Sep 17 19:42:28 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRq106Pmjz67xNh; Wed, 17 Sep 2025 19:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRq103qSfz4GZ5; Wed, 17 Sep 2025 19:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138148; 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=fSUG0k92Gwu4Sh3s4M8IIqsBDe+taH8KA6ayQpKSggU=; b=GDWG801F5SlEcTeiA7D4nj007iBPZyyzJAuyYhLqAnAx8XVS63gY2YkZOqhbgr0qzcPvIm oeJccle7pChq8KvRoNJ6x0ebSJwGjRiu3uun/WIZQxVKxir+kwY6g//Q26heXrYqIEqhDu zict2KfNNDKX4O3GP4d2tD7Rf+CFzQQoipuX5Qpa66xntb406kmCnZPDLS4swQDwHh1oVR jb/LyquIFWM6XMBLY8OJQvtJTxRh10KKDZzXX+U519DT7Ly7l9wjCALs4/WhK9ikDtKSbd AI6u6JIW4BIfp3kRiwGOIT7e7Qf051aXs6XC94ohB9JaU48INlgEHhpWCJp93Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758138148; 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=fSUG0k92Gwu4Sh3s4M8IIqsBDe+taH8KA6ayQpKSggU=; b=M9lrd2ZhX1Ws6Vz8A3q4CZNQTq/U00s4uYeDpAQJdgtamsFnT/+aPONi9Gxutz94YHFpBm 0YcSCaNpX21mvnnhhdr7fcv/L277PoBTRaqhqzcULBM5jQDcP9KcneGa6fHWUC91Z1GKUm L8cz0Mmmgf7yBN3rB88E04QeLId6xChXWXxTaZUUIqFnLuZlWyZp8A/eLc4IyQH6lLU/2L nUdIcDGhWB7C4zz35Lz1RAH//N/mhMRd+HPKX2Nk7H4F9a07c5zFZJVnfb/WAe2tIz1ldM vIPGyx9ASRxivUxzkRHOOGU95je81eiDet/nuPIqr4tIsduek0DNhlaNYGsrSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758138148; a=rsa-sha256; cv=none; b=Uf0JILq6WC5LEYm4IwACAhC0MnQuvh05z54MVwKxcjqE4iJ+d4yV8DD+m1h+DVkNFfUBeq vdYBeUGZ4Cc9mnVnxyrd9relm2rhpbqd2BMa5oCfHr3sGCgfT7ERpXWu3DpDNRUcmFGH83 Yt9znUOaE2lop8j3LkTz+hAqQP6VEsUl3aLlR978pFN9Yk9gkugAVdqTxBMyYLvEWhWGkU WGTPgch8QMDHBs2QF2RIZJbFGqf2DOS9jRegDKD/uZDw3KfXjXRK08WFOphJFW9/jz2oDW ppaVAJR5beWtR2DEoILahSniiFD9kpuDYDQHRTin1udQzveL/fstLPbIhP1DvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRq103FqZzggt; Wed, 17 Sep 2025 19:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HJgSW3033552; Wed, 17 Sep 2025 19:42:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HJgS7H033549; Wed, 17 Sep 2025 19:42:28 GMT (envelope-from git) Date: Wed, 17 Sep 2025 19:42:28 GMT Message-Id: <202509171942.58HJgS7H033549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: cbd62452bff6 - stable/14 - nuageinit: Add doas support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cbd62452bff6bc8837c9cffeaa4c9f43b99995ce Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=cbd62452bff6bc8837c9cffeaa4c9f43b99995ce commit cbd62452bff6bc8837c9cffeaa4c9f43b99995ce Author: Jesús Daniel Colmenares Oviedo AuthorDate: 2025-09-11 16:54:24 +0000 Commit: Baptiste Daroussin CommitDate: 2025-09-17 19:42:03 +0000 nuageinit: Add doas support * Set mode of etc directory to 0755. * Use user.localbase sysctl instead of /usr/local. * Add test case for doas. * Set ${LOCALBASE} instead of /usr/local in nuageinit(7) man page. Reviewed by: bapt@ Approved by: bapt@ Differential Revision: https://reviews.freebsd.org/D52437 (cherry picked from commit 9a829e865697e623a046800545be7781a117125e) --- libexec/nuageinit/nuage.lua | 62 +++++++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit | 3 ++ libexec/nuageinit/nuageinit.7 | 9 +++++- libexec/nuageinit/tests/nuageinit.sh | 12 ++++++- 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index b042698f97e7..ef3cfd994fe1 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -8,6 +8,17 @@ local unistd = require("posix.unistd") local sys_stat = require("posix.sys.stat") local lfs = require("lfs") +local function getlocalbase() + local f = io.popen("sysctl -in user.localbase 2> /dev/null") + local localbase = f:read("*l") + f:close() + if localbase == nil or localbase:len() == 0 then + -- fallback + localbase = "/usr/local" + end + return localbase +end + local function decode_base64(input) local b = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' input = string.gsub(input, '[^'..b..'=]', '') @@ -277,11 +288,59 @@ local function addsshkey(homedir, key) end end +local function adddoas(pwd) + local chmodetcdir = false + local chmoddoasconf = false + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + local localbase = getlocalbase() + local etcdir = localbase .. "/etc" + if root then + etcdir= root .. etcdir + end + local doasconf = etcdir .. "/doas.conf" + local doasconf_attr = lfs.attributes(doasconf) + if doasconf_attr == nil then + chmoddoasconf = true + local dirattrs = lfs.attributes(etcdir) + if dirattrs == nil then + local r, err = mkdir_p(etcdir) + if not r then + return nil, err .. " (creating " .. etcdir .. ")" + end + chmodetcdir = true + end + end + local f = io.open(doasconf, "a") + if not f then + warnmsg("impossible to open " .. doasconf) + return + end + if type(pwd.doas) == "string" then + local rule = pwd.doas + rule = rule:gsub("%%u", pwd.name) + f:write(rule .. "\n") + elseif type(pwd.doas) == "table" then + for _, str in ipairs(pwd.doas) do + local rule = str + rule = rule:gsub("%%u", pwd.name) + f:write(rule .. "\n") + end + end + f:close() + if chmoddoasconf then + chmod(doasconf, "0640") + end + if chmodetcdir then + chmod(etcdir, "0755") + end +end + local function addsudo(pwd) local chmodsudoersd = false local chmodsudoers = false local root = os.getenv("NUAGE_FAKE_ROOTDIR") - local sudoers_dir = "/usr/local/etc/sudoers.d" + local localbase = getlocalbase() + local sudoers_dir = localbase .. "/etc/sudoers.d" if root then sudoers_dir= root .. sudoers_dir end @@ -585,6 +644,7 @@ local n = { update_packages = update_packages, upgrade_packages = upgrade_packages, addsudo = addsudo, + adddoas = adddoas, addfile = addfile } diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 5541f6d0f164..29340a3d91ea 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -140,6 +140,9 @@ local function users(obj) if u.sudo then nuage.addsudo(u) end + if u.doas then + nuage.adddoas(u) + end else nuage.warn("invalid type : " .. type(u) .. " for users entry number " .. n) end diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index e5da5cf342e1..b527c984970c 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -308,7 +308,14 @@ Ignored if an encrypted password is already provided. Boolean to determine if the user account should be locked. .It Ic sudo A string or an array of strings which should be appended to -.Pa /usr/local/etc/sudoers.d/90-nuageinit-users +.Pa ${LOCALBASE}/etc/sudoers.d/90-nuageinit-users +.It Ic doas +A string or an array of strings which should be appended to +.Pa ${LOCALBASE}/etc/doas.conf +.Pp +Instead of hardcoding the username, you can use +.Sy %u Ns , +which will be replaced by the current username. .El .Pp A special case exist: if the entry is a simple string with the value diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 619df019cc4f..2b7c5226c97a 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -120,12 +120,16 @@ users: gecos: Foo B. Bar primary_group: foobar sudo: ALL=(ALL) NOPASSWD:ALL + doas: permit persist %u as root groups: users passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ - name: bla sudo: - "ALL=(ALL) NOPASSWD:/usr/sbin/pw" - "ALL=(ALL) ALL" + doas: + - "deny %u as foobar" + - "permit persist %u as root cmd whoami" EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet @@ -148,7 +152,13 @@ EOF sed -i "" "s/freebsd:.*:1001/freebsd:freebsd:1001/" "${PWD}"/etc/master.passwd atf_check -o file:expectedpasswd cat "${PWD}"/etc/master.passwd atf_check -o file:expectedgroup cat "${PWD}"/etc/group - atf_check -o inline:"foobar ALL=(ALL) NOPASSWD:ALL\nbla ALL=(ALL) NOPASSWD:/usr/sbin/pw\nbla ALL=(ALL) ALL\n" cat ${PWD}/usr/local/etc/sudoers.d/90-nuageinit-users + localbase=`sysctl -ni user.localbase 2> /dev/null` + if [ -z "${localbase}" ]; then + # fallback + localbase="/usr/local" + fi + atf_check -o inline:"foobar ALL=(ALL) NOPASSWD:ALL\nbla ALL=(ALL) NOPASSWD:/usr/sbin/pw\nbla ALL=(ALL) ALL\n" cat "${PWD}/${localbase}/etc/sudoers.d/90-nuageinit-users" + atf_check -o inline:"permit persist foobar as root\ndeny bla as foobar\npermit persist bla as root cmd whoami\n" cat "${PWD}/${localbase}/etc/doas.conf" } nocloud_network_head() From nobody Wed Sep 17 20:30:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cRr3s6z6wz681vj; Wed, 17 Sep 2025 20:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRr3s6DBlz3Cf5; Wed, 17 Sep 2025 20:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758141001; 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=uPneM/7h1OB6LwXSqX+zSnCGPSjzX+P4ayvlDWf8c48=; b=XP0ynsekWaFq06unf8djGxFAVlQQCZojqew5awqnUg1ZrET+euDNxFR4cROKbP7NvpweTh d3KrOBvVSHhZIyAUC3LRn/Oc1lWMiG1NdHpdQDXgeBbf/q1LUWxsvRycXcXxvn6/mGU3ZD OJMuGnVb7OU8J0MQxzbJlcvwgYaT2BSPZwgV/OJ4PRRQX9sQ7yybi/kGasoN1Kn/F19ri2 kv4ll8wiQTGfrvpSuFJY3d4mnKCWSn1ldNIpj56ZCmWXAt7mzJMJ0ghfVZCUwlne5E/AVL wbUNvpAXHxmDjlnqbjh2Mo1WIEvyrZdk4++w+T6aQ0sLOCnE9c68kaRCA+5bzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758141001; 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=uPneM/7h1OB6LwXSqX+zSnCGPSjzX+P4ayvlDWf8c48=; b=qJl5I9SIUnKFTGYVDWMmr+0IfUGFxWAC0vovc0ZxmbOvDBkv0caEuwb+rVY9fDbMd7D1BR SWE126PYH9QX5cotXhjPjtpP9Tg4AAZF1pfCR2jCtCzMFkRTW6eiO2p03iStklRe3fGT4N GF9VynDvAilRsDFxHvFyduxahe99pyF1V7IVrsmVtX3w6S/WuVaSQoQrcZRI3uv6TrdfLM 0kpMXYYvivZdKf4GagpCmm2YMxRXBRr2P95Ahnx/u5pDywajT2xp2Xo/ffmep7o7It0OQw /X8lmubueI7gsJpu0EDP0mPTwc+IVVfg1bIp5+Q2lTkk9YrrtT0dfC5CHToBmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758141001; a=rsa-sha256; cv=none; b=TwimLGVHMTUWwpBw2vL/Y6uTMiOLLgNLd9rgXc+rdZ3f/ZVhMWNb8cVdmBvnTWeK+MUCeg 1F6pSJZZxIKxw6A9MdXUgR1YNMANtzETk0QjKgxyWf5lJAN9L+FDp+FTCLQ0yn7+Tar7o6 t1y6udu09EdG1EDFBFDM9rzcqSAKdTSIgvcPDblqVYblmqstb5F4JSMIWSM1oiizfz8Owc uzjO43F0/AuLhV+cFZJMfnT/49jL+153e5+wrLKI3N48/+acv72eDytlvsdrW6+3dPWNK0 K/4wAq+5SjmEDKXYjVF1cipI38Hf+xooGAMQZc3n48yffTQcAiaLslCpvvO4eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRr3s5VD0zhqM; Wed, 17 Sep 2025 20:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58HKU1i8013418; Wed, 17 Sep 2025 20:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HKU1rF013412; Wed, 17 Sep 2025 20:30:01 GMT (envelope-from git) Date: Wed, 17 Sep 2025 20:30:01 GMT Message-Id: <202509172030.58HKU1rF013412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 221a5fb331e1 - stable/15 - bsdinstall: Drop outdated comments about ZFS dataset compression List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 221a5fb331e104a1becb67090ef8ee843cbce1d7 Auto-Submitted: auto-generated The branch stable/15 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=221a5fb331e104a1becb67090ef8ee843cbce1d7 commit 221a5fb331e104a1becb67090ef8ee843cbce1d7 Author: Michael Osipov AuthorDate: 2025-08-31 10:10:48 +0000 Commit: Michael Osipov CommitDate: 2025-09-17 20:29:50 +0000 bsdinstall: Drop outdated comments about ZFS dataset compression All datasets on zroot pool are compressed by default since FreeBSD 11.0 [1], no need to mention that on some specific datasets these days. [1] 47206692f2cca020891d1eec5028e02c3e6f56c5 Reviewed by: jrm (mentor), ziaee MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52304 (cherry picked from commit f304c5bb8be65df83b86f8a50e1c7982b266262d) --- usr.sbin/bsdinstall/bsdinstall.8 | 4 ++-- usr.sbin/bsdinstall/scripts/zfsboot | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 181abdcf9d05..5ccbaef87835 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -693,7 +693,7 @@ is: # Home directories separated so they are common to all BEs /home mountpoint=/home -# Compress /tmp, allow exec but not setuid +# Create /tmp and allow exec but not setuid /tmp mountpoint=/tmp,exec=on,setuid=off # Do not mount /usr so that 'base' files go to the BEROOT @@ -702,7 +702,7 @@ is: # Ports tree /usr/ports setuid=off -# Source tree (compressed) +# Source tree /usr/src # Create /var and friends diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index a3c1e2ddb89f..aa05faa7d3dd 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -152,7 +152,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS=" # Home directories separated so they are common to all BEs /home mountpoint=/home - # Compress /tmp, allow exec but not setuid + # Create /tmp and allow exec but not setuid /tmp mountpoint=/tmp,exec=on,setuid=off # Don't mount /usr so that 'base' files go to the BEROOT @@ -161,7 +161,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS=" # Ports tree /usr/ports setuid=off - # Source tree (compressed) + # Source tree /usr/src # Create /var and friends From nobody Thu Sep 18 08:51:55 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8Wv3Fh7z681fj; Thu, 18 Sep 2025 08:51:55 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8Wv2mqCz3hng; Thu, 18 Sep 2025 08:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185515; 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=QoRaSZ3lrpj0Clu2UK95Vug5AWBkF4X6dyeeFMboAi0=; b=ZCiiAPcvpMGup2PMYnO43qU97MkMitSfcWpEnRMCZSrStj8ESfGx+iLlsxXRrVcEpUs+KA E/zWq3dgO2vW2IjQBNwA5AjgOkTivsYqlSAaH3/ghDdNenzb09muqvCWNQMxrSBpdcVPYE qYqTNhYbdUnSV6uzHaYRTigKxCr2FXAmr5wMuBexKnTQxMzHNAzRXy+/9NXT6XPBrJTIEB wgJetyt6F8WkFMWRN4K+P9mvwHX2kRCisa/MQZpXXEhr9Lar+RvyblumjGviWe0UAKR9Pi 3TbWx65ilg2tRPxMc+2+UEf3iogogE94rXvsutbZ8qfzAQ3F6UmErrmWgbs9Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185515; 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=QoRaSZ3lrpj0Clu2UK95Vug5AWBkF4X6dyeeFMboAi0=; b=yW92uqqRIUfsYVUWcp9vC6clUexOlk1hwP1Ryc2dXXnfZxNBxneZmr2nOfewTHo9DmEoGQ cASEXGh0T23gR8OqFWa4UPhgcdG6FL/j5OrEmonrwmDqBobOeuTtxfFZ52OC95sRjaB+p/ I5Nd++hCwQuBDhDQCf9Dj1p0S48ggRskhylr88qGLuFpUBKNerRGj6nvfYNaof0cpPozTF cKuvVuYcGhXlPlSytbkE9qtqGIiKBlI8NpzWbRnISOJlxb5a0Jw2NGNdZS0kFnvboVY9Aa JrmWihshTBEbJJj4ocbHWIS9oscsdVR5Z5dJgtkiwSNZRsP1zYMOjDkttRB5Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185515; a=rsa-sha256; cv=none; b=vzTOfKGByPV4V7lQZuB5nay8OsSBT8J3OW7hOMUxEhbCOp8C9g30wc0DKl0PgEhOEBn9KD /Edw5sdzwU60hr1HRJN58yHGnScbFDfXCUQCZbXsmHqvRA9MFVrHawpIMyabr2AjSyms/Z Ho/9fFUhOVWR7Af3TZOtn70K4T4TstdcuHxn58eDDNs4A6lzafiMyhtC4kjbbCRRI3Ub+E x2i7I9SYle0sjKviHf6vFob0jffSb7880eyiii4c9qhRph2p2bk8+lubDbNagBlo3euJjM Z6t3NOdk/GULOY4T92a1+zH6D22NiEQJvJHWyiRYXTlRW5baFTxG0jZr3yRwzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8Wv2D0fz147l; Thu, 18 Sep 2025 08:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8pt36017254; Thu, 18 Sep 2025 08:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8ptMG017251; Thu, 18 Sep 2025 08:51:55 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:51:55 GMT Message-Id: <202509180851.58I8ptMG017251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 960dbe036d85 - stable/15 - ddb ps: Print again the effective GID, separately List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 960dbe036d853dee08f3d5220c970bb6964baf2f Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=960dbe036d853dee08f3d5220c970bb6964baf2f commit 960dbe036d853dee08f3d5220c970bb6964baf2f Author: Olivier Certner AuthorDate: 2025-08-26 08:56:54 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:22 +0000 ddb ps: Print again the effective GID, separately Following commit be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]"), cr_groups[] doesn't contain the effective GID anymore. Fix the 'show proc' DDB command to show it again, and make it stand out with respect to the supplementary ones. Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52251 (cherry picked from commit de974a0f1b73e79466c25f3c85fe727004576fea) --- sys/ddb/db_ps.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c index 733c440f5ee3..a26cf8161294 100644 --- a/sys/ddb/db_ps.c +++ b/sys/ddb/db_ps.c @@ -459,12 +459,11 @@ DB_SHOW_COMMAND(proc, db_show_proc) db_printf("??? (%#x)\n", p->p_state); } if (p->p_ucred != NULL) { - db_printf(" uid: %d gids: ", p->p_ucred->cr_uid); - for (i = 0; i < p->p_ucred->cr_ngroups; i++) { - db_printf("%d", p->p_ucred->cr_groups[i]); - if (i < (p->p_ucred->cr_ngroups - 1)) - db_printf(", "); - } + db_printf(" uid: %d gid: %d supp gids: ", + p->p_ucred->cr_uid, p->p_ucred->cr_gid); + for (i = 0; i < p->p_ucred->cr_ngroups; i++) + db_printf(i == 0 ? "%d" : ", %d", + p->p_ucred->cr_groups[i]); db_printf("\n"); } if (p->p_pptr != NULL) From nobody Thu Sep 18 08:51:56 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8Ww4KgKz6826K; Thu, 18 Sep 2025 08:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8Ww3hn2z3hth; Thu, 18 Sep 2025 08:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185516; 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=PG46uyKlSiGj1bBZH4aPyLcUw2H3icS4AlRNz2OnPyU=; b=CLUH4ZAzneFVZgRWw+56tawpbHlwYnWQF2Qn533iSmrU3pEigxyVEBIXPl6SwE9O/Tzkpy HKpZNZQ6CkYG31O2QO87c8c4G8BnGh5T+yWRmuXhIiGGl+TaqjDV35Hszo48EZtabjd5iN x1ni9Peobfym8XWYnPHnEmuDlWv4tWDsDG61PGtRf5GUpuGrL6e7cLDc4JVehZMAgFv85l mpJQ8pjeJbAWZk1Li7+AQOjLBl76xMhm+G+PhMA1UfiQd8bdLYY9uqJKiC/Zp8HNdVkJwS TrET4vDzMDOBxBcMQbq95lYQJcsdfGGwLfzZYx2xvTpeLB2IwkcDL/oJfVWobA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185516; 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=PG46uyKlSiGj1bBZH4aPyLcUw2H3icS4AlRNz2OnPyU=; b=EjYzYFYCRy0HAJIHXSKNWY/vDMaKVCZn4Fnl+PiSlUDv4hJgme0hDLoNle5pFDQhn91vfV I92kqWvQN1NgIyEFtFQLRqnCaXogAHJWN9i/FeYHzAl7BXROoiSLLBVkzjzcGF2p1csYFg noVi5mUmF0yfoBBdasc89o5ElHtOGLvFhDVED2n9MW+X1J3u6PlmqywvUgos3ESr8SQy0K giJTPsiYF/BG6X8pLm1XDN0XgC69WelaxEkQThmU8PeOpLSuKMfwjBkkKVyVpWGKYfUDki 793fRJ2QjfNHS900E8+HaEGpLNCOwScQMZ5ejC5nK9MFsGoXeGRAE+Cc6pJqpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185516; a=rsa-sha256; cv=none; b=FK0qJPizrODKNV8JGSY01JyLX04g36lNcjMZGBKBxyVeUFszZqTco7GIFACvkPIScQcUZr L9Dk0bkjdROe+5fZ7InwAfgICtsZikqKxQq67IPpB1G2ahioN8nF3kmOopA8h+ZvmN9Nfz qIkMjhTkJvMDU5A6koqlQDacd/gDSMDzvVkbBxezKOJaISIhdjrnQ5674EEnomR1kWdC/z RHlCNV7tV0iJgnHtqgxNj2Oj4DTJrPob8JJwaaKQ4rcWnaOTpunu5UKQWMF9VAGyES+uyz 1aklL1cFRFyZZhOmuusXmX1ZAu1LyeHMjn1PlkTwsDegQESq0PW8cpfCqzyEjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8Ww3B4Gz149Y; Thu, 18 Sep 2025 08:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8pusn017294; Thu, 18 Sep 2025 08:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8puVE017291; Thu, 18 Sep 2025 08:51:56 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:51:56 GMT Message-Id: <202509180851.58I8puVE017291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 018b8acde021 - stable/15 - hwpmc: On attach, ensure owner is a target effective GID's member List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 018b8acde0218956dca99e49d384b072c7e43ca4 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=018b8acde0218956dca99e49d384b072c7e43ca4 commit 018b8acde0218956dca99e49d384b072c7e43ca4 Author: Olivier Certner AuthorDate: 2025-08-26 09:43:38 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:28 +0000 hwpmc: On attach, ensure owner is a target effective GID's member This restores a check that existed prior to commit be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]"). While here, improve pmc_can_attach()'s style by changing the type of 'decline_attach' to 'bool', fixing tests on it, adding missing parentheses to 'return' statements, and by changing its return value type to 'bool'. Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52252 (cherry picked from commit 1c3c698ba4c40485ebbbd157cb49172cfa7de9b2) --- sys/dev/hwpmc/hwpmc_mod.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 9b85c989dc96..15c782b91b69 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -210,7 +210,7 @@ static int pmc_attach_one_process(struct proc *p, struct pmc *pm); static bool pmc_can_allocate_row(int ri, enum pmc_mode mode); static bool pmc_can_allocate_rowindex(struct proc *p, unsigned int ri, int cpu); -static int pmc_can_attach(struct pmc *pm, struct proc *p); +static bool pmc_can_attach(struct pmc *pm, struct proc *p); static void pmc_capture_user_callchain(int cpu, int soft, struct trapframe *tf); static void pmc_cleanup(void); @@ -1029,19 +1029,19 @@ pmc_unlink_target_process(struct pmc *pm, struct pmc_process *pp) * Check if PMC 'pm' may be attached to target process 't'. */ -static int +static bool pmc_can_attach(struct pmc *pm, struct proc *t) { struct proc *o; /* pmc owner */ struct ucred *oc, *tc; /* owner, target credentials */ - int decline_attach, i; + bool decline_attach; /* * A PMC's owner can always attach that PMC to itself. */ if ((o = pm->pm_owner->po_owner) == t) - return 0; + return (false); PROC_LOCK(o); oc = o->p_ucred; @@ -1066,18 +1066,17 @@ pmc_can_attach(struct pmc *pm, struct proc *t) * Every one of the target's group ids, must be in the owner's * group list. */ - for (i = 0; !decline_attach && i < tc->cr_ngroups; i++) + for (int i = 0; !decline_attach && i < tc->cr_ngroups; i++) decline_attach = !groupmember(tc->cr_groups[i], oc); - - /* check the read and saved gids too */ - if (decline_attach == 0) - decline_attach = !groupmember(tc->cr_rgid, oc) || + if (!decline_attach) + decline_attach = !groupmember(tc->cr_gid, oc) || + !groupmember(tc->cr_rgid, oc) || !groupmember(tc->cr_svgid, oc); crfree(tc); crfree(oc); - return !decline_attach; + return (!decline_attach); } /* @@ -1412,7 +1411,7 @@ pmc_process_exec(struct thread *td, struct pmckern_procexec *pk) */ for (ri = 0; ri < md->pmd_npmc; ri++) { if ((pm = pp->pp_pmcs[ri].pp_pmc) != NULL) { - if (pmc_can_attach(pm, td->td_proc) != 0) { + if (pmc_can_attach(pm, td->td_proc)) { pmc_detach_one_process(td->td_proc, pm, PMC_FLAG_NONE); } From nobody Thu Sep 18 08:51:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8Wx6ngWz6826L; Thu, 18 Sep 2025 08:51: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8Wx4t8pz3hjK; Thu, 18 Sep 2025 08:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185517; 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=Xi2Dp1iM+xN7GZ8ia9aTaRclcGgI2yPw1zeFMDbyGeM=; b=T2lEYW1y2qbUPQ/z4Djl3zukfXG07uvp8NxmIF0ZHajqHDfHjwWMEAndE7zNETt12gggfp DOCyItXiu/wgevigsqrC/7GmdUzPurQJV2jl1kvY6+QF6LSvFSRErT8i8RDpPHA9ryanf5 f6p/NYx1/+olDYtPPAkF3ngcRqcyZTJ/MRfWggEJ2SMPG1cSKMcweAfEXGZSRFo7IdJhFd lz3UXAklhATNXtEyyIlM8UU2emt0zZocteF2dKytRy02c4i4ST6/JyrBoC3nke7xqxTyw9 yORmKWuBzzuKyIOkeRn2eylZWMG+/0AYhUSZsqClWe5bJhYZqMvTU6GFE6EaqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185517; 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=Xi2Dp1iM+xN7GZ8ia9aTaRclcGgI2yPw1zeFMDbyGeM=; b=Md7SyE9serKo4I2NjaydCQcedfz2pgB0XSnMdNV76Pz2Q7NcQhF1c7rZmjbHX0rCDnyYHj A6sOE1pxTZ03YBnlcwy/Qy2K4Tt11DZ0TE4Yd18DXEnZTCvaFfu8eDlDl5IJb5itOren2L V0nRM8Nh+UnoiIIaRCcApTPUIAxP+4uDWK1bv7t7YLTfQb/RR+tz2tYD1gZ21oL+2aKkqV VxY1uriq7FxgLrtQWQggSoMSzmD83XiP111aCK4DdJf+PQQfNXSfLY6CfKByiyNQg0i9gx WFOORSJf/X7MSVMg2YfMrnorkLnay1MHymql95fpxE1W9neM207f6EHR0/z8Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185517; a=rsa-sha256; cv=none; b=TRJdTrAMEE0jUv/Z7jMrqlUQNnj33Qb5y2iTVLC8ifQqGb4o+EGxBGc3950SMHrF3CidLk P3zxargoXJsWAG2clSMtkWxWoy+S8PFsQlKu19z2xLFS+uJI2LLjSUW2eqUTnJ9qhT/ADj h7Rlqf7nAhvYly3WSx2k/CzwDAgbjOCe7rLR5mBbj/EDiQivuUqtykxi70ruHle3kYfVAY qGMkGaDfNMa0x8sZk4prxEpUOdzOsZ2bWqm44+Vd9VUZVKVlrlpPhopB5XQcQcbWKzskM1 46bsAH+54x+AbkfTRcrrOgoG/5b/5zESoscVZH1upu68gxFpHqx9VGNyjeRvKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8Wx47mkz147s; Thu, 18 Sep 2025 08:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8pvBW017334; Thu, 18 Sep 2025 08:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8pvXG017331; Thu, 18 Sep 2025 08:51:57 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:51:57 GMT Message-Id: <202509180851.58I8pvXG017331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 30ea55ff5eea - stable/15 - hwpmc: On attach, fix allowing a PMC's owner to attach it to itself List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 30ea55ff5eea80ee9b1e021b151b16c799fb288d Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=30ea55ff5eea80ee9b1e021b151b16c799fb288d commit 30ea55ff5eea80ee9b1e021b151b16c799fb288d Author: Olivier Certner AuthorDate: 2025-09-09 12:48:05 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:28 +0000 hwpmc: On attach, fix allowing a PMC's owner to attach it to itself The returned value in this case was wrong, and would basically prevent some PMC's owner process to attach that PMC to itself although the security checks underneath would have allowed it. Now that this early return has been fixed, its block basically becomes a performance short-circuit which has no effect from a functional standpoint. Fixes: ebccf1e3a6b1 ("Bring a working snapshot of hwpmc(4), ...") MFC after: 9 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 1c40b15971f09c0c0676ae476b88b32166eae8ac) --- sys/dev/hwpmc/hwpmc_mod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 15c782b91b69..a6a6ae68996c 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -1041,7 +1041,7 @@ pmc_can_attach(struct pmc *pm, struct proc *t) */ if ((o = pm->pm_owner->po_owner) == t) - return (false); + return (true); PROC_LOCK(o); oc = o->p_ucred; From nobody Thu Sep 18 08:51:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8Wz2Fv7z681ss; Thu, 18 Sep 2025 08:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8Wy5qvzz3hjc; Thu, 18 Sep 2025 08:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185518; 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=Yr+U3vqsq2wdmdq//B4HNScZbW7Lbr6Qqu8IL9FM5is=; b=NGHvyFyxGPbvCpQ6IX0LmURQ9GD1CsYB1BwfJ62vDtXAQjy6iOrHsKxo62XmUvFLWyVD4O rqoYGDyXxGqSplCAK0tjdFAx/PbMIwnVgRw7vNeGE5U2P5bSCW4+QzEfvXOLq9Mcz3e/T5 PJY9b4wWdZldYslPRbLgzjKzaae/LCNJeHzY4Ni3VP9jHP/U6lhVRLSJRwpYQMG+Unv0uy Tgxc42KqrMv2C/LEiM2/0g3lYEqEhscg55dOXO+/1jemfmRfFFSeTcxKV98ql88btmblzK NdO8KYuR8hM8/jQWjJX48DJP+PzJ6FuES5Iv0H1USPuT7x9KbGLh43lcmjhaQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185518; 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=Yr+U3vqsq2wdmdq//B4HNScZbW7Lbr6Qqu8IL9FM5is=; b=x+0PBgYHW0JCEsb9hxMGh64kQgSJe8HTlO6li/zo1Yux+uZrBgLUbRAmuQ/HlSBi89SIXZ U5Kr69vUj8gfqG5NJeW23kYyRSu4eCfhvrXjPfKRK33leJpHRnN23jFA3jvXufN9Om6E4b /GrFJn2GstmG4+8PWKHIEwsi8oRU+PKZPmlWALZgbhbH4/lxGtt729Y3s2JVjB3FWcAY6v fK8q7qcFL90W3zISFqKL1SJJQDt5QdpmU0OKFNIXz2khg35ct0ryI3koaS6/tGmwO5zEr2 hrW1FcGU4in/ZqooQ9kmGGhiBt6nYrEQ/ifOO2DrTnmU7a8gfwVfR7/n8VaQ9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185518; a=rsa-sha256; cv=none; b=x0arkgXQU4rMLqkHfiGPMx/pwmEqtEXtM6YWzHQTFf68+WsCkOd87DGYRNenDShyrHAMSQ v8zdXL5XDZBDdPtNNETT07LdTPrWVDlNMFOaPlFLIb8U2gd8nFt31YuTbtHPTmMcCJT60+ 6CDtcKL7PkQrFiWXfxUGNT3R/wumiK+ElAtKad5EMgxHme8h9kbwPoL11OM31L11eI+b+/ 3J+lbZ2MgarEUyP3Y4pQGDMUoBs3UnQposvR8dttgstp81c0ucFjgRstbMfkbLJGn3r0wi IoxOzRTtxr33b5vGdixyq/s5B0ppkdvYQ9ykNiWIK05pmynbJbXO1oXneE5XRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8Wy55ndz14L4; Thu, 18 Sep 2025 08:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8pwhZ017369; Thu, 18 Sep 2025 08:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8pwTZ017366; Thu, 18 Sep 2025 08:51:58 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:51:58 GMT Message-Id: <202509180851.58I8pwTZ017366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 97a56375caa5 - stable/15 - hwt: On attach, ensure owner is a target effective GID's member List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 97a56375caa55b5e147117463224e6ddfc12c61e Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=97a56375caa55b5e147117463224e6ddfc12c61e commit 97a56375caa55b5e147117463224e6ddfc12c61e Author: Olivier Certner AuthorDate: 2025-08-26 10:05:15 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:29 +0000 hwt: On attach, ensure owner is a target effective GID's member This restores a check that existed prior to commit be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]"). Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52253 (cherry picked from commit d9e11f01ef076749e58614c03168e89f161dd978) --- sys/dev/hwt/hwt_ioctl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/hwt/hwt_ioctl.c b/sys/dev/hwt/hwt_ioctl.c index 592db4931bb4..184c7e72f986 100644 --- a/sys/dev/hwt/hwt_ioctl.c +++ b/sys/dev/hwt/hwt_ioctl.c @@ -112,12 +112,11 @@ hwt_priv_check(struct proc *o, struct proc *t) error = EPERM; goto done; } - - /* Check the read and saved GIDs too. */ - if (!groupmember(tc->cr_rgid, oc) || + if (!groupmember(tc->cr_gid, oc) || + !groupmember(tc->cr_rgid, oc) || !groupmember(tc->cr_svgid, oc)) { - error = EPERM; - goto done; + error = EPERM; + goto done; } done: From nobody Thu Sep 18 08:51:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X03lLhz681fq; Thu, 18 Sep 2025 08:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8Wz6BTjz3hm1; Thu, 18 Sep 2025 08:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185519; 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=n9LLqXq9/UfjqvhBDw6paIYwB9Q2DohngxXjMAsPj6Y=; b=hVWPNbH760oee9ynS7d/jwxSZ55R9xRsY6noxyKnYaUG2j5VIF3O2yvVvXfSE9cPffP8mF zDfQezX4Z4zZOqqPmkjVYoRJASiegV7JaxLS7W+Qg2SI1MTNfqoqwMHVmIqhqW7z+N0LLg bc+ODs35QsAge1LdZRo7haTtONFMVnzN0Rzdh92l6rBz95IrgJs+MnKsMOmWL4t9kWi+RK iiQdNLLQremJtq4c6nlo6GB/dKFGXu+CUKmUo30g4qT8LIhB2P0ITqLxSWmtZo2SPNHYmF tpwokd2Sr7BbRIGrjhi4X6wN3GGGeMS9ILEv8rNOADkNX564Qw5BihBsJTuj4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185519; 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=n9LLqXq9/UfjqvhBDw6paIYwB9Q2DohngxXjMAsPj6Y=; b=pVXxHcTTdrIndgTH36OYRp/vOmIiSFES22vnMMnT6EIBlGBtu/xEQJUqOLFR4lVyFjH1PV qsScBcKtd82aQGH7s2vVamLo+pyGENm2yDTjnpvZIsqk4ODVAGPoZNYj5/9ElMSRr2w52+ TK0j0nYxzZISM8soz67QnhSEl5steLkT2wiqB5eF7lyi1BwPmqZXfUD8pApvW/L3RKpAh/ pi0JWKWz0szEVCUkuDkT9fymHLmlB0yECtToH5VIDC+y31NAncschYjBxZus2TfI1OlES3 vdHlm/tFTRP817fC7TumXkupfbyjdDM2my2Ew1xieuCpjb6h9ivM3KmvaPXMhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185519; a=rsa-sha256; cv=none; b=hYvqRIolEU97Ysq+E/vqPB5gZ0CfAuL2dMcpimp7T4/RBdUAymv+t6+QdesopJ7K91BaS4 Z2iIX0Ops3x3n/H7xofxcPYioEdW9nrSin+1gIA6XgUtsePu0Ew4rXWhfR0a+Jpfs8lfOZ XoVWXjCCqgTy2UYuFfmptLq+zq9drzrxWocnw5Z3lJNbfwqFyUm5L8T6y9CTZk4T+xoKqv fZ0i0x7gNw1iqjjoGaxB1AutjiYRDb+E5AaBV1+ySIe7Anz93QZjWNTFpM9C0WfxW1OtXg rIgHkc49BQj6iF0HAJbSpfc9v2P722pJA83WuJwt1K+5B7CsHjfLf/p/5JtteQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8Wz5jhwz14bG; Thu, 18 Sep 2025 08:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8pxEr017404; Thu, 18 Sep 2025 08:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8pxTl017401; Thu, 18 Sep 2025 08:51:59 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:51:59 GMT Message-Id: <202509180851.58I8pxTl017401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: a5e6ecb88986 - stable/15 - nfs: newnfs_setroot(): Remove an obsolete comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a5e6ecb88986399a0d06f41404e6dc16bc11f698 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a5e6ecb88986399a0d06f41404e6dc16bc11f698 commit a5e6ecb88986399a0d06f41404e6dc16bc11f698 Author: Olivier Certner AuthorDate: 2025-08-26 10:26:36 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:29 +0000 nfs: newnfs_setroot(): Remove an obsolete comment This comment is obsolete, as: 1. This code is FreeBSD-specific and is not shared with other BSDs. 2. With our recent changes in commit be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]"), all of NetBSD, OpenBSD and FreeBSD have the effective GID in a separate field (DragonFlyBSD remains to this day an outlier). MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52254 (cherry picked from commit 67f8bd5986a42a173ef9082abfcd523b1a3ac056) --- sys/fs/nfs/nfs_commonport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c index e5fdb395c9f7..862780741ee7 100644 --- a/sys/fs/nfs/nfs_commonport.c +++ b/sys/fs/nfs/nfs_commonport.c @@ -371,8 +371,6 @@ nfsrv_atroot(struct vnode *vp, uint64_t *retp) /* * Set the credentials to refer to root. - * If only the various BSDen could agree on whether cr_gid is a separate - * field or cr_groups[0]... */ void newnfs_setroot(struct ucred *cred) From nobody Thu Sep 18 08:52:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X14yQyz681ql; Thu, 18 Sep 2025 08:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X10FtPz3hk4; Thu, 18 Sep 2025 08:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185521; 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=sosBVUzu/+trNvjB/XDwTRjnD/9deaXr/rYk3QEnttk=; b=wrStvp7zFA8Lsj1+AuF42igUd3cUKfAd9M1iernooqGT5iCDtv3SHNcADz6sTg9akK5v+k ZUvcTGBnAaEsd4bFCVyiclsKz5eOwsnkN2BEgNXlnmr0PxNVolGzOPzGnnzstUUH+uvxoM L64DaOx88riF/QFsJFDZMCKLpCvtH1WyxmQHz6QVBcxTdxVCWWOLqKo14IbXLXdtFP78GH akQqHznaWsnTjkeZxqiLD9v/G00zmiljl5PIy+PW30d/PjwRD5mEX08b6lURR2YCfLkQZq uUducgjhb21z1/FRBXMJVzFdroQ/IhNK1rzpjyP+JKcXvVQipYo72DKz9vbOXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185521; 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=sosBVUzu/+trNvjB/XDwTRjnD/9deaXr/rYk3QEnttk=; b=jRBhtn/p5nBcYedDs7sR8ui94cxzcWBwo7OskYTtHN0xqRwb2Zp6eocKqy5eGUKmWj0oCe B0w3EdaIjAJ92Pwxp2kAqeDb6tk6/9PW4CT7LWudG8kcQcCCK31//jlmFFnPirWAF0ZmDT l4vB+2bJV7S3U1ICHCgZWJl8TirqNCwCbTK5lqKdVvkeWO7rOnhbOH52cIOl686Cnjk+B6 ygCIsngZoqBo945vLX6UhhD89NII4k/LUvAgrDvGA5p5BSLKQbG6jQTgDSHhPCeuhnYQmJ HmNkOfcKKDygpCqsLhq9oHJ08YvGtEXVyGg0uOt6YvRn3GAyf7qpHpUb5Vf5og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185521; a=rsa-sha256; cv=none; b=ZGQ9J+lJjgWtw8JQtOn35gdNi2pdCkWZIcECVoTU+rHlxVniGQrWVDHt5nzEM6z9qHjFxQ sr0w8vt1tlyffGjgnmgdeJy8+jWuLRQuDBi1pSmVwqzbEhAxuHztzrbMlOZIr8AKStSWPL iOg+XkfRdJFhnlh0eLoZ0vN8qLeoOLIwQN5RSSBkA3HqMNbeZC2VqhCWAy/IY8wX6aA6W0 hoB2bb5XaoNnpTFR8bMYOM2Xpla/MFSSZ7m6O3vfXMftsn2Jyuck+G0jqjhiWLEorNvlw+ KLA1M1x50Bi7Q+QZhFPRhN/2g4Rpd1DRv6HbRMm9vr3ZiPN1x6ymA2S8xdp4Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X06fk5z145s; Thu, 18 Sep 2025 08:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q0f4017444; Thu, 18 Sep 2025 08:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q08Y017441; Thu, 18 Sep 2025 08:52:00 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:00 GMT Message-Id: <202509180852.58I8q08Y017441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 702888ce72ed - stable/15 - nfscl: Restore sending the effective GID to the server List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 702888ce72edac87bb3299c9df5d573d7e9a1df7 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=702888ce72edac87bb3299c9df5d573d7e9a1df7 commit 702888ce72edac87bb3299c9df5d573d7e9a1df7 Author: Olivier Certner AuthorDate: 2025-08-26 12:55:41 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:29 +0000 nfscl: Restore sending the effective GID to the server Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52256 (cherry picked from commit 71db32347665753a3384e36dcf89c9e3a8af6529) --- sys/fs/nfsclient/nfs_clport.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index e9f1dc23ddbe..77e71d4153c9 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -1098,9 +1098,10 @@ newnfs_copyincred(struct ucred *cr, struct nfscred *nfscr) KASSERT(cr->cr_ngroups >= 0, ("newnfs_copyincred: negative cr_ngroups")); nfscr->nfsc_uid = cr->cr_uid; - nfscr->nfsc_ngroups = MIN(cr->cr_ngroups, NFS_MAXGRPS + 1); - for (i = 0; i < nfscr->nfsc_ngroups; i++) - nfscr->nfsc_groups[i] = cr->cr_groups[i]; + nfscr->nfsc_ngroups = MIN(cr->cr_ngroups + 1, NFS_MAXGRPS + 1); + nfscr->nfsc_groups[0] = cr->cr_gid; + for (i = 1; i < nfscr->nfsc_ngroups; i++) + nfscr->nfsc_groups[i] = cr->cr_groups[i - 1]; } /* From nobody Thu Sep 18 08:52:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X259wrz681qn; Thu, 18 Sep 2025 08:52:02 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X20H6pz3j5N; Thu, 18 Sep 2025 08:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185522; 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=mVGJKNRUs19np/IAzsFRf/MB+dbCaIO3PTuwqCVXao8=; b=Wb2U/XvYBXUxnwlacQlsCkjMh9Cik7XBiGf8rY2dcKJBWc/DYNFuiUNeXsQLR5VJM3KX0S uv6KLzAYpaj4t3thpuUSRm8zXpvqrmY5FwOIWgBMkIay3g0EtcBHW3pMExZ3mTlOZosO2T 7dsmrJkdT/G6weqmoQ+gOypICyd9Wq6X8T+/pJrLuBEyS7bjbiixXQAtWwJVve7BmVmlvz e0uAdMg1eQgBqGmp/aD8xPtV1R3tF8r48vZ+jQLJq95aKlkFpB1Eh2bPzjvHDslAR3WNhY nTgqENfiMH49dvhwSsNbdwbIl6YpI/XK7OUGqGc//BviTAlveUozghx2TCVyow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185522; 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=mVGJKNRUs19np/IAzsFRf/MB+dbCaIO3PTuwqCVXao8=; b=rr/nEAcWoMz5OL9DthAvyv8k45y19rEcJ0UIHAla0V5XLrGW7mUq2RFYmC5uV6aUidlpWO E2jPvR9oVn98sJhaPCzX5sOFD44RM18eyzvpsMNw2Hc1mzOj2PfpUY25v9jMVDuwXL5o1u rOZitYDsxtecoxt/PfGWKZnNMQicmgMs0N3OZSdLfGGimNsZmW0g9H9TmuHgWUUyZ2pzU4 wm/knj9rwERFcXJ5Y1c+Mgy5/TnA8hrr6xqVmR/QIVOiJEJGffDjGjivDSgqISYQySqPkz ky6jxygra+74y3Oh6DEkPd1PtZm/JNzM9FqYAGAJEQwmoIJxfjoJq+FjRhu2pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185522; a=rsa-sha256; cv=none; b=yRJfnednoscfA+dqRdQZyFWOtv/hKUaBgnVXrqkGuZeUYfS9JuhspArHYvDJ6TB+TxUt5j t/vH6s0E0cLm4PPrm3WnSaJuoNMPMmQzP7Jc1n+asbaC8/m7T3nKzcMnkPRpr4HGhE8WCu v6AXDUYWDr03tnoY4yt/XnzTNU+5vqNdX3l2qLle920rxAGgqI5Z+iFIhLbj2zR4br/oXV C2m0Yokcl531KWTu0LZxxgAgCuK3v36UvScBZGTWOfD1NYed3vMv+zANnSJ5nmWyrN94py p82bDSTvCt5JL057E0+2gOBuF5p/6/eXzZvDR59NLxSYiwdzPmJSQk8fjdfJ0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X16w7sz14bJ; Thu, 18 Sep 2025 08:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q1OJ018256; Thu, 18 Sep 2025 08:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q1wY018245; Thu, 18 Sep 2025 08:52:01 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:01 GMT Message-Id: <202509180852.58I8q1wY018245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 79c1160fb9f2 - stable/15 - procfs: Restore printing the effective GID in 'status' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 79c1160fb9f264ea13a96d521b2b41dc97fc6931 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=79c1160fb9f264ea13a96d521b2b41dc97fc6931 commit 79c1160fb9f264ea13a96d521b2b41dc97fc6931 Author: Olivier Certner AuthorDate: 2025-08-26 13:03:19 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:29 +0000 procfs: Restore printing the effective GID in 'status' Reviewed by: kib Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52257 (cherry picked from commit d859d4c57eda8ad277611466b840637234712e42) --- sys/fs/procfs/procfs_status.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c index 38070e0946bb..49c084d02ff8 100644 --- a/sys/fs/procfs/procfs_status.c +++ b/sys/fs/procfs/procfs_status.c @@ -141,13 +141,9 @@ procfs_doprocstatus(PFS_FILL_ARGS) (u_long)cr->cr_uid, (u_long)cr->cr_ruid, (u_long)cr->cr_rgid); - - /* egid (cr->cr_svgid) is equal to cr_ngroups[0] - see also getegid(2) in /sys/kern/kern_prot.c */ - - for (i = 0; i < cr->cr_ngroups; i++) { + sbuf_printf(sb, ",%lu", (u_long)cr->cr_gid); + for (i = 0; i < cr->cr_ngroups; i++) sbuf_printf(sb, ",%lu", (u_long)cr->cr_groups[i]); - } if (jailed(cr)) { mtx_lock(&cr->cr_prison->pr_mtx); From nobody Thu Sep 18 08:52:03 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X33qTtz681t1; Thu, 18 Sep 2025 08:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X31gsyz3hmY; Thu, 18 Sep 2025 08:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185523; 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=E27WHRf2aHlK7yHXr0dYa2XPuJVNlAXhkNHLyg6L/f4=; b=yzxEtyhz7PtqWN/d3w+adeqIKpLHCbkAENi1QPXjdus1IEKVQO5EJRFTdb0tN2XAfRHpf3 3xl1SSnFp9TKh90RJ01p2+FUOGoyEX0Khzzy0HxnMhILmf2W6DNvYwr4V4rvsJpecYXUOI IsRz2nA3c9JnuD1vKwTbSRcyBQrdqIzmefz58c8gUmzr9yA84+DJiTOopvCk/7ZoFVFOiW IZ42UllODEhAnQe/GXSkRv7hVeLgzxTz+iLObEyNWhHgw/TymyMyJHxujBXqfWf0M/VStk AJJjLbW0fw/mH8AAh5n5hWzdKO4SU6MoBpuojIesg05fBYeL99mlIUwuJSbqsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185523; 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=E27WHRf2aHlK7yHXr0dYa2XPuJVNlAXhkNHLyg6L/f4=; b=jCeO0UylOkvrVFxwvKUI92qWVbuo2PsBgTlnYdNcGGcDFToPrRk/fj49Np+A3dP0CY1DSm KvBoobibqzxVTWOpF2RXasxqr+wLl6AJxJkxE5gpeR0bRpRkpICC1sZxynBPE6dKF8aqlv 4q5EKks/kcZtQoh31d8K8117d3ms1Fr3R6qEHAdRnDAzS/ItWWsW/yEmz1FcdoInlrI0jq Bb8QW2VkqoCdNvAqqKj+Efonq50P9gua2gxyJNh5HdYvINueoouWQjXkP2h8FcLuj+ddDA o3ZHVpRK2L39nZsBsfqi7TI1ibpsxNozMHsx5NlNJLLN6RkHvAo5Nt0ywWU+3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185523; a=rsa-sha256; cv=none; b=XQr0jqqtz1eYYAEnGeNac2W3N+rFTgdGrDzF2+hoKNSiXjaeaGS2Ko/ssPLUcKejqnt+Ge 2Kt7T13FJS52CkRlUsA00mbJ5DEHV5R5iM63r6z6Hzdv+Vn2Psvyg9+32ik0ykSb/VyIBQ qcEYtTNAzdr9hKPAW3CTBpSgi+6UtXqFJArPYMxCpy8H0a/Fs4LOCJp9tYHjkAOpl5yLYC 2rPSzlFlk5Lv2pWCxx92fpelScEM/XwzcH88Ngj5VUh0mgIFghPNfjNqIMXDBoN+rJqz48 r5BNjKhkjFB7apOsFhxeES7otfjNuYcngtmQR+xOmw6/51C3NmqhT0kCtgY6sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X30zM7z14M0; Thu, 18 Sep 2025 08:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q3jT018820; Thu, 18 Sep 2025 08:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q385018817; Thu, 18 Sep 2025 08:52:03 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:03 GMT Message-Id: <202509180852.58I8q385018817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 96a2fc56439e - stable/15 - imgact_elf: procstat groups: Restore sending the effective GID List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 96a2fc56439ebd58622c484944ada9f2d4f2f468 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=96a2fc56439ebd58622c484944ada9f2d4f2f468 commit 96a2fc56439ebd58622c484944ada9f2d4f2f468 Author: Olivier Certner AuthorDate: 2025-08-26 13:41:49 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:30 +0000 imgact_elf: procstat groups: Restore sending the effective GID Fixes 'procstat -s' run on a core file when the number of groups in effect at the moment of core dump exceeds KI_NGROUPS (16). Reviewed by: kib Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52258 (cherry picked from commit 5568b4441dff078733a76835312a6ce1ccb50a17) --- sys/kern/imgact_elf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 5a53fac50f2c..1bc2491a1a12 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2610,11 +2610,13 @@ note_procstat_groups(void *arg, struct sbuf *sb, size_t *sizep) int structsize; p = arg; - size = sizeof(structsize) + p->p_ucred->cr_ngroups * sizeof(gid_t); + size = sizeof(structsize) + + (1 + p->p_ucred->cr_ngroups) * sizeof(gid_t); if (sb != NULL) { KASSERT(*sizep == size, ("invalid size")); structsize = sizeof(gid_t); sbuf_bcat(sb, &structsize, sizeof(structsize)); + sbuf_bcat(sb, &p->p_ucred->cr_gid, sizeof(gid_t)); sbuf_bcat(sb, p->p_ucred->cr_groups, p->p_ucred->cr_ngroups * sizeof(gid_t)); } From nobody Thu Sep 18 08:52:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X45JLkz681lc; Thu, 18 Sep 2025 08:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X42Lvdz3j6M; Thu, 18 Sep 2025 08:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185524; 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=U58z8+1hLNa4QGwTnF1DJmiXU+MPpnAYxsF664dh5mo=; b=pujvvdSxnEdkv77RUSKCkEQ0XMz3Iv91ffJT9H0XjezyNsKYvfUR5tSOMUBbSand4/xqxM Svg2fZ3HvuvKacmFWZPSHEe2tHaUNzG7ukXc4LRgqshx6ldJFk6ziGw0Rrp90CwZ65A/P0 ijNVLYEXMKT7tVCIJksFr5tLmu6PFKxsS8/MdU2ZtDhLXC92BCo/qysjZeff2NMAjxvqV2 k6ACpF3W7d5r24uhm8A0HFLzh7XZUbdiKcxDMpHck5//Bkfk+mOYeFzq6m5ifVSgpjX9+f HlavvffvCcvVSalqGqlDPv/MH32Ey2zitz2l4LpOEjyTM9YxFuLSOlDbbS5P1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185524; 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=U58z8+1hLNa4QGwTnF1DJmiXU+MPpnAYxsF664dh5mo=; b=IeenQ3zo1UOKl6fGURWWwjKF9LPjB3I6v7MfUpPjm//QaWHEa9N5Ttwg62bczcol7n/MMS UmTPKHKLnWgANruyVYeD8JIFoQ11ev/A9wN9GyswsfAkvg41N02tBoT7u+wJn/CGBC86nF ffj/xWawWy8ONPtOQ4dv08clEZs0oFrO65cqCaxwtf0oh8yPraYcnR0iBxlTY7e75JlLLn cZvzSI2WQ7qzJ9vZUBIwFRGeIQw+a+M7cktzBZSbawUo2+EzamsHMxeuf+sYEleb9vQuS2 t6gNMIV1lyo46ric629qmHTUK928GraGidwQKjjhS0RdQY5bso4afJfrFHPlgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185524; a=rsa-sha256; cv=none; b=mAXxkPWx2AAqzWNVp8ojnWS8OjcEogcWnOY4qaGS/TOlZK6cX+vhrLdNmR7OBacHgfMdwb 90H44zo17cLz5smh4qN0BPGd+/WFbYFzT/KIUUBw+aCc0r7tCcWrdrqCNZNU24OMmxVjwq wfm6r+U0tZ8ULaIlP/+nWlHc3hQatxBXXNIBrWhTPKb0j8bAY/iRU/Ui67pv3w/f9RM/8D Of66ZH1s7n4srh5bUF5yisViIaK7EccgsuXbXH6zKWR0W/J0R72QRkFs62cbKZnCK5Vxd1 uhuFix/NcgSjiYhICoFbJUQ7Ffk4IJ8Q0xPDHtiE+JDCgOK6Vsrh22naYwEEpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X41wtyz14YW; Thu, 18 Sep 2025 08:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q4b4018859; Thu, 18 Sep 2025 08:52:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q4oX018856; Thu, 18 Sep 2025 08:52:04 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:04 GMT Message-Id: <202509180852.58I8q4oX018856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 74d3fdf040c0 - stable/15 - kinfo_proc: Restore outputting the effective GID List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 74d3fdf040c07116533fca2551a473e959d76c27 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=74d3fdf040c07116533fca2551a473e959d76c27 commit 74d3fdf040c07116533fca2551a473e959d76c27 Author: Olivier Certner AuthorDate: 2025-08-26 13:53:06 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:30 +0000 kinfo_proc: Restore outputting the effective GID In particular, fixes 'procstat -s' on a live system or a core file (only if there are less than 16 groups). Reviewed by: kib Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52259 (cherry picked from commit 63a40ca813a9995e8e2dee0142297d9c38106c05) --- sys/kern/kern_proc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 379fbda619c0..c2855034fabf 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1112,13 +1112,14 @@ fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp) if (cred->cr_flags & CRED_FLAG_CAPMODE) kp->ki_cr_flags |= KI_CRF_CAPABILITY_MODE; /* XXX bde doesn't like KI_NGROUPS */ - if (cred->cr_ngroups > KI_NGROUPS) { + if (1 + cred->cr_ngroups > KI_NGROUPS) { kp->ki_ngroups = KI_NGROUPS; kp->ki_cr_flags |= KI_CRF_GRP_OVERFLOW; } else - kp->ki_ngroups = cred->cr_ngroups; - bcopy(cred->cr_groups, kp->ki_groups, - kp->ki_ngroups * sizeof(gid_t)); + kp->ki_ngroups = 1 + cred->cr_ngroups; + kp->ki_groups[0] = cred->cr_gid; + bcopy(cred->cr_groups, kp->ki_groups + 1, + (kp->ki_ngroups - 1) * sizeof(gid_t)); kp->ki_rgid = cred->cr_rgid; kp->ki_svgid = cred->cr_svgid; /* If jailed(cred), emulate the old P_JAILED flag. */ From nobody Thu Sep 18 08:52:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X601SSz681qt; Thu, 18 Sep 2025 08:52:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X53RkTz3jHQ; Thu, 18 Sep 2025 08:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185525; 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=6AwYvFwkkA017zmrk5/NcaXeME1Jf6JFL1rdhtX3YAg=; b=dy6Hxd9BiguFzcADplmgLX2byPoN4KASkl+A5mn33Rxe183KFIz8gW0AH8ZQUJHKeE8YFe jtBKe2cdVU1auFNX1SUPBheVJA6KrNBFztlreIrr2+FhPyuduer54vd+xKeMfT8tRMfLM2 YDs7WvyppMsEBhOFUhZ4h9bsCAyvXs8ttvkOr6imFcPBm/s48hCDTHxvYP0kOW0SNRnqPb dU4BBStzDun8Yx/gbPHepBYr4cqrn2ywgkZSqQkQafZq7P47URvWD1dYMUI+twKAmte6Tb g693MZzrYdwC3W815jIIfpzei62qeyrhzHGiCfOeRoQPz+qBPHyfbDOLW84y7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185525; 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=6AwYvFwkkA017zmrk5/NcaXeME1Jf6JFL1rdhtX3YAg=; b=S2w2xVJHkVSZXHujNq4gKuZkj3wsTySBQDksnviCwXWNJAA9PsyE4sbkOAMvme8oMpVmz5 KBD7C2QWUAkpQK2/qeY01twpy7tnmQVpRPbWstw/HMsfXaqynfckRxSb2KGnDNQOO+Jl+b 7yae57gk/duVblKwaiD0PKsOGy32+poJYx1ieqOLcYTA1v3jTZe49BO5wHaELg3YKFKXGC KHtp9LGCQRbjNuIW6FEMDymaYByh9qBv1LNqefVevOwl9PVh7vyRef9RKP4IocNk2TzoMs f6J+zPG4Ce91BVxS4v6NLMbtCKIuegM3w+TV9B7rL05dbfiks1juZheBGp10Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185525; a=rsa-sha256; cv=none; b=sPXZLhF/5XJKoE/iXGykUGhrx7AAB5fpZXtlfpnjQ8eG4TM5IOeV5hoxtbtQzfnOdCX9D/ 6c0hBbyKbuFyzlTKITM9qNuQ1GUNnzrIiRNbONVQiFch6nHrJqIOYVySP1ThJOySaVCuxr l8qL6MLCBCwVpYlETt5q3rCtfDQyoBMkOxATYA75Mi6+MRYiOXxECDxkRRDxtPOPvvJeXp diAQlHhIJjHzl1UfaFIEUDypxE/QLzcupoMUYGUEmZ75QCfhT8kRiZ4s41gxDnXa6sc4XQ RzOuyJZHjV3zNg11SR2wK3iGmkRVVp5kz5Ok0hDU0Poka5TKSM9b9NCwKhTRWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X52x0Vz14L6; Thu, 18 Sep 2025 08:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q59r018893; Thu, 18 Sep 2025 08:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q5LT018889; Thu, 18 Sep 2025 08:52:05 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:05 GMT Message-Id: <202509180852.58I8q5LT018889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 53a9f161903d - stable/15 - kvm_proclist(): Restore outputting the effective GID List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 53a9f161903d1cc9e0dc11be79a5c84735ab33da Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=53a9f161903d1cc9e0dc11be79a5c84735ab33da commit 53a9f161903d1cc9e0dc11be79a5c84735ab33da Author: Olivier Certner AuthorDate: 2025-08-28 14:19:43 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:30 +0000 kvm_proclist(): Restore outputting the effective GID In particular, fixes 'procstat -s -M' (only if there are less than 16 groups). Reviewed by: kib, emaste Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52260 (cherry picked from commit 7676df2faeb6dcbf20456574dcd2a7f4ab8fff8a) --- lib/libkvm/kvm_proc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index b2b7c6ecce56..fed483978e62 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -150,13 +150,14 @@ kvm_proclist(kvm_t *kd, int what, int arg, struct proc *p, kp->ki_cr_flags = 0; if (ucred.cr_flags & CRED_FLAG_CAPMODE) kp->ki_cr_flags |= KI_CRF_CAPABILITY_MODE; - if (ucred.cr_ngroups > KI_NGROUPS) { + if (1 + ucred.cr_ngroups > KI_NGROUPS) { kp->ki_ngroups = KI_NGROUPS; kp->ki_cr_flags |= KI_CRF_GRP_OVERFLOW; } else - kp->ki_ngroups = ucred.cr_ngroups; - kvm_read(kd, (u_long)ucred.cr_groups, kp->ki_groups, - kp->ki_ngroups * sizeof(gid_t)); + kp->ki_ngroups = 1 + ucred.cr_ngroups; + kp->ki_groups[0] = ucred.cr_gid; + kvm_read(kd, (u_long)ucred.cr_groups, kp->ki_groups + 1, + (kp->ki_ngroups - 1) * sizeof(gid_t)); if (ucred.cr_prison != NULL) { if (KREAD(kd, (u_long)ucred.cr_prison, &pr)) { _kvm_err(kd, kd->program, From nobody Thu Sep 18 08:52:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X65sP9z681L1; Thu, 18 Sep 2025 08:52:06 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X640nFz3j4R; Thu, 18 Sep 2025 08:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185526; 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=4/D+o65MezwdysvKWPa+f8gIMWNZ+VWVfQLYIRyM6tI=; b=uGHiwdq4zi3HWR8QyHuCpGwL4LqjtFE5xuHyypBus+7t3qHmWlD1uINtqKGVgHrRHtQp/U q3bS72YaCls8k8jV3cbpATrm1Bv9liIZAMvLVfnCoZluH8R+BUj4g2DrmODfTRuu8W0F59 9EfUWzBSnAVo2+tkz1JrB5Ru65mWGoixWWgjA4zEhFJVVUNDRd1gRBpRCi0bW2rSs/gMHV klBlTg2ZPUt4Oi/3YWyAN2vHwF2fVfFsIRnQAoCREzETSM4MT/LVVqpNjg0Y3FiJW2B3+h 3QPnjTggodRlqy6K0icg0/fN4T2uSP5EsMEKoWvYI/6zu6S4tJauhgc8N2Ql+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185526; 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=4/D+o65MezwdysvKWPa+f8gIMWNZ+VWVfQLYIRyM6tI=; b=XqhigjaeGwrbnHzbetm2tCmJKatdwktaQmw2svebt9l54AS34rwoGDRS9NNxQrUgVNHP+M dlnLItXBQtxJd3mHyJcKocce7mOggpIR7Kui+gSYJ2x7TLRom2EUtlYdqmvMHetsJ5yRP7 uARHvVk3eWUIFXtsEsxGh9NQK7Ip/30c6FEtHq5mFb6dqe8fctb08SAZpKxmCYLCBYMdWT jEqn5rdML49sOduQ3OsED7zjLg+/ULXYmUDaKwGHiExEf+1ABw3Bt/j8TvyaKmuMzDVaRb WijPhZYMb5IWiKfXExB5bpzEWX8hrhYzI3b6V1Z0rgoxqpF0aALyNGtoOsEVlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185526; a=rsa-sha256; cv=none; b=amwRs90KLzz4RbXf1/2PWFmjNCDo9f8sGzYCi8RW0dJ5DRbExpJB+WoN7e4UPcOBe3BcLp zbKZRFpfIl1arUXbr72wtjvliHasta+1TIXJY/CUVbyCHmB+MSfkCex4imIbXhOXZVysW/ 84/fQZEYq7SgNhg7lPzOr8lDsiJ1IORJFVmvoOL6/omordbvsEDpCEGrNV5o3KLYDNXspi KSnwQEQBjWn2kBDWVzry+KCWqydsevsk8AzylVpBozKF6TBBe4KX51vdaLthaRFcuzu3GE /1PTUSZ93oOnh4T0eBku3/tppLzDJ/w9PvID41Su0l43dwOZmZJS+E3J4xwgNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X63btxz14bP; Thu, 18 Sep 2025 08:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q6F6018928; Thu, 18 Sep 2025 08:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q6hg018925; Thu, 18 Sep 2025 08:52:06 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:06 GMT Message-Id: <202509180852.58I8q6hg018925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 32606eb5c4dd - stable/15 - 'kern.proc.groups' sysctl knob: Restore outputting the effective GID List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 32606eb5c4ddedc1ad9cf40625ca3f69de19bc24 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=32606eb5c4ddedc1ad9cf40625ca3f69de19bc24 commit 32606eb5c4ddedc1ad9cf40625ca3f69de19bc24 Author: Olivier Certner AuthorDate: 2025-08-26 15:54:47 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:31 +0000 'kern.proc.groups' sysctl knob: Restore outputting the effective GID In particular, fixes 'procstat -s' on a live system (for processes with more than 16 groups). Reviewed by: kib, emaste Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52261 (cherry picked from commit faf7e99375910fadb1b409a756be5477b561a517) --- sys/kern/kern_proc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index c2855034fabf..6e56664d12ce 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2944,8 +2944,11 @@ sysctl_kern_proc_groups(SYSCTL_HANDLER_ARGS) cred = crhold(p->p_ucred); PROC_UNLOCK(p); - error = SYSCTL_OUT(req, cred->cr_groups, - cred->cr_ngroups * sizeof(gid_t)); + error = SYSCTL_OUT(req, &cred->cr_gid, sizeof(gid_t)); + if (error == 0) + error = SYSCTL_OUT(req, cred->cr_groups, + cred->cr_ngroups * sizeof(gid_t)); + crfree(cred); return (error); } From nobody Thu Sep 18 08:52:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X854ZBz681fy; Thu, 18 Sep 2025 08:52:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X74r6Nz3jLQ; Thu, 18 Sep 2025 08:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185527; 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=kQBVYg3GR8Fxe6+pLxR2KQ57/93jZJ5dRiKvw4WXjOw=; b=Jb/YyU6UxGouX2aY4p51uDeul2bM1TNMihonU5mfrIPdKd5x7LCdJMdXXribyg8vCPOOC3 ARruQvbixDk2oapCd5unAA3NBm8xPt13lRjXk3Ee4cmpAlWZfO4EeeU0VLO9oIVKkpnHWj izUbWW387y12O2gukxYe37/oRqWasqLSvWQSwhPVBVkzn38fB85tM4XkWjBZPNFLaS+qr6 5tIgf1R3Q+7fNsEQ/glyEal33vSBkTPj/l9MgxpnmTpHAamUoItog3/nbC98/knqDuw63p 1QPWpMHiF3I3F1NYzdkRNR6qhi+9XWWCQpWzmLi/LetjAuGUl8r9kGm4DmxQOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185527; 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=kQBVYg3GR8Fxe6+pLxR2KQ57/93jZJ5dRiKvw4WXjOw=; b=soEce6qSgI+qJss+JGLi8v6sBveuhE3MBfod/bTeTkC7LpAb/qMLeFnnXtT/2wvJFRqbDs taN8oy+xkfQQHxg+KcK6MttbM7AOXznyCF6gEBaodYfM+2RpOFK1c4FIfQJWC5Yfij7PG7 +fupzGhZCjypThSjoK3Mc1PG92TB7EiCA5Opqq8CykhVvpK/8vo5zLWKj/na0vx/qoEX3g THgRp+7FQaY84UuDtptrgBp0TuSnuSkvCHMDdtIpMsyUAiQvkhwJwzs/HV09XV3DLiH7J5 KKpvMX7QB6kZpMIOBmUAzb3YjjvAvxvX2fimEAw4KFfLIZY0Y40slXo1I144+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185527; a=rsa-sha256; cv=none; b=icgZABbOBgC1b+IsZVWD8TWp+601hS1iCu+lVAKEsgbOB1ayP/9jrj8lVSCpAh2IGmDifx 8fs+ELCF2RsOYnKit7YbJ0E2jOYl87R6amvvEGMP1kWtNTOi/eabwDVSd+OWNmm0HPD8Lp MSITgltceUvDaovG7xnsCzCiz3CTHbOQJaDZDUDIxsB9NgUqf+MCcf+y2rUfsMGX07mzVm c8jGTw3oJw+aFq+JYippkN8oPXtBTc69oXRt8fWwFkFVRU4daZr2wHrAGjgIOafj23oCCK umHyc4jKkjCaUa973Y4qm8wIuaMEysWd1KKUd3266qhezTsOoenD3rd2L/LiMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X74PtCz14L8; Thu, 18 Sep 2025 08:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q7cc018961; Thu, 18 Sep 2025 08:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q7MU018958; Thu, 18 Sep 2025 08:52:07 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:07 GMT Message-Id: <202509180852.58I8q7MU018958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b5bd97460110 - stable/15 - getgrouplist(3): Remove superfluous headers, bogus comment and whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b5bd97460110f1536228c9d2e8f25ebef0972a30 Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b5bd97460110f1536228c9d2e8f25ebef0972a30 commit b5bd97460110f1536228c9d2e8f25ebef0972a30 Author: Olivier Certner AuthorDate: 2025-09-12 12:29:59 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:31 +0000 getgrouplist(3): Remove superfluous headers, bogus comment and whitespace No functional change (intended). Fixes: a59d6a872459 ("Implementing 'fallback' nsswitch source.") MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit d3f8ed6066fdea329ed695925fc726e84d50abc3) --- lib/libc/gen/getgrouplist.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c index 5bd06bc5121f..cb23b9b2316d 100644 --- a/lib/libc/gen/getgrouplist.c +++ b/lib/libc/gen/getgrouplist.c @@ -29,14 +29,8 @@ * SUCH DAMAGE. */ -/* - * get credential - */ #include -#include -#include -#include #include extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *); @@ -46,4 +40,3 @@ __ssp_real(getgrouplist)(const char *uname, gid_t agroup, gid_t *groups, int *gr { return __getgroupmembership(uname, agroup, groups, *grpcnt, grpcnt); } - From nobody Thu Sep 18 08:52:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8X90YNxz6826b; Thu, 18 Sep 2025 08:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8X85hHCz3jNy; Thu, 18 Sep 2025 08:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185528; 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=OWwOsT6dl7/EVYXycw5+QgC0evPQypRKnN3yFJpdVAw=; b=sOSJ3gCOEZDjrebNoEM2/2Kk0TItBohQ6ht0dxqpgf1c9ePLv+c5unLlXecCHzGnA7U1Yr eOtfgcuV0/7WPi2vl9szwH4/amAol6pnXRXOp08tKq78WsjlYzYFcdZit0y3Fn71grek2g 7sFlv7Kxml1B8JzMQn5GobGLDRJ81l+4mlLxGn043RHs5aesBbqOpndMj9cpcSXsm7fu8y Jzdk9f7SUps2+anbp5n/KgKzJnTaCwhM4dRJOBnHvjHfqdDbgZsNcvLEbJi88AQsYvb1bY ZpTTpsuiKUpd/c927wn1KSAN3PvHlHMu2NBiMuBnZBvcMjsJSDwPKjiPLTzmpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185528; 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=OWwOsT6dl7/EVYXycw5+QgC0evPQypRKnN3yFJpdVAw=; b=MdMdW976dIl5b0TBldH7YXbUThUYn9TBGix5lTYmxmW0oMrg/vJYe7G2E+9rRT015HceS7 JeZJF0hbm1hweIxu8j5xfdpS4aHmcUlmOPOSKOqJjreXxnTEpvp2wxEsiYPwn/qXzr8A4y 8sfH+/1c1bsfIgGConw9UPc9/nIb+VAlbcJ5rO1LSoGv80ans3Ls2lvB1bxd/QvcUsYJR7 CowVk4WoccUVgqJR574aQUbq91cSIQvIGaC16pVwU7xRWeTgrIumnAweLoK4AVNAjJxV8H NlpXF+oUogfMEMuvTVVdLdt5OhqX3raONh9wr45LSu4oaiebW0u0q+A5rtIldw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185528; a=rsa-sha256; cv=none; b=RLFBdrdLI3syJnlsncxqICgCTZQqKIQBr/MhULLO4FZvL59Ha1v+WBPjwxhvMyY73uAd4g z4mMnFXqww2VGMg+WLVscNN7lLqCY3L7OSFDpa/gnliv+62udNQbqAZsXshiSEl7ysyiS1 GKQiI5a4ZW6SFuMRNM/nG6Ys/UxTcBC3CTtGMq6vBgoWiPkiLAmz3LsAhldMKIXPuuZ/fF BUdIEIc5CBMZ24BClYAYPB5vUneaDe2s/dKG0DqvMfR3QjKu8TU4omkPSoVMw1koICO3vN Ou0Nc9M6Mmwl9x9xqgk88Ew1jNb1DbonEZJuv7H/lfBdFpIo6ZXqDx+7iremVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X855Vgz147y; Thu, 18 Sep 2025 08:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q8bJ018993; Thu, 18 Sep 2025 08:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q80t018990; Thu, 18 Sep 2025 08:52:08 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:08 GMT Message-Id: <202509180852.58I8q80t018990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 2e71d105249d - stable/15 - libc: fix the _FORTIFY_SOURCE build of getgrouplist(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2e71d105249deeb1daed328fff993e79bb26be1c Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2e71d105249deeb1daed328fff993e79bb26be1c commit 2e71d105249deeb1daed328fff993e79bb26be1c Author: Kyle Evans AuthorDate: 2025-09-13 22:19:46 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:31 +0000 libc: fix the _FORTIFY_SOURCE build of getgrouplist(3) We need to get our prototype normally, but WARNS in libc is way too low to surface that. Additionally, _FORTIFY_SOURCE needs to include by way of to actually export an implementation of getgrouplist(3). The version defined in the .c gets named __ssp_real_getgrouplist() and the actual implementation comes from the redirect stub in , which basically gets optimized away in the built object because our __builtin_object_size() check is trivially false when we cannot resolve any object sizes in this translation unit. This could be argued as a design flaw in _FORTIFY_SOURCE, but we should grab for our prototype anyways so let's kick the can down the road instead of re-thinking it for 15.0. Reported by: Shawn Webb (HardenedBSD) Fixes: d3f8ed6066 ("getgrouplist(3): Remove superfluous [...]") MFC after: 3 days (cherry picked from commit 91ea7e2ce2b5b2ff4702c3092cfe944862d58172) --- lib/libc/gen/getgrouplist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c index cb23b9b2316d..9c57b7031336 100644 --- a/lib/libc/gen/getgrouplist.c +++ b/lib/libc/gen/getgrouplist.c @@ -31,6 +31,7 @@ #include +#include #include extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *); From nobody Thu Sep 18 08:52:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cS8XB66gSz6827J; Thu, 18 Sep 2025 08:52: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS8XB2Ngxz3jSm; Thu, 18 Sep 2025 08:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185530; 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=GMDHZmIWFkdR6xPMffYXRZebAn2MagcHagJNwwyoPTE=; b=PfDMg5K9MhgAmIzyCbC7aS0knDlGHMZGZ2TcUoxU5ePRS0XQeXV/SXP0S8kpMGxcjH3LKY FyxzlDJbxa8Q/GddJFravaaV/WKn4zPX9zDHBKzivjpahiEwyWy/+9oiXK8UmSA5HSL1yx adT+KCaNqQ0Ba2yFDT9twJrdiLeQ0lAovkizwJnFIGyQosW20GPaxnNqF1vbtwKQa6wD6D 6aSRi0YW8+wRGt3HUq5pSn8/z4HYqWrcasoRFpQWlrjVNcnl/6tcQWgS9T41mI9mW28oSg IqqgUIQJh2EEr/TvGiUSldDgjC+OLSdUjE0gJqhGr3sqoK0edNKAZ3EDBlWvug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758185530; 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=GMDHZmIWFkdR6xPMffYXRZebAn2MagcHagJNwwyoPTE=; b=nhna+OnVFc9pk3OvNw3rUejOWjlZy9F+4ZBOreuoTkObWTrTZTFL/loU8h8oddQD0xpPgu Khg9tP6bMR/mVGJiAgMQ86RwXh42LldKP/ZtTmqBU/qWIRVe7+lrx4kP2FzL0crFGZvgGN aJ5H7X41RXPbY/Bxs6rzO2YD3kGlEFzicrW3RdRw3CllTMGbYm540l8NhWcSrSuJ3H0MCc nd21Dm5rpyZaCc7cPQBipO1DbYpirEycI18Qn06sCy2iONzVCNA7iJ5mmw+TLxo22cJh9u o8MQMaw5OtY8m3IxoWPpcgXoqPOp5MLwRfaqN2bE79YM5Wc8lEFg7G3k0lQNzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758185530; a=rsa-sha256; cv=none; b=EZ/QUvjMOHwrNjfVoMHqzSXN1bkF2DaJFKAMvg2OPBCKW4IrdpTNAryBzEYphzMjoZ3cuL BRavNDVYzutNr3PefAO5/0GCmfZmmGxpoYrvWIgZmWjlG6yFmipsQ4gKz3MVN0cFHrFXbB pogNAOPnQwJ0gigrz46gjZ277oTV9bSX4/K9A6XFQRttytxXJ8dkuuxkWDbXb0ixLcazBx ednfF4dOhZ3EpAPJsx8YbA5jw7meFeam9HEZbOyOnYG9j99/22/JdrmLy2DoFP3frgj1uN wJuAnDjZLI11woeFF2PIWm40BXb5wRAGG0U4D5xCPAqN8acbb5+DF2G9BYtf7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS8X96Q4lz1481; Thu, 18 Sep 2025 08:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I8q9Bl019031; Thu, 18 Sep 2025 08:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I8q9ln019028; Thu, 18 Sep 2025 08:52:09 GMT (envelope-from git) Date: Thu, 18 Sep 2025 08:52:09 GMT Message-Id: <202509180852.58I8q9ln019028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 7140f620a569 - stable/15 - jail.2: Mention EPERM is returned on open directories List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7140f620a5695b023e76e482dab50133479f0a0b Auto-Submitted: auto-generated The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7140f620a5695b023e76e482dab50133479f0a0b commit 7140f620a5695b023e76e482dab50133479f0a0b Author: Olivier Certner AuthorDate: 2025-09-01 09:31:23 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 08:50:31 +0000 jail.2: Mention EPERM is returned on open directories The manual page does not directly mention this reason for getting EPERM, instead referring the reader to chroot(2). We have had some questions about it recently, in part due to a bug (fixed), and this case is not an obvious permission/problem, so let's be more explicit. PR: 280809 Reviewed by: jamie MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52319 (cherry picked from commit ef2f36be8fce8cf7a62ce7d33ab1c4a181fac3e2) --- lib/libsys/jail.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libsys/jail.2 b/lib/libsys/jail.2 index d3f871608c1d..ee4e5b03d38e 100644 --- a/lib/libsys/jail.2 +++ b/lib/libsys/jail.2 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 9, 2025 +.Dd September 15, 2025 .Dt JAIL 2 .Os .Sh NAME @@ -555,6 +555,9 @@ and call .Xr chroot 2 internally, so they can fail for all the same reasons. +In particular, they return the +.Bq Er EPERM +error when the process to join a jail has open directories. Please consult the .Xr chroot 2 manual page for details. From nobody Thu Sep 18 09:58:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSB0P2bPVz686bw; Thu, 18 Sep 2025 09:58: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSB0P1t0Nz40nW; Thu, 18 Sep 2025 09:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189493; 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=j1TL1uGhAyAjCGufOJRNpclzq8m9AFCgXyhoZkWjfrQ=; b=Z7sEuJzZ44ks2SLlNjFJ0U8GZgFZRnjw1OgVt4EAZzgrWfzkm2YfUNETq3YVwVfWdVfsCp ydQBqoUSLAIZegqF4TIoRyLea195s6jKnAyhvJJClg+v3m7IpbQE7O8FNvins0CU7oLzhW Y23eFRfKSJ1x89wWbuxhm4ONeelScU4RPMtQhGTv7phyWzCh2oZyt4iT1+mKf8YTCTTlNh Z5b20GA3PGVudsK66g5sQCc5J5LoVFS1rvcNC2NUGgGva/OCxTAQGPcu6snODueY3XYrS5 ix4zv0VWABzBa/gqn936Vm0CMzie6Y5NUgMkMvZOIW+lHe24/m1jpM2m6I+wgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189493; 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=j1TL1uGhAyAjCGufOJRNpclzq8m9AFCgXyhoZkWjfrQ=; b=cuftgcXuvo33ialU2XTajy6fM/Xphpz9rWg7KaTkzpPIm1kQ4a/+Nu90ZAiNuZBihn62H8 Xv3VqpvjsAnFHZXE/YxNU2thpKCZzHb6HpWu13RSZy/6oe9MpQNnoW6MeiJk908cT5Y0oP JqDubtsgwMJ9qAdRjQaKu0T1eG+63wvP8zagZXUFdM7d84o0wwnsfGokjJP14RNirYJuN4 FGk32Je3GcJb+1yR3EGBgydWv8TGQJNlS3CaKx5Elm8p9hv/sDEdD+5mqjfJBrqno24cFD eBk1YOTJb90YeF9hoTO8C+bnbNaugp9g9w8iI8gOMh5niwNZuP32A38E9Ry1cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758189493; a=rsa-sha256; cv=none; b=RqmyDcGUGcRFmm+Q17ThTW9rjhSSOzmx2m0v/SQfIjtiI6EWQIpuhupQiPffJNSx8+sBnG XQteAmzPNtB1/H7nwSZTVtWrKLFdQyyysq5/whGYnvmm1ELQZ+GP5iKik5xHqRQZVPLt60 EcXfHDWLc4otBLk3cO1XfzE6XaCT9FgdmAfMGzPqVD9nLzADxaBZBbHZm+Q4NRt3c0x+9A g0Ni1wY2YafKBhCnrX+BOv08dc8RWI2jofGkmmzW0eTQY1OQHRSfqKRmf5ylv8bSLsYKmO 0JEp+/7tUDI6SbXWqMoseg7+7kE5C/9Giw3migJW0hxQSKfIs2JyEkXHgVaKtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSB0P0ytwz160R; Thu, 18 Sep 2025 09:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I9wCEq034778; Thu, 18 Sep 2025 09:58:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I9wCan034775; Thu, 18 Sep 2025 09:58:12 GMT (envelope-from git) Date: Thu, 18 Sep 2025 09:58:12 GMT Message-Id: <202509180958.58I9wCan034775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8813774cebc9 - stable/15 - ng_hci: Cast NG_HCI_BDADDR_ANY to const bdaddr_t * List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8813774cebc975d7c031beb9b162007bde959f3c Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8813774cebc975d7c031beb9b162007bde959f3c commit 8813774cebc975d7c031beb9b162007bde959f3c Author: Christos Margiolis AuthorDate: 2025-09-15 13:09:42 +0000 Commit: Christos Margiolis CommitDate: 2025-09-18 09:57:07 +0000 ng_hci: Cast NG_HCI_BDADDR_ANY to const bdaddr_t * This is needed to address some compiler errors cleanly, where consumer functions want this address to be a const pointer. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52310 (cherry picked from commit 680f9acc3657efcea07d8ac0954645b6eaf8dac8) --- sys/netgraph/bluetooth/include/ng_hci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h index 44a14e62f4ed..ce3291770740 100644 --- a/sys/netgraph/bluetooth/include/ng_hci.h +++ b/sys/netgraph/bluetooth/include/ng_hci.h @@ -448,7 +448,7 @@ typedef struct { typedef bdaddr_t * bdaddr_p; /* Any BD_ADDR. Note: This is actually 7 bytes (count '\0' terminator) */ -#define NG_HCI_BDADDR_ANY ((bdaddr_p) "\000\000\000\000\000\000") +#define NG_HCI_BDADDR_ANY (&(const bdaddr_t){"\000\000\000\000\000\000"}) /* HCI status return parameter */ typedef struct { From nobody Thu Sep 18 09:58:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSB0Q3XdTz686WW; Thu, 18 Sep 2025 09:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSB0Q1fcXz4106; Thu, 18 Sep 2025 09:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189494; 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=zSNRakvx30xOz/ZJoKprIjs8zgKBFgfAvkNExCbHiMc=; b=ah7OCKc6zxpouFiunOub4eL+GdSjlBS7eH0OTYClPVWH7pIrey+ZFrGV7kGHXK0oKXAs7g T9Z+Cvp+cFco2iE5bVy5i/NNnqGAJXliMgtUrmsTb47oUzELYElTRfS5thIFGQIjLe4tDf dkGVWPSI+1vcuyKVTb/bj8DoWB3GbkO6mi7HiXfBGJ7oiJmi8f8o+R85Jyrdm5+nriHE9+ iKRxjEMdfMnXBzIVvJjsI8XQL4FNyIlQVZtPUcynLXqPsSVkpya2mWJ+sZBxISCRDAq3NG YK0gmSAiBWmXQkfOvF2r9l6j9VNXoui+KFeqEUlvr68DSK8u0EFLYYKnlY4P8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189494; 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=zSNRakvx30xOz/ZJoKprIjs8zgKBFgfAvkNExCbHiMc=; b=WV/8Bhv1jnpqalWR6eEo+4N83nYPb1UPFEeef1iRug63d56cZEXg4DSXWh9c0FgUb/oVp9 p6dszwrIDHHQOxVkWvolpHRwBJ3v3l8p3uYA3ifvJ+/cFX+BrYyohu9GCQ2SmACTCqF/bK QmfmvpJwyjsAb6RzwZ9X/XgvWBqfgRqBzeAH0jdBIvoTu2zCii/uEygPbZKC6Qe77RyXIu uA0LAj+r95JkTWlJ1ZGigLSOxD8kw8abNbKyC6MFWRbnr875iRn534x8JBKC0aebN+KfNi HKVrWdM4IFpKy0LstQAE+IT5doCDEItrsIYCXMquis2DsSdfSUIvZtyeJyG0aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758189494; a=rsa-sha256; cv=none; b=ZndZS0ium20LksgLyOWm6UxgjKHmZMX9U1jtnKSEqgyAXphjlrpRbWk8ecJrE281Egfpwr dy2FWKUDnBLcVfSdSWhyMCYRLCEWJKHEVl4n6vlVzM0tsgfsWoS87p9W8X8DpkPpwpsOuY ib2odOO3xI6rQDKhee7God9nvCKg4q72Q2exbo4UlHMb2l3Rm6gZC8hnESOlDVPT4eQrSY gBXi/S1MsTEmQCQ0R2EE5d3sLFOUb04+hHREkUgScb/4JkRdmQvFvm7wNDyiWUnrw2AKm7 zCI4/VM9r/n5DHsM5B790e/GOCWhIxHcvAwM/D1OGO08yiDo3zoXXChNhtrDVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSB0Q16lKz164W; Thu, 18 Sep 2025 09:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I9wELB034810; Thu, 18 Sep 2025 09:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I9wEk6034807; Thu, 18 Sep 2025 09:58:14 GMT (envelope-from git) Date: Thu, 18 Sep 2025 09:58:14 GMT Message-Id: <202509180958.58I9wEk6034807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3ed893431075 - stable/15 - ng_btsocket_rfcomm: Mark a couple buffers as const in a helper function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3ed89343107518daeebdbe1d5a554d59ac9c958e Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3ed89343107518daeebdbe1d5a554d59ac9c958e commit 3ed89343107518daeebdbe1d5a554d59ac9c958e Author: Mark Johnston AuthorDate: 2025-09-15 13:57:19 +0000 Commit: Christos Margiolis CommitDate: 2025-09-18 09:57:07 +0000 ng_btsocket_rfcomm: Mark a couple buffers as const in a helper function Fixes: 680f9acc3657 ("ng_hci: Cast NG_HCI_BDADDR_ANY to const bdaddr_t *") (cherry picked from commit 18fd3f8ec5c50da21515757af24421a078a4a468) --- sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index 6c0a6fda1fb1..73a0897857b2 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -113,7 +113,7 @@ static void ng_btsocket_rfcomm_connect_cfm static int ng_btsocket_rfcomm_session_create (ng_btsocket_rfcomm_session_p *sp, struct socket *l2so, - bdaddr_p src, bdaddr_p dst, struct thread *td); + const bdaddr_t *src, const bdaddr_t *dst, struct thread *td); static int ng_btsocket_rfcomm_session_accept (ng_btsocket_rfcomm_session_p s0); static int ng_btsocket_rfcomm_session_connect @@ -1250,7 +1250,7 @@ ng_btsocket_rfcomm_connect_cfm(ng_btsocket_rfcomm_session_p s) static int ng_btsocket_rfcomm_session_create(ng_btsocket_rfcomm_session_p *sp, - struct socket *l2so, bdaddr_p src, bdaddr_p dst, + struct socket *l2so, const bdaddr_t *src, const bdaddr_t *dst, struct thread *td) { ng_btsocket_rfcomm_session_p s = NULL; From nobody Thu Sep 18 09:58:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSB0R57dhz686Sk; Thu, 18 Sep 2025 09:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSB0R2Ddyz40r5; Thu, 18 Sep 2025 09:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189495; 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=BUyqw1clfKXIbO7+dPA7YAMd8h/og+cNA1/mCP5mLk0=; b=dM9LXXlOHgRi9RUatXglNAPE41gvo/GYy/gca0vnmR3ffi6l75CN/XaSKNhr3zcSVcUVFw 8U4SnkYk3LHmXdQ+XObtS3l+FodavnkNq106IQnrlq0sa3z5CHuHis4prRBPR7wx9cb8CM 1zss5Qghp51Ri4qGKnbb04fFbZ68WxPzMUCD0hqJaUy2ll9Pt/A+UHUU58l6th5lZjdyr/ yFzjsNNdOpRL2rhfACgsXlmI6fDGf7wzM8Xb3P/pkYPoe6vzHd0Vos2TOqiFIwCo2Dt7c0 gtJAEi796m+tXtWOWT0CZPJOHAKlT8B2qqdw364P4sasDBFERZuGxUki+Xw+rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189495; 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=BUyqw1clfKXIbO7+dPA7YAMd8h/og+cNA1/mCP5mLk0=; b=AYGRN/wK1P4xFbvaS58r4I0TalshbjVz8CR92CtS8jmz8sD4OPJ5ZVjsBC3WvkcY+3tA+A Ov1sMbE82py6v+HaOTQyM+8qfVwcGJJJ9gwlG/00pegcblAfoLNJK0k214U0VJ0f58euXj MmaI6813pPuNAgXl6wvg5akKrb38c41f3T+hHiHcETgil0VjFtGmQ39DoV0sxlwRMWcqw7 W3G9mKmktiAdRtSwbFEo0iDvZ3vA1a1T4wpvOvOFaWG5rK1l5htbGAlH5kFeEY/t97yuLV wyVWCDLjkdJYdj3RourFeviqWiReGUsnC5A0R/Li7TFZQx52U7BUVomwgKbkXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758189495; a=rsa-sha256; cv=none; b=ImqwSNbZbholJMguoVvogDJGrxhGqPunNqt4px0S5hZB/bhWQB28R/dlMP2opCnVGDaGfd fF46uhS3AQnb96FkR8RGdz9iZFocyiXQus7pTu15wMMw3U6hb/GrfYHfPLr/VqUL3nLK0D SafAuK+n8SGiS9HwpYmy87dKbkz1VUNWt1vsT6KGcOgFFdth1oJiP6/iMmXkcknOG1Bozr cSNHeWvWz/JPmJuXwv/nUO1AdNWedk8YEdjcDElvN+/tOeZ31HUswK1MPyAL87HP/t/5iI 0EtGpNxWBmMYMViN6p6Wim6M9K/NRUpZzN/h4OrOCQRCUtxqX+NzdyGHAvv/FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSB0R1p7nz164X; Thu, 18 Sep 2025 09:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I9wFYu034842; Thu, 18 Sep 2025 09:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I9wFuC034839; Thu, 18 Sep 2025 09:58:15 GMT (envelope-from git) Date: Thu, 18 Sep 2025 09:58:15 GMT Message-Id: <202509180958.58I9wFuC034839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3501e2597e9e - stable/15 - sdp(3): Change bdaddr parameter type in sdp_register_service() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3501e2597e9e241b57832941912452c48df05e56 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3501e2597e9e241b57832941912452c48df05e56 commit 3501e2597e9e241b57832941912452c48df05e56 Author: Christos Margiolis AuthorDate: 2025-09-17 14:12:03 +0000 Commit: Christos Margiolis CommitDate: 2025-09-18 09:57:22 +0000 sdp(3): Change bdaddr parameter type in sdp_register_service() Fixes compiler error when the caller passes a const bdaddr_t * paramemeter (e.g., NG_HCI_BDADDR_ANY). Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D52582 (cherry picked from commit 3d14cc82d7a8c11cd164a6ba668d20b939c576fe) --- lib/libsdp/sdp.3 | 4 ++-- lib/libsdp/sdp.h | 2 +- lib/libsdp/service.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libsdp/sdp.3 b/lib/libsdp/sdp.3 index dcd9077798ea..015f9cd8fb44 100644 --- a/lib/libsdp/sdp.3 +++ b/lib/libsdp/sdp.3 @@ -24,7 +24,7 @@ .\" .\" $Id: sdp.3,v 1.1 2003/09/07 20:34:19 max Exp $ .\" -.Dd April 30, 2018 +.Dd September 16, 2025 .Dt SDP 3 .Os .Sh NAME @@ -87,7 +87,7 @@ .Fn sdp_uuid2desc "uint16_t uuid" .Ft int32_t .Fo sdp_register_service -.Fa "void *xss" "uint16_t uuid" "bdaddr_p const bdaddr" "uint8_t const *data" +.Fa "void *xss" "uint16_t uuid" "const bdaddr_t *bdaddr" "uint8_t const *data" .Fa "uint32_t datalen" "uint32_t *handle" .Fc .Ft int32_t diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h index faad36aefca6..0c9474a70eff 100644 --- a/lib/libsdp/sdp.h +++ b/lib/libsdp/sdp.h @@ -702,7 +702,7 @@ typedef struct sdp_panu_profile sdp_panu_profile_t; typedef struct sdp_panu_profile * sdp_panu_profile_p; int32_t sdp_register_service (void *xss, uint16_t uuid, - bdaddr_p const bdaddr, uint8_t const *data, + const bdaddr_t *bdaddr, uint8_t const *data, uint32_t datalen, uint32_t *handle); int32_t sdp_unregister_service (void *xss, uint32_t handle); int32_t sdp_change_service (void *xss, uint32_t handle, diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c index 9f07d1ba86ba..2cce6c133600 100644 --- a/lib/libsdp/service.c +++ b/lib/libsdp/service.c @@ -45,7 +45,7 @@ static int32_t sdp_receive_error_pdu(sdp_session_p ss); int32_t -sdp_register_service(void *xss, uint16_t uuid, bdaddr_p const bdaddr, +sdp_register_service(void *xss, uint16_t uuid, const bdaddr_t *bdaddr, uint8_t const *data, uint32_t datalen, uint32_t *handle) { sdp_session_p ss = (sdp_session_p) xss; From nobody Thu Sep 18 09:59:12 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSB1Y0twGz686Yj; Thu, 18 Sep 2025 09:59: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSB1Y09zyz41X4; Thu, 18 Sep 2025 09:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189553; 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=8lAjHDfrWpzhkSYm6e8f5VeAexmxUVHwI33M+Z7uUOo=; b=ADkeGSEfMAIDLZqz7R25M1EMH1cOjZVvUpjvrVNDUUbW3ubarY/QdqyTj7EnC7c9Y6R9Xo 1mGtnJyvZO50r29FOI6my9R8Ofh8E3boox8nNrcnis9N+ZHO+64ffliA8x8QcO+xttP1S9 x6GR5v58Vh6+FsTFC0SAjC1LuR78YNWfYdAQ9aoYIPDBHwA3nFjG2HA+rOvvn7mZr9u1Ug KFrfWqjX0zFS9kNaUzGnpdXhnu8M2UsxvSmCdJ3ymo/tHSfmkYA8ghNEhwurYF5RLIhVBh BY3zrXMg9nu2v4z30+KojxjQaqezncn12KKo6AS/L7gevsbHYhwOCMIBMApjVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189553; 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=8lAjHDfrWpzhkSYm6e8f5VeAexmxUVHwI33M+Z7uUOo=; b=fvyXyjkt3U/GXuv518slNMfxHpzpe0Ntzl0tB1Q2phpQUacMzbJ9nM+8hVqfDdj5NNt5iv lJmeU9TiL3a3YVx7PVbl1pREHC1rIRnnA/S6WpuIJhttbaPDfBmSdz3/bXbMcrZtI0Epkv C/k0L3X+xSBA5Bt8S4i/ZDaRUkRDExcQ6tTLws7JGWnojG0Ly2le4KBn21N0zgEg6Av6HX 2T95lk+1Cx/Z61D4fiA42QeYZ5vrq4z4UrfF8IIiX9eJY+ZX7uMOM/4LlUR5h/veqEHddi RN9ryTnAwdXZHDx6unTp87vUmxs+2y8y4WqIBeyUBGdDm7d9+gOkv0rR/aK3aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758189553; a=rsa-sha256; cv=none; b=cl9Ikq5RYxxZSwx/i/78YkNl1hg+QcW3lz/ZwHgf5Os6grIGL6Y0WTHQONKsnWsmrnMjsP uX7pRfY/uH1HTrQWrNhrCvGDzNQj4Xw21clenJuXJn1WoJzlJluB45H8tStAYqCJg3MNvi 288jES0pf8frOamlj1HXhOvNWuSh2YgeBqw2UR6QQzAGFdEHgmw2AH8qE5YAAiRDwuW3M+ WnacH8QiZQEL8Oja2Qs/RGy4REh8fsF0S1L0RaAlZI0XV0NQ7WEKd/VeOKFFzLu0byKYFA kdka7YiSV/7KGwUxXofm3VVY1i4rwmHuJVtuEIesARjog/SOjPI68e5+mnjXUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSB1X6YKLz16FN; Thu, 18 Sep 2025 09:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I9xCfm035273; Thu, 18 Sep 2025 09:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I9xCu9035270; Thu, 18 Sep 2025 09:59:12 GMT (envelope-from git) Date: Thu, 18 Sep 2025 09:59:12 GMT Message-Id: <202509180959.58I9xCu9035270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 064006b78c90 - stable/14 - ng_hci: Cast NG_HCI_BDADDR_ANY to const bdaddr_t * List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 064006b78c90b52813a5a93341a4c52452114ca9 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=064006b78c90b52813a5a93341a4c52452114ca9 commit 064006b78c90b52813a5a93341a4c52452114ca9 Author: Christos Margiolis AuthorDate: 2025-09-15 13:09:42 +0000 Commit: Christos Margiolis CommitDate: 2025-09-18 09:59:03 +0000 ng_hci: Cast NG_HCI_BDADDR_ANY to const bdaddr_t * This is needed to address some compiler errors cleanly, where consumer functions want this address to be a const pointer. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D52310 (cherry picked from commit 680f9acc3657efcea07d8ac0954645b6eaf8dac8) --- sys/netgraph/bluetooth/include/ng_hci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h index 44a14e62f4ed..ce3291770740 100644 --- a/sys/netgraph/bluetooth/include/ng_hci.h +++ b/sys/netgraph/bluetooth/include/ng_hci.h @@ -448,7 +448,7 @@ typedef struct { typedef bdaddr_t * bdaddr_p; /* Any BD_ADDR. Note: This is actually 7 bytes (count '\0' terminator) */ -#define NG_HCI_BDADDR_ANY ((bdaddr_p) "\000\000\000\000\000\000") +#define NG_HCI_BDADDR_ANY (&(const bdaddr_t){"\000\000\000\000\000\000"}) /* HCI status return parameter */ typedef struct { From nobody Thu Sep 18 09:59:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSB1Z2DyCz686M0; Thu, 18 Sep 2025 09:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSB1Z0lhKz41jM; Thu, 18 Sep 2025 09:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189554; 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=NI7eunK/LgmG7H6pyQI6+gLg/ICY8XP+dlT9SQmBBbc=; b=QR+CKLUyYEBts8xd83dZsz5OYnf/CXq2TJuseKB4iP88uMlqhblooCKZi/Em1fF8hyHaFW 5xKmQaaaQKpwZWXCtnalLmqqrkYAHEe3wt1chW0bV04OovgzRq+pg+bYlI5zlLwz+ogo3d JEmQDQD8/6OFfFkbDXMKfCQ18b+DlgI3E+Rgchvie6f86g6ZeY6rxUtLABGh07h0+JiC/F wHyqza+QLT2ivzV65gT4uizkoFyHtGSsdTubxGnJKtb+DWX40/BDSv8GHl4fq/X3fyETTY 0111Pv/USrWBXJdli1KQfP8KwS8eID/xih06pKfXOiW5QZSDv1T7kVz+pfkvNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189554; 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=NI7eunK/LgmG7H6pyQI6+gLg/ICY8XP+dlT9SQmBBbc=; b=FguGx7ppZ3ai6zHFTKC/Y+Azfstzw2fw43Wo9nah3LfG1V7tQfNoTi70hrnSwrB5a6ooe5 TBrAja3cJ2yIdtSns9/V+sljstoTCBktYyWXNcPrp3GHyDcP42JuZYrlNG0W+WGQKvWC4/ XntLdISMs9lVcJhTxFZ5S3CsMJVS7Y8QtxOA+TpVzJ/xEQVzEjtwAQfDvsKCv4ddu11NaG Uw5Ln9eE5mbf2q1tzudv1G0LE/79+rJOlo1WFwI/4bPMP0LpcnmxGc3fiPWKfhjRQQGCcn 5qvocGuIN7ZgiKpnd4QMWrAkdaNzO0sLueZMGvvIJOOnjHBxXiWuLNZJYlhJ2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758189554; a=rsa-sha256; cv=none; b=ii9TQTm0yKD1Fz7aWXb3sd0ndoxTyUsLIOyDjhdah6S/5j7tv2zoeuKxRmlnJ1fSc9mnkd W1WRAF/pVXXkahhlSlr2PoZ76SevGWo0huWp+y9xG89s0ZDsNIcHVywteCvKtRDwuENCZL 3KlTtQziVeYdB/1Kg1IwIle+UFozCkQIH+VlZfULmvz2fWA1hkWBKET1P6Yo+GRKLFm0R5 r74vbkGFiFYcrWReKGbmp8/UUFJ4mvt9KREnXJV5Z4kvzZNWhh+vDUDOeMfUCAMJkKHmUI fdIQY/chB6GxzUhuxjGJ2ZM7IrRcWj9MqoOiYqAtu64Q04NKplfRSizdyRwXSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSB1Z0CRTz15f9; Thu, 18 Sep 2025 09:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I9xDjU035305; Thu, 18 Sep 2025 09:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I9xDuD035302; Thu, 18 Sep 2025 09:59:13 GMT (envelope-from git) Date: Thu, 18 Sep 2025 09:59:13 GMT Message-Id: <202509180959.58I9xDuD035302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e4fcd203f252 - stable/14 - ng_btsocket_rfcomm: Mark a couple buffers as const in a helper function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4fcd203f2525fa98a03fa631cf1cc36bf438e41 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e4fcd203f2525fa98a03fa631cf1cc36bf438e41 commit e4fcd203f2525fa98a03fa631cf1cc36bf438e41 Author: Mark Johnston AuthorDate: 2025-09-15 13:57:19 +0000 Commit: Christos Margiolis CommitDate: 2025-09-18 09:59:03 +0000 ng_btsocket_rfcomm: Mark a couple buffers as const in a helper function Fixes: 680f9acc3657 ("ng_hci: Cast NG_HCI_BDADDR_ANY to const bdaddr_t *") (cherry picked from commit 18fd3f8ec5c50da21515757af24421a078a4a468) --- sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index 00225f8240e9..0013bb08bc17 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -113,7 +113,7 @@ static void ng_btsocket_rfcomm_connect_cfm static int ng_btsocket_rfcomm_session_create (ng_btsocket_rfcomm_session_p *sp, struct socket *l2so, - bdaddr_p src, bdaddr_p dst, struct thread *td); + const bdaddr_t *src, const bdaddr_t *dst, struct thread *td); static int ng_btsocket_rfcomm_session_accept (ng_btsocket_rfcomm_session_p s0); static int ng_btsocket_rfcomm_session_connect @@ -1261,7 +1261,7 @@ ng_btsocket_rfcomm_connect_cfm(ng_btsocket_rfcomm_session_p s) static int ng_btsocket_rfcomm_session_create(ng_btsocket_rfcomm_session_p *sp, - struct socket *l2so, bdaddr_p src, bdaddr_p dst, + struct socket *l2so, const bdaddr_t *src, const bdaddr_t *dst, struct thread *td) { ng_btsocket_rfcomm_session_p s = NULL; From nobody Thu Sep 18 09:59:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSB1b2GYyz686PS; Thu, 18 Sep 2025 09:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSB1b19Blz41Zb; Thu, 18 Sep 2025 09:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189555; 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=/DdAFiukQmriS3aKt8dgSNklCQr1aMT1JhpoNxvmFcY=; b=tqNW8IlNl5F3o+zEUp6gyzXcZ+lZSfzEHu+h3aPH2bSvE8X310U1ZMWnVeimZiYj7J5nAp B9kRm0/7KVmWOECFN6RIUMV9bymkjneTmmtwttXdzVVnBUtnVy3RZrVUo6jDGP68wv0dxZ yTuA33kkiRobom15lg5/2rxHCQwq+mQ8x81xYD6vFcYeNPK4zstkorigOTYXkVeGe6AfDY v55aWBMqIdICMCppV86ac3/Oq9rL9SQ/rrv+OZEENsT/4ovGjDbfVUEISN3BnzivQQquMP MagimBwHlUdc3sQnVfBRdndQD/s/lWXDo9kWLvpi/xaxcif8l2IVSwPM391kxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758189555; 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=/DdAFiukQmriS3aKt8dgSNklCQr1aMT1JhpoNxvmFcY=; b=ritEXXcvSchINvTCoXSD07Am59qNVZufJDw7fRgHgjTd2tqb6n+UGIy0jJTe4GJXraP8vt CW5pQbwoaJVACeIeLN6w7pukZVKNMBOIZWYBivmhGIPXtERkZmv8QNilkKhEaTVtNexlzt Xp11zl3uqRX5ABkhHaR6b+6Emn18cBFa58VZN9vu5cb1VdXZ0oo4vjWnwi1UhdjP1C6KUQ KXUTsHRMoTCo3ISlKkiaj62T8XFMKNNvUY4yYpIkbWq8NMybNtIvMYxdbXMw217YrUCpny BNme8mlTHYrHA1enSRgMExwiNGtiNbPpuPv6zd5zWI6ycB6PU/FCt6FuBC2+/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758189555; a=rsa-sha256; cv=none; b=ixAfb0DKybLJ0cmX8lA65mMwVBFRDvxDppHGtkN7sryQjnvdds+r7yIqDRkD0gTEZhYiDr mUmXmoAktxiQWcA7YdtI35zgXCwjaLimVCOqMl5JNFYKvejYfWloVdpfZ8ETDQY95kVhoT ZQgzjgPr8HrGtfGB6qv8y9NDXkzU092vL1W3LCFIspK9s3jWZOVcjJP956zzQgFaKc+STS vEh7lSWgxdK6FCcTE3lAGWbz8h/d38SUgCXyign4m8TC3MhKuWRQ/KKFfwwzoLQ4ZLtuyb 6jNHH7qV9ynw050Y3E2OQB0TJEa0m6XSchyRGVyAikYqxqRFKRIHsK0hcIaVnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSB1b0f9fz1630; Thu, 18 Sep 2025 09:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58I9xEKP035344; Thu, 18 Sep 2025 09:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I9xE76035341; Thu, 18 Sep 2025 09:59:14 GMT (envelope-from git) Date: Thu, 18 Sep 2025 09:59:14 GMT Message-Id: <202509180959.58I9xE76035341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: eabd561d3a2a - stable/14 - sdp(3): Change bdaddr parameter type in sdp_register_service() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eabd561d3a2a7542e5817e493ccef25dfd247eed Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=eabd561d3a2a7542e5817e493ccef25dfd247eed commit eabd561d3a2a7542e5817e493ccef25dfd247eed Author: Christos Margiolis AuthorDate: 2025-09-17 14:12:03 +0000 Commit: Christos Margiolis CommitDate: 2025-09-18 09:59:05 +0000 sdp(3): Change bdaddr parameter type in sdp_register_service() Fixes compiler error when the caller passes a const bdaddr_t * paramemeter (e.g., NG_HCI_BDADDR_ANY). Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D52582 (cherry picked from commit 3d14cc82d7a8c11cd164a6ba668d20b939c576fe) --- lib/libsdp/sdp.3 | 4 ++-- lib/libsdp/sdp.h | 2 +- lib/libsdp/service.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libsdp/sdp.3 b/lib/libsdp/sdp.3 index dcd9077798ea..015f9cd8fb44 100644 --- a/lib/libsdp/sdp.3 +++ b/lib/libsdp/sdp.3 @@ -24,7 +24,7 @@ .\" .\" $Id: sdp.3,v 1.1 2003/09/07 20:34:19 max Exp $ .\" -.Dd April 30, 2018 +.Dd September 16, 2025 .Dt SDP 3 .Os .Sh NAME @@ -87,7 +87,7 @@ .Fn sdp_uuid2desc "uint16_t uuid" .Ft int32_t .Fo sdp_register_service -.Fa "void *xss" "uint16_t uuid" "bdaddr_p const bdaddr" "uint8_t const *data" +.Fa "void *xss" "uint16_t uuid" "const bdaddr_t *bdaddr" "uint8_t const *data" .Fa "uint32_t datalen" "uint32_t *handle" .Fc .Ft int32_t diff --git a/lib/libsdp/sdp.h b/lib/libsdp/sdp.h index faad36aefca6..0c9474a70eff 100644 --- a/lib/libsdp/sdp.h +++ b/lib/libsdp/sdp.h @@ -702,7 +702,7 @@ typedef struct sdp_panu_profile sdp_panu_profile_t; typedef struct sdp_panu_profile * sdp_panu_profile_p; int32_t sdp_register_service (void *xss, uint16_t uuid, - bdaddr_p const bdaddr, uint8_t const *data, + const bdaddr_t *bdaddr, uint8_t const *data, uint32_t datalen, uint32_t *handle); int32_t sdp_unregister_service (void *xss, uint32_t handle); int32_t sdp_change_service (void *xss, uint32_t handle, diff --git a/lib/libsdp/service.c b/lib/libsdp/service.c index 9f07d1ba86ba..2cce6c133600 100644 --- a/lib/libsdp/service.c +++ b/lib/libsdp/service.c @@ -45,7 +45,7 @@ static int32_t sdp_receive_error_pdu(sdp_session_p ss); int32_t -sdp_register_service(void *xss, uint16_t uuid, bdaddr_p const bdaddr, +sdp_register_service(void *xss, uint16_t uuid, const bdaddr_t *bdaddr, uint8_t const *data, uint32_t datalen, uint32_t *handle) { sdp_session_p ss = (sdp_session_p) xss; From nobody Thu Sep 18 10:13:41 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSBLF4Jn6z687st; Thu, 18 Sep 2025 10:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSBLF3Zl0z46tQ; Thu, 18 Sep 2025 10:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190421; 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=IgqlMVbFmcO3e8sITmkdNzmP05VZSQ79rTwPE8fFfhk=; b=Za/POngC1cyo2gj3fHjjGh4YSGG2z1KDP+qx1KHz5dOH846qedL9FEnQqfhPsyxG6cAt2O Z/1wy99brJrb7AEVgKLdcphQ81st4GX3ALunpTR82Z6Qo+jAFMQP9Gixb+LuBDDciHAfdy Y7OLxHZS3ku3WFSuDEPXIvz9LtGtdeWZBhHMJGA5KxvAW19r5VwVgIx7lXVtTgRGxNO5cP ghSJezbhUUVwuIboc+aInw4KzpTmarUWiwbDVaNb+XVHl4YlVCGJTiz/AuTSiHIyv4Uzmr YnPRVBuzBw1WKZthbqWxpidDNVxYwFiXloJbWtcdFPAiQPHjZgxON9YOqHUiSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190421; 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=IgqlMVbFmcO3e8sITmkdNzmP05VZSQ79rTwPE8fFfhk=; b=Y2mWi6n/eXJ3Qr4drWU4QWiNSLL9lbWPjNeBAN+G9Apa96nNuDQx/YFFP3LBMAc9QdYOKq w7fIvcpaWPzxSdVUg+i1kjn6lCAlAXPsKqnPUUN166te3n7D3XtYzwC5ionSy6EHIHumuE EejYN4pCuW+clJCceFkmfuIpTgJTarZWwd3OZ5+KMJ6pcO7CMyCRKobRfAUfa7tOqh/uND xnKBxs8WT04EeByGrIO0DF/pY4fka4pvGEm5tzbujp4rFcfJU8BD/v6RwPG4w23zbpBGs7 Q21R5GTK2VeJBH4MDJ/NUZrjvu/fB9ldZDM1RotPxEqPNZjvxkyBrsQW60Obwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758190421; a=rsa-sha256; cv=none; b=wPLc/GTmnMA8WG0832BmNo0kh2NcEHMAn1anUQuzJiH8TEptDxDOeoK8/b8T/zW82TQ4UH aZftXL2VFtz6V8rNW0EWix8/KNebfxQwrjZKA873Aro/idyejFELMeT1myh0N5m8I/GiZX sj03Zu4jfiYJ9hkI8mQmB7YTJ7fySrc1DhaFUkLp8LYul+DSolW7Gkl+8CL6UzvyhY17iu B/LBBN/+PaCXKY/EBB29156As2yEqCtymtv9VoUAdizzBZZtfBNcaBMNhO6b5/bkW2qWjX h521fG90FvIxgdrPPnliS9jre+tHEAr8rEjA5yd+zqFys8MsZTKLrj6+1wi+1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSBLF37tSz16R8; Thu, 18 Sep 2025 10:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IADfhM072638; Thu, 18 Sep 2025 10:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IADfsj072635; Thu, 18 Sep 2025 10:13:41 GMT (envelope-from git) Date: Thu, 18 Sep 2025 10:13:41 GMT Message-Id: <202509181013.58IADfsj072635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 59a73e9a1fe3 - stable/14 - hwpmc: On attach, ensure owner is a target effective GID's member List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 59a73e9a1fe33517393a18ff958ef8d05f550a56 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=59a73e9a1fe33517393a18ff958ef8d05f550a56 commit 59a73e9a1fe33517393a18ff958ef8d05f550a56 Author: Olivier Certner AuthorDate: 2025-08-26 09:43:38 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 10:13:05 +0000 hwpmc: On attach, ensure owner is a target effective GID's member This restores a check that existed prior to commit be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]"). While here, improve pmc_can_attach()'s style by changing the type of 'decline_attach' to 'bool', fixing tests on it, adding missing parentheses to 'return' statements, and by changing its return value type to 'bool'. Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 9 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52252 (cherry picked from commit 1c3c698ba4c40485ebbbd157cb49172cfa7de9b2) MFC to 14 does not fix any bug, but just applies some style changes needed by next MFC. In pmc_can_attach(): Start index of the loop on groups was changed to 1 in order to avoid a (harmless) duplicated groupmember() call with 'tc->cr_gid', which in 14 is still an alias of 'tc->cr_groups[0]'. We chose to MFC the addition of that latter call to minimize differences with what is in -CURRENT and 15. --- sys/dev/hwpmc/hwpmc_mod.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 5dd8bc67d60a..21f416510d5e 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -211,7 +211,7 @@ static int pmc_attach_one_process(struct proc *p, struct pmc *pm); static bool pmc_can_allocate_row(int ri, enum pmc_mode mode); static bool pmc_can_allocate_rowindex(struct proc *p, unsigned int ri, int cpu); -static int pmc_can_attach(struct pmc *pm, struct proc *p); +static bool pmc_can_attach(struct pmc *pm, struct proc *p); static void pmc_capture_user_callchain(int cpu, int soft, struct trapframe *tf); static void pmc_cleanup(void); @@ -1030,19 +1030,19 @@ pmc_unlink_target_process(struct pmc *pm, struct pmc_process *pp) * Check if PMC 'pm' may be attached to target process 't'. */ -static int +static bool pmc_can_attach(struct pmc *pm, struct proc *t) { struct proc *o; /* pmc owner */ struct ucred *oc, *tc; /* owner, target credentials */ - int decline_attach, i; + bool decline_attach; /* * A PMC's owner can always attach that PMC to itself. */ if ((o = pm->pm_owner->po_owner) == t) - return 0; + return (false); PROC_LOCK(o); oc = o->p_ucred; @@ -1067,18 +1067,17 @@ pmc_can_attach(struct pmc *pm, struct proc *t) * Every one of the target's group ids, must be in the owner's * group list. */ - for (i = 0; !decline_attach && i < tc->cr_ngroups; i++) + for (int i = 1; !decline_attach && i < tc->cr_ngroups; i++) decline_attach = !groupmember(tc->cr_groups[i], oc); - - /* check the read and saved gids too */ - if (decline_attach == 0) - decline_attach = !groupmember(tc->cr_rgid, oc) || + if (!decline_attach) + decline_attach = !groupmember(tc->cr_gid, oc) || + !groupmember(tc->cr_rgid, oc) || !groupmember(tc->cr_svgid, oc); crfree(tc); crfree(oc); - return !decline_attach; + return (!decline_attach); } /* @@ -1413,7 +1412,7 @@ pmc_process_exec(struct thread *td, struct pmckern_procexec *pk) */ for (ri = 0; ri < md->pmd_npmc; ri++) { if ((pm = pp->pp_pmcs[ri].pp_pmc) != NULL) { - if (pmc_can_attach(pm, td->td_proc) != 0) { + if (pmc_can_attach(pm, td->td_proc)) { pmc_detach_one_process(td->td_proc, pm, PMC_FLAG_NONE); } From nobody Thu Sep 18 10:13:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSBLG6MDlz687R6; Thu, 18 Sep 2025 10:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSBLG4VBPz474C; Thu, 18 Sep 2025 10:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190422; 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=TrmAXJ6f1yFkPO/CoxXSJBvMEWdQlyPqDReVq2wwa+k=; b=vuD7q/h6zZ+QvWaRE4AZH9bNZ/kIN7qfldUS+V5y4pZuvZuZr3ofLA5Jrygtil4EWVzIkG zFlrEzIkx/taJ16aPqrb+Vc651Wxc/Wvt1/MMRSGWtIluvzf6te+n3fOrYqG+rdZ6AGVsu LPA5ViOD8VArBiN+H8Fw5vJCXwTBOT10RsBFg5Xis0s6s7mCoOed1vu75RI0YN83m/IMu9 2/VxaLgR0/vYNdwH+wuUQHvlvQfoSjsKNqy9XjBExgOFsrphfGd/D7qfwKG7ZjrGrE1Rud Y80nIJCkzgi3223QJxYN1VIopHGB1qu6ZzaltH6erQcNpTc4F9YpC80cLlsEfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190422; 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=TrmAXJ6f1yFkPO/CoxXSJBvMEWdQlyPqDReVq2wwa+k=; b=pc15kX+tc/y2pJSFu9bG2h1LiKCbhg93Ifc+GAiEcK/+cj1reAP5KM2uDnGr6TECrhvaPF PsiCdhnsuVPWpd10K50IKKZxYqiqkhKQrP2EEAoNQyDOum9Q7UC/9x3eykRc087rr+7Lkp vSkm5/kuUGGWyj+km0ELwcxQUWM5uaWOAttxcUpcdfsS/0EA+K6noOZ9+7eOaReYr2TWOt 94mEthqR63v6/dP+7LYZ1yxtn2CBb9rB3RwRQeCHLwJ51T+hHq96WKlHXbWNZcyLd+kvOz oOdrFlr8y6mDBnMRqaOqpik0ZJPZlHztzbld1lopGYFl+FF+r4/MzSdgnLtN0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758190422; a=rsa-sha256; cv=none; b=IDdpeGpBxnyZ5LYYjVmSZ4FjkmeAnuz1MHKKIozwyfo+kXs0GzzugTTdN87Rlzx+DIgI9k ZVYCVg/VRkhSApCNrC5vpR1c7iuC5O/tdMgmd6AA6/6BcilT2vYnlrFYdoJjKFsTQu5Zi1 psPl/oRA5C0XGUjnFRcBb+4mipPSUgJL6gGph6ZRdlg+r5Y6d+6sgoDN+0JQdj6mf3+vfC SMgu4npT/cloy+unRqueNwePkNU1Kxx6BHDBhOph27GM6gkDD3COtkSlDhK+8t6UzZLiSo wA9LDUn7CFNlKYc6CiJRw/pTkCezuVvUsfiDyIBNDFXddgCs/y0BN6TMSwyI+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSBLG3rSjz16Yw; Thu, 18 Sep 2025 10:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IADgWg072674; Thu, 18 Sep 2025 10:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IADgxe072671; Thu, 18 Sep 2025 10:13:42 GMT (envelope-from git) Date: Thu, 18 Sep 2025 10:13:42 GMT Message-Id: <202509181013.58IADgxe072671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 009268dbfdd5 - stable/14 - hwpmc: On attach, fix allowing a PMC's owner to attach it to itself List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 009268dbfdd5fe487117654f75ae3850a2c1a7d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=009268dbfdd5fe487117654f75ae3850a2c1a7d9 commit 009268dbfdd5fe487117654f75ae3850a2c1a7d9 Author: Olivier Certner AuthorDate: 2025-09-09 12:48:05 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 10:13:10 +0000 hwpmc: On attach, fix allowing a PMC's owner to attach it to itself The returned value in this case was wrong, and would basically prevent some PMC's owner process to attach that PMC to itself although the security checks underneath would have allowed it. Now that this early return has been fixed, its block basically becomes a performance short-circuit which has no effect from a functional standpoint. Fixes: ebccf1e3a6b1 ("Bring a working snapshot of hwpmc(4), ...") MFC after: 9 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 1c40b15971f09c0c0676ae476b88b32166eae8ac) --- sys/dev/hwpmc/hwpmc_mod.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index 21f416510d5e..54fcc2dafb4f 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -1042,7 +1042,7 @@ pmc_can_attach(struct pmc *pm, struct proc *t) */ if ((o = pm->pm_owner->po_owner) == t) - return (false); + return (true); PROC_LOCK(o); oc = o->p_ucred; From nobody Thu Sep 18 10:13:43 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSBLJ4SGXz687WV; Thu, 18 Sep 2025 10:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSBLH548mz47Ch; Thu, 18 Sep 2025 10:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190423; 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=xh28t6WKCpsuYdsToJlVEp2vmfEnV62FxA3T0/V6KFU=; b=YPxFBnhLPVtWWQ+SBkpcR7Ujm48hCAkrGAFb/T8Jbwa49CxJH3+f2IKjcLA+e+Paiyobeh 0WuMY4qPxx07BbDeMg4YxWeRroLqUq+KI3zj2D/FJvBYekLpBS4fg8HJyO1nKDLGaHdyIe sXCh/8iy9lR3RoN8suwNoHnrQoTXiUxkADGruVVQrHKRCsKB9pVXP/7tge/WOFEQj9aIo/ Xli/S3IXV8lAQh6Neb1BR6d+4EraYjrXPGbvAuOZutZbCdbL/ap3u/wQn2IMKqqb+JsLNE Kb1u+2NVUSwCrYsGHyyJ0qRQWtWGCxwqekqk4f4AvxG8oAWSyK59JOpFTR353g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190423; 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=xh28t6WKCpsuYdsToJlVEp2vmfEnV62FxA3T0/V6KFU=; b=x4jmsfWNyluFRsvnJYU7+vO30qPnO9++6zfjaVCo6anwD4xeBsqksNGuLRDp8Q2OiQ8i6p nZAuru3zq5TKvZZDEIONVJQMXmM0SNlw6YULOpkgabC/WhRuowq36LVeRxZMPy/W8PhMtk YQy96Aie+v9utJN8OGMT6fJvUbzd3N07FHqpR+K2130kHjU2MpZ1JKrVE7Zl05XKhgBvU4 r0cQUROYR+PU+dC/g8Zc+u75OYXoB1ajQhoPmLL0OcLIVQOiyn9VsAE0eLzb0pXU35ZpSI RQstcGzUmJEmAfzmtEgb4aKjKpsLPFH54tkMlykfeTH2vTgoewJSx+AjixnmKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758190423; a=rsa-sha256; cv=none; b=IVELJ0tbPZQp7NjOH5y7ZmTqXTlOhOZAmQD0nGFda3TShozav/d4Qfq5jgRLcQOG6hRLwX 8nk6x5lhm1eHC6eX7KpYKtDTZBpYO1P+HVym8km1KFdFXAXDU1ao5WvTXx7Zczt4Lb3OvA VvugGnewqg0YuQgA6NqQokRKF4BtUh3MLIfVxJutZ/st/MjY7eWczXeu/sEsGM4zuDq5D1 KZYiTZqO/KgRw0uNmB5aNiRJYrFiIMx17Lq+wya43oy+nGAWKAsM+0STBaDrJ/nEKoUTbE KOxEHaYoUP7rd7TRzEZcVgpDhITfm6SSqSAQYKytajGMXcNWuQoq+VH5/b2+/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSBLH47HQz16dB; Thu, 18 Sep 2025 10:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IADhXB072708; Thu, 18 Sep 2025 10:13:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IADhOb072705; Thu, 18 Sep 2025 10:13:43 GMT (envelope-from git) Date: Thu, 18 Sep 2025 10:13:43 GMT Message-Id: <202509181013.58IADhOb072705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 7220f36f6cf9 - stable/14 - getgrouplist(3): Remove superfluous headers, bogus comment and whitespace List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7220f36f6cf9d72bef0f274d4134fad0d86f6052 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7220f36f6cf9d72bef0f274d4134fad0d86f6052 commit 7220f36f6cf9d72bef0f274d4134fad0d86f6052 Author: Olivier Certner AuthorDate: 2025-09-12 12:29:59 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 10:13:10 +0000 getgrouplist(3): Remove superfluous headers, bogus comment and whitespace No functional change (intended). Fixes: a59d6a872459 ("Implementing 'fallback' nsswitch source.") MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit d3f8ed6066fdea329ed695925fc726e84d50abc3) --- lib/libc/gen/getgrouplist.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c index 6dddea5c3847..90626cef3c83 100644 --- a/lib/libc/gen/getgrouplist.c +++ b/lib/libc/gen/getgrouplist.c @@ -31,15 +31,8 @@ #include __SCCSID("@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"); -/* - * get credential - */ #include -#include -#include -#include - extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *); int @@ -47,4 +40,3 @@ getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) { return __getgroupmembership(uname, agroup, groups, *grpcnt, grpcnt); } - From nobody Thu Sep 18 10:13:44 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSBLK26tCz687Nk; Thu, 18 Sep 2025 10:13: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSBLJ5Yh6z472y; Thu, 18 Sep 2025 10:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190424; 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=RIo6PSgDap0eWp1Ef1xfsioOA7EpqX8VHmXxojTJUg8=; b=ZDTlZYTp9GnILq50JCDd91fjNpecjRvc9EWuNRFOrVvHr/Sf0fG4sCIrshldGLZlP8QedG D/aMYAXZs5byO22aHrSN05SgDaYR78cG8rEmMWk/ftFRUC7WwiMptK4y/sDbh7C3XolFgG kj8o5BKehDWlXs8n6iYjU7a6CfPjel9LRs9EQUCWggBi4L/ytEZdwsr4yPThQTIxFTclOE GY5IprDXab73i2Nome4fLc5w/0yzOKhtwGIODzE88PI17HE/CdplrtYqYhad+xPvb7wTPx qdKI2LmWK1zQrFiFdIYgHKU3VM551JmwA3KDHUL7QufqytDI2K4H9US1OqLveg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758190424; 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=RIo6PSgDap0eWp1Ef1xfsioOA7EpqX8VHmXxojTJUg8=; b=I9W6l/cwXhFe0nMKzMkKa0FfLca4DW5qC+h+YutImEqv84y/LfAruWwnroAHvdTezJo/Pn s7bawpwvQlW6K+DAYgGeJrWh58sowNSIvuvTDCgPZm3nWN1jF5IxFJhKz3ehRyKIgJWl8z aGYPb6Rk/jwjK+tV9Qr5unKduDdIOCLlaEAzcR4o/hzlZLu8wlA+Qmu5eerKMe98wqC50p MQ5UlAbYPkDVyvI+Jzoiy0MxPKCsUovN30pOVNyKyyh9NGhESAHyP/SMoIO9aJV/5AQZGK TfRp2R4BvlU9Tk5kPaqRhb73zU5rLPb972ox6gHhtYiajn9B5RTtxx+RDXS2jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758190424; a=rsa-sha256; cv=none; b=xw1vYNMh0OmcvaF2xNJBI7a+rRBRy5rvWNokUU7NI5ZED8NRP1SsGo5JilvleGrwaLidTT QT5PnsvU/Ruy8j1V5zlEFQ4tQOqRROduN55e8/+KjhfblXild2MJ3yMAQ0s7VavwGWw6fB u+mkI8IcOQYMuybzWmjy+APbCsxzKBV1zoVDCe5peRFXStD58vUoHjNrtl1sQ4bSBkB7vO Y5OsgC6aoNAIrxPrNQUuOwpm5od9QM6b2q5TQewZZD+Rk4qbtuXI4/tWDXQzfYolf2qhkX jhRppNyI/riIfxIAdsXbNttsfUQ3je/oWs5YoYCQju6fRO64BUh1m8tel4CQ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSBLJ51rQz16dC; Thu, 18 Sep 2025 10:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IADiv4072747; Thu, 18 Sep 2025 10:13:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IADiAB072744; Thu, 18 Sep 2025 10:13:44 GMT (envelope-from git) Date: Thu, 18 Sep 2025 10:13:44 GMT Message-Id: <202509181013.58IADiAB072744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: d1142d54fa21 - stable/14 - libc: fix the _FORTIFY_SOURCE build of getgrouplist(3) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1142d54fa2153fdba3947f0cf03e8a2ce4f0e75 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d1142d54fa2153fdba3947f0cf03e8a2ce4f0e75 commit d1142d54fa2153fdba3947f0cf03e8a2ce4f0e75 Author: Kyle Evans AuthorDate: 2025-09-13 22:19:46 +0000 Commit: Olivier Certner CommitDate: 2025-09-18 10:13:11 +0000 libc: fix the _FORTIFY_SOURCE build of getgrouplist(3) We need to get our prototype normally, but WARNS in libc is way too low to surface that. Additionally, _FORTIFY_SOURCE needs to include by way of to actually export an implementation of getgrouplist(3). The version defined in the .c gets named __ssp_real_getgrouplist() and the actual implementation comes from the redirect stub in , which basically gets optimized away in the built object because our __builtin_object_size() check is trivially false when we cannot resolve any object sizes in this translation unit. This could be argued as a design flaw in _FORTIFY_SOURCE, but we should grab for our prototype anyways so let's kick the can down the road instead of re-thinking it for 15.0. Reported by: Shawn Webb (HardenedBSD) Fixes: d3f8ed6066 ("getgrouplist(3): Remove superfluous [...]") MFC after: 3 days (cherry picked from commit 91ea7e2ce2b5b2ff4702c3092cfe944862d58172) This is (partly) MFCed just for the sake of re-introducing the include to have a prototype. There is no _FORTIFY_SOURCE support for getgrouplist(3) in 14. --- lib/libc/gen/getgrouplist.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c index 90626cef3c83..fb4945beb2b2 100644 --- a/lib/libc/gen/getgrouplist.c +++ b/lib/libc/gen/getgrouplist.c @@ -33,6 +33,8 @@ __SCCSID("@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"); #include +#include + extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *); int From nobody Thu Sep 18 12:54:21 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSFvd4npqz68KnY; Thu, 18 Sep 2025 12:54: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSFvd42xKz3YMt; Thu, 18 Sep 2025 12:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758200061; 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=q2ktGA0u6Ah3prv8yYsQIyU5/2LJ0mOx0B1ZjnI28B0=; b=vBvWbUOXhIWjPJPZXD81rCg9H/CDTvRgEAuL7ADqVcsO5xqUcUU8xxD/6j1OifoCiYFfub Dd910AN5qSTnrSFtkYZSiPeteRsWe+DOvMgS1j2W31SSFwz76x52Nvnh8M8HfpqaIm2REJ bDsOELgns6YBOaaylQC/MQEfBAZuQ0lcwv8T4kynznG8Rn7tf25Wk3rpbyQp7eJJrWJ+4v rlP9qwejCXq9SCf1shUzd1rcwWpiPW8DS2/jauGc2Wu9NTphIXULAOGPWK3BKrP8X/Htby Us6wkA35IsHFkBlmUoAyCf6cDpG0kfM6FXi60C6u94ibuNdFU+pwWKQSDHw1gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758200061; 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=q2ktGA0u6Ah3prv8yYsQIyU5/2LJ0mOx0B1ZjnI28B0=; b=mBXvVnJ1fT7/VCv11lIDhKlbkQbJ3+D04C6ReDbO0IwkbenSCf4ngerGTt5aw03kBugJCh o/hVzLuhLtCSoqouEH+jLr/VPvYmgCVjvFRttvfz/JvNVtE4B+0SRjizTtDGX2l1VZ3Hre 9kp8rU9JZUoQxt1u9SlxZMr/ol9oj6fnBPzro53scf6ZHCkzToNya7cdJrMynm234LeYrV XLYwPJ/DEQd5KQAW6zdLpfWpRdfxRQ6xy5a2+738nvy1QxoNZC/Nge0AWMiI6ikS2R3fSu wZdBtqr/d5OXyXD+bvTz9xX+evXPdnrbBaClzQrGjIBFzil4YSb2RRaQf1QqFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758200061; a=rsa-sha256; cv=none; b=G1E/vKa2nMm4fhyFfDEVSezwTaPta+h+PXN91olOiXFBYPMFNz4OaXvWyy66fzmXnffVfx txfIBWZxndsfJA6/0/7AuBGBIUEmnHEgnSl+ysGluo0/nfKOEdsvI+3h82AXbL5IsYaQ5c w4T6xhN00EgltnNKdE244VCNGPUsWZh/Z1tnwx/nFtPxWPrzI8M5cjIV9Uc+kvwbtHsX8o rAURtcxvf+3xCET0sBxaVVbbbqR14cNX2Ku3YS/kEHTYly705NAew+PHrDe7NcF9SMT58X 5dO1+TaJqYluBOO2mFliQlyKjIYRRZsBtEgSu/mWX2JljoLGExWhT/nOmxUmWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSFvd3DHKz1BnQ; Thu, 18 Sep 2025 12:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58ICsL6E072793; Thu, 18 Sep 2025 12:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ICsLmc072790; Thu, 18 Sep 2025 12:54:21 GMT (envelope-from git) Date: Thu, 18 Sep 2025 12:54:21 GMT Message-Id: <202509181254.58ICsLmc072790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tom Jones Subject: git: 46e6e9173875 - stable/15 - udbc: Add usb debug host mode driver List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 46e6e91738757e3090423ce5e0dc700d4e24da7b Auto-Submitted: auto-generated The branch stable/15 has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=46e6e91738757e3090423ce5e0dc700d4e24da7b commit 46e6e91738757e3090423ce5e0dc700d4e24da7b Author: Tom Jones AuthorDate: 2025-07-08 08:04:00 +0000 Commit: Tom Jones CommitDate: 2025-09-18 12:53:13 +0000 udbc: Add usb debug host mode driver xhci offers a debugging interface which uses a special usb 3 cable with the D+, D- and VBUS pairs disconnected. This interface allows a target device to configure its xhci controller as a debugging channel which can then be used to provide a serial link between the target and a debug host. This change extracts the udbc host mode driver from hrs@'s xhci debug implementation. Reviewed by: bcr (man page) MFC after: Before 15-ALPHA3 builds Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51299 (cherry picked from commit d566b6a70bcbc329e8c690464043401fa8bdd49f) --- share/man/man4/udbc.4 | 132 ++++++++++++++ sys/dev/usb/serial/udbc.c | 404 ++++++++++++++++++++++++++++++++++++++++++ sys/modules/usb/Makefile | 7 +- sys/modules/usb/udbc/Makefile | 9 + 4 files changed, 548 insertions(+), 4 deletions(-) diff --git a/share/man/man4/udbc.4 b/share/man/man4/udbc.4 new file mode 100644 index 000000000000..c8fa02ec18f1 --- /dev/null +++ b/share/man/man4/udbc.4 @@ -0,0 +1,132 @@ +.\" +.\" Copyright (c) 2025 The FreeBSD Foundation +.\" +.\" This documentation was written by Tom Jones under +.\" sponsorship from the FreeBSD Foundation. +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" +.Dd September 3, 2025 +.Dt UDBC 4 +.Os +.Sh NAME +.Nm udbc +.Nd USB Debug Class device driver +.Sh SYNOPSIS +.Cd "device usb" +.Cd "device ucom" +.Cd "device udbc" +.Pp +In +.Xr rc.conf 5 : +.Cd kld_list="udbc" +.Sh DESCRIPTION +The +.Nm +driver provides support for USB Debug Class devices whose +interface class is Diagnostic Class and the subclass is DbC.GP. +.Pp +The USB Debug Class is defined in the USB 3.1 Device Class +Specification for Debug Devices. +This is designed to provide a general-purpose communication channel +for debugging. +It has also been widely implemented in USB xHCs +.Pq USB eXtensible Host Controllers , +which can be found on many commodity computers, +as an optional feature. +Once this feature is enabled on a USB xHC, one of the USB ports will +behave as a USB Debug Class device, +not a host port, +when a USB debug cable is connected. +The supported class in USB xHCs is typically DbC.GP, +while the specification defines several types of Debug Class devices. +The DbC.GP uses IN and OUT endpoint pairs and realizes a single +bidirectional serial communication channel. +On most systems, +including +.Fx , +the DbC.GP is seen as a simple serial device. +.Pp +Most systems with USB xHC can be configured to provide DbC.GP access. +The +.Nm +is a driver that connects to DbC.GP-supported devices, +offering +.Xr tty 4 +devices to connect to them via the +.Xr ucom 4 +device driver. +.Sh HARDWARE CONFIGURATION +A native DbC.GP device can be attached using the +.Nm +driver in a straightforward way. +.Pp +A USB xHC DbC.GP device on a target system needs a special hardware +configuration because all of the ports are supposed to be a USB Host. +There is one method to expose DbC.GP is to use a USB 3.1 A-to-A cable +.Pq section 5.5.2 in USB 3.1 Legacy Cable and Connector Specification . +When this cable is connected to a USB 3.1 port on the target system, +the DbC-enabled USB xHC automatically switches the port as a USB Device. +The +.Nm +driver can find a DbC.GP device on that port. +.Pp +Note that a USB xHC with USB 3.2 support +.Pq USB Type-C connectors +is not compatible with the USB 3.1 A-to-A cable. +Connecting a USB 3.2 C-to-C cable or A-to-C cable does not automatically work, +either, +because it needs role configuration of the port, which is not supported on +.Fx +yet. +.Sh FILES +.Bl -tag -width "/dev/ttyU*.*.init" -compact +.It Pa /dev/ttyU*.* +for callin ports +.It Pa /dev/ttyU*.*.init +.It Pa /dev/ttyU*.*.lock +corresponding callin initial-state and lock-state devices +.Pp +.It Pa /dev/cuaU*.* +for callout ports +.It Pa /dev/cuaU*.*.init +.It Pa /dev/cuaU*.*.lock +corresponding callout initial-state and lock-state devices +.El +.Sh SEE ALSO +.Xr tty 4 , +.Xr ucom 4 , +.Xr usb 4 , +.Xr xhci 4 +.Sh STANDARDS +.Rs +.%T eXtensible Host Controller Interface for Universal Serial Bus (XHCI) +.%U https://www.intel.com/content/dam/www/public/us/en/documents/technical-specifications/extensible-host-controler-interface-usb-xhci.pdf +.Re +.Rs +.%T USB 3.1 Device Class Specification for Debug Devices +.%U https://www.usb.org/sites/default/files/documents/usb_debug_class_rev_1_0_final_0.pdf +.Re +.Rs +.%T USB 3.1 Legacy Cable and Connector Specification +.%U https://www.usb.org/document-library/usb-31-legacy-cable-and-connector-revision-10 +.Re +.Sh HISTORY +The +.Nm +driver first appeared +.Fx +15.0. +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Hiroki Sato Aq Mt hrs@FreeBSD.org . +.Sh BUGS +According to the XHCI specification the host side of USB Debug should work with +any USB 3.0 port, +whether connected directly to a controller or with a hub in between. +Testing on some controllers has encountered issues when using a hub rather than +a directly connected port on the controller. diff --git a/sys/dev/usb/serial/udbc.c b/sys/dev/usb/serial/udbc.c new file mode 100644 index 000000000000..d7ca6b25bf32 --- /dev/null +++ b/sys/dev/usb/serial/udbc.c @@ -0,0 +1,404 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * Copyright (c) 2016-2024 Hiroki Sato + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (lennart@augustsson.net). + * + * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "usbdevs.h" + +#define USB_DEBUG_VAR udbc_debug +#include +#include +#include + +static SYSCTL_NODE(_hw_usb, OID_AUTO, udbc, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "USB DbC Client"); + +#ifdef USB_DEBUG +static int udbc_debug = 0; +SYSCTL_INT(_hw_usb_udbc, OID_AUTO, debug, CTLFLAG_RWTUN, &udbc_debug, 0, + "Debug level"); +#endif + +#define UDBC_CONFIG_INDEX 0 + +#define UDBC_IBUFSIZE 1024 +#define UDBC_OBUFSIZE 1024 + +enum { + UDBC_BULK_DT_WR, + UDBC_BULK_DT_RD, + UDBC_N_TRANSFER, /* n of EP */ +}; + +struct udbc_softc { + struct ucom_super_softc sc_super_ucom; + struct ucom_softc sc_ucom; + + struct usb_device *sc_udev; + struct usb_xfer *sc_xfer[UDBC_N_TRANSFER]; + device_t sc_dev; + struct mtx sc_mtx; + + uint32_t sc_unit; +}; + +/* prototypes */ + +static device_probe_t udbc_probe; +static device_attach_t udbc_attach; +static device_detach_t udbc_detach; +static void udbc_free_softc(struct udbc_softc *); + +static usb_callback_t udbc_write_callback; +static usb_callback_t udbc_read_callback; + +static void udbc_free(struct ucom_softc *); +static void udbc_cfg_open(struct ucom_softc *); +static void udbc_cfg_close(struct ucom_softc *); +static int udbc_pre_param(struct ucom_softc *, struct termios *); +static int udbc_ioctl(struct ucom_softc *, uint32_t, caddr_t, int, + struct thread *); +static void udbc_start_read(struct ucom_softc *); +static void udbc_stop_read(struct ucom_softc *); +static void udbc_start_write(struct ucom_softc *); +static void udbc_stop_write(struct ucom_softc *); +static void udbc_poll(struct ucom_softc *ucom); + +static const struct usb_config udbc_config[UDBC_N_TRANSFER] = { + [UDBC_BULK_DT_WR] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .bufsize = UDBC_OBUFSIZE, + .flags = {.pipe_bof = 1,}, + .callback = &udbc_write_callback, + }, + + [UDBC_BULK_DT_RD] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .bufsize = UDBC_IBUFSIZE, + .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .callback = &udbc_read_callback, + }, +}; + +static const struct ucom_callback udbc_callback = { + .ucom_cfg_open = &udbc_cfg_open, + .ucom_cfg_close = &udbc_cfg_close, + .ucom_pre_param = &udbc_pre_param, + .ucom_ioctl = &udbc_ioctl, + .ucom_start_read = &udbc_start_read, + .ucom_stop_read = &udbc_stop_read, + .ucom_start_write = &udbc_start_write, + .ucom_stop_write = &udbc_stop_write, + .ucom_poll = &udbc_poll, + .ucom_free = &udbc_free, +}; + +static device_method_t udbc_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, udbc_probe), + DEVMETHOD(device_attach, udbc_attach), + DEVMETHOD(device_detach, udbc_detach), + DEVMETHOD_END +}; + +static int +udbc_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + + if (uaa->usb_mode != USB_MODE_HOST) + return (ENXIO); + if (uaa->info.bConfigIndex != UDBC_CONFIG_INDEX) + return (ENXIO); + if (uaa->info.bInterfaceClass != UICLASS_DIAGNOSTIC) + return (ENXIO); + if (uaa->info.bDeviceProtocol != 0x00) /* GNU GDB == 1 */ + return (ENXIO); + + return (BUS_PROBE_SPECIFIC); +} + +static int +udbc_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct udbc_softc *sc = device_get_softc(dev); + int error; + + DPRINTF("\n"); + + sc->sc_udev = uaa->device; + sc->sc_dev = dev; + sc->sc_unit = device_get_unit(dev); + + device_set_usb_desc(dev); + mtx_init(&sc->sc_mtx, "udbc", NULL, MTX_DEF); + ucom_ref(&sc->sc_super_ucom); + + sc->sc_ucom.sc_portno = 0; + + error = usbd_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, + sc->sc_xfer, udbc_config, UDBC_N_TRANSFER, sc, &sc->sc_mtx); + + if (error) { + device_printf(dev, + "allocating USB transfers failed\n"); + goto detach; + } + /* clear stall at first run */ + mtx_lock(&sc->sc_mtx); + usbd_xfer_set_stall(sc->sc_xfer[UDBC_BULK_DT_WR]); + usbd_xfer_set_stall(sc->sc_xfer[UDBC_BULK_DT_RD]); + mtx_unlock(&sc->sc_mtx); + + error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, + &udbc_callback, &sc->sc_mtx); + if (error) + goto detach; + ucom_set_pnpinfo_usb(&sc->sc_super_ucom, dev); + + return (0); /* success */ + +detach: + udbc_detach(dev); + return (ENXIO); +} + +static int +udbc_detach(device_t dev) +{ + struct udbc_softc *sc = device_get_softc(dev); + + ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom); + usbd_transfer_unsetup(sc->sc_xfer, UDBC_N_TRANSFER); + + device_claim_softc(dev); + + udbc_free_softc(sc); + + return (0); +} + +UCOM_UNLOAD_DRAIN(udbc); + +static void +udbc_free_softc(struct udbc_softc *sc) +{ + if (ucom_unref(&sc->sc_super_ucom)) { + mtx_destroy(&sc->sc_mtx); + device_free_softc(sc); + } +} + +static void +udbc_free(struct ucom_softc *ucom) +{ + udbc_free_softc(ucom->sc_parent); +} + +static void +udbc_cfg_open(struct ucom_softc *ucom) +{ + /* + * This do-nothing open routine exists for the sole purpose of this + * DPRINTF() so that you can see the point at which open gets called + * when debugging is enabled. + */ + DPRINTF("\n"); +} + +static void +udbc_cfg_close(struct ucom_softc *ucom) +{ + /* + * This do-nothing close routine exists for the sole purpose of this + * DPRINTF() so that you can see the point at which close gets called + * when debugging is enabled. + */ + DPRINTF("\n"); +} + +static void +udbc_write_callback(struct usb_xfer *xfer, usb_error_t error) +{ + struct udbc_softc *sc = usbd_xfer_softc(xfer); + struct usb_page_cache *pc; + uint32_t buflen; + + DPRINTFN(3, "\n"); + + switch (USB_GET_STATE(xfer)) { + default: /* Error */ + if (error != USB_ERR_CANCELLED) { + /* try to clear stall first */ + usbd_xfer_set_stall(xfer); + } + /* FALLTHROUGH */ + case USB_ST_SETUP: + case USB_ST_TRANSFERRED: + pc = usbd_xfer_get_frame(xfer, 0); + if (ucom_get_data(&sc->sc_ucom, pc, 0, UDBC_OBUFSIZE, + &buflen) == 0) + break; + if (buflen != 0) { + usbd_xfer_set_frame_len(xfer, 0, buflen); + usbd_transfer_submit(xfer); + } + break; + } +} + +static void +udbc_read_callback(struct usb_xfer *xfer, usb_error_t error) +{ + struct udbc_softc *sc = usbd_xfer_softc(xfer); + struct usb_page_cache *pc; + int buflen; + + DPRINTFN(3, "\n"); + + usbd_xfer_status(xfer, &buflen, NULL, NULL, NULL); + + switch (USB_GET_STATE(xfer)) { + case USB_ST_TRANSFERRED: + pc = usbd_xfer_get_frame(xfer, 0); + ucom_put_data(&sc->sc_ucom, pc, 0, buflen); + /* FALLTHROUGH */ + case USB_ST_SETUP: +tr_setup: + usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer)); + usbd_transfer_submit(xfer); + return; + + default: /* Error */ + if (error != USB_ERR_CANCELLED) { + /* try to clear stall first */ + usbd_xfer_set_stall(xfer); + goto tr_setup; + } + return; + } +} + +static int +udbc_pre_param(struct ucom_softc *ucom, struct termios *t) +{ + DPRINTF("\n"); + + return (0); +} + +static int +udbc_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, + struct thread *td) +{ + return (ENOIOCTL); +} + +static void +udbc_start_read(struct ucom_softc *ucom) +{ + struct udbc_softc *sc = ucom->sc_parent; + + usbd_transfer_start(sc->sc_xfer[UDBC_BULK_DT_RD]); +} + +static void +udbc_stop_read(struct ucom_softc *ucom) +{ + struct udbc_softc *sc = ucom->sc_parent; + + usbd_transfer_stop(sc->sc_xfer[UDBC_BULK_DT_RD]); +} + +static void +udbc_start_write(struct ucom_softc *ucom) +{ + struct udbc_softc *sc = ucom->sc_parent; + + usbd_transfer_start(sc->sc_xfer[UDBC_BULK_DT_WR]); +} + +static void +udbc_stop_write(struct ucom_softc *ucom) +{ + struct udbc_softc *sc = ucom->sc_parent; + + usbd_transfer_stop(sc->sc_xfer[UDBC_BULK_DT_WR]); +} + +static void +udbc_poll(struct ucom_softc *ucom) +{ + struct udbc_softc *sc = ucom->sc_parent; + + usbd_transfer_poll(sc->sc_xfer, UDBC_N_TRANSFER); +} + +static driver_t udbc_driver = { + .name = "udbc", + .methods = udbc_methods, + .size = sizeof(struct udbc_softc), +}; + +DRIVER_MODULE(udbc, uhub, udbc_driver, NULL, NULL); +MODULE_DEPEND(udbc, ucom, 1, 1, 1); +MODULE_DEPEND(udbc, usb, 1, 1, 1); +MODULE_VERSION(udbc, 1); diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index 1290b878fa37..d9b1c8635b30 100644 --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -46,10 +46,9 @@ SUBDIR = usb SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} \ ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw} ${_bcm2838_xhci} SUBDIR += mtw ${_rum} ${_run} ${_runfw} ${_uath} upgt usie ural ${_zyd} ${_urtw} -SUBDIR += atp cfumass uhid uhid_snes ukbd ums udbp uep wmt wsp ugold uled \ - usbhid -SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ - umb umct umcs umodem umoscom uplcom uslcom uvisor uvscom +SUBDIR += atp cfumass uhid uhid_snes ukbd ums udbp uep wmt wsp ugold uled usbhid +SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom udbc ufoma uftdi ugensa uipaq +SUBDIR += ulpt umb umct umcs umodem umoscom uplcom uslcom uvisor uvscom SUBDIR += i2ctinyusb SUBDIR += cp2112 SUBDIR += udl diff --git a/sys/modules/usb/udbc/Makefile b/sys/modules/usb/udbc/Makefile new file mode 100644 index 000000000000..9996b2e391fb --- /dev/null +++ b/sys/modules/usb/udbc/Makefile @@ -0,0 +1,9 @@ +S= ${SRCTOP}/sys + +.PATH: $S/dev/usb/serial + +KMOD= udbc +SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ + udbc.c + +.include From nobody Thu Sep 18 12:54:22 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSFvf5X8Wz68Kjd; Thu, 18 Sep 2025 12:54: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSFvf4fBPz3Y14; Thu, 18 Sep 2025 12:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758200062; 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=rMiVpT+6XWWnHfICsiHfPuQAw3johSmYiVBJCv2q2QU=; b=k4w3vHbkGA/clPwfhVWKYe5aOEupo3teeGHvH4Z24DiTPeK4GeVUKZarn/PL+HCxRulZls F+24XexmPD6Ubnj4vhHbgBC/bKrub9sxDHNVfMJeVHFBytMyyWrTnPwlk3IjxahSfPxdTa aKmKpRWG+3xpQYonMCueHbfYqZW7vN27E2H52KnNFtb/px2LPo4+EgawrNDMSWJ43DNJQ9 NsDo25Fe6jZ6wo+kN8+DRdE6f4H2sThTp5jzYFTP0domZNbld9pZJHT813R06GC5FBwjY3 fB3xD2DYTgkS1f/BuNIc4sR7rovnJnpv0EBqCwEBI/BE4ByqPbnSqZUud0kjpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758200062; 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=rMiVpT+6XWWnHfICsiHfPuQAw3johSmYiVBJCv2q2QU=; b=JvFFcnq/bNx/jJyXG8Pc2jVB11esBCRVGll9Lnvb3fPssnVhe0lG31A1wOzM67D2OTHJ2D RU9EwToUakMX2JI2QwhjYg+WGjDieCiMeOpmJdv9q1ogPn/rdAeDFUvCNnmOTdQbZNz/Ho fj3tCOYT6+KAVk8YnA8mnxMyEAKUFjEvlReFl0X+iaJ3EWcRrlZYCfbL0tpvwcf12P/7iD ZXCs/QREr6+nphKWMO9UlP8vRjtDPp6gXrO9Qd19wI833YF5hYJ+68G3Zeyj9ycUfWw/hy nHDPsIHzDMXs7gNJuhVSejqumlsy4ku68A534cphb1k1HNBCO+vfIBg5COEOZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758200062; a=rsa-sha256; cv=none; b=ajUTaIBryl124bLIxUti+yVVMTT6tTzxVX9a12eyVXslBRqGyqLhlTmlHxRQ7ZvHacvk4k Hys98XNBW3WpLJrtq/cufiZ1byX13wl7Ea4lCP3OmXUNZVxhOnyMPYg+RECbqYc7OgbO60 M/PtIVz4RBFjEAO1fAsyBNQrlFDy0dJ+Ra93wmDMC7AaynEG3lbTW4Vn78wulfCBHcCxDm sy/7NkHQUtn0oaZl1CQK2VWcwhfKvzsnWi0dDDSAt/nJ9BbqOiztJ2AHMUyGDI+vJiiZa+ UxQvhlViQM/YADFxrdMsVheUrsML8liqfwe/WDB7VzX+1AlwktKcrv28tKDBnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSFvf481Nz1Bbb; Thu, 18 Sep 2025 12:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58ICsM3I072826; Thu, 18 Sep 2025 12:54:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ICsM9C072823; Thu, 18 Sep 2025 12:54:22 GMT (envelope-from git) Date: Thu, 18 Sep 2025 12:54:22 GMT Message-Id: <202509181254.58ICsM9C072823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tom Jones Subject: git: e8d181eeb204 - stable/15 - udbc(4): connect to build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e8d181eeb204f06b6a66841baa2c78bd64ae378f Auto-Submitted: auto-generated The branch stable/15 has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d181eeb204f06b6a66841baa2c78bd64ae378f commit e8d181eeb204f06b6a66841baa2c78bd64ae378f Author: Li-Wen Hsu AuthorDate: 2025-09-15 18:34:43 +0000 Commit: Tom Jones CommitDate: 2025-09-18 12:53:13 +0000 udbc(4): connect to build Reviewed by: thj MFC with: d566b6a70bcbc329e8c690464043401fa8bdd49f Sponsored by: The FreeBSD Foundation (cherry picked from commit a75c3c2c633dfa29b628f692fc7274cab1920640) --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 1d708cfda019..c454a696f112 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1065,6 +1065,7 @@ MAN+= \ ucom.4 \ ucycom.4 \ udav.4 \ + udbc.4 \ udbp.4 \ udl.4 \ uep.4 \ From nobody Thu Sep 18 16:18:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSLQh5Rhtz67dc1; Thu, 18 Sep 2025 16:18: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSLQh4pnNz45rC; Thu, 18 Sep 2025 16:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212284; 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=mwkcZWMFVgFWAkHSQsI5O2uPHii/soesOkNutBo1gnU=; b=d4/voGv+DOr8piT90BdpOEzyzPWpjv/T9L09GgmIOjVZswfNE+0dWu6nXcov16kvXfKzqN qAVltNZmxdi44kepIv4efmhIsZLtwMgnx8/JVFMC/wwbLlWE/kOderalyuFnJKAFMZuuzj AUg4ZUtnhgAu1sd9AODBEH/Sopfh6bUOrDjVL0dZjPOpne/En/gBwI0sXDqAM+UcIG8lPy VqvdcOIyF5O1KOwfLbn3EgVco1tRrpuRpJW9/Rqgvk2OP8d5I67FWRpDV9KYxA77QkFSYa 9HQwq+O/ZnXZab1MeavGPUjQzYnVyrGhBlDThh16oriThZVBiEgKouN37swDAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212284; 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=mwkcZWMFVgFWAkHSQsI5O2uPHii/soesOkNutBo1gnU=; b=wAOAaQ6HufZADcFo/7py3+um0VF16IJfSXAdWmbd2sIIvLny+GiysqyYj2eAztK/doYuBA i7coNfZeAIslgQhHJOvVY5+1O8EQ9NrrvDRAn53yzCNB8guGKJ4bnEhoGTIPIM9SLe2mN6 Zl41/3EeiVf0OBYDmDLES8ddIEv39+yZTXrROkZqE7UP5FJgm1bvgHDx5dW39jGZwdxDXW Zl/j3xZvoiD2mVmeIHkDj7e9lI9Gq9XIu5atyTIzEj+4WIUga0ab+qdwWH9BAUxHYCxhDi /3QpVcWVYeRtkEhdg8Wk4LtYRafmr0/87srUFwSwakORz7qAVKSVL61Pm329Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758212284; a=rsa-sha256; cv=none; b=R+zOk9XuiLPOFKLsN9YF2bQtKO2kv8424ivjx2H2oQ3zS4+ArRdRM0BGw2Eb6SB7YHvvb6 MFOTb91S6zJ4tFdci30GwLtN3ESjgOCyVLdHKW6gDoCGwsTXllY3cs7RtEjG9i5ywBJ4w/ XEdbJerEEVdZON68ujOZNkyCXrVAFMLnTvIqVnTExDYganDrE5znaWnJXPCTJLRYBG7nKd QDepyMqGsVCIxXuO1Yl/yNCU9Ohs2ll9Z+S3WZA+VDP77qetuBeS5a0wYNygm1rfacVVrN MsuwQ2d/KF5U0aJas7/QHkOSCE97WdZDurBV6q26L5bnkz71r+4Tm527wg2vgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSLQh444fz3t5; Thu, 18 Sep 2025 16:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IGI4wl050827; Thu, 18 Sep 2025 16:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IGI4JV050824; Thu, 18 Sep 2025 16:18:04 GMT (envelope-from git) Date: Thu, 18 Sep 2025 16:18:04 GMT Message-Id: <202509181618.58IGI4JV050824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5aa49c98edfc - stable/15 - qlnxe: Unconditionally enable extended media types List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5aa49c98edfc48fbe96f7aba0e0631d4c0f29493 Auto-Submitted: auto-generated The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5aa49c98edfc48fbe96f7aba0e0631d4c0f29493 commit 5aa49c98edfc48fbe96f7aba0e0631d4c0f29493 Author: Zhenlei Huang AuthorDate: 2025-09-09 10:04:54 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-18 16:15:52 +0000 qlnxe: Unconditionally enable extended media types Those extended media types are available since about 2015 [1]. All supported branches already have them defined. No functional change intended. [1] eb7e25b22f1c ifmedia changes: Extend the number of available subtypes for Ethernet media ... Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52374 (cherry picked from commit 08356a733eb7a7bef1afe20ded2d983b55310de7) --- sys/dev/qlnx/qlnxe/qlnx_def.h | 16 ---------------- sys/dev/qlnx/qlnxe/qlnx_os.c | 21 +++++++++------------ 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_def.h b/sys/dev/qlnx/qlnxe/qlnx_def.h index 4342bba89587..796845f3f8c6 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_def.h +++ b/sys/dev/qlnx/qlnxe/qlnx_def.h @@ -696,22 +696,6 @@ extern int qlnx_alloc_mem_sb(qlnx_host_t *ha, struct ecore_sb_info *sb_info, * Some OS specific stuff */ -#if (defined IFM_100G_SR4) -#define QLNX_IFM_100G_SR4 IFM_100G_SR4 -#define QLNX_IFM_100G_LR4 IFM_100G_LR4 -#define QLNX_IFM_100G_CR4 IFM_100G_CR4 -#else -#define QLNX_IFM_100G_SR4 IFM_UNKNOWN -#define QLNX_IFM_100G_LR4 IFM_UNKNOWN -#endif /* #if (defined IFM_100G_SR4) */ - -#if (defined IFM_25G_SR) -#define QLNX_IFM_25G_SR IFM_25G_SR -#define QLNX_IFM_25G_CR IFM_25G_CR -#else -#define QLNX_IFM_25G_SR IFM_UNKNOWN -#define QLNX_IFM_25G_CR IFM_UNKNOWN -#endif /* #if (defined IFM_25G_SR) */ #define QLNX_INC_IERRORS(ifp) if_inc_counter(ifp, IFCOUNTER_IERRORS, 1) #define QLNX_INC_IQDROPS(ifp) if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 4ad190374f87..696604cf1202 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2375,18 +2375,15 @@ qlnx_init_ifnet(device_t dev, qlnx_host_t *ha) ifmedia_add(&ha->media, (IFM_ETHER | IFM_40G_CR4), 0, NULL); } else if ((device_id == QLOGIC_PCI_DEVICE_ID_1656) || (device_id == QLOGIC_PCI_DEVICE_ID_8070)) { - ifmedia_add(&ha->media, (IFM_ETHER | QLNX_IFM_25G_SR), 0, NULL); - ifmedia_add(&ha->media, (IFM_ETHER | QLNX_IFM_25G_CR), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_25G_SR), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_25G_CR), 0, NULL); } else if (device_id == QLOGIC_PCI_DEVICE_ID_1654) { ifmedia_add(&ha->media, (IFM_ETHER | IFM_50G_KR2), 0, NULL); ifmedia_add(&ha->media, (IFM_ETHER | IFM_50G_CR2), 0, NULL); } else if (device_id == QLOGIC_PCI_DEVICE_ID_1644) { - ifmedia_add(&ha->media, - (IFM_ETHER | QLNX_IFM_100G_LR4), 0, NULL); - ifmedia_add(&ha->media, - (IFM_ETHER | QLNX_IFM_100G_SR4), 0, NULL); - ifmedia_add(&ha->media, - (IFM_ETHER | QLNX_IFM_100G_CR4), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_100G_LR4), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_100G_SR4), 0, NULL); + ifmedia_add(&ha->media, (IFM_ETHER | IFM_100G_CR4), 0, NULL); } ifmedia_add(&ha->media, (IFM_ETHER | IFM_FDX), 0, NULL); @@ -3808,11 +3805,11 @@ qlnx_get_optics(qlnx_host_t *ha, struct qlnx_link_output *if_link) case MEDIA_MODULE_FIBER: case MEDIA_UNSPECIFIED: if (if_link->speed == (100 * 1000)) - ifm_type = QLNX_IFM_100G_SR4; + ifm_type = IFM_100G_SR4; else if (if_link->speed == (40 * 1000)) ifm_type = IFM_40G_SR4; else if (if_link->speed == (25 * 1000)) - ifm_type = QLNX_IFM_25G_SR; + ifm_type = IFM_25G_SR; else if (if_link->speed == (10 * 1000)) ifm_type = (IFM_10G_LR | IFM_10G_SR); else if (if_link->speed == (1 * 1000)) @@ -3822,11 +3819,11 @@ qlnx_get_optics(qlnx_host_t *ha, struct qlnx_link_output *if_link) case MEDIA_DA_TWINAX: if (if_link->speed == (100 * 1000)) - ifm_type = QLNX_IFM_100G_CR4; + ifm_type = IFM_100G_CR4; else if (if_link->speed == (40 * 1000)) ifm_type = IFM_40G_CR4; else if (if_link->speed == (25 * 1000)) - ifm_type = QLNX_IFM_25G_CR; + ifm_type = IFM_25G_CR; else if (if_link->speed == (10 * 1000)) ifm_type = IFM_10G_TWINAX; From nobody Thu Sep 18 16:18:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSLQj6JWgz67dW8; Thu, 18 Sep 2025 16:18:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSLQj5HWBz469q; Thu, 18 Sep 2025 16:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212285; 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=1rJCBj8mCf/7YWjR7karOq5Rj5940rquPKqOTp6uwXk=; b=Fmdg+S5dcv90ACtVdBejZA7Jl5iLV0k1NovIquE5OLUdqlc0w7FuTXXSSxgXHE+1hU6URf VwHu6jaCbqAfeuB6WlkbcEkGtR2ji6y47MbELax8JrmZFXc6vp2S0TRoITKUsSt+miVpwV TfbeMMgPhQZworL2qeJGrqcqAJCmHNF3gjUCKgwfBdgMW3FMj4/EgppzWGvij+BsGpqZ9E AtHkBv3ub0hCGTBbIGowoRb7u86T+XsW+Zfpz2KK0PUzWNOcMuGtWWqx1wnSRokfDxzMps g7bjnqdkgC8SktWzi6qFFX82q7oxw0OIrETn8cmEvU9v2doX/eEWPqDgaFQ+KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212285; 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=1rJCBj8mCf/7YWjR7karOq5Rj5940rquPKqOTp6uwXk=; b=rE3I626/VtlQJ6rPCinrS7tb+vlG1MrDT6Z/bHReHfVp7UhTZM8R4grLed7lJRew9ndEyq A8/DSpIoKlWC6mQiMMvYpQMqmuPPaw71Nm3UpDaCJ8teshIglgbwX1pNduvkZGM8pplCli 0bzjNFXZkxn9CytiyDJRw5QAKxvz1CMUB0MgLodvEvctxs6GSd3VaFwNt/W1T9p7k0HB78 HEmjh5mvaTJcCf5JxovpAyQeJWXxFTre5SBVuSXV29g7bjQZ3lAZu7krfnLF1Y4BgM0FHY UnsdXrH8CdTd1R/rnsjkVlLU5WREpJZhy4mYWSnXUJt0OtnKUp0GW/ucaQM4nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758212285; a=rsa-sha256; cv=none; b=PPTgWp8P3938BiXUxsP3AxBKKMNT4pG63BTtqBf9A4PJgcVzjG7aVW0ad6KHBW0E5EvmKR TfKqH9kLwcxHd0eEqWmHJU9FePqiN+HhojqpRMneapos9LIxXZGjG7XUiJVeUwGO9EPlEf d0FEKgIDuvKoy5/Y/YZvoPhSU/NL+7LPYLQ4+xuNOqM75beNmq8zJXhu8vG+s/E/L+vV/j VaIgxSSXxHCcDv+OrEKeu1lK3WUk0CNCwT/TOUt4kJvexwJ3CBHuioeqjk0c6ocGZkmW32 ufcerjrYpkaTD3WktCbGFaWlG/Iv28K7epcw1Nb+jhXLmOiLgWogw1v/S+gI2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSLQj4mDqz3Ck; Thu, 18 Sep 2025 16:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IGI5F6050860; Thu, 18 Sep 2025 16:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IGI5b4050857; Thu, 18 Sep 2025 16:18:05 GMT (envelope-from git) Date: Thu, 18 Sep 2025 16:18:05 GMT Message-Id: <202509181618.58IGI5b4050857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 817bc7009270 - stable/15 - qlnxe: Support SIOCGIFXMEDIA ioctl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 817bc700927087a52d0dd34c43e45736a867240e Auto-Submitted: auto-generated The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=817bc700927087a52d0dd34c43e45736a867240e commit 817bc700927087a52d0dd34c43e45736a867240e Author: Zhenlei Huang AuthorDate: 2025-09-09 10:04:54 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-18 16:15:52 +0000 qlnxe: Support SIOCGIFXMEDIA ioctl ifconfig(8) will try SIOCGIFXMEDIA first and then retry SIOCGIFMEDIA if that fails. Since the driver reports extended media types, support SIOCGIFXMEDIA ioctl directly rather than doing another round. Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52375 (cherry picked from commit 6e3c8c0f709ab0b9d70e2725e58f4a4ba7a4404e) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 696604cf1202..9963f472c615 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -2721,7 +2721,9 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) case SIOCSIFMEDIA: case SIOCGIFMEDIA: - QL_DPRINT4(ha, "SIOCSIFMEDIA/SIOCGIFMEDIA (0x%lx)\n", cmd); + case SIOCGIFXMEDIA: + QL_DPRINT4(ha, + "SIOCSIFMEDIA/SIOCGIFMEDIA/SIOCGIFXMEDIA (0x%lx)\n", cmd); ret = ifmedia_ioctl(ifp, ifr, &ha->media, cmd); break; From nobody Thu Sep 18 16:18:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSLQl1n87z67dF7; Thu, 18 Sep 2025 16:18:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSLQk74Hhz45xd; Thu, 18 Sep 2025 16:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212287; 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=Co/JdMk7EPhaHHoNz1teoDFV24gCfQKb3ungT43Mhm0=; b=sLVGMTwD+yur9HRt4/dxUCmVos5zEt6BUC3ruGv7RbrrkWjKFQO8bGpCP18hIHQ539twhx awEe5gqfx7085vHvb/Lf3vzHi5cOkzc5sNqlH7m/DfowuLPLPoGRkxVqrAxvfFXo4zdWDc spYsb3csLfDFTKbdJlTVb4tq9ll7o1uHu93o4Q+yaWXyOItsU+Nstuw2KKOSrZCjxlCZNA aN9gXwUKHNSmLl3VSzjSz+hnhy7eYyn2hbcO+O7BaAao8HSTzeuXRTe2tzqQtOS2SCwWPv TiYDR5YlUrx+dPYMDxcOh3dB+kligu8ozT1xwEvBjkT5iZg5wMPC4BF6VdHxeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212287; 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=Co/JdMk7EPhaHHoNz1teoDFV24gCfQKb3ungT43Mhm0=; b=EnZQlXaxCKFTYxbmHUyiLyCYYzm31JKsH55NEqnKUC34K531hEgfpC0i0dj5ah/dPn8I9e LJ9fYe7DFZONpJ0LjwJlXA4EDhNxHpCT98uKiUj2SXtuDCClmb1dqSdGuz6VYe3Sfv6xJV d3KVo9A5FTtBhGqlx/6YtvL0BZbJqXrPYMQVoYN40gqOnNgbvoUN/JyaQ7OuaX847tx9ig 9HdE1RudkBVs/bZJJdTFxvwXDhoVNokpEJDplGDV1+crN384u7w3kjDSV3p/jv7IV6anRr sgW/6VNotEpOiBW1td1LQv23YtzyubbEgPUXmsjZ9/olwqHRbIXnF7+itdvzpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758212287; a=rsa-sha256; cv=none; b=G061TSlryt8R2IbcJwzCaSzOhIendqUlejjJEY/LKKTXVxIDeeuhYO+84ooSkd9dgOjjO3 kXZrpMnR5TbKMiWeJdMcvbvD8rwDLVuA/o8/0Aac75wCsdZg0tYCf1UO6W+b9spKLNF4lT YLSBBGS4uIQ5JPb9951Ipm0pbXUrsikIUj2X/If4nCHzTK7jVyz1n9L91Qxz+/72tXDYY6 3LaIEdDkZtD50notPk2A0HVFu4fY/ZT0JpSTIxDd0VhAQOLjVYlu/Z0EsXb+fjCAAeoMmH rv+uAqpGNecT+/whLtasZ7l8EzT1OwHTVqydfpQIZ5aTgEJJt9XtyMLnEdmiMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSLQk5YLJz39W; Thu, 18 Sep 2025 16:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IGI6Hc050893; Thu, 18 Sep 2025 16:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IGI6tY050890; Thu, 18 Sep 2025 16:18:06 GMT (envelope-from git) Date: Thu, 18 Sep 2025 16:18:06 GMT Message-Id: <202509181618.58IGI6tY050890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6fb046515ea6 - stable/15 - qlnxe: Report speeds in decimal format List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6fb046515ea6005b3958e0c3220d0e6e630af292 Auto-Submitted: auto-generated The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6fb046515ea6005b3958e0c3220d0e6e630af292 commit 6fb046515ea6005b3958e0c3220d0e6e630af292 Author: Zhenlei Huang AuthorDate: 2025-09-09 10:04:55 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-18 16:15:52 +0000 qlnxe: Report speeds in decimal format It is more natural to read the speed in decimal format than hexadecimal one. Spotted this while diagnosing PR 287445, ``` [__ecore_configure_pf_max_bandwidth:6864(qlnx-0)]Configured MAX bandwidth to be 000061a8 Mb/sec [__ecore_configure_pf_min_bandwidth:6922(qlnx-0)]Configured MIN bandwidth to be 750 Mb/sec ``` Reviewed by: kbowling MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52376 (cherry picked from commit e1c5e043961ab3a5429a0c6e727265dfa819cf00) --- sys/dev/qlnx/qlnxe/ecore_dev.c | 6 +++--- sys/dev/qlnx/qlnxe/ecore_mcp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/ecore_dev.c b/sys/dev/qlnx/qlnxe/ecore_dev.c index 6187ecdbc446..389a95a4164c 100644 --- a/sys/dev/qlnx/qlnxe/ecore_dev.c +++ b/sys/dev/qlnx/qlnxe/ecore_dev.c @@ -5268,7 +5268,7 @@ ecore_hw_get_nvm_info(struct ecore_hwfn *p_hwfn, } DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, - "Read default link: Speed 0x%08x, Adv. Speed 0x%08x, AN: 0x%02x, PAUSE AN: 0x%02x EEE: %02x [%08x usec]\n", + "Read default link: Speed %u Mb/sec, Adv. Speeds 0x%08x, AN: 0x%02x, PAUSE AN: 0x%02x EEE: %02x [%u usec]\n", link->speed.forced_speed, link->speed.advertised_speeds, link->speed.autoneg, link->pause.autoneg, p_caps->default_eee, p_caps->eee_lpi_timer); @@ -6860,7 +6860,7 @@ int __ecore_configure_pf_max_bandwidth(struct ecore_hwfn *p_hwfn, p_hwfn->qm_info.pf_rl); DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, - "Configured MAX bandwidth to be %08x Mb/sec\n", + "Configured MAX bandwidth to be %u Mb/sec\n", p_link->speed); return rc; @@ -6918,7 +6918,7 @@ int __ecore_configure_pf_min_bandwidth(struct ecore_hwfn *p_hwfn, rc = ecore_init_pf_wfq(p_hwfn, p_ptt, p_hwfn->rel_pf_id, min_bw); DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, - "Configured MIN bandwidth to be %d Mb/sec\n", + "Configured MIN bandwidth to be %u Mb/sec\n", p_link->min_pf_rate); return rc; diff --git a/sys/dev/qlnx/qlnxe/ecore_mcp.c b/sys/dev/qlnx/qlnxe/ecore_mcp.c index ab14b1eb5186..6d1e5fe24d06 100644 --- a/sys/dev/qlnx/qlnxe/ecore_mcp.c +++ b/sys/dev/qlnx/qlnxe/ecore_mcp.c @@ -1638,7 +1638,7 @@ enum _ecore_status_t ecore_mcp_set_link(struct ecore_hwfn *p_hwfn, if (b_up) DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, - "Configuring Link: Speed 0x%08x, Pause 0x%08x, adv_speed 0x%08x, loopback 0x%08x\n", + "Configuring Link: Speed %u Mb/sec, Pause 0x%08x, adv_speed 0x%08x, loopback 0x%08x\n", phy_cfg.speed, phy_cfg.pause, phy_cfg.adv_speed, phy_cfg.loopback_mode); else From nobody Thu Sep 18 16:18:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSLQm31bKz67dWC; Thu, 18 Sep 2025 16:18:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSLQm1GCmz46BC; Thu, 18 Sep 2025 16:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212288; 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=zlYwiSI2dYlLdkqMzSAlD2RsH0qzuLfYiOUMDz7rduQ=; b=MVchWE5UXPz1xY9OtgBahKwx20J0LQUvmzLzq4aSYAOYyPS90Wl3vQDdlZqfxal+OSgXdJ wAhTeqH6kNBYgUJq+xMyDoKD/FNHD4JBGotZzGHA2rIgiVYAk/QVzli+IC27xsnN31urVB kvv0Q+Ot4hxcjVkHFjZGT2eMfKuyvgrVCHO0bb/OY19YSGyKILe1NMpqsfZVvlpFYVl8jc VvY99PmEh2Tlpfe9Lzrf/1jYshWVZWuR2JlWhNvqP8sEXn5OmqWq4T1YqFBkmgvDVFncGP MoJOKD87nC2duOFAAkhiFnCgwbOhQcpPRhV/t3aghyvy//IdZ4oJhh0pKeanRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758212288; 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=zlYwiSI2dYlLdkqMzSAlD2RsH0qzuLfYiOUMDz7rduQ=; b=cIoUOFcWoHMKxYZ3wEEGKd7Zbi+0ShunZFXKh99bz4KFK+Uf0UGww/JMA0QFoGLICO67jp Ksp8E2vjctsGjiX/7856gjY0MBIbVGu9s2V363rLX1smhkd5tSKKrNcpBKHZlkI9P5yxWi ffvhUq860pwOULUzAB1cPNKXRk/5c43jxFcBwV7Ee0443FMzoDrqwszK5Cquz4Jc9O8UyC I0L1J5X62MGYTGSFwltfJO/4ZDoa/SxJVZyxs21DZKVtRd7abwTee3f4Lc95ctJTtFmsi4 A2FJR8y7LVP42XLk7efLlBkNz3h8TIfuE3hd7Mm8Zqh3XR4quUMfsySBEznRfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758212288; a=rsa-sha256; cv=none; b=PoCkPSxdbea2izKYpjmvPQCpiGdWQW17KTuvHSjBLD+ege5ymLw08OtHwo/xyBbwZ9BAd9 /xo70wKljhSz/hCQ52EMzxjaY1t+TfytWzbjgs6hJtwwzIDm4a6BL5ahWS3Rs9/W+gVVCa 7noUPX9WXhGhaiiXAQQ+2LKDF/2iBFmcyIQcNJosIlfNOCaLhEaW9SRhjB0CRGjdL+QZBY TwfxiB10FjDhf9liLnm3iB/oaWxuHLTg33JQ5dVkG6qWSFIDZZ/6isNXhHwKtYA5tvbnQq mbj7bewZB1RG4HFrHieeVv3zAsnP4gw6YU8jS2w7wn3Fgc84WAmg2CwRlrBbJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSLQl6lrDz3h7; Thu, 18 Sep 2025 16:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58IGI7M2050932; Thu, 18 Sep 2025 16:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58IGI72X050929; Thu, 18 Sep 2025 16:18:07 GMT (envelope-from git) Date: Thu, 18 Sep 2025 16:18:07 GMT Message-Id: <202509181618.58IGI72X050929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: bd721f6e8040 - stable/15 - tslog: Move sysinit_tslog_shim() into kern_tslog.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bd721f6e8040f0b9d0546c293954290844b6a070 Auto-Submitted: auto-generated The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bd721f6e8040f0b9d0546c293954290844b6a070 commit bd721f6e8040f0b9d0546c293954290844b6a070 Author: Zhenlei Huang AuthorDate: 2025-09-10 14:44:36 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-18 16:15:53 +0000 tslog: Move sysinit_tslog_shim() into kern_tslog.c struct sysinit's func pointer requires its address, thus a real function is generated in every translation unit when the source file has SYSINITs declared. That results in plenty of identical sysinit_tslog_shim in the final kernel file, in which only one is used and others are left useless. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52413 (cherry picked from commit 5f9a05e574050c8b3f6b444311a12e8fb293ad1a) --- sys/kern/kern_tslog.c | 10 ++++++++++ sys/sys/kernel.h | 11 ++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_tslog.c b/sys/kern/kern_tslog.c index fbf81d423b95..09070eea284f 100644 --- a/sys/kern/kern_tslog.c +++ b/sys/kern/kern_tslog.c @@ -220,3 +220,13 @@ SYSCTL_PROC(_debug, OID_AUTO, tslog_user, CTLTYPE_STRING|CTLFLAG_RD|CTLFLAG_MPSAFE|CTLFLAG_SKIP, 0, 0, sysctl_debug_tslog_user, "", "Dump recorded userland event timestamps"); + +void +sysinit_tslog_shim(const void *data) +{ + const struct sysinit_tslog *x = data; + + tslog(curthread, TS_ENTER, "SYSINIT", x->name); + (x->func)(x->data); + tslog(curthread, TS_EXIT, "SYSINIT", x->name); +} diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 380099092107..81efeff527f5 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -249,15 +249,8 @@ struct sysinit_tslog { const void *data; const char *name; }; -static inline void -sysinit_tslog_shim(const void *data) -{ - const struct sysinit_tslog *x = data; - - TSRAW(curthread, TS_ENTER, "SYSINIT", x->name); - (x->func)(x->data); - TSRAW(curthread, TS_EXIT, "SYSINIT", x->name); -} +void sysinit_tslog_shim(const void *); + #define C_SYSINIT(uniquifier, subsystem, order, func, ident) \ static struct sysinit_tslog uniquifier ## _sys_init_tslog = { \ func, \ From nobody Thu Sep 18 21:22:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSTBC1WRnz683Sc; Thu, 18 Sep 2025 21:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSTBB6tCLz3Y2y; Thu, 18 Sep 2025 21:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758230563; 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=axRjiI/FZsBzTyBGshw01cWyIqcTSMAdVLIkhFRfOo0=; b=swV01QvDt3049eEyRBssEkeKI+POUNc1qh89yzwJXYDgvUkkvrcggYmW+ieM8ALw37b2WI AH2Xj9qLUmoAvx+qZ0LZ3vOExoTIIMjTYsZ+0TbTQFhk80V05NxIl6imWv8DAAFrKRic1K q6cumRpQM7AT2bUduYEFQqkAvKofIZim6t1QYb2A4N439OK5KHNb7/fkLztJFtTD5rUrfX uXY4FHdR2QQ3m5QOeeagrljYe1poSycdzAFF/OlXbjoyaYY2P4zdoNushL2Y9/cddBsFRS x1s7jbGZlMLeK8LlwTTG27sGd5DZFIR2q8n1m9dWrpFYhfltxXDEQ+kutrQzdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758230563; 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=axRjiI/FZsBzTyBGshw01cWyIqcTSMAdVLIkhFRfOo0=; b=p0Ml8x97Chgp6Q0xjjsaI8+5DradKk6zv3oi3OdP9SOdKs1l0r8DGYWANjpKwvB94lblq+ bg6HpbfCq9jflAz1+nP4U9TREQG+J4OIc+i6f7F16EA6qI/EeiocSZi4GMk96zacjg/IgL oh5auGh+CgjtWe+z16viLxnxSmPHH5bJWr6AG2lO6Zf4d6oKm5urV8wD56W5N1tauCfMFa jNmU+3jPyCaeXQE7s7dpqkVhTabLxX9yq5PVvHMb3afwG3dNqASmOlVjekWqs4lGRWj8bq r9pgovrhnKvNORRSjxWIMk6sPUG5FlektmRpkhvsbc8ufDwWw78lr9ftQJTG5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758230563; a=rsa-sha256; cv=none; b=avnwt2K3fGhqOSfP1hz2FrpJGbF59oRiRoQiJcz2eF/NujSlOX96+8wwTylcGkYBlMKPbR 3tct6l3ZPj6VoCDLOcebvc4y6nge//G5S2VL0x32uOyXSXnWD9pHWJ9VgNFyNhG5/y+/Wu OG+XrYuBrPbikQRqWMPJ6EGN+ZI9g875am3K56mp/G4AdXEZk4INww5uJCjWb7UJuzjssv aOwwKe3ZidB+1XHZv0j3cx4d5l90dtaQ6EYKpAneS3r+FpyruV6J9hRLT3K4nJPhH08tj0 Ambwd83kwjkXz7VAqQwiCvuw0faGTFEOVBKT3AVGVilN3vadikJqQnFj5z142w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSTBB6H0CzCLX; Thu, 18 Sep 2025 21:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58ILMg8l030763; Thu, 18 Sep 2025 21:22:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ILMgvh030760; Thu, 18 Sep 2025 21:22:42 GMT (envelope-from git) Date: Thu, 18 Sep 2025 21:22:42 GMT Message-Id: <202509182122.58ILMgvh030760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3b47fcc146da - stable/14 - release: Fix typo in powerpc mkisoimages.sh List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b47fcc146dae76988084983fbb95e82d44e6b54 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3b47fcc146dae76988084983fbb95e82d44e6b54 commit 3b47fcc146dae76988084983fbb95e82d44e6b54 Author: Colin Percival AuthorDate: 2025-09-16 01:09:05 +0000 Commit: Colin Percival CommitDate: 2025-09-18 21:22:32 +0000 release: Fix typo in powerpc mkisoimages.sh "[ n foo ]" is an error and should have been "[ -n foo ]". Fortunately the only ill effect was to result in garbage in /tmp/ when creating powerpc ISO images. Fixes: 6c3e01bf8578 ("release: Randomize powerpc boot block file name") MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit 8c9a919abaa3f6f16a17586ca72bab939788bf69) --- release/powerpc/mkisoimages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh index ba7c32f87bee..62656cdaaede 100644 --- a/release/powerpc/mkisoimages.sh +++ b/release/powerpc/mkisoimages.sh @@ -109,7 +109,7 @@ if [ -n "${METALOG}" ]; then fi makefs -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@" rm -f "$BASEBITSDIR/etc/fstab" -if [ n "$bootable" ]; then +if [ -n "$bootable" ]; then rm $BOOTBLOCK fi rm -rf "$BASEBITSDIR/ppc" From nobody Fri Sep 19 00:46:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSYj35yJ8z68Hwb; Fri, 19 Sep 2025 00:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSYj34Swtz439w; Fri, 19 Sep 2025 00:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758242775; 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=P2WL+AVs5HUpZO959l1Y3arW9PGfnS9s2TMJgXUMUSI=; b=mYwhq0QsUpPlKYx8QDzrjUXSELk+2fO0EHzpMkF66CjTQSz8Q3e3TakHui5L8opF+hPqND O+1VZcWQdKEZczkXkgEKE2Vcon+4mNIIHEaeGl1kmgPKEbi9fYkZgUHFqXGBNIuQZXBeIR c96v1r0YQYPyApJAaQWyfYOWQnWsjmkZK7/BA+tEwBNVh2/x+5f2qIYZ81sYUODUnyCw9c T99wCrg9O24gt02i78b0EjPA+xIDZUErKu2oDB/k2+DAB8DwEuuo2U3skxsvBuR91NG7Mn 6981HT/VmRSGDEEUe1z+XwgUgwNp9ge+b97CuZ4ZrChXKNDbIvXG92f2pWrp4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758242775; 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=P2WL+AVs5HUpZO959l1Y3arW9PGfnS9s2TMJgXUMUSI=; b=i6rGSosnRiHwASg5zAFbdUylmVU2j8dfxH0FdfH7njq4HAHku0Z8VYVJBWUsGWQ9CsaoQ2 oooL7xdhOgE2hQQpMo5IPfA4bPGGTwM+sxqywfqID3EnG97V6T/8w8gPGjpJB4QDjuRZ/7 G47gDeR0O4v2tS0tiiw5W4bhju1qTCoCQMRZp7QE7GYIJ6PbjZoayGvI4+g3SIFF5EgPVb oKa1FTKijS/x7K8Z/iB8tz1FpUYBciLVGOKdK8WCJ1iVgPANbP0A6Rto1Q5mIOfazbgZir eqN9DQwiw7VXKH6L43EcBfYqoTaWQovAspEgqVTfXU2UzF7jdZuRl+6sRkNN4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758242775; a=rsa-sha256; cv=none; b=xw14ZKOTtzFoZo704+qTL0szKDZeHQsIP/pGoBQkD3EGDx3Z9s62vEj83AxAuyPh2Zr9oO fHOPGGAtsnja6FakRraOMqCVF7QP4nbMR8NpI7opVSAEbjXPYsG47Y0gH0qG27T93XxtiT XnYOsn8lH8jISWt0DRZNu0Stbr1Na6aG7h8oDB6R80s9SJSSCsDwWUqpN61MdFItLE3PWQ kk2tVAo93fwwdOaKsgm7a058OJcFUA2o4QNJAqYItYITgaJx+hruVQSaHutdnS6F20WaQv gyfrYbXjUS/agxD5HfevXMU6Uc6yZrywZ8Y/U72yEQcTlgxb1V88xbcNCm4LPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSYj342MlzbQ4; Fri, 19 Sep 2025 00:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58J0kFff008768; Fri, 19 Sep 2025 00:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58J0kFTX008765; Fri, 19 Sep 2025 00:46:15 GMT (envelope-from git) Date: Fri, 19 Sep 2025 00:46:15 GMT Message-Id: <202509190046.58J0kFTX008765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: c8d87fd983e9 - stable/15 - rmuser.sh: Improve prompt consistency with adduser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c8d87fd983e96785a58967fca40db6d2f2a3a850 Auto-Submitted: auto-generated The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d87fd983e96785a58967fca40db6d2f2a3a850 commit c8d87fd983e96785a58967fca40db6d2f2a3a850 Author: Alexander Ziaee AuthorDate: 2025-09-09 17:06:29 +0000 Commit: Alexander Ziaee CommitDate: 2025-09-19 00:45:25 +0000 rmuser.sh: Improve prompt consistency with adduser While here, improve userlist error message. PR: 289399 MFC after: 3 days Reviewed by: kbowling, rgrimes Approved by: kbowling, rgrimes (src) Reported by: michaeldexter, rgrimes Differential Revision: https://reviews.freebsd.org/D52464 (cherry picked from commit fc68f8aac623b5494484adfa41ac600415609870) --- usr.sbin/adduser/rmuser.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh index 4c1e4049763a..8e5dd28cf01f 100644 --- a/usr.sbin/adduser/rmuser.sh +++ b/usr.sbin/adduser/rmuser.sh @@ -303,7 +303,7 @@ if [ ! "$userlist" ]; then show_usage exit 1 else - echo -n "Please enter one or more usernames: " + echo -n "Please enter one or more usernames, or press enter to exit: " read userlist fi fi @@ -333,11 +333,11 @@ for _user in $userlist ; do echo echo $userrec echo - if ! prompt_yesno "Is this the entry you wish to remove? " ; then + if ! prompt_yesno "Is this the entry you wish to remove? (yes/no): " ; then continue fi _homedir=`echo $userrec | awk -F: '{print $9}'` - if prompt_yesno "Remove user's home directory ($_homedir)? "; then + if prompt_yesno "Remove user's home directory? [$_homedir] (yes/no): "; then pw_rswitch="-r" fi else From nobody Fri Sep 19 00:59:24 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSZ0D2X23z68Jpg; Fri, 19 Sep 2025 00:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSZ0D1VsTz44cH; Fri, 19 Sep 2025 00:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758243564; 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=nzYBVTDgFn5Q/JeRyv3vqRc7kZxMYgxrt/wKniuJio0=; b=h+LKfb5MnsC4voifIXplpoSjijO8soDwdDn7lY9x/Xl7HTlYDTJ3re9lyUqjpaqDvK2zP4 aXijjx3KHtbh1qsTZ/7ycjEbnJEmyNL575hsvW489wA3lk9Omyvcam+ijc06UBBimueAQN egfp64UbX2VMB3xK4AUinOGjtC40pD6ZEyaxhM7QJOdnPx6qMS/4Yn4JrSWyEcJz9KKNn5 SM6F9BYRiaxfeLT7FekS2SpAQXXkj2MT+zV/40WAsEavuhIGaA3diZtTNpFcgzZoRABW05 jj2LXGgzquBC2p+3xJuHQsBx4j80tHGjZiYaAi8DzJY7OY/lxE5iAHXZABE7cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758243564; 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=nzYBVTDgFn5Q/JeRyv3vqRc7kZxMYgxrt/wKniuJio0=; b=XVaSRWLdJsbbVoZMd7/7YJNLKJ+2tT82RqHWpwpfw7Ri7zkKEhkRblOBJepOVdcWrq/UbH 7HiZAga2zy3oPdfQ3XXkti5qTPy3KEPlwltAvsNxbbxuIz71r/JkTN/RM/2P3vKaeK7Vry 8WAkAJci06GOFIU+1niK+iIKsuHCXh9/H0vBkyNm5w3uw0dgJyG0RToxD91NgqDSWdlOQL zCSZHrNrHU+nomgMzJvOSsfYnfEN9T6lLwbM0qd09VAUDNYLsgWI92/CQw6jU/84sP/U44 QY/7K8pyhP3D6FV4OaGb4O2c2jzf65wk4uFPoXSRekEv5Z76uDc0USZSCI9VEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758243564; a=rsa-sha256; cv=none; b=o/bN7vOrJOs7yLULWkxDR6djW5d4Grqp372BXJELNqt3apSZip806ebaBt4s9m/aTzWMWh LB/qQI7j45giSsNgmX2amjthJbLWG2jnddnXXDfRjGfBi6L/WSdCHfk2jJmQT1DV6/9FSS e+iLR3DrxDPFFe2q21byGNMKSOFJncGsqltqIRmfEs5f87ib+8zbwX7DB3ZJllTieRbdCw stPbkhuqL07Gm7wz5ht8tjrzwYKq7xHS+/shW3N6nKDIDUh9X5T6D/AHB+kucCEMg6jrxi mt7qy8uy5hwVjS2DnIVusZhkDKH29m9o63rlz2JA2mxZLSV73LZTWOezW9VXTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSZ0D1558zcCx; Fri, 19 Sep 2025 00:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58J0xO2K028233; Fri, 19 Sep 2025 00:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58J0xOD3028230; Fri, 19 Sep 2025 00:59:24 GMT (envelope-from git) Date: Fri, 19 Sep 2025 00:59:24 GMT Message-Id: <202509190059.58J0xOD3028230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 92801ed02423 - stable/15 - lib/msun: cpow{,f,l}(CMLX(0.0, 0.0)) should return 1.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 92801ed02423bd8f7237223168eaa194b28d147f Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=92801ed02423bd8f7237223168eaa194b28d147f commit 92801ed02423bd8f7237223168eaa194b28d147f Author: Steve Kargl AuthorDate: 2025-09-11 16:38:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-19 00:58:53 +0000 lib/msun: cpow{,f,l}(CMLX(0.0, 0.0)) should return 1.0 PR: 289447 (cherry picked from commit 8b41ba845c7e10b5f241a1f944fe9a8e19ad75a9) --- lib/msun/src/s_cpow.c | 5 ++++- lib/msun/src/s_cpowf.c | 5 ++++- lib/msun/src/s_cpowl.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/msun/src/s_cpow.c b/lib/msun/src/s_cpow.c index b887db51aa2a..2c20a8f3b48b 100644 --- a/lib/msun/src/s_cpow.c +++ b/lib/msun/src/s_cpow.c @@ -58,7 +58,10 @@ cpow(double complex a, double complex z) y = cimag (z); absa = cabs (a); if (absa == 0.0) { - return (CMPLX(0.0, 0.0)); + if (x == 0 && y == 0) + return (CMPLX(1., 0.)); + else + return (CMPLX(0., 0.)); } arga = carg (a); r = pow (absa, x); diff --git a/lib/msun/src/s_cpowf.c b/lib/msun/src/s_cpowf.c index 144291079f97..b8bdbd9cb07b 100644 --- a/lib/msun/src/s_cpowf.c +++ b/lib/msun/src/s_cpowf.c @@ -57,7 +57,10 @@ cpowf(float complex a, float complex z) y = cimagf(z); absa = cabsf (a); if (absa == 0.0f) { - return (CMPLXF(0.0f, 0.0f)); + if (x == 0 && y == 0) + return (CMPLXF(1.f, 0.f)); + else + return (CMPLXF(0.f, 0.f)); } arga = cargf (a); r = powf (absa, x); diff --git a/lib/msun/src/s_cpowl.c b/lib/msun/src/s_cpowl.c index 39797cadcfcb..efbe4936895f 100644 --- a/lib/msun/src/s_cpowl.c +++ b/lib/msun/src/s_cpowl.c @@ -57,7 +57,10 @@ cpowl(long double complex a, long double complex z) y = cimagl(z); absa = cabsl(a); if (absa == 0.0L) { - return (CMPLXL(0.0L, 0.0L)); + if (x == 0 && y == 0) + return (CMPLXL(1.L, 0.L)); + else + return (CMPLXL(0.L, 0.L)); } arga = cargl(a); r = powl(absa, x); From nobody Fri Sep 19 01:00:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSZ1d68j3z68Jpm; Fri, 19 Sep 2025 01:00: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSZ1d4q74z450H; Fri, 19 Sep 2025 01:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758243637; 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=EPgU/jJTYgSNgJe9/abup3+Wz85wcpdoB0Th2+zo3FY=; b=E+pPJHgG7CA25nYNg96yBVv81/HNpgl8ntV6YB7JOBA6RugFIQ7GdUta7TxVC40tMnB0Oj CjU2MKTUW/DfJg4D0yOGS/lzldJKeR4OEBIXrpIT0mOBi36BakIzfl/pjF7nHiCZqlHCGF ucF4iRrAVBJIqliqxfM09eTiZttmFnMa4Bp4JUZdbtwjHY+0dCBNRpOfhT0dX0fFJC6dGq w9LIdmdLpkR2/AgX/n25TNuiKFKxr534lzfYabqj6pU4zghSMaAJ5IzkPn21slj1AQKCE9 09VxrUgY68lX9ADQMdllyeLIc90qX3I7g4olzXkHpTSMCm8ENXmBjgUkcchepw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758243637; 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=EPgU/jJTYgSNgJe9/abup3+Wz85wcpdoB0Th2+zo3FY=; b=r/Jz61Kgj4dfRnX+SV90y1+OO+YOf64/lpbcc1FtP3GSJd66rxYH343yQ+onmVUCau/TcJ yVlWvF2GFaQX8f1nxXBADGWoc3ATWj/2zOU202Lz5fiW9f9Jvc4+sk5YtSvmglaxx7zTiB nMa9dJekCUctfzElpMT/SR81VbtQm74p+bzBGHfqjTImnTIeW1/SGuZtAUsWm07lcxgFtf 7G18SEMKzLFFw0BsDgI05JT0ftV06tRCYnQtsElx5tV8ed1bZqxcimKfuSLpfz8QIJlgW4 dMPgKSqsCUPEBsngCfZkdIN6jDMCO8THRg4jD4GgwIylATTxOTQBM/+3BTCVOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758243637; a=rsa-sha256; cv=none; b=nNoH2K6Dr6YErbLAsmhMuB5QEXUiibVjmShslx8wo3u28RSFEoQtT5UHfkHzkw38uIJKJp t4VfvH7+HzR4SbAFL1b0gM9dRDkwskU5zEPm2/j7x45Z8RRAGVT2Yn8JqHlr26meFeDSUh gEs0BKXEUYmjd9O8RdhHupysMGG7AW/nAVCOVoparfIdeUfdaxGk2eO/etwIqvQBi43daD /ZPb+t0/fKJD/IpAWsAMac5j/Rf5plX9qztdRrTgKD7rtVjBZL997AVZIuD6NABxPTsY+k GO7DbelAUVHyp9AkpcPRf61XJrOy0sgvXmdopKyamGQP//EF+O9iUggx3v8+yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSZ1d4BWbzbtK; Fri, 19 Sep 2025 01:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58J10bBd038497; Fri, 19 Sep 2025 01:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58J10bfi038494; Fri, 19 Sep 2025 01:00:37 GMT (envelope-from git) Date: Fri, 19 Sep 2025 01:00:37 GMT Message-Id: <202509190100.58J10bfi038494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6f59cb79e84a - stable/14 - lib/msun: cpow{,f,l}(CMLX(0.0, 0.0)) should return 1.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f59cb79e84a86d7b864d709652ec57b6928a6cf Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6f59cb79e84a86d7b864d709652ec57b6928a6cf commit 6f59cb79e84a86d7b864d709652ec57b6928a6cf Author: Steve Kargl AuthorDate: 2025-09-11 16:38:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-19 00:59:55 +0000 lib/msun: cpow{,f,l}(CMLX(0.0, 0.0)) should return 1.0 PR: 289447 (cherry picked from commit 8b41ba845c7e10b5f241a1f944fe9a8e19ad75a9) --- lib/msun/src/s_cpow.c | 5 ++++- lib/msun/src/s_cpowf.c | 5 ++++- lib/msun/src/s_cpowl.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/msun/src/s_cpow.c b/lib/msun/src/s_cpow.c index b887db51aa2a..2c20a8f3b48b 100644 --- a/lib/msun/src/s_cpow.c +++ b/lib/msun/src/s_cpow.c @@ -58,7 +58,10 @@ cpow(double complex a, double complex z) y = cimag (z); absa = cabs (a); if (absa == 0.0) { - return (CMPLX(0.0, 0.0)); + if (x == 0 && y == 0) + return (CMPLX(1., 0.)); + else + return (CMPLX(0., 0.)); } arga = carg (a); r = pow (absa, x); diff --git a/lib/msun/src/s_cpowf.c b/lib/msun/src/s_cpowf.c index 144291079f97..b8bdbd9cb07b 100644 --- a/lib/msun/src/s_cpowf.c +++ b/lib/msun/src/s_cpowf.c @@ -57,7 +57,10 @@ cpowf(float complex a, float complex z) y = cimagf(z); absa = cabsf (a); if (absa == 0.0f) { - return (CMPLXF(0.0f, 0.0f)); + if (x == 0 && y == 0) + return (CMPLXF(1.f, 0.f)); + else + return (CMPLXF(0.f, 0.f)); } arga = cargf (a); r = powf (absa, x); diff --git a/lib/msun/src/s_cpowl.c b/lib/msun/src/s_cpowl.c index 39797cadcfcb..efbe4936895f 100644 --- a/lib/msun/src/s_cpowl.c +++ b/lib/msun/src/s_cpowl.c @@ -57,7 +57,10 @@ cpowl(long double complex a, long double complex z) y = cimagl(z); absa = cabsl(a); if (absa == 0.0L) { - return (CMPLXL(0.0L, 0.0L)); + if (x == 0 && y == 0) + return (CMPLXL(1.L, 0.L)); + else + return (CMPLXL(0.L, 0.L)); } arga = cargl(a); r = powl(absa, x); From nobody Fri Sep 19 01:19:50 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSZRp2hGRz68LcJ; Fri, 19 Sep 2025 01:19:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSZRp1rmpz49Lx; Fri, 19 Sep 2025 01:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758244790; 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=a4Wtjf7WP/GPLPkICiNZ0tGksc+A2LVYhNfA/Nn5zjU=; b=hOMA+ncrEGKEBwa9mjx0yUVPkoQAdbzwmPF9byPz1RI0SYAxuOB8W4tOB2LW62PkHq0690 jkUhKbIGG5l9I+FpZjfAi0A5wFjwOkcdeKmvOYpL4e7RKZkg4ciwLLG7jmGOKYAd/Ua78d 6jQb0pKZE7/bXObTo34WlafCpP437y+OIvAD75tId3W9j3nVix5/dq8oOD3sBe1VkApKKC FROHda64DP0L256YnUVXHTfJ+0NR5vhJejiOy8RV0z9HS2zj2nOZ2ZJDpCLZ54p9Go2Dmk WoAh7eUD2jsH0qWRm1qPNXfsqgaCL93ufSMxvucoFU+3iUbvlvrpNbCBocUd1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758244790; 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=a4Wtjf7WP/GPLPkICiNZ0tGksc+A2LVYhNfA/Nn5zjU=; b=y27IW8jdtNLNeJxpfsOtB7e35UsL4ImHPzqvFCpsj9mmMw04wUUD+KihankZFJXAF0kvhk py53Uaidqvynf40kZJKneZVU/oUtC7I2ieny1q6ixVKY5skQuQwrO8NwzZdGr0YFJU/8A1 YSaE+rF6jsV+xV8n5c7jAR0RDDDk6+3WaYc2drOl8q3ZczVnySWW/zCtw/T0TYyEctrncO WeWBV4/Sm9al4L9WwuuBMkCsXm5rdQ7cMgtfTMzaEfihM2BgiPV5MU+/BvOEG8RP+A3KI2 sk0/05M0vNqn/zYOTBDwyNW+cry3Z+S96lV3MeeR3/jd0Z5eX057TSEEFDKxmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758244790; a=rsa-sha256; cv=none; b=KHbq3Mw6W8FARb+Xnu+Da/HOcZVR7YupbC2WFSi9yVtOi/+diX1baln+PrBnJ9Fl9aNgW+ d609ISrFCufjixzpb5iTs2VJAeeYJshk7S84BA9XL+6hajdOXknBpT6UfrpS9JhkPqicrv JyW9u08J1NKwdu4hGLPgMh0Sc/tHaMlZWIGZPXq2y7yBex7RnEPnrktxkx8M+hUgS2sD2F C9YFEXQYsyH/y46hfFxmeeO/Cb83d2Teen8PhNEQ+yyTKnSc+G2YSMNJ0oaRQpokiSxnCI aBsjcPGBrE81RYkrHqah0KQhUn07OyUT413qHNX7QqMxpUXAgLjzCR+DZpAcGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSZRp1SLbzcM8; Fri, 19 Sep 2025 01:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58J1JoT3066987; Fri, 19 Sep 2025 01:19:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58J1JoVd066984; Fri, 19 Sep 2025 01:19:50 GMT (envelope-from git) Date: Fri, 19 Sep 2025 01:19:50 GMT Message-Id: <202509190119.58J1JoVd066984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 7e9f0bf1c05c - stable/15 - packages: Turn off MANSPLITPKG by default List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7e9f0bf1c05c3e0de161c4ea9f0dfd71791f8957 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7e9f0bf1c05c3e0de161c4ea9f0dfd71791f8957 commit 7e9f0bf1c05c3e0de161c4ea9f0dfd71791f8957 Author: Lexi Winter AuthorDate: 2025-09-10 18:38:01 +0000 Commit: Lexi Winter CommitDate: 2025-09-19 01:17:27 +0000 packages: Turn off MANSPLITPKG by default Manpages are very small, and having a separate manpages package for every base package is quite annoying for users. Turn this option off by default. Discussed with: bapt Reviewed by: manu, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52417 (cherry picked from commit a8a18eeb5e1711ad27c3ee20eb342b73d3badffa) --- UPDATING | 6 ++++++ share/man/man5/src.conf.5 | 4 ++-- share/mk/bsd.opts.mk | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/UPDATING b/UPDATING index ae4f14a24858..fa8ef72082c1 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,12 @@ 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. +20250918: + The MANSPLITPKG knob has been turned off by default, so pkgbase builds + will no longer generate "-man" subpackages; instead the manpages will + be shipped in the packages they belong to. If you want to continue + building split man packages, set WITH_MANSPLITPKG=1. + 20250916: If SRCCONF is unset and a file named src.conf is present at the top of the source tree, it will now be used instead of diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 648249148817..7ba8b4ac5e8f 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1215,8 +1215,8 @@ is set explicitly) .It Va WITHOUT_MANCOMPRESS Do not install compressed man pages. Only the uncompressed versions will be installed. -.It Va WITHOUT_MANSPLITPKG -Do not split man pages into their own packages during make package. +.It Va WITH_MANSPLITPKG +Split man pages into their own packages during make package. .It Va WITHOUT_MAN_UTILS Do not build utilities for manual pages, .Xr apropos 1 , diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 2251b499ffdc..73ebf82c258f 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -60,7 +60,6 @@ __DEFAULT_YES_OPTIONS = \ MAKE_CHECK_USE_SANDBOX \ MAN \ MANCOMPRESS \ - MANSPLITPKG \ NIS \ NLS \ OPENSSH \ @@ -79,6 +78,7 @@ __DEFAULT_NO_OPTIONS = \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ + MANSPLITPKG \ RETPOLINE \ RUN_TESTS \ STALE_STAGED \ From nobody Fri Sep 19 01:19:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cSZRq4Lvgz68LXY; Fri, 19 Sep 2025 01:19: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cSZRq39JFz49WV; Fri, 19 Sep 2025 01:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758244791; 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=yss9+GPiNpYnXnUoiVjEeuooTe8fZlJxofgdbajeYNk=; b=qQYUq2ZBjBDFY3VPzhTxE48tJB+9V+0g21Dh05G6qBUDlGgIyknXlYSYAA4/sexLpQEvT2 mLKOcb3OdOAhF+vCBiCaJaAASAduQfwJSDacrpCAifU++e0AX3LrIWdWL+CTx6EtMSfWpa ozO7kEsa37SA51+IgLLsfhiX2wbpZySYGVgvhguDG6qp/N8CUh9xYh9M8XoOIKm1TPlRcG ei0VhnQLP7rODw24pna8jwoqlB0bfs5CB1tF9VYtu82ADg0jd9SidsnMegsiggAx4K9p0K HZ0KsLiUZ3cinEO3eyOm0bXk31xnSselPmitm6rs4piWZrgwrm+1Ls94NIti6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758244791; 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=yss9+GPiNpYnXnUoiVjEeuooTe8fZlJxofgdbajeYNk=; b=aVsifB3YK6E0+kr54jMfgjxzaKGjZW0K23swMY1Np+NES8jYo9gxX44k4qsdfoBgxh8zre FPr1ig4m/NTWbMVXFndZqEplTQB4qDGXAIk7vtm+Fft+UdQQS61HEx4Lsu4qPkxSjl7H/0 WbxddY1WE8vv93aovcfmeNo/xIdGH2+js4YAo8eBhWCXNrj16lrsEMaZQQp0OEQuIzc6Ix ReC7+5U0TMfFNdwaCI24fZWfrRkrTdoTz4pPgjHHsdlHRj7Vmf8FXJRVP1wr9vRLvsiqwD ax+JyksAzojMfJznZhoABhgsJ/0fGrn04W6vbEHN01tBprIEXBK/N1g/51IFSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758244791; a=rsa-sha256; cv=none; b=Oo6CjDVZqMOqUp1x/SCpE769K4XOsMrsGeG0Ca7szIaoUVnRzrEovYixxN2bzTWE8v00AR Ld1ccJrQAhHTp63llUoilIV11qtxCxHgwChMhg4ksXrsDiBXCcCDHxEODgQ6hnSuHtFwVd PtpghV2A3BkycjXjKCwM6ao8IlozuOiqLEnJe+CEdmwsRf4MNuuqrnxGD4F0Vtud5dYMXA y1KdY0BYyZ4FmowVQwXYj5ZEj5JfPB4iizy6xc5axSfxmsYzX+Wy/Isd+vMeK0ShAKK7GK Y5CCctb6V0iEaF360JaVOlunNFhWBow27iw2Co7K6yF0EC5DXn2kLqBTXh7nww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cSZRq2kcrzcj6; Fri, 19 Sep 2025 01:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58J1JpbJ067021; Fri, 19 Sep 2025 01:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58J1JpBf067018; Fri, 19 Sep 2025 01:19:51 GMT (envelope-from git) Date: Fri, 19 Sep 2025 01:19:51 GMT Message-Id: <202509190119.58J1JpBf067018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: f0971db25826 - stable/15 - packages: Use LIB_PACKAGE for zfs and ufs packages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f0971db25826d7e8a969cdd05858122554ca5663 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f0971db25826d7e8a969cdd05858122554ca5663 commit f0971db25826d7e8a969cdd05858122554ca5663 Author: Lexi Winter AuthorDate: 2025-09-11 19:46:26 +0000 Commit: Lexi Winter CommitDate: 2025-09-19 01:17:27 +0000 packages: Use LIB_PACKAGE for zfs and ufs packages Commit f9513c334ff7 moved the shared libraries for ZFS and UFS into separate packages (libzfs and libufs), which resulted in a rather large number of packages being created, e.g. for ZFS: FreeBSD-libzfs FreeBSD-libzfs-dbg FreeBSD-libzfs-dbg-lib32 FreeBSD-libzfs-dev FreeBSD-libzfs-dev-lib32 FreeBSD-libzfs-lib32 FreeBSD-zfs FreeBSD-zfs-dbg FreeBSD-zfs-dbg-lib32 FreeBSD-zfs-dev FreeBSD-zfs-dev-lib32 FreeBSD-zfs-lib32 FreeBSD-zfs-man Use LIB_PACKAGE instead, which significantly reduces the number of packages: FreeBSD-zfs FreeBSD-zfs-dbg FreeBSD-zfs-dbg-lib32 FreeBSD-zfs-dev FreeBSD-zfs-dev-lib32 FreeBSD-zfs-lib FreeBSD-zfs-lib32 FreeBSD-zfs-man MFC after: 3 days Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D52416 (cherry picked from commit 29185c9a26204383270cf96957c685c51f5bc894) --- cddl/lib/libavl/Makefile | 4 +++- cddl/lib/libicp/Makefile | 2 ++ cddl/lib/libnvpair/Makefile | 4 +++- cddl/lib/libspl/Makefile | 4 +++- cddl/lib/libtpool/Makefile | 7 ++++--- cddl/lib/libumem/Makefile | 4 +++- cddl/lib/libuutil/Makefile | 4 +++- cddl/lib/libzdb/Makefile | 4 +++- cddl/lib/libzfs/Makefile | 4 +++- cddl/lib/libzfs_core/Makefile | 3 ++- cddl/lib/libzfsbootenv/Makefile | 2 ++ cddl/lib/libzpool/Makefile | 2 ++ cddl/lib/libzutil/Makefile | 4 +++- lib/libbe/Makefile | 1 + lib/libufs/Makefile | 4 +++- release/packages/ucl/libufs-all.ucl | 8 -------- release/packages/ucl/libzfs-all.ucl | 5 ----- 17 files changed, 40 insertions(+), 26 deletions(-) diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index ce77012def9f..4ce1de20a3d9 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= avl LIBADD= spl SRCS= avl.c diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 8e801246215f..1a9a79103b50 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp PACKAGE= zfs +LIB_PACKAGE= + LIB= icp LIBADD= diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 2d9ef1c7af1e..8245b324688b 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -2,10 +2,12 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/include +PACKAGE= zfs +LIB_PACKAGE= + LIB= nvpair LIBADD= spl -PACKAGE= libzfs # user INCS= libnvpair.h SRCS= libnvpair.c \ diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index d8d997c6f377..26e14ea72b8a 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -4,9 +4,11 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl .PATH: ${SRCTOP}/sys/contrib/openzfs/include +PACKAGE= zfs +LIB_PACKAGE= + LIB= spl LIBADD= -PACKAGE= libzfs SRCS = \ assert.c \ diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 7acf34219a47..3a50a21bf62c 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -1,11 +1,12 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool .PATH: ${SRCTOP}/sys/contrib/openzfs/include +PACKAGE= zfs +LIB_PACKAGE= -LIB= tpool +LIB= tpool SHLIBDIR?= /lib -LIBADD= spl -PACKAGE= libzfs +LIBADD= spl INCS= thread_pool_impl.h SRCS= thread_pool.c diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index 9164ba771fe6..512332275fec 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= umem SRCS= umem.c WARNS?= 3 diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 8c8a786ee039..947e755d4aae 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= uutil SRCS=\ uu_alloc.c \ diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile index 0eb30c55d107..040d7d2c63f9 100644 --- a/cddl/lib/libzdb/Makefile +++ b/cddl/lib/libzdb/Makefile @@ -1,8 +1,10 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb .PATH: ${SRCTOP}/sys/contrib/openzfs/include -LIB= zdb PACKAGE= zfs +LIB_PACKAGE= + +LIB= zdb INCS = libzdb.h diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 40553aa68719..376e32fb893f 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -7,7 +7,9 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= zfs LIBADD= \ avl \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index bac81ca73497..10533c5de05b 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -3,10 +3,11 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs +PACKAGE= zfs +LIB_PACKAGE= LIB= zfs_core LIBADD= nvpair spl zutil -PACKAGE= libzfs INCS= libzfs_core.h SRCS= libzfs_core.c \ diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile index 15ee5bfaeaa4..22f5da1ee5b1 100644 --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -2,6 +2,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/include PACKAGE= zfs +LIB_PACKAGE= + LIB= zfsbootenv SHLIB_MAJOR= 1 diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 4da3840e59f0..82ec0e890d56 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -29,6 +29,8 @@ PICFLAG= -fPIC .endif PACKAGE= zfs +LIB_PACKAGE= + LIB= zpool USER_C = \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index 07ca3b9bc156..37e9e8dd5e63 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -2,9 +2,11 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= zutil LIBADD= avl geom m tpool -PACKAGE= libzfs INCS = zutil_import.h diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index b04becc38d74..3ba456aee4b7 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -3,6 +3,7 @@ SHLIBDIR?= /lib .include PACKAGE= zfs +LIB_PACKAGE= LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile index ab913f834bb3..3b1911d7a5cd 100644 --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,4 +1,6 @@ -PACKAGE= libufs +PACKAGE= ufs +LIB_PACKAGE= + LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 8 diff --git a/release/packages/ucl/libufs-all.ucl b/release/packages/ucl/libufs-all.ucl deleted file mode 100644 index d86a84bbd637..000000000000 --- a/release/packages/ucl/libufs-all.ucl +++ /dev/null @@ -1,8 +0,0 @@ -comment = "Low-level access to UFS filesystems" -desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 74e73673d5cb - stable/15 - packages: Add correct license for zoneinfo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 74e73673d5cbfdef92769e59354ec9c6905a8433 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=74e73673d5cbfdef92769e59354ec9c6905a8433 commit 74e73673d5cbfdef92769e59354ec9c6905a8433 Author: Lexi Winter AuthorDate: 2025-09-11 19:49:09 +0000 Commit: Lexi Winter CommitDate: 2025-09-19 01:17:27 +0000 packages: Add correct license for zoneinfo Source: contrib/tzdata/LICENSE MFC after: 3 days Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D51886 (cherry picked from commit 163f8625c4df3ccdfab0717cf8b8d13a163e22eb) --- release/packages/ucl/zoneinfo-all.ucl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/packages/ucl/zoneinfo-all.ucl b/release/packages/ucl/zoneinfo-all.ucl index 39991bf144e6..ed737c740bee 100644 --- a/release/packages/ucl/zoneinfo-all.ucl +++ b/release/packages/ucl/zoneinfo-all.ucl @@ -1,5 +1,8 @@ comment = "Timezone database" + desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 00ae91fa64a1 - stable/15 - packages: Add meta-package sets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 00ae91fa64a10c7c0b1edcea466b0b2ba97cb0cc Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=00ae91fa64a10c7c0b1edcea466b0b2ba97cb0cc commit 00ae91fa64a10c7c0b1edcea466b0b2ba97cb0cc Author: Lexi Winter AuthorDate: 2025-09-12 20:59:25 +0000 Commit: Lexi Winter CommitDate: 2025-09-19 01:17:27 +0000 packages: Add meta-package sets Add several metapackages which contain no files themselves, but depend on other packages. This allows the user to install a system by using a set like "FreeBSD-set-minimal" instead of having to know which specific packages are required, and it means if we add more package in the future, existing installations will get them automatically as long as they were installed using a set. The defined sets are significantly less granular than the actual packages; the assumption is that users who want a very specific set of packages installed can do that manually, while sets are intended more for typical users who just want to install FreeBSD. The following sets are defined: * minimal: the set of packages required to boot the system and bring up a multi-user UNIX system. This includes hardware support, networking (wireless, DHCP), basic functionality like syslogd, cron and periodic. It does not include a kernel, because the kernels are quite large and the user might want to use a custom kernel. sendmail and DMA are not included in minimal. Since we provide two MTAs, the user should select which one they want, or install one from ports. sshd is not included because it's not required for the base system, and the user might want to install it from ports. Some other significant subsystems (e.g. NFS, Kerberos) are also not included. The minimal set does not include any libraries itself, since we rely on dependencies to pull these in. This implies it doesn't include library manpages, which is fine, since users won't want manpages for libraries unless they've also installed the development packages. * devel: the compiler toolchain for building software, along with all "-dev" packages which include header files and static libraries. * lib32: 32-bit compatibility packages. This includes both runtime and development packages. * kernels: the kernel packages. For freebsd.org builds, this will be GENERIC, GENERIC-DEBUG, etc., for custom builds it will be whatever was set in $KERNCONF. * base: everything else; this includes the entire base system. For each set, also generate a -dbg set containing the debug packages for the set. The sets are built along with the rest of the packages using a new script called create-sets.sh, which examines the "set" annotation in each package and puts it in the appropriate set. This is in anticipation of the later "groups" feature appearing in pkg itself, at which point we can simply replace the set annotation with the group. MFC after: 3 days Reviewed by: imp, bapt Differential Revision: https://reviews.freebsd.org/D52412 (cherry picked from commit 66f36c3686762d9a6e48b0453fc7221be36a0eb8) --- Makefile.inc1 | 30 +++++++++- release/packages/create-sets.sh | 45 ++++++++++++++ release/packages/generate-set-ucl.lua | 96 ++++++++++++++++++++++++++++++ release/packages/generate-ucl.lua | 34 +++++++++++ release/packages/set-template.ucl | 15 +++++ release/packages/sets/base-dbg.ucl | 16 +++++ release/packages/sets/base.ucl | 16 +++++ release/packages/sets/devel-dbg.ucl | 13 ++++ release/packages/sets/devel.ucl | 13 ++++ release/packages/sets/kernels-dbg.ucl | 6 ++ release/packages/sets/kernels.ucl | 6 ++ release/packages/sets/lib32-dbg.ucl | 6 ++ release/packages/sets/lib32.ucl | 6 ++ release/packages/sets/minimal-dbg.ucl | 6 ++ release/packages/sets/minimal.ucl | 6 ++ release/packages/template.ucl | 33 +++++++--- release/packages/ucl/README | 21 +++++++ release/packages/ucl/at-all.ucl | 4 ++ release/packages/ucl/bmake-all.ucl | 5 ++ release/packages/ucl/bootloader-all.ucl | 4 ++ release/packages/ucl/caroot-all.ucl | 4 ++ release/packages/ucl/certctl-all.ucl | 4 ++ release/packages/ucl/clang-all.ucl | 4 ++ release/packages/ucl/clibs-all.ucl | 5 ++ release/packages/ucl/cron-all.ucl | 4 ++ release/packages/ucl/ctf-tools-all.ucl | 5 ++ release/packages/ucl/devd-all.ucl | 5 ++ release/packages/ucl/devmatch-all.ucl | 11 +++- release/packages/ucl/dhclient-all.ucl | 5 ++ release/packages/ucl/dtb-all.ucl | 5 ++ release/packages/ucl/fetch-all.ucl | 10 +++- release/packages/ucl/firmware-iwm-all.ucl | 10 +++- release/packages/ucl/fwget-all.ucl | 10 +++- release/packages/ucl/geom-all.ucl | 11 +++- release/packages/ucl/hyperv-tools-all.ucl | 10 +++- release/packages/ucl/inetd-all.ucl | 9 ++- release/packages/ucl/kernel-all.ucl | 5 ++ release/packages/ucl/lld-all.ucl | 4 ++ release/packages/ucl/lldb-all.ucl | 4 ++ release/packages/ucl/locales-all.ucl | 5 ++ release/packages/ucl/mtree-all.ucl | 5 ++ release/packages/ucl/newsyslog-all.ucl | 10 +++- release/packages/ucl/nuageinit-all.ucl | 5 ++ release/packages/ucl/periodic-all.ucl | 11 +++- release/packages/ucl/pkg-bootstrap-all.ucl | 11 +++- release/packages/ucl/ppp-all.ucl | 5 ++ release/packages/ucl/rc-all.ucl | 11 +++- release/packages/ucl/rdma-all.ucl | 3 + release/packages/ucl/rescue-all.ucl | 11 +++- release/packages/ucl/resolvconf-all.ucl | 11 +++- release/packages/ucl/runtime-all.ucl | 10 +++- release/packages/ucl/runtime.ucl | 1 + release/packages/ucl/syslogd-all.ucl | 10 +++- release/packages/ucl/toolchain-all.ucl | 5 ++ release/packages/ucl/ufs-all.ucl | 5 ++ release/packages/ucl/utilities-all.ucl | 5 ++ release/packages/ucl/vi-all.ucl | 10 +++- release/packages/ucl/vt-data-all.ucl | 5 ++ release/packages/ucl/wpa-all.ucl | 5 ++ release/packages/ucl/zfs-all.ucl | 5 ++ release/packages/ucl/zoneinfo-all.ucl | 4 ++ 61 files changed, 619 insertions(+), 40 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 98059640daab..97a0b00cc517 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2097,6 +2097,14 @@ create-packages-world: _pkgbootstrap _repodir .PHONY DESTDIR=${WSTAGEDIR} \ PKG_VERSION=${PKG_VERSION} create-world-packages +.ORDER: create-packages-world create-packages-sets +.ORDER: create-packages-kernel create-packages-sets +create-packages-sets: _pkgbootstrap _repodir .PHONY + ${_+_}@cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 \ + DESTDIR=${WSTAGEDIR} \ + PKG_VERSION=${PKG_VERSION} create-sets-packages + create-packages-kernel: _pkgbootstrap _repodir .PHONY ${_+_}@cd ${.CURDIR}; \ ${MAKE} -f Makefile.inc1 \ @@ -2109,6 +2117,8 @@ create-packages-kernel-repo: .PHONY create-packages-kernel sign-packages create-packages-world-repo: .PHONY create-packages-world sign-packages +create-packages-sets-repo: .PHONY create-packages-sets sign-packages + create-packages-source: _pkgbootstrap _repodir .PHONY ${_+_}@cd ${.CURDIR}; \ ${MAKE} -f Makefile.inc1 \ @@ -2117,7 +2127,7 @@ create-packages-source: _pkgbootstrap _repodir .PHONY SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ create-source-packages -create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source +create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source create-packages-sets create-source-src-package: _pkgbootstrap .PHONY rm -f ${SSTAGEDIR}/src.plist 2>/dev/null || : @@ -2214,6 +2224,24 @@ create-world-package-${pkgname}: .PHONY -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} .endfor +create-sets-packages-jobs: .PHONY create-sets-packages +create-sets-packages: .PHONY + @echo "==> Creating set metapackages." + sh "${SRCDIR}/release/packages/create-sets.sh" "${SRCDIR}" \ + "${WSTAGEDIR}" "${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}" \ + VERSION "${PKG_VERSION}" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + PKG_WWW "${PKG_WWW}" + @for manifest in ${WSTAGEDIR}/set-*.ucl; do \ + echo "--> Processing manifest: $$manifest"; \ + ${PKG_CMD} -o ABI=${PKG_ABI} -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ + -M $$manifest \ + -o "${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}" \ + || exit 1; \ + done + _default_flavor= -default .if make(*package*) && exists(${KSTAGEDIR}/kernel.meta) . if ${MK_DEBUG_FILES} != "no" diff --git a/release/packages/create-sets.sh b/release/packages/create-sets.sh new file mode 100755 index 000000000000..6c034834672e --- /dev/null +++ b/release/packages/create-sets.sh @@ -0,0 +1,45 @@ +#! /bin/sh + +# Generate metapackage sets. We do this by examining the annotations field +# of the packages we previously built. + +set -e + +if [ $# -lt 3 ]; then + printf >&2 'usage: %s \n' "$0" + exit 1 +fi + +srcdir="$1"; shift +wstagedir="$1"; shift +repodir="$1"; shift +# Everything after the first three arguments is UCL variables we pass to +# generate-set-ucl.lua. +UCL_VARS="$@" + +for pkg in "$repodir"/*.pkg; do + # If the package name doesn't containing a '-', then it's + # probably data.pkg or packagesite.pkg, which are not real + # packages. + { echo "$pkg" | grep -q '-'; } || continue + + set -- $(pkg query -F "$pkg" '%At %n %Av' | grep '^set ') + pkgname="$2" + set="$3" + SETS="$SETS $set" + setvar="$(echo "$set" | tr - _)" + eval PKGS_${setvar}=\"\$PKGS_${setvar} $pkgname\" +done + +for set in $(echo $SETS | tr ' ' '\n' | sort | uniq); do + setvar="$(echo "$set" | tr - _)" + eval deps=\"\$PKGS_${setvar}\" + + "${srcdir}/release/packages/generate-set-ucl.lua" \ + "${srcdir}/release/packages/set-template.ucl" \ + PKGNAME "$set" \ + SET_DEPENDS "$deps" \ + UCLFILES "${srcdir}/release/packages/sets" \ + $UCL_VARS \ + > "${wstagedir}/set-${set}.ucl" +done diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua new file mode 100755 index 000000000000..b1b70053b02a --- /dev/null +++ b/release/packages/generate-set-ucl.lua @@ -0,0 +1,96 @@ +#!/usr/libexec/flua + +--[[ usage: +generare-set-ucl.lua