From nobody Tue Apr 23 07:12:01 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNtbQ0MwXz5JcqQ for ; Tue, 23 Apr 2024 07:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNtbQ04mVz3y2t; Tue, 23 Apr 2024 07:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713856322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LK6ds4HMom1VsHdoHTEAgDLpN8qMg3J4tMJaGX2es2E=; b=b1oxNMEgotPA+jzpMm5PvUqbty2/IJGhqAtJe+G+0NOYoCoJBcJuK4iBFzFFRiNJi+dXbr tl+pUKSAm6nnmLLPfwEUitMR3ZJbJbQKhsM/QdQLuKQh+Z4EN9WSxreK/oQ2NW/TYRil8D YJBsJ3SUH01+8zCxYc9nUW9pN/UIXTNL/iSTRsmt/7terQ4svPlCrNgmvnuJo73EVW4iNj K6zcQ7mJLHYqUZ9dQCs8aCW7WVt9h6HjJGbh0bfEHDpUw1bMooeI8OM50/1ZTPOBYV6aye Y7fKe3IASbwcPmJNL+3cadR0dSGlKEyLno6KJXfYYIOhyy2lTjWxhbZTs9HHwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713856322; a=rsa-sha256; cv=none; b=QOl1HBOE8bJgUzS0xEhmd8xKRu+yXoRZ7MtGCEThJYxEi9c8HF0n7/XpCTnChbfTw1IXfO 2X0YdBccnJKer0mvUgEzuZqR7y4v1WfY0s5JYMYJQQZuLpMS12X6u8SDjwFHOomGPr30xT DniVr73P3s6Hz8YotzIUhoIMIKgyclCL6NiWmo7tL2HW3NQeqCxAMC1AN7fijcjmq83VQI zW+OxAsDwSlzuOcuJ8VvYOwTNuyqCdv9CeFE555uB2/MQLroudJB+lnkDM5vDaldKXvBmz 5yVmbnAsZQaDgnH9DwcgXpIi1ZNE6oTGAhnH4GaEnE/Lc46DCdsMOJNks791mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713856322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LK6ds4HMom1VsHdoHTEAgDLpN8qMg3J4tMJaGX2es2E=; b=KmOlOwUpgk41HsE8y30bXudRt50u82qaX2fnX2tOENDcgWA1+0RfRIy1KY8FJnJeXKjv1/ bVyvtQ9F2HkR2sy4uidnDuPtiUrcY/2juEVAmH3rywADb7uDqCEIkUUmViaDI8asMgEGlv 7M15h0BvAFw7eWhM80epZ4PDl62FLqRB/MsaUp8OjQnp7SzECwpTwNGnFam+IjKiLtTA/S Jhkis2VbGhi6LatQ/bsVJZtc99HTmg7TijOlp3dkQSPJB1HyqCVTh/u5ujZ4qXkwreHvWp ze8+j3ZIkwXAIIMmfiSgK62LCxhxcoPlCNpgcjWRLVD/nKiVfPdQJdsVCh9/lg== 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 4VNtbP6nTtzMRR; Tue, 23 Apr 2024 07:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N7C1d9000283; Tue, 23 Apr 2024 07:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N7C1Km000280; Tue, 23 Apr 2024 07:12:01 GMT (envelope-from git) Date: Tue, 23 Apr 2024 07:12:01 GMT Message-Id: <202404230712.43N7C1Km000280@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Matthew Seaman Subject: git: 2b8ce0b409 - main - Extend my pgp key validity for another year List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b8ce0b409784368b40a4e0989d7c4c5ebfe4b65 Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/doc/commit/?id=2b8ce0b409784368b40a4e0989d7c4c5ebfe4b65 commit 2b8ce0b409784368b40a4e0989d7c4c5ebfe4b65 Author: Matthew Seaman AuthorDate: 2024-04-23 07:11:35 +0000 Commit: Matthew Seaman CommitDate: 2024-04-23 07:11:35 +0000 Extend my pgp key validity for another year --- documentation/static/pgpkeys/matthew.key | 652 ++++++++++++++++--------------- 1 file changed, 333 insertions(+), 319 deletions(-) diff --git a/documentation/static/pgpkeys/matthew.key b/documentation/static/pgpkeys/matthew.key index cb81fef0f3..03f43e9edb 100644 --- a/documentation/static/pgpkeys/matthew.key +++ b/documentation/static/pgpkeys/matthew.key @@ -2,15 +2,16 @@ [.literal-block-margin] .... -pub rsa4096/036F6C9EE7F39EBF 2013-09-29 [SC] [expires: 2024-04-23] +pub rsa4096/036F6C9EE7F39EBF 2013-09-29 [SC] [expires: 2025-04-23] Key fingerprint = 72CF AC21 79BC B024 B5B5 4590 036F 6C9E E7F3 9EBF uid Matthew Seaman uid Matthew Seaman -sub rsa4096/5D0DFEAF7BFB01B4 2013-09-29 [E] [expires: 2024-04-23] -sub rsa4096/BB23AF518E1A4013 2013-10-06 [S] [expires: 2024-04-23] -sub rsa4096/E527EC985DBEA0A8 2013-10-06 [E] [expires: 2024-04-23] -sub rsa4096/00513F10E0A9E4E7 2013-10-06 [S] [expires: 2024-04-23] -sub rsa4096/0AC81803C8520138 2013-10-06 [E] [expires: 2024-04-23] +uid Matthew Seaman +sub rsa4096/5D0DFEAF7BFB01B4 2013-09-29 [E] [expires: 2025-04-23] +sub rsa4096/BB23AF518E1A4013 2013-10-06 [S] [expires: 2025-04-23] +sub rsa4096/E527EC985DBEA0A8 2013-10-06 [E] [expires: 2025-04-23] +sub rsa4096/00513F10E0A9E4E7 2013-10-06 [S] [expires: 2025-04-23] +sub rsa4096/0AC81803C8520138 2013-10-06 [E] [expires: 2025-04-23] .... @@ -96,19 +97,19 @@ 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 @@ -175,76 +176,140 @@ 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 @@ -258,126 +323,126 @@ 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 @@ -391,115 +456,64 @@ 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 -YcU4tt4= -=JMpH +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 +qDyTPHOehU7NfSZoh9+SkoeOS6XEmw697Q== +=b+Ft -----END PGP PUBLIC KEY BLOCK----- .... From nobody Wed Apr 24 10:41:49 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPbC244Q1z5H4nw for ; Wed, 24 Apr 2024 10:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPbC21mM1z46rt; Wed, 24 Apr 2024 10:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713955310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxXOunVgO/D8Q8rgG1lVD+h53tYS4xfPGKFgx5o+0B4=; b=uofHu3CCVZBbsJ/3LA/ERmswPXfwlqMz9kOrp3A7XntP3bevUZg1pNxj3LR+NF2OAV0AQs E0BYAWaAJt82TOzOX63f+Mk7yU8kLLbQoMd/j1LPw74m22NYxEK1UbB4NcOVsKLyD9Uavl vNLY4W/8Ej4L535saCt9MHI23yc5GmMSXQ3IgB3s7KGlrSGCcLoAU8vKUaMsQvfaPkd9gx 7NTKVKkRc6/VyFPmuQ9sg5yqziCwMTkNOq/RLEqnwC87KYIJ2PLBkxAmEbKCSzQQW7oSWn Y7SUUo3b/Y+ufM7PGeRaurLCakXaoX3P7cj04dQNW/dLpwxr/ZxBgZFvwWDdYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713955310; a=rsa-sha256; cv=none; b=sNB9SrED/R5ZpktukuhNGJTkVFHgHA/D5tczlgf7mjM/k7hOm7ZuYABYihMRj4ubHxdquO /1GSHpravQ6FeeWAptwhR9gKkZWE9EVWTrbiSiCLTK4cQz7bKqNAKscCshDm9MI/jggKXt YWCh22qTeufGzi3KlsKQGGD70kVQCDX9QFTYoSFn9rl+tz5SwwObRh0EXemVHkVRfsLUST ieAKnEcolK65lJAgQPQqbGN5O3BMBOuCJMDBnb0KYxNbL/j0LR43S+sxGxIs5q2GQM2CsF hg40Al8GKXJggUqXfE+efr7ZP2zc0DBzsED1eSRr7JUc+F1eQfJhLWc0ZmBvtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713955310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xxXOunVgO/D8Q8rgG1lVD+h53tYS4xfPGKFgx5o+0B4=; b=pX4qrvh70uxeF8B3Zh8lsVORh+WIQ6+bFkc3tAiC3O4aKATmhnCuBBxyIjoEklLwF/gr1T y4tUx/uyi2/HYnRnNPxmi4mHd17UyX6FXcH3q6jGh09XuSjJ/12g+vK5SIFxacShBG/Nbt i4bDJbpMDm6bCUVqYbKh67B3Zq4rIl5oEh+s5CTlATU+wQliIXUqcW49g/8fETnh3oHJMv BnooWExLG0DytaTBTdwCQ+IfnjSePhzyADQtdDu4G+sNbjI6svaBWebGBox+MavYJ2tSqx 8N+sXbydD7SZ/H3O9A21am0Z3NyffmjdQfRzteojlsW7ZLaAPQWW2Yps7f4uyQ== 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 4VPbC16C0nz1BlB; Wed, 24 Apr 2024 10:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OAfni0096314; Wed, 24 Apr 2024 10:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OAfnDN096311; Wed, 24 Apr 2024 10:41:49 GMT (envelope-from git) Date: Wed, 24 Apr 2024 10:41:49 GMT Message-Id: <202404241041.43OAfnDN096311@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: 980d2c57df - main - Status/2024Q1/libsys.adoc: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 980d2c57df3c5842a282fa57a3bc7ee4a4f031fe Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/doc/commit/?id=980d2c57df3c5842a282fa57a3bc7ee4a4f031fe commit 980d2c57df3c5842a282fa57a3bc7ee4a4f031fe Author: Brooks Davis AuthorDate: 2024-04-24 10:39:45 +0000 Commit: Lorenzo Salvadore CommitDate: 2024-04-24 10:39:45 +0000 Status/2024Q1/libsys.adoc: Add report Reviewed by: status (Pau Amma ) Pull Request: https://github.com/freebsd/freebsd-doc/pull/372 --- .../en/status/report-2024-01-2024-03/libsys.adoc | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/website/content/en/status/report-2024-01-2024-03/libsys.adoc b/website/content/en/status/report-2024-01-2024-03/libsys.adoc new file mode 100644 index 0000000000..46275eb7aa --- /dev/null +++ b/website/content/en/status/report-2024-01-2024-03/libsys.adoc @@ -0,0 +1,41 @@ +=== libsys + +Contact: Brooks Davis + +The libsys project removes direct system calls from [.filename]#libc.so# and [.filename]#libpthread.so# (aka [.filename]#libthr.so#) to a separate [.filename]#libsys.so#. +This will: + + * Isolate language runtimes from the details of system call implementations. + * Better support logging and replay frameworks for systems calls. + * Support elimination of the ability to make system calls outside trusted code in the runtime linker and `libsys`. + +This work was initially inspired by a compartmentalization prototype in CheriBSD in 2016. +Ali Mashtizadeh and Tal Garfinkel picked that work up and attempted to upstream it (link:https://reviews.freebsd.org/D14609[D14609]). +Unfortunately we could not figure out how to review and land the massive reorganization required through a phabricator review so it languished. +Last year the CHERI project once again found a need for system call separation in a new library-based compartmentalization framework in CheriBSD so I rebuilt the patch from scratch, committing dozens of `libc` cleanups along the way. +I landed the first batch of changes on February 5th. +Since then I have made a number of refinements to the way we link `libsys` as well as which symbols are provided in which library. + +Thanks to mailto:kib@FreeBSD.org[Konstantin Belousov] for many rounds of review and feedback as well as runtime linker fixes. +Thanks to mailto:markj@FreeBSD.org[Mark Johnston] for runtime linker debugging and mailto:dim@FreeBSD.org[Dimitry Andric] for sanitizer fixes. +Thanks also to everyone who reported bugs and helped debug issues. + +==== Known issues (as of the end of the reporting period) + + * The `libsys` ABI is not yet considered stable (it is safe to assume `__sys_foo()` will be supported so language runtimes can use it now). + * Programs using the address sanitizer must be linked with `-lsys` (resolved in base at publication time). + +==== TODO + + * Add a [.filename]#libsys.h#. (See link:https://reviews.freebsd.org/D44387[D44387] and other reviews in the stack.) + * Update man:intro[2] for `libsys`. + * Finalize the ABI. + I am likely to reduce the set of `_` (underscore) prefixed symbols we expose. + * MFC the existence of `libsys`? It is not clear this is practical, but it might be possible to MFC something useful for language runtimes. + +==== Help wanted + + * Port language runtimes that do not use `libc` to use `libsys` for system calls rather than rolling their own interfaces. + * Explore limitations on where system calls can be made similar to OpenBSD's link:https://man.openbsd.org/OpenBSD-7.3/msyscall[msyscall(2)] (now obsolete) and link:https://man.openbsd.org/pinsyscalls[pinsyscalls(2)] (not an obvious match to our `libsys`). + +Sponsor: AFRL, DARPA From nobody Wed Apr 24 12:37:12 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPdm92CBJz5HGpl for ; Wed, 24 Apr 2024 12:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPdm86qzfz4HS7; Wed, 24 Apr 2024 12:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713962233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6r8xj0MZXu5cvWm9N3zPxoWLXeCC+SgXnboIngjR05c=; b=IMENg0tnmP07IG/7nqx/3VR9KqBVk+ABe9s+j9HldKUiApr8U2pEkzSQUwZV+dUdiXw2gx 5uIdHpcoqemx/9Yau+/Ztd6cRMMBsBXcltXb0wAvZO9A3O3imurYxmFC3yyqNuzzCHijvQ 3aluJyLk/h4Og8HCMF4ZV2hdo5Gbg/YmR2LSlANxFkkguQWDJqA7yyLxNv//uToTGZTClM XGbw1aKZ6OlyKF9cihTezjvGl52wNHVINRXNgWXn/IuZ4caY2P2LfkaCqeis/U/XvYJtXV 00a9asxUkHXSIGvpK3OIHjliY1W6jhOSFKf5aYCSLFVHe+MhCrVf4ms1HqRAyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713962233; a=rsa-sha256; cv=none; b=VC+RfGvQC/ncSzDrBICz8rgcpGs5QbO9JAiwAAp+x50FiYo8cRvjgJvJRYhzq7cPvTJRE2 E4CHk6O/+VmjAQ5LojHHThU7B4/dhiO5u7BMjb9A8mJzUXsUEel9qh5+zUPpAtiseopuEZ U//5f04ye/32QomT9fBgkCreUolp0m6hmzdF+/gLFjwI+sAkKsOrA6Kh9cCxpTb61q6/G4 r+v8wjFkUcCKs8lxuA/JJd5aXGgmV5dvBMvXo2faBKwoIfGwTazQ6qim8FnvAikaAjp8TN jCbIt7MRFN2dSN1r4EQ1BoighSpR25+zK/Rj0/Vnluk6CpRS7XAb20aHegZODw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713962233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6r8xj0MZXu5cvWm9N3zPxoWLXeCC+SgXnboIngjR05c=; b=CoKcv6zcwnH0LgUDrK0LcfvvitkfDYBczTe+Bxx3Kro4/ZOfqxreKZPUR5dWETGTEdGU8x Xry4XNGwnNN0yjpbLItxO1Ru+zPhSfUhhu0bQZZZl95ZSV44i5+Alh4OrwsE7UFnRrJy9U L9h59AT7gGANTX9+GDKyrqAGMvC7cPjkvr51jkRk/QmJ5GqYG0yxEXj+tcmgeIyTTg+BcW sP+ITP3qBQavBtf1HEBfdIHElaPdM0cO0dLtApMTZzSBVC6z3pS6AeLeSMllsbYs2I78T1 QiPBs48OGTl08lAjRARC6tB9lO3fTrynpvPhEJLcZTEZEkj5hTKMnYcLauE1wg== 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 4VPdm85dcXzFbk; Wed, 24 Apr 2024 12:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OCbC1X085305; Wed, 24 Apr 2024 12:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OCbCYv085302; Wed, 24 Apr 2024 12:37:12 GMT (envelope-from git) Date: Wed, 24 Apr 2024 12:37:12 GMT Message-Id: <202404241237.43OCbCYv085302@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: 9a189acbc2 - main - Status/2024Q1/freebsd-foundation.adoc: Minor fixes List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a189acbc28e39db674c2c82dac54edd0a31d782 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/doc/commit/?id=9a189acbc28e39db674c2c82dac54edd0a31d782 commit 9a189acbc28e39db674c2c82dac54edd0a31d782 Author: Lorenzo Salvadore AuthorDate: 2024-04-24 12:36:09 +0000 Commit: Lorenzo Salvadore CommitDate: 2024-04-24 12:36:09 +0000 Status/2024Q1/freebsd-foundation.adoc: Minor fixes - Consistent lists - Use mailto macros --- .../report-2024-01-2024-03/freebsd-foundation.adoc | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/website/content/en/status/report-2024-01-2024-03/freebsd-foundation.adoc b/website/content/en/status/report-2024-01-2024-03/freebsd-foundation.adoc index baa8322c0e..87cf09e0a1 100644 --- a/website/content/en/status/report-2024-01-2024-03/freebsd-foundation.adoc +++ b/website/content/en/status/report-2024-01-2024-03/freebsd-foundation.adoc @@ -16,11 +16,11 @@ We are 100% supported by donations from individuals and corporations and those i * Software development projects to implement features and functionality in FreeBSD * Sponsor and organize conferences and developer summits to provide collaborative opportunities and promote FreeBSD -* Purchase and support of hardware to improve and maintain FreeBSD infrastructure, -* Resources to improve security, quality assurance, and continuous integration efforts. -* Materials and staff needed to promote, educate, and advocate for FreeBSD. -* Collaboration between commercial vendors and FreeBSD developers. -* Representation of the FreeBSD Project in executing contracts, license agreements, and other legal arrangements that require a recognized legal entity. +* Purchase and support of hardware to improve and maintain FreeBSD infrastructure +* Resources to improve security, quality assurance, and continuous integration efforts +* Materials and staff needed to promote, educate, and advocate for FreeBSD +* Collaboration between commercial vendors and FreeBSD developers +* Representation of the FreeBSD Project in executing contracts, license agreements, and other legal arrangements that require a recognized legal entity ==== Operations We kicked off the new year with ambitious goals to help move the FreeBSD Project forward by identifying features and functionality to support in the operating system and increasing our advocacy efforts to increase and expand the visibility of FreeBSD. @@ -35,13 +35,13 @@ During the first quarter of 2024, 180 src, 65 ports, and 18 doc tree commits ide Three new projects began this quarter. * Work began to improve FreeBSD's audio stack and provide audio developers with useful tools and frameworks to make sound development on FreeBSD easier. - Read more in Christos Margiolis's (christos@'s) <<_audio_stack_improvements,Audio Stack Improvements>> report entry. + Read more in mailto:christos@FreeBSD.org[Christos Margiolis] <<_audio_stack_improvements,Audio Stack Improvements>> report entry. -* Olivier Certner (olce@) began his second contract with the Foundation, and this time around, the main goal is to make unionfs stable and useful on FreeBSD. +* mailto:olce@FreeBSD.org[Olivier Certner] began his second contract with the Foundation, and this time around, the main goal is to make unionfs stable and useful on FreeBSD. Other work may include revamping VFS lookups, improving out-of-memory handling, implementing a notification system for en-masse detection of filesystem changes such as inotify, and improving console usability. * This quarter, a new project to add hierarchical rate limits to the OpenZFS file system began. - Pawel Dawidek (pjd@) will add support for limits that will be configurable, similar to quotas, but would limit the number of read/write operations and read/write bandwidth. + mailto:pjd@FreeBSD.org[Pawel Dawidek] will add support for limits that will be configurable, similar to quotas, but would limit the number of read/write operations and read/write bandwidth. Six projects continued this quarter. @@ -52,15 +52,15 @@ Six projects continued this quarter. * A new joint project began between Advanced Micro Devices (AMD) and The FreeBSD Foundation to develop a complete FreeBSD AMD IOMMU driver. This work will allow FreeBSD to fully support greater than 256 cores with features such as CPU mapping and will also include bhyve integration. - For those interested in the technical details, follow Konstantin Belousov's (kib@'s) commits tagged with Sponsored by fields for Advanced Micro Devices (AMD) and The FreeBSD Foundation. + For those interested in the technical details, follow mailto:kib@FreeBSD.org[Konstantin Belousov] commits tagged with Sponsored by fields for Advanced Micro Devices (AMD) and The FreeBSD Foundation. * Refer to Pierre Pronchery's <<_graphical_installer_for_freebsd,Graphical Installer for FreeBSD>> report entry to read about the status of FreeBSD's new graphical installer. * Work continues to port the Vector Packet Processor (VPP) to FreeBSD. VPP is an open-source, high-performance user space networking stack that provides fast packet processing suitable for software-defined networking and network function virtualization applications. - Look for a pending article from the developer working on the project, Tom Jones (thj@), that details the experience of porting VPP to FreeBSD. + Look for a pending article from the developer working on the project, mailto:thj@FreeBSD.org[Tom Jones], that details the experience of porting VPP to FreeBSD. -* Björn Zeeb (bz@) and Cheng Cui (cc@) continue their wireless work. +* mailto:bz@FreeBSD.org[Björn Zeeb] and mailto:cc@FreeBSDd.org[Cheng Cui] continue their wireless work. This quarter was mostly focused on bug fixes and stability improvements to LinuxKPI 802.11 and net80211. Much of this work made it into the 13.3 release. @@ -93,11 +93,11 @@ As a community, every conversation we have with people outside the BSD communiti To this end, the Foundation is working on a FreeBSD Impact Report that will aggregate the core and often mission critical role FreeBSD plays in society, from embedded systems powered by QNX, to payments and check processing, to digital entertainment, internet and cybersecurity infrastructure. -Our community is stepping up in innumerable ways, including to make sure FreeBSD supports industry-standard containerized workloads - check out the link:https://github.com/opencontainers/wg-freebsd-runtime[Open Container Initiative FreeBSD runtime extension working group]. +Our community is stepping up in innumerable ways, including to make sure FreeBSD supports industry-standard containerized workloads -- check out the link:https://github.com/opencontainers/wg-freebsd-runtime[Open Container Initiative FreeBSD runtime extension working group]. The recently-opened hardware vendor support survey will feed into a hardware support guide that reflects the collective experience of all respondents that is intended to help everyone identify hardware vendors that prioritize FreeBSD; it will also help focus Partnerships' outreach on the priority vendors. -To close, please *TELL THE WORLD YOU USE FREEBSD AND WHY. There is no wrong way to do this* - put it on your blog, on your favorite social media channel, list FreeBSD on your company’s Open Source page, contact the Foundation about a Case Study, etc. +To close, please *TELL THE WORLD YOU USE FREEBSD AND WHY. There is no wrong way to do this* -- put it on your blog, on your favorite social media channel, list FreeBSD on your company’s Open Source page, contact the Foundation about a Case Study, etc. link:https://www.stormshield.com/news/a-short-history-of-open-source/[Stormshield, a leading cybersecurity company based in Europe, provides a great example of how vendors that use FreeBSD can do this]. The footer of their blogs says: "A strong supporter of Open Source, Stormshield is an active member (and sponsor) of the FreeBSD community...Whenever we modify Open Source software, make patches or add features, we offer them to the community for inclusion." @@ -107,16 +107,17 @@ We welcomed link:https://freebsdfoundation.org/blog/kim-mcmahon-to-join-freebsd- Just some of our expanded Q1 efforts to support FreeBSD are below. * Began work planning the on the link:https://freebsdfoundation.org/news-and-events/event-calendar/may-2024-freebsd-developer-summit/[May 2024 FreeBSD Developer Summit], co-located with BSDCan, taking place May 29-30, 2024 in Ottawa, Canada -* Introduced FreeBSD to new and returning folks at link:https://stateofopencon.com/soocon-2024/[State of Open Con 24] in London, UK, February 6-7, 2024. -* Held an Introduction to FreeBSD half-day workshop and staffed a booth at link:https://www.socallinuxexpo.org/scale/21x[SCaLE21x], which took place March 14-17, 2024 in Pasadena, CA. Thanks to Gordon Tetlow for his help with the workshop. -* The Foundation team also worked on a common message on the improvement and benefits of FreeBSD to ensure consistency between the FreeBSD Foundation and Core Team. +* Introduced FreeBSD to new and returning folks at link:https://stateofopencon.com/soocon-2024/[State of Open Con 24] in London, UK, February 6-7, 2024 +* Held an Introduction to FreeBSD half-day workshop and staffed a booth at link:https://www.socallinuxexpo.org/scale/21x[SCaLE21x], which took place March 14-17, 2024 in Pasadena, CA. + Thanks to Gordon Tetlow for his help with the workshop +* The Foundation team also worked on a common message on the improvement and benefits of FreeBSD to ensure consistency between the FreeBSD Foundation and Core Team * Members of the Foundation team served as Administrators for the 2024 Google Summer of Code. This year marks the 20th anniversary of Google Summer of Code and the 20th year that the link:https://freebsdfoundation.org/blog/the-freebsd-project-participating-in-google-summer-of-code-2024-2/[FreeBSD Project was accepted as a mentoring organization]. - The Project received 23 applications from prospective interns. + The Project received 23 applications from prospective interns * Provided an link:https://freebsdfoundation.org/blog/freebsd-13-3-whats-new-and-how-did-we-get-here/[overview of FreeBSD 13.x] including the 13.3 release * Worked on the final report of the 2024 FreeBSD Community Survey. - Be on the lookout for the report at the end of April. -* In partnership with Innovate UK and Digital Security by Design (DSbD), the Foundation held the first annual link:https://www.globenewswire.com/news-release/2024/04/03/2856691/0/en/FreeBSD-Foundation-and-Digital-Security-by-Design-DSbD-Announce-Beacon-Award-Winners-for-Innovations-and-Improvements-to-CheriBSD.html[Digital Security by Design (DSbD) Ecosystem Beacon Awards] to celebrate innovators working with and enhancing CheriBSD. + Be on the lookout for the report at the end of April +* In partnership with Innovate UK and Digital Security by Design (DSbD), the Foundation held the first annual link:https://www.globenewswire.com/news-release/2024/04/03/2856691/0/en/FreeBSD-Foundation-and-Digital-Security-by-Design-DSbD-Announce-Beacon-Award-Winners-for-Innovations-and-Improvements-to-CheriBSD.html[Digital Security by Design (DSbD) Ecosystem Beacon Awards] to celebrate innovators working with and enhancing CheriBSD * Published numerous blogs including: ** link:https://freebsdfoundation.org/blog/what-makes-the-freebsd-governance-model-successful/[What Makes the FreeBSD Governance Model Successful] ** link:https://freebsdfoundation.org/blog/guiding-the-future-of-freebsd-releases-colin-percival-the-new-release-engineering-team-lead/[Guiding the future of FreeBSD releases: Colin Percival, the new Release Engineering Team Lead] @@ -124,8 +125,8 @@ Just some of our expanded Q1 efforts to support FreeBSD are below. ** link:https://freebsdfoundation.org/news-and-events/latest-news/the-cybersecurity-battle-has-come-to-hardware/[The Cybersecurity Battle Has Come to Hardware] ** link:https://freebsdfoundation.org/news-and-events/latest-news/ampere-in-the-wild-how-freebsd-employs-ampere-arm64-servers-in-the-data-center/[Ampere in the Wild: How FreeBSD Employs Ampere Arm64 Servers in the Data Center] ** link:https://freebsdfoundation.org/news-and-events/latest-news/isas-and-the-dawning-hardware-security-revolution/[ISAs and the Dawning Hardware Security Revolution] -** Published the link:https://freebsdfoundation.org/news-and-events/newsletter/march-2024-foundation-update/[March 2024 FreeBSD Update] with a new look. -** Released the link:https://freebsdfoundation.org/past-issues/freebsd-14-0/[November/December 2023] and link:https://freebsdfoundation.org/past-issues/networking-10th-anniversary/[January/February 2024] issues of the FreeBSD Journal now with HTML versions of the articles. +** Published the link:https://freebsdfoundation.org/news-and-events/newsletter/march-2024-foundation-update/[March 2024 FreeBSD Update] with a new look +** Released the link:https://freebsdfoundation.org/past-issues/freebsd-14-0/[November/December 2023] and link:https://freebsdfoundation.org/past-issues/networking-10th-anniversary/[January/February 2024] issues of the FreeBSD Journal now with HTML versions of the articles ==== Fundraising Thank you to everyone who gave us a financial contribution last quarter to help fund our work to support the Project. From nobody Wed Apr 24 14:52:53 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPhmj6SQSz5Hl7b for ; Wed, 24 Apr 2024 14:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPhmj5qmxz4bfC; Wed, 24 Apr 2024 14:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713970373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUI9AS+XGGoZCzaNTzchmx3KrYDm0l/HUG7pSMmKGng=; b=lv7fbynn2dzlBrpKPCwFUNpECqPGaukEfNv5DSzUeTWKbQkV8t2bRTufLtIyXjijJeaII7 8Pe0BA9ty7M4EESAq4H7KqAsXydDpa0IBn1umif32SdDR+3DzQZgt8NT46C0woHW6BDpN+ 7yGpT9laE7BMkwdXGH//g3L+zCdW3PYcLaxq9JnaCcjq62t7oIHoLy3R2HwDCh5pzRcyRz fM11NxhB4DLjuP0zJbJ+W9K0ZVgB1w5GmARjq8Y1sWMjgBeYOIIe9v4oME3FDjjRVx821f 8MMZoNIkvpzCzehWEY0fv0lB6w1Via9bqDZzFHnOxLrjeO1+Un9WPw4SFKulkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713970373; a=rsa-sha256; cv=none; b=Kjjm/9BusRfVAXh8HlLrBq+o7ajBCZt5lYLip6uXzCyOFKRk0pAPYq/AzV3upYRDvH9iTB S0gltHe2UB4TjBnR//DWO9Dxd/SFW0vKc3aFEo2t/qyYFXdnqdUdIr9jzwPaVX7Wtw02hv rsMubEtvA8HmjjqdiAwR+PWnT9tBFNadUPRI1qcXBhfI/XkQI0gwJ6rU2qmWvFKGXb820X w+T/K/FNbu07wZYUCRKDJx0yYiR+gK02b41SQzj9V1c3yQl4UHKFA03jCWZDw9nt2IewiA vX1cEAAws5HTdT3Hbrk0r/HThVfrHhgbKi3XwmCxIA/cdZipi7xChATgQnr28w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713970373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUI9AS+XGGoZCzaNTzchmx3KrYDm0l/HUG7pSMmKGng=; b=RpEgtHfYpJ1ZYuB10f/nCWaI+Fjix1vVAItfSNHGzMK23p5Cl8ngPLUInNW1umSjDyMKiG b+jdeCizzXXtnMHRTYoajC0BhmjjfJ4rizyK1csLK1SuFsSmSt5YWBLt8zCAHdCG3jrF55 zqeBTWg6nrm26ve391DuAXY/ZzMHJVwA97DaICXOwOAbu/Xq4oLtOz1J86jVebMbSQGms1 Bcd6NRGhPBPG5HR+ylzi+iPZ64Cw1RdbqDmr9UoF02/LHaUQxR0/yf5QXFGx5g0G+2UmbZ 1JDrrGpW5OjqNP7Kf56f5G+BF06S/BAjhZgR+LV2XwFDikWqKKeEUYD+qRWssA== 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 4VPhmj5QpmzKNN; Wed, 24 Apr 2024 14:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OEqrpC022456; Wed, 24 Apr 2024 14:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OEqrv5022453; Wed, 24 Apr 2024 14:52:53 GMT (envelope-from git) Date: Wed, 24 Apr 2024 14:52:53 GMT Message-Id: <202404241452.43OEqrv5022453@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: 4637351256 - main - Status/2024Q1/portmgr.adoc: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46373512563e22ddcbc134fe8015bab9675afa45 Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/doc/commit/?id=46373512563e22ddcbc134fe8015bab9675afa45 commit 46373512563e22ddcbc134fe8015bab9675afa45 Author: Tobias C. Berner AuthorDate: 2024-04-24 14:51:30 +0000 Commit: Lorenzo Salvadore CommitDate: 2024-04-24 14:52:09 +0000 Status/2024Q1/portmgr.adoc: Add report Reviewed by: status (Pau Amma ) --- .../en/status/report-2024-01-2024-03/portmgr.adoc | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/website/content/en/status/report-2024-01-2024-03/portmgr.adoc b/website/content/en/status/report-2024-01-2024-03/portmgr.adoc new file mode 100644 index 0000000000..f8a65f4472 --- /dev/null +++ b/website/content/en/status/report-2024-01-2024-03/portmgr.adoc @@ -0,0 +1,59 @@ +=== Ports Collection + +Links: + +link:https://www.FreeBSD.org/ports/[About FreeBSD Ports] URL:link:https://www.FreeBSD.org/ports/[] + +link:https://docs.freebsd.org/en/articles/contributing/#ports-contributing[Contributing to Ports] URL: link:https://docs.freebsd.org/en/articles/contributing/#ports-contributing[] + +link:https://www.freebsd.org/portmgr/[Ports Management Team] URL: link:https://www.freebsd.org/portmgr/[] + +link:http://ftp.freebsd.org/pub/FreeBSD/ports/ports/[Ports Tarball] URL: link:http://ftp.freebsd.org/pub/FreeBSD/ports/ports/[] + +Contact: Tobias C. Berner + +Contact: FreeBSD Ports Management Team + +The Ports Management Team is responsible for overseeing the overall direction of the Ports Tree, building packages, and personnel matters. +Below is what happened in the last quarter. + +According to INDEX, there are currently 32,244 ports in the Ports Collection. +There are currently ~3,300 open ports PRs. +The last quarter saw 12,991 commits by 158 committers on the main branch and 888 commits by 61 committers on the 2024Q1 branch. +Compared to last quarter, this means a large increase in the number of commits on the main branch (up from 9,424) and slightly more backports to the quarterly branch (up from 781). +The number of ports also increased (up from 31,942). + +In Q1 there were around 14,127 commits to main: +The most active committers were: +2934 sunpoet +2676 bofh +1297 yuri +748 eduardo +545 jbeich +347 arrowd +233 diizzy +195 yasu +170 ehaupt +164 wen + +A lot has happened in the ports tree in the last quarter, an excerpt of the major software upgrades are: +- pkg 1.21.0 +- New USES: ocaml +- Default version of gcc switched to 13 +- Default version of ruby switched to 3.2 +- Default version of lazarus switched to 3.2.0 +- Default version of go switched to 1.21 +- Chromium updated to 123.0.6312.105 +- Electron-28 updated to 28.2.10 +- Electron-27 updated to 27.3.9 +- Firefox updated to 124.0.2 +- Firefox-esr updated to 115.9.1 +- KDE updated to Frameworks 5 5.115, Frameworks 6 to 6.0.0 Plasma Desktop 5 to 5.27.11, Plasma Desktop 6 to 6.0.2 +- Qt5 updated to 5.15.13 +- Qt6 updated to 6.6.3 +- Python updated to 3.11.9, 3.10.14 and 3.8.10 +- Ruby updated to 3.2.3 +- Rust updated to 1.77.0 +- SDL updated to 2.30.2 +- Sway updated to 1.9 +- wlroots updated to 1.17.2 +- Wine updated to 9.0 +- Xorg server updated to 0.17.2 + + +During the last quarter, pkgmgr@ ran 17 exp-runs to test various ports upgrades, updates to default versions of ports, subpackage support and base system changes. From nobody Wed Apr 24 20:26:13 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VPr9K3lnxz5J35t for ; Wed, 24 Apr 2024 20:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPr9K3YSGz4LCP; Wed, 24 Apr 2024 20:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HR/OZcgMhZhDI6L33SEBvb+GTi2F8hDuDR3kcji7+Io=; b=jNvHbXEFlL65/S5fFrX1GAD0/mBiEUyrhTaQK0rphOBXraoKMZb/WbdaFyx+Rp62xlM7J9 lsmJx3wI/5CtCPFqckxe7nBt2dR76kzeokIt0nDbel3Sk4wEPWXzQz+m3NOuqAUNL09lnK rV+ppOiQ2X6gszyXHe5v5H4NKz7JXywsX2rW5NUQUyTmCyGHaZ+D0wser/caRi4Uy0ABFy /3UhgIJZLj74+/o+NUuyjwgB+XqFoVq1WsELvYtWxGZPL56PD8yX2aM2KjYVNrGmaccZ6M zwT1kLxFoceijkSK5zWqzTBvD+8I7gHeq7IOjtKPBx00jlVjPWvvPG6NgSJH7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713990373; a=rsa-sha256; cv=none; b=Y9AHw4Kb3E+qTNJKAYwBSN/pNdN2OzGrL6yisXS9AbwwYdwEinYs0MTG1SkWs2JH16KR7E fJNOCI4KV7hQRvTsqlMB+yKnMDFPXPx9aWG27H86MyCyZqovOQzuLEzi/+FM3ufHW98Dae FrwIrBY/5YTE5pOx1S+2RXWch6B3sI+T6evm0y6HNinARv+cEiqG0VmcjVBwcVgkyRAlOk Gkh5X4YG8JwFY/5WYAMyvwvZDo2UR2xEpw7lPHRZT9HB68e1PCWcl98V4NUQCTLropqyFp P1ZQmvDVXvhXWKhrKomZf86+V8Os/KFBi51YQiHfzxyZSyOUMqvJ6qG9hS/Lfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713990373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HR/OZcgMhZhDI6L33SEBvb+GTi2F8hDuDR3kcji7+Io=; b=QytBMruZ2QchN8tJnUqHpzXq2YASgCsfCa6TQLjS1kWRbmxZgMT37lTGY3lIb7kvIdpJke J7TkzndokVPtZFsvQprK0n1aELWyNTZXftVoXwesfJYdx1naH5T9UoC393BQUVCWiEuiWr c40lp2twhFsOGPh8/ErwznwjvxpXUdZSbgTBxYc7fd7EtxyCCSu6xVNjgYgHtUOB2FKCX9 QTZseo0UyxyQ4W1+FUlgAFo25jX0NMd0Sc7uNPbXDP0ml8ddg65gnPJEafCWUAQXQ3o5oe eHingY+2GgKEeHScaC6yfeVyR1sJ3KPeh9G4shvnSDVQMSsOJeVzHaU/1FSWOw== 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 4VPr9K2yZNzVqm; Wed, 24 Apr 2024 20:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43OKQDMh082349; Wed, 24 Apr 2024 20:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OKQDrC082346; Wed, 24 Apr 2024 20:26:13 GMT (envelope-from git) Date: Wed, 24 Apr 2024 20:26:13 GMT Message-Id: <202404242026.43OKQDrC082346@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Gordon Tetlow Subject: git: f5973f2e90 - main - Add EN-24:09. List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5973f2e90e430ed97d65de8dd5230f6c4405f0d Auto-Submitted: auto-generated The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/doc/commit/?id=f5973f2e90e430ed97d65de8dd5230f6c4405f0d commit f5973f2e90e430ed97d65de8dd5230f6c4405f0d Author: Gordon Tetlow AuthorDate: 2024-04-24 20:25:48 +0000 Commit: Gordon Tetlow CommitDate: 2024-04-24 20:25:48 +0000 Add EN-24:09. Approved by: so --- website/data/security/errata.toml | 4 + .../security/advisories/FreeBSD-EN-24:09.zfs.asc | 144 ++++++++++ website/static/security/patches/EN-24:09/zfs.patch | 316 +++++++++++++++++++++ .../static/security/patches/EN-24:09/zfs.patch.asc | 16 ++ 4 files changed, 480 insertions(+) diff --git a/website/data/security/errata.toml b/website/data/security/errata.toml index 50d0a89e3a..702576a943 100644 --- a/website/data/security/errata.toml +++ b/website/data/security/errata.toml @@ -1,6 +1,10 @@ # Sort errata notices by year, month and day # $FreeBSD$ +[[notices]] +name = "FreeBSD-EN-24:09.zfs" +date = "2024-04-24" + [[notices]] name = "FreeBSD-EN-24:08.kerberos" date = "2024-03-28" diff --git a/website/static/security/advisories/FreeBSD-EN-24:09.zfs.asc b/website/static/security/advisories/FreeBSD-EN-24:09.zfs.asc new file mode 100644 index 0000000000..3a3b203d3a --- /dev/null +++ b/website/static/security/advisories/FreeBSD-EN-24:09.zfs.asc @@ -0,0 +1,144 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +============================================================================= +FreeBSD-EN-24:09.zfs Errata Notice + The FreeBSD Project + +Topic: High CPU usage by kernel threads related to ZFS + +Category: contrib +Module: zfs +Announced: 2024-04-24 +Affects: FreeBSD 13.3 +Corrected: 2024-04-12 13:00:11 UTC (stable/13, 13-STABLE) + 2024-04-24 20:21:10 UTC (releng/13.3, 13.3-RELEASE-p2) + +For general information regarding FreeBSD Errata Notices and Security +Advisories, including descriptions of the fields above, security +branches, and the following sections, please visit +. + +I. Background + +ZFS is an advanced and scalable file system originally developed by Sun +Microsystems for its Solaris operating system. ZFS was integrated as part of +the FreeBSD starting with FreeBSD 7.0, and it has since become a prominent +and preferred choice for storage management. + +II. Problem Description + +Because ZFS may consume large amounts of RAM to cache various types of +filesystem objects, it continuously monitors system RAM available to decide +whether to shrink its caches. Some caches are shrunk using a dedicated +thread, to which work is dispatched asynchronously. + +In some cases, the cache shrinking logic may dispatch excessive amounts of +work to the "ARC pruning" thread, causing it to continue attempting to shrink +caches even after resource shortages are resolved. + +III. Impact + +The bug manifests as a kernel thread, "arc_prune", consuming 100% of a CPU core +for indefinite periods, even while the system is otherwise idle. This behavior +also impacts workloads running on the system, by reducing available CPU +resources and by triggering lock contention in the kernel, in particular with +the "vnlru" process whose function is to recycle vnodes (structures representing +files, whether opened or cached), a mechanism frequently triggered by intensive +filesystem workloads. + +IV. Workaround + +No workaround is available. Systems not using ZFS are unaffected. + +V. Solution + +Upgrade your system to a supported FreeBSD stable or release / security branch +(releng) dated after the correction date. A reboot is required following the +upgrade. + +Perform one of the following: + +1) To update your system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the amd64 or arm64 platforms, +or the i386 platform on FreeBSD 13 and earlier, can be updated via +the freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install +# reboot + +2) To update your system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +# fetch https://security.FreeBSD.org/patches/EN-24:09/zfs.patch +# fetch https://security.FreeBSD.org/patches/EN-24:09/zfs.patch.asc +# gpg --verify zfs.patch.asc + +b) Apply the patch. Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +c) Recompile your kernel as described in + and reboot the +system. + +VI. Correction details + +This issue is corrected as of the corresponding Git commit hash or Subversion +revision number in the following stable and release branches: + +Branch/path Hash Revision +- ------------------------------------------------------------------------- +stable/13/ 330954bdb822 stable/13-n257698 +releng/13.3/ 266b3bd3f26d releng/13.3-n257432 +- ------------------------------------------------------------------------- + +Run the following command to see which files were modified by a +particular commit: + +# git show --stat + +Or visit the following URL, replacing NNNNNN with the hash: + + + +To determine the commit count in a working tree (for comparison against +nNNNNNN in the table above), run: + +# git rev-list --count --first-parent HEAD + +VII. References + +See problem reports + and +. + +See also the previous, similar errata notice issued for FreeBSD 14.0: +. + +The latest revision of this advisory is available at + +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmYpapQACgkQbljekB8A +Gu8gBxAAiuUNqeGaKNQ1XbV0kSucwnae5uOrQmthHQBY98PJJKUZpm1RTt/FnBB7 +qPxEY5vFRcGgZ43GVlnmfmH/EmqOg6WPpsgKfdq1XTy/ERU815JOsD+wKUWa/9Ia +g67pnl8HPMSF5eZ1FreWfzNsWmxakiDLg2VXtFx7x3+qocifD/WwGvDTjdDBzzyK ++cIrBqvTlbOCRdHzl49wmNLz46ha5bmxTb7MzXB3jIQ1v+PZ71biyQxBZTrZgR6S +La8oVe4Kj2lJTJw5S2xvsoyo5PzqmPCyD1m22fzgKTyaAUCXiioUUQDuFTxu9rhW +I3lSvqdIRw28yRFjGslxlq9x1vShQTw3ILcH31ucxKUNow7hlDz4Ow2NzqXhSjxN +RMGamxLTA5BcNCR4/DexAjfeh6OKnCG7n0ntlhxI0LWGr4ceT3/ySck7xhCNCSm1 +Ze/Gf9/j4+zR2jyauRANkITPkVHUV79/Sgjn1IlcMDLpzegH+QfQsX6CosG5uSWS +UlpK2hhCv2g3lE7XuBItz7E/8i5Nx9RZgnh047Nj3ZB/6dCauAeUYKnY5X3xJa5X +OKJWIGyJAyrCoFIg+LdBS47ggg8wswyyb1XBF2rZgZNqVmzZrJd7lBV/sjDaEC1H +13lHhIIwtpTagDAT1Nbji++IT+2DatjhLZnMQwvALno0tIE19mg= +=IgLQ +-----END PGP SIGNATURE----- diff --git a/website/static/security/patches/EN-24:09/zfs.patch b/website/static/security/patches/EN-24:09/zfs.patch new file mode 100644 index 0000000000..48e3e06a44 --- /dev/null +++ b/website/static/security/patches/EN-24:09/zfs.patch @@ -0,0 +1,316 @@ +--- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h.orig ++++ sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h +@@ -52,7 +52,7 @@ + extern const struct file_operations zpl_dir_file_operations; + + /* zpl_super.c */ +-extern void zpl_prune_sb(int64_t nr_to_scan, void *arg); ++extern void zpl_prune_sb(uint64_t nr_to_scan, void *arg); + + extern const struct super_operations zpl_super_operations; + extern const struct export_operations zpl_export_operations; +--- sys/contrib/openzfs/include/sys/arc.h.orig ++++ sys/contrib/openzfs/include/sys/arc.h +@@ -81,7 +81,7 @@ + typedef void arc_read_done_func_t(zio_t *zio, const zbookmark_phys_t *zb, + const blkptr_t *bp, arc_buf_t *buf, void *priv); + typedef void arc_write_done_func_t(zio_t *zio, arc_buf_t *buf, void *priv); +-typedef void arc_prune_func_t(int64_t bytes, void *priv); ++typedef void arc_prune_func_t(uint64_t bytes, void *priv); + + /* Shared module parameters */ + extern int zfs_arc_average_blocksize; +--- sys/contrib/openzfs/include/sys/arc_impl.h.orig ++++ sys/contrib/openzfs/include/sys/arc_impl.h +@@ -994,7 +994,6 @@ + + extern void arc_lowmem_init(void); + extern void arc_lowmem_fini(void); +-extern void arc_prune_async(int64_t); + extern int arc_memory_throttle(spa_t *spa, uint64_t reserve, uint64_t txg); + extern uint64_t arc_free_memory(void); + extern int64_t arc_available_memory(void); +--- sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c.orig ++++ sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c +@@ -51,11 +51,6 @@ + #include + #include + +-#if __FreeBSD_version >= 1300139 +-static struct sx arc_vnlru_lock; +-static struct vnode *arc_vnlru_marker; +-#endif +- + extern struct vfsops zfs_vfsops; + + uint_t zfs_arc_free_target = 0; +@@ -151,53 +146,6 @@ + return (MAX(allmem * 5 / 8, size)); + } + +-/* +- * Helper function for arc_prune_async() it is responsible for safely +- * handling the execution of a registered arc_prune_func_t. +- */ +-static void +-arc_prune_task(void *arg) +-{ +- int64_t nr_scan = (intptr_t)arg; +- +-#ifndef __ILP32__ +- if (nr_scan > INT_MAX) +- nr_scan = INT_MAX; +-#endif +- +-#if __FreeBSD_version >= 1300139 +- sx_xlock(&arc_vnlru_lock); +- vnlru_free_vfsops(nr_scan, &zfs_vfsops, arc_vnlru_marker); +- sx_xunlock(&arc_vnlru_lock); +-#else +- vnlru_free(nr_scan, &zfs_vfsops); +-#endif +-} +- +-/* +- * Notify registered consumers they must drop holds on a portion of the ARC +- * buffered they reference. This provides a mechanism to ensure the ARC can +- * honor the arc_meta_limit and reclaim otherwise pinned ARC buffers. This +- * is analogous to dnlc_reduce_cache() but more generic. +- * +- * This operation is performed asynchronously so it may be safely called +- * in the context of the arc_reclaim_thread(). A reference is taken here +- * for each registered arc_prune_t and the arc_prune_task() is responsible +- * for releasing it once the registered arc_prune_func_t has completed. +- */ +-void +-arc_prune_async(int64_t adjust) +-{ +- +-#ifndef __LP64__ +- if (adjust > INTPTR_MAX) +- adjust = INTPTR_MAX; +-#endif +- taskq_dispatch(arc_prune_taskq, arc_prune_task, +- (void *)(intptr_t)adjust, TQ_SLEEP); +- ARCSTAT_BUMP(arcstat_prune); +-} +- + uint64_t + arc_all_memory(void) + { +@@ -248,10 +196,6 @@ + { + arc_event_lowmem = EVENTHANDLER_REGISTER(vm_lowmem, arc_lowmem, NULL, + EVENTHANDLER_PRI_FIRST); +-#if __FreeBSD_version >= 1300139 +- arc_vnlru_marker = vnlru_alloc_marker(); +- sx_init(&arc_vnlru_lock, "arc vnlru lock"); +-#endif + } + + void +@@ -259,12 +203,6 @@ + { + if (arc_event_lowmem != NULL) + EVENTHANDLER_DEREGISTER(vm_lowmem, arc_event_lowmem); +-#if __FreeBSD_version >= 1300139 +- if (arc_vnlru_marker != NULL) { +- vnlru_free_marker(arc_vnlru_marker); +- sx_destroy(&arc_vnlru_lock); +- } +-#endif + } + + void +--- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c.orig ++++ sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +@@ -2097,6 +2097,26 @@ + #endif + } + ++#if __FreeBSD_version >= 1300139 ++static struct sx zfs_vnlru_lock; ++static struct vnode *zfs_vnlru_marker; ++#endif ++static arc_prune_t *zfs_prune; ++ ++static void ++zfs_prune_task(uint64_t nr_to_scan, void *arg __unused) ++{ ++ if (nr_to_scan > INT_MAX) ++ nr_to_scan = INT_MAX; ++#if __FreeBSD_version >= 1300139 ++ sx_xlock(&zfs_vnlru_lock); ++ vnlru_free_vfsops(nr_to_scan, &zfs_vfsops, zfs_vnlru_marker); ++ sx_xunlock(&zfs_vnlru_lock); ++#else ++ vnlru_free(nr_to_scan, &zfs_vfsops); ++#endif ++} ++ + void + zfs_init(void) + { +@@ -2123,11 +2143,23 @@ + dmu_objset_register_type(DMU_OST_ZFS, zpl_get_file_info); + + zfsvfs_taskq = taskq_create("zfsvfs", 1, minclsyspri, 0, 0, 0); ++ ++#if __FreeBSD_version >= 1300139 ++ zfs_vnlru_marker = vnlru_alloc_marker(); ++ sx_init(&zfs_vnlru_lock, "zfs vnlru lock"); ++#endif ++ zfs_prune = arc_add_prune_callback(zfs_prune_task, NULL); + } + + void + zfs_fini(void) + { ++ arc_remove_prune_callback(zfs_prune); ++#if __FreeBSD_version >= 1300139 ++ vnlru_free_marker(zfs_vnlru_marker); ++ sx_destroy(&zfs_vnlru_lock); ++#endif ++ + taskq_destroy(zfsvfs_taskq); + zfsctl_fini(); + zfs_znode_fini(); +--- sys/contrib/openzfs/module/os/linux/zfs/arc_os.c.orig ++++ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c +@@ -491,57 +491,6 @@ + } + #endif /* _KERNEL */ + +-/* +- * Helper function for arc_prune_async() it is responsible for safely +- * handling the execution of a registered arc_prune_func_t. +- */ +-static void +-arc_prune_task(void *ptr) +-{ +- arc_prune_t *ap = (arc_prune_t *)ptr; +- arc_prune_func_t *func = ap->p_pfunc; +- +- if (func != NULL) +- func(ap->p_adjust, ap->p_private); +- +- zfs_refcount_remove(&ap->p_refcnt, func); +-} +- +-/* +- * Notify registered consumers they must drop holds on a portion of the ARC +- * buffered they reference. This provides a mechanism to ensure the ARC can +- * honor the arc_meta_limit and reclaim otherwise pinned ARC buffers. This +- * is analogous to dnlc_reduce_cache() but more generic. +- * +- * This operation is performed asynchronously so it may be safely called +- * in the context of the arc_reclaim_thread(). A reference is taken here +- * for each registered arc_prune_t and the arc_prune_task() is responsible +- * for releasing it once the registered arc_prune_func_t has completed. +- */ +-void +-arc_prune_async(int64_t adjust) +-{ +- arc_prune_t *ap; +- +- mutex_enter(&arc_prune_mtx); +- for (ap = list_head(&arc_prune_list); ap != NULL; +- ap = list_next(&arc_prune_list, ap)) { +- +- if (zfs_refcount_count(&ap->p_refcnt) >= 2) +- continue; +- +- zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); +- ap->p_adjust = adjust; +- if (taskq_dispatch(arc_prune_taskq, arc_prune_task, +- ap, TQ_SLEEP) == TASKQID_INVALID) { +- zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); +- continue; +- } +- ARCSTAT_BUMP(arcstat_prune); +- } +- mutex_exit(&arc_prune_mtx); +-} +- + /* BEGIN CSTYLED */ + ZFS_MODULE_PARAM(zfs_arc, zfs_arc_, shrinker_limit, INT, ZMOD_RW, + "Limit on number of pages that ARC shrinker can reclaim at once"); +--- sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c.orig ++++ sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c +@@ -334,7 +334,7 @@ + } + + void +-zpl_prune_sb(int64_t nr_to_scan, void *arg) ++zpl_prune_sb(uint64_t nr_to_scan, void *arg) + { + struct super_block *sb = (struct super_block *)arg; + int objects = 0; +--- sys/contrib/openzfs/module/zfs/arc.c.orig ++++ sys/contrib/openzfs/module/zfs/arc.c +@@ -868,6 +868,8 @@ + static void l2arc_hdr_arcstats_update(arc_buf_hdr_t *hdr, boolean_t incr, + boolean_t state_only); + ++static void arc_prune_async(uint64_t adjust); ++ + #define l2arc_hdr_arcstats_increment(hdr) \ + l2arc_hdr_arcstats_update((hdr), B_TRUE, B_FALSE) + #define l2arc_hdr_arcstats_decrement(hdr) \ +@@ -6521,6 +6523,56 @@ + kmem_free(p, sizeof (*p)); + } + ++/* ++ * Helper function for arc_prune_async() it is responsible for safely ++ * handling the execution of a registered arc_prune_func_t. ++ */ ++static void ++arc_prune_task(void *ptr) ++{ ++ arc_prune_t *ap = (arc_prune_t *)ptr; ++ arc_prune_func_t *func = ap->p_pfunc; ++ ++ if (func != NULL) ++ func(ap->p_adjust, ap->p_private); ++ ++ zfs_refcount_remove(&ap->p_refcnt, func); ++} ++ ++/* ++ * Notify registered consumers they must drop holds on a portion of the ARC ++ * buffers they reference. This provides a mechanism to ensure the ARC can ++ * honor the metadata limit and reclaim otherwise pinned ARC buffers. ++ * ++ * This operation is performed asynchronously so it may be safely called ++ * in the context of the arc_reclaim_thread(). A reference is taken here ++ * for each registered arc_prune_t and the arc_prune_task() is responsible ++ * for releasing it once the registered arc_prune_func_t has completed. ++ */ ++static void ++arc_prune_async(uint64_t adjust) ++{ ++ arc_prune_t *ap; ++ ++ mutex_enter(&arc_prune_mtx); ++ for (ap = list_head(&arc_prune_list); ap != NULL; ++ ap = list_next(&arc_prune_list, ap)) { ++ ++ if (zfs_refcount_count(&ap->p_refcnt) >= 2) ++ continue; ++ ++ zfs_refcount_add(&ap->p_refcnt, ap->p_pfunc); ++ ap->p_adjust = adjust; ++ if (taskq_dispatch(arc_prune_taskq, arc_prune_task, ++ ap, TQ_SLEEP) == TASKQID_INVALID) { ++ zfs_refcount_remove(&ap->p_refcnt, ap->p_pfunc); ++ continue; ++ } ++ ARCSTAT_BUMP(arcstat_prune); ++ } ++ mutex_exit(&arc_prune_mtx); ++} ++ + /* + * Notify the arc that a block was freed, and thus will never be used again. + */ diff --git a/website/static/security/patches/EN-24:09/zfs.patch.asc b/website/static/security/patches/EN-24:09/zfs.patch.asc new file mode 100644 index 0000000000..52cdb325ff --- /dev/null +++ b/website/static/security/patches/EN-24:09/zfs.patch.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEthUnfoEIffdcgYM7bljekB8AGu8FAmYpapUACgkQbljekB8A +Gu+L3BAA1EBD3O+tAqKg9W8MvPihcNkHCVX5gDvY9p/xiN6nmo7JQsdNmoycZVjF +R07XpgAtuQ0mfw4fy/FvgAy4EK1q/SjQC/ON3zu78Hph610F2wabGW5p6qbotYl2 +P/msYGFPDqUgtw1SjVzXHKYRYjQnhQqbr2SIpH7ekOej65TiWuQSsRcl0YIQrjia +RfeH6faIXUyjNnDrlu2L71GY9XxiWR3FGXTfnXWbguz17kuWctCxT8UMfVGRoLa+ +yxzPX1cVgEW86lDtlvlnPbymR4rohGPrGlmLdHJdwY0H855ff0kQrreQzcfNYf7Y +xu/yxj51CF+ima7o8auDGPxGFzy3zkD5GQsLw2QoXG+Ad4EY4ZiaKYryqK7zug6Q +V8Im3PPx2CXHXXs3FmVYA+RVMHJo79zlDEwE450bRfTaj/NzRUlO62v6jqpUjayr +2pFVYwIyECm/qNddKY/4j/hMCjp11/H1co5uqFvXDWUfyVQB3iXHl5wjjyTdO8xw +DS9dRtNAUiCxgOHgz6k0U9C6gi6Xh8NNLE9QSU3CWpFWuTgrzIwAXYoCryg/c7J+ +17M6DnK0NN9z3ScehrVT4QgPPzxp5ziLhY84ZJ8qpCPsYV7ZR/rU9Yc/+mT5N3SE +QcJehAsEQUJjHL7EhkML61emj8i/avXau95AkCrcmHI5eLy1F+g= +=Q5E+ +-----END PGP SIGNATURE----- From nobody Thu Apr 25 09:23:54 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQ9Qg0zLgz5HB7S for ; Thu, 25 Apr 2024 09:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQ9Qg0TZhz4s5v; Thu, 25 Apr 2024 09:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714037035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWku1tHPPBm4U9syFCUwRgCphJaEI+ffIzi2JD6td3E=; b=Mp4KylXh8fUYCjxS1zJLTUpnaVHfSW2Dx7fqtxyCTJ0RYJ2eVGjzn5tRVHdSQl9pQA7Dlb ziwda8BiyYJ1PZmR/XNefcCHkRBFTdyGp3WDXmy/6UCPkhGyfyRuOqeQ5zrp3e+NQ/uXFB sLMA72qg8AQqaFDggvqdo/ilQZAiU3ahgS2h1wuI4M9bhER78uSEd5EyDduqY8omrZfbPf ZhQKqfQrl0TGI6rXfAPD26SWSBxWpSXGTT1Fet8FoOCeT9eKlZ8th88ntQ7pa0UNQWcdVe HrgKtZzvPu4BtnCOYF3zNKOQ9jG2Thshhle31nF5MH5lONbalQEXwu8E9TF4Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714037035; a=rsa-sha256; cv=none; b=MzESWoDMr3/s/XipRp6I0Q1rFRslWqBfep2scLXMh7h/te7E5zFdmXsgyXHnpmRBfahZgp TJEEXVAkY8xI8qaWsbOSwlQVx9EsLiqG9LhjwXtmlCOZOoDKk8yw5gwp4c7bFpNNAhaK/K DblUzczC5uQCjAVRQOTShMT//sthK6g9qqea6dzTiNzUhl+q2aAaCCKIFHb2dxu6SbwpxL TWqo7YW7Fe0I1oSCqOp1hADN78Gnm41LNZQwitttaoT1oJbeaI3mh9O2Zuhpf80y0XV6BV a+O+AgSmhgOyg6FnqgXgOeCALsbOFejcQteMV9Pp6emK5RQVFZ5usokRGxZsfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714037035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oWku1tHPPBm4U9syFCUwRgCphJaEI+ffIzi2JD6td3E=; b=ZCekAJK1TtfM5d6T471ZeaWt5oMvcWAzgmwdmEvJZyInGJDJr7sWbzpOOGCIb/nf0hLi+l JNhqW7B82Zl8xSJSd9ZmyrcKMal0YNuAxm8JBY+StPRSolDwuoxlN2jixPBKUyvjPoby4x z/2EKzYR41i2ublxGuHexuG1Cv2vJO4ht74PFMyb+dZHzF6jjGKJ8F2pQdXwOvVxg+iI/l 7DzZVH67Jmy9rGfuBKTYCNf/8Bivq+3MJNRxv1LB2tly+hvRGRJO/Lho1mZXchryK6R4oh CyKMhVCN+buyE9WQru2yKOxHii5HiqpnF48sLiFG46r+EzPWGhjIjAy2SuNJIg== 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 4VQ9Qg04kBztkC; Thu, 25 Apr 2024 09:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43P9NsuD003359; Thu, 25 Apr 2024 09:23:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43P9NsFM003356; Thu, 25 Apr 2024 09:23:54 GMT (envelope-from git) Date: Thu, 25 Apr 2024 09:23:54 GMT Message-Id: <202404250923.43P9NsFM003356@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 6c209a22c6 - main - *: Change net/samba413 to net/samba416 List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c209a22c620f045f46f7c6d7db0d1c1a26fd82a Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/doc/commit/?id=6c209a22c620f045f46f7c6d7db0d1c1a26fd82a commit 6c209a22c620f045f46f7c6d7db0d1c1a26fd82a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-04-25 08:47:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-04-25 09:23:11 +0000 *: Change net/samba413 to net/samba416 --- documentation/content/en/articles/cups/_index.adoc | 2 +- documentation/content/en/articles/cups/_index.po | 2 +- documentation/content/en/books/handbook/network-servers/_index.adoc | 4 ++-- documentation/content/en/books/handbook/network-servers/_index.po | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/content/en/articles/cups/_index.adoc b/documentation/content/en/articles/cups/_index.adoc index d16f8da5de..cc7b52b604 100644 --- a/documentation/content/en/articles/cups/_index.adoc +++ b/documentation/content/en/articles/cups/_index.adoc @@ -181,7 +181,7 @@ Generally, the Windows(R) administrator will run the Windows(R) `Add Printer` wi http://server-name-or-ip:631/printers/printername .... -If one has an older version of Windows(R) without native IPP printing support, then the general means of connecting to a CUPS printer is to use package:net/samba413[] and CUPS together, which is a topic outside the scope of this chapter. +If one has an older version of Windows(R) without native IPP printing support, then the general means of connecting to a CUPS printer is to use package:net/samba416[] and CUPS together, which is a topic outside the scope of this chapter. [[printing-cups-troubleshooting]] == CUPS Troubleshooting diff --git a/documentation/content/en/articles/cups/_index.po b/documentation/content/en/articles/cups/_index.po index 11c5502507..b377aee531 100644 --- a/documentation/content/en/articles/cups/_index.po +++ b/documentation/content/en/articles/cups/_index.po @@ -332,7 +332,7 @@ msgstr "" msgid "" "If one has an older version of Windows(R) without native IPP printing " "support, then the general means of connecting to a CUPS printer is to use " -"package:net/samba413[] and CUPS together, which is a topic outside the scope " +"package:net/samba416[] and CUPS together, which is a topic outside the scope " "of this chapter." msgstr "" diff --git a/documentation/content/en/books/handbook/network-servers/_index.adoc b/documentation/content/en/books/handbook/network-servers/_index.adoc index e0979c9b84..c47585f60f 100644 --- a/documentation/content/en/books/handbook/network-servers/_index.adoc +++ b/documentation/content/en/books/handbook/network-servers/_index.adoc @@ -2471,10 +2471,10 @@ It can be added to non-Microsoft(R) Windows(R) systems by installing the Samba c The protocol allows clients to access shared data and printers. These shares can be mapped as a local disk drive and shared printers can be used as if they were local printers. -On FreeBSD, the Samba client libraries can be installed using the package:net/samba413[] port or package. +On FreeBSD, the Samba client libraries can be installed using the package:net/samba416[] port or package. The client provides the ability for a FreeBSD system to access SMB/CIFS shares in a Microsoft(R) Windows(R) network. -A FreeBSD system can also be configured to act as a Samba server by installing the same package:net/samba413[] port or package. +A FreeBSD system can also be configured to act as a Samba server by installing the same package:net/samba416[] port or package. This allows the administrator to create SMB/CIFS shares on the FreeBSD system which can be accessed by clients running Microsoft(R) Windows(R) or the Samba client libraries. === Server Configuration diff --git a/documentation/content/en/books/handbook/network-servers/_index.po b/documentation/content/en/books/handbook/network-servers/_index.po index 4f7f0a8456..b8922fcdb2 100644 --- a/documentation/content/en/books/handbook/network-servers/_index.po +++ b/documentation/content/en/books/handbook/network-servers/_index.po @@ -5163,7 +5163,7 @@ msgstr "" #: documentation/content/en/books/handbook/network-servers/_index.adoc:2450 msgid "" "On FreeBSD, the Samba client libraries can be installed using the package:" -"net/samba413[] port or package. The client provides the ability for a " +"net/samba416[] port or package. The client provides the ability for a " "FreeBSD system to access SMB/CIFS shares in a Microsoft(R) Windows(R) " "network." msgstr "" @@ -5172,7 +5172,7 @@ msgstr "" #: documentation/content/en/books/handbook/network-servers/_index.adoc:2453 msgid "" "A FreeBSD system can also be configured to act as a Samba server by " -"installing the same package:net/samba413[] port or package. This allows the " +"installing the same package:net/samba416[] port or package. This allows the " "administrator to create SMB/CIFS shares on the FreeBSD system which can be " "accessed by clients running Microsoft(R) Windows(R) or the Samba client " "libraries." From nobody Fri Apr 26 02:05:18 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQbf66Vypz5HJ94 for ; Fri, 26 Apr 2024 02:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQbf65l44z4R9G; Fri, 26 Apr 2024 02:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714097118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rERe5xA83pq4+YeRkaMIViHZF3yOpVfr20IrCeBBmGE=; b=xhZ+8GRnORElKCT5sAsmLxt4Jl4AtMa9f4tBIWeJTDqcBlOBOIQVhuBd/ek9EuDMPveFoF iVLizIZyD57H6sahKvhMZRCO8t5kJPo2Lq0qkg5K1TWHQQOf6jtXX6gKAP2GpAXg8PfBID BNgs7wEMNdv3bMB53DGtQ4YE9zu+qdi7JpuGddZ+QPi41K21lCzk56Z3Vl/GjxKpGJPGBi Qj2LNXKu1TwAAnhjJyT6eNdRr7zd85LQYgsBPtMIIisXjCEr/zHFS0htcvYD4WVFcaUIKi DB5slWYNn/O84qHy6BQQHMZlQrUyoExjpIdxwVggG1Ni9bX/TbJnJHF2S1jFfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714097118; a=rsa-sha256; cv=none; b=obxMxvmkpq0VfJQTFgRDs+tEShjq5BjXCAYrKS+n/FlWJo3MIT8NqxtbpxZ6+worBBqkxr /jDng06qDCmfolBhJU2sk+yH5MdsKUrDNHIB00O4mlc0gzFWoBOKKK0CqzDaoIUpiwBNq2 3d/6DaWiLWcO13f01D9cr/7LanafpjqKTmFGa/A8qY050U7JzBKLCC7kFN9M690IwrBzr/ sPeAFxT6M9H3ofZBkepzmHowHEw90fizpxq/Pzh0KSWeq3AwIW9oVM5QtT24pXJhdmrgl6 rlvk2O6oEg2YjaITy7K0lhzUzj8gNjnPLts7AkmX4MFMPqRy/INgwRXERFPTNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714097118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rERe5xA83pq4+YeRkaMIViHZF3yOpVfr20IrCeBBmGE=; b=GvXcZhCc7cAPoqshTg8eE8Ljn5lVk80g9SJ2cg+UuzxGML8BA4udSem0df3G1xBnrN8kFa /WeMd8VIQS5lxcsmVD/0zUqG3SeZm6wCWU09AkQPqc7Qj1r+mNgLN7Wbq++TWBkYjc9SQT dcGBza2QNS+dGEHIeaTgx0LMQZmXZqh0JDaKqxFqVDeN0szlZK2X34KTYQO8VjyKOEN34X aepJttcqn97+DCBP2XBdzlHFDEFM95btNys29FJqsS5QUvOJMi61QmBp4QijrAnqgYjJX3 n1+NjOV6aTB430K8kHdljeFuZlCc1PqzjjuWBmAmQPMoAD/8SmMSHPzx0+KCJA== 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 4VQbf650YPzP1F; Fri, 26 Apr 2024 02:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43Q25IeW091623; Fri, 26 Apr 2024 02:05:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q25IjB091620; Fri, 26 Apr 2024 02:05:18 GMT (envelope-from git) Date: Fri, 26 Apr 2024 02:05:18 GMT Message-Id: <202404260205.43Q25IjB091620@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Philip Paeps Subject: git: ae77e1cffb - main - Add erratum affecting 13.3R List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae77e1cffb6f42ee9d427704f1950c436742e511 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/doc/commit/?id=ae77e1cffb6f42ee9d427704f1950c436742e511 commit ae77e1cffb6f42ee9d427704f1950c436742e511 Author: Philip Paeps AuthorDate: 2024-04-26 02:03:45 +0000 Commit: Philip Paeps CommitDate: 2024-04-26 02:03:45 +0000 Add erratum affecting 13.3R FreeBSD-EN-24:09.zfs affects 13.3R --- website/content/en/releases/13.3R/errata.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/website/content/en/releases/13.3R/errata.adoc b/website/content/en/releases/13.3R/errata.adoc index d6f4dd3606..cc6ba7d2c7 100644 --- a/website/content/en/releases/13.3R/errata.adoc +++ b/website/content/en/releases/13.3R/errata.adoc @@ -57,6 +57,7 @@ For a list of all FreeBSD CERT security advisories, see https://www.FreeBSD.org/ |Errata |Date |Topic |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-24:06.wireguard.asc[FreeBSD-EN-24:06.wireguard] |28 March 2024 |Insufficient barriers in WireGuard if_wg(4) |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-24:07.clang.asc[FreeBSD-EN-24:07.clang] |28 March 2024 |Clang crash when certain optimization is enabled +|link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-24:09.zfs.asc[FreeBSD-EN-24:09.zfs] |24 April 2024 |High CPU usage by kernel threads related to ZFS |=== [[open-issues]] From nobody Fri Apr 26 15:52:58 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VQy165bgbz5HS2h for ; Fri, 26 Apr 2024 15:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VQy16535nz4kLV; Fri, 26 Apr 2024 15:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714146778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avKlAI5EaxS7Ne8K61a//5yxJ092mL5gvvSHNcfDrII=; b=XPScG/8OACe6O3KlWSgQgSHQPN/rRlDN0Q2/A0a1ypTU6mKklk3kX1o36aNicxIuWZ8j6C EA0/6aopEIdj8cfFmBsrb5VERURwcXyXnk9fsvVGV6kRiuoLyji0JDKkTCJRa9ToOr5uMa GLTtPsUdzHclUVgkLiSjzprKrS4lm28MyfrRchEehAFIxOW1LoL1xX3A7Z/KMXxPUVJago XV1mrNTzmGBIFzja78/bPsFMgDtryN7xzhu1yUhTdkMlIKJT1cmQrLt8+MJT64tOCqoedD cpn0LreEIUg54Spk2/DYbKeV/dzOq362Y14q4nZKw9iYeaO5p9PnsuI1ISPB/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714146778; a=rsa-sha256; cv=none; b=Mq9w51x6NejrFAnanv9n5E9fyIRt61oJkFX5dTigFLnfra6N0gUe6sN2ErNSEVjgvLGtm5 3NSAxMr7my9789JvyQ34Y/3yznRMB9LQliGIuJL6p4Ap1RMAF4N2ClFUvcBS9K7nYaPgam J7DHTChM6UAq8g0kjvouOFLrojvjlja7KAliU4KmdOgH4IXfJH8kd7HvMgZHyUGg5WBuKP mk5BYC0ntJX+S5EDss8ZveSe5HrDTnD5OJjN0wz7LrUAImB16zyzD11y23Y0bdZygKhzm5 APik1oUKA4vs32HfSoiWFDzunukqs/bHT/u8CGUQxL/DCeiab6dkalbo6iY8yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714146778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avKlAI5EaxS7Ne8K61a//5yxJ092mL5gvvSHNcfDrII=; b=ef80RRgynNs/ESDRNV1GDrO2bRyN6T8EmzpeOMMbTn8QU9dL6Cj4HvjZjcRNu1S3oC8Kz8 a/kf9KyV8l+0jn21AEcu2EA1Pa4uzv8LG22UuYpYGlXB9VGG91ajs+LQOMiKagn5m+qqVF dSHrilILT8i0oj4QJkvyCs0KglG41gzJsgRWQn0Z8VSnrLhONvNjk4Wlh8chlXxKD08W++ 8Y83WV/qRtcy2sDOrdPaez4nLW7vuCAcLXgXVLo6GY5WCTZjVqlmVlewFcJkg9aufj9eGk 0bpgNHjbcvXazWEb/RM8fydNaJ4U2cd5rlrbYggdzJza6z4LqVzrGVMn6ppZEA== 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 4VQy164fGYzpmm; Fri, 26 Apr 2024 15:52:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43QFqwhW095274; Fri, 26 Apr 2024 15:52:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QFqwUp095271; Fri, 26 Apr 2024 15:52:58 GMT (envelope-from git) Date: Fri, 26 Apr 2024 15:52:58 GMT Message-Id: <202404261552.43QFqwUp095271@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: 0288c0935a - main - add Ubuntu 24.04 noble manual pages List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0288c0935af1bba91b285fdc48e78c2952eea11c Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=0288c0935af1bba91b285fdc48e78c2952eea11c commit 0288c0935af1bba91b285fdc48e78c2952eea11c Author: Wolfram Schneider AuthorDate: 2024-04-26 15:52:07 +0000 Commit: Wolfram Schneider CommitDate: 2024-04-26 15:52:55 +0000 add Ubuntu 24.04 noble manual pages --- website/content/en/cgi/man.cgi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index 0afb4de294..24c11be53b 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -818,6 +818,7 @@ $manPathDefault = 'FreeBSD 14.0-RELEASE and Ports'; 'Ubuntu 23.10 mantic', "$manLocalDir/Ubuntu-mantic-23.10/man:$manLocalDir/Ubuntu-mantic-23.10/misc", + 'Ubuntu 24.04 noble', "$manLocalDir/Ubuntu-noble-24.04/man:$manLocalDir/Ubuntu-noble-24.04/misc", 'Ubuntu 22.04 jammy', "$manLocalDir/Ubuntu-jammy-22.04/man:$manLocalDir/Ubuntu-jammy-22.04/misc", 'Ubuntu 20.04 focal', "$manLocalDir/Ubuntu-focal-20.04/man:$manLocalDir/Ubuntu-focal-20.04/misc", 'Ubuntu 18.04 bionic', "$manLocalDir/Ubuntu-bionic-18.04/man:$manLocalDir/Ubuntu-bionic-18.04/misc", @@ -1070,7 +1071,7 @@ while ( ( $key, $val ) = each %manPath ) { 'redhat', 'Red Hat 9', 'suse', 'SuSE 11.3', 'debian', 'Debian 12.5.0', - 'ubuntu', 'Ubuntu 22.04 jammy', + 'ubuntu', 'Ubuntu 24.04 noble', 'dragonfly', 'DragonFly 6.4.0', 'centos', 'CentOS 7.9', 'rocky', 'Rocky 9.3', From nobody Fri Apr 26 19:10:40 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VR2PF10Kzz5J3T8 for ; Fri, 26 Apr 2024 19:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VR2PD6k9Dz43wH; Fri, 26 Apr 2024 19:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714158640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPv5r+H3wSciAQuVm9YRoVTyBGzmCbb+MaTOSoG5dvc=; b=tT6EYCjvvn3vrphwnD1mUepxanI//b/ffmifCXx/TIQpXxFh4z9PZYRFamgDrNg7U6u6Ip mBOks8HuarfrRbvkgqSJSXbX7j7BFC030M5uP/bE5NX6cQK5nefR0rCG4ZoOSNkUnvbmg4 V/tMhEdVvXPE6aB11I86yjkJGItVShOLkaPcdnDFwzhCHLmQMkQCMV7TI3gsg0QT/TjMs7 DvpuSIvFDYR4QLMpqnO8caU02WoJkOez/3lnwbXHEDcLv7gquSDb60yJoKiOXfQYF89MzX 1qhRzRSjinKoorLWdDfqZnUfUK7EziGnohz/coQLEkd9rkL+0cJhXEu4PsGR6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714158640; a=rsa-sha256; cv=none; b=J4gl8PFubOoWpJ7Fb0Vc6h5N3nEoTbQk5GaDj+NATO8Q8iotvg7+oX27sYzxvmfy7ZubmQ ECdZRLPVq9gdkOIEZXMJ+gZALwyc8ex1DYBGOs1jB8XNj7rFOw8PV9hoJQHBZHuBOZrMrK lEhswCrH4BGo82tQ5QbE6Dct2c4ZTeKt/dydbZqvNCWgCDIT82VhsCp8VCzuQylk39gKjB FzjBw2q3WyAkMj04pBrNrggWYzPbRJv8pw0hodTvN0hVV2d7MebbA+MqVfQpBNwh4gIbK7 teHT2HRWFzFt3lb3zCR2SeMaO+YgawZzPUPe93J+u8BxoG09zJwXQKOmEx/Zlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714158640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPv5r+H3wSciAQuVm9YRoVTyBGzmCbb+MaTOSoG5dvc=; b=tndqhZBcYg64ImydZoa3FSJPiD2B5XQvalT2tkrw0M9MCxhEdH1WGYKwUq/de7hhRZtTXd UjEri1oX9vk9PJHuRqrJ1Hw0HQ86qUE+IjV3sogHfgkXVXfSTpBoF6OY0qJjBoI5kGQ5QS HiKA/ZVclTUUVQO1kzSS2+/bqCodFaetomMM5xxXApGrfYGV0aVGpekctEbBsKFvt0vuuT xq1lQwIInHYwQ2JZtQySN9W/4UW7FmFXG5/CojNSTTwU4sVGiQt2MvL/uOtljzza2bE9rk 9U3Yl9emyC/LvIRLVt5NQOrtbO9K6Brrv6niMPvePnFZ43nachrgI6agPb0mjw== 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 4VR2PD6KdfzvNK; Fri, 26 Apr 2024 19:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43QJAe2Z026918; Fri, 26 Apr 2024 19:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QJAeEj026915; Fri, 26 Apr 2024 19:10:40 GMT (envelope-from git) Date: Fri, 26 Apr 2024 19:10:40 GMT Message-Id: <202404261910.43QJAeEj026915@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: ce06b59f92 - main - Status/2024Q1/ci: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce06b59f92b1b728dbe67072d21e1ba1260144e0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/doc/commit/?id=ce06b59f92b1b728dbe67072d21e1ba1260144e0 commit ce06b59f92b1b728dbe67072d21e1ba1260144e0 Author: Li-Wen Hsu AuthorDate: 2024-04-26 19:02:12 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-26 19:02:12 +0000 Status/2024Q1/ci: Add report Reviewed by: Pau Amma , salvadore Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44962 --- .../en/status/report-2024-01-2024-03/ci.adoc | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/website/content/en/status/report-2024-01-2024-03/ci.adoc b/website/content/en/status/report-2024-01-2024-03/ci.adoc new file mode 100644 index 0000000000..72ed57b362 --- /dev/null +++ b/website/content/en/status/report-2024-01-2024-03/ci.adoc @@ -0,0 +1,51 @@ +=== Continuous Integration + +Links: + +link:https://ci.FreeBSD.org[FreeBSD Jenkins Instance] URL: link:https://ci.FreeBSD.org[] + +link:https://tinderbox.freebsd.org[FreeBSD CI Tinderbox view] URL: link:https://https://tinderbox.freebsd.org[] + +link:https://artifact.ci.FreeBSD.org[FreeBSD CI artifact archive] URL: link:https://artifact.ci.FreeBSD.org[] + +link:https://wiki.FreeBSD.org/HostedCI[Hosted CI wiki] URL: link:https://wiki.FreeBSD.org/HostedCI[] + +link:https://wiki.FreeBSD.org/3rdPartySoftwareCI[3rd Party Software CI] URL: link:https://wiki.FreeBSD.org/3rdPartySoftwareCI[] + +link:https://bugs.freebsd.org/bugzilla/buglist.cgi?bug_status=__open__&email1=testing%40FreeBSD.org&emailassigned_to1=1&emailcc1=1&emailtype1=equals[Tickets related to freebsd-testing@] URL: link:https://bugs.freebsd.org/bugzilla/buglist.cgi?bug_status=__open__&email1=testing%40FreeBSD.org&emailassigned_to1=1&emailcc1=1&emailtype1=equals[] + +link:https://github.com/freebsd/freebsd-ci[FreeBSD CI Repository] URL: link:https://github.com/freebsd/freebsd-ci[] + +link:https://lists.FreeBSD.org/subscription/dev-ci[dev-ci Mailing List] URL: link:https://lists.FreeBSD.org/subscription/dev-ci[] + +Contact: Jenkins Admin + +Contact: Li-Wen Hsu + +Contact: link:https://lists.FreeBSD.org/mailman/listinfo/freebsd-testing[freebsd-testing Mailing List] + +Contact: IRC #freebsd-ci channel on EFNet + +In the first quarter of 2024, we worked with the project contributors and developers to address their testing requirements. +Concurrently, we collaborated with external projects and companies to enhance their products by testing more on FreeBSD. + +Important completed tasks: + +* With help from clusteradm, the host running test VMs had disk and memory upgraded by reusing the parts of decommissioned machines. +* Update the build environment of stable/13 jobs to 13.3-RELEASE. +* Turn i386 build on main branch to use cross build on amd64. + +Work in progress tasks: + +* Merging link:https://reviews.freebsd.org/D43786[] +* Merging link:https://reviews.freebsd.org/D36257[] +* Adding new hardware purchased by the FreeBSD Foundation to the CI cluster +* Designing and implementing pre-commit CI building and testing and pull/merge-request based system (to support the link:https://gitlab.com/bsdimp/freebsd-workflow[workflow working group]) + * Proof of concept system is in progress. +* Designing and implementing use of CI cluster to build release artifacts as release engineering does, starting with snapshot builds +* Simplifying CI/test environment setting up for contributors and developers +* Setting up the CI stage environment and putting the experimental jobs on it +* Redesigning the hardware test lab and adding more hardware for testing + +Open or queued tasks: + +* Collecting and sorting link:https://hackmd.io/@FreeBSD-CI/freebsd-ci-todo[CI tasks and ideas] +* Setting up public network access for the VM guest running tests +* Implementing use of bare-metal hardware to run test suites +* Adding drm ports building tests against -CURRENT +* Planning to run ztest tests +* Helping more software get FreeBSD support in its CI pipeline (Wiki pages: link:https://wiki.FreeBSD.org/3rdPartySoftwareCI[3rdPartySoftwareCI], link:https://wiki.FreeBSD.org/HostedCI[HostedCI]) +* Working with hosted CI providers to have better FreeBSD support + +Please see link:https://bugs.freebsd.org/bugzilla/buglist.cgi?bug_status=__open__&email1=testing%40FreeBSD.org&emailassigned_to1=1&emailcc1=1&emailtype1=equals[freebsd-testing@ related tickets] for more WIP information, and do not hesitate to join the effort! + +Sponsor: The FreeBSD Foundation From nobody Fri Apr 26 19:10:41 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VR2PG2dvHz5J37B for ; Fri, 26 Apr 2024 19:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VR2PG0Dh9z43qL; Fri, 26 Apr 2024 19:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714158642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYTEtVidQ8vkR/KE6XtEx+NkBYQbWZmmyOtrOd9UqPg=; b=TfZL61SVR96cLsA0uytL7e4xaZ6yeS2qubaRzRh43ueBh6EA9kkQqzxA/za9r9M9B5u4J3 9330oo2PEJLRL+OVkOGQaX9xtbuw4+fnFIvp/Af6DVRghwY1oUjU1NwJiRtQIdzhvJZT0d BIfgKUNl6J6kPgWWAEPvd+oQXVCdMT2ES+boHK4quxQMRGBWd+fC+AeRB+L8c+l4+TuYQa j3m5mYmkBMoOba9fEXetWQCso382stVNXeqUcXl+ZcnQXlMRWC4WIakJV8eIovwq849uz4 hLEFxEUSj8DYWXhqx3xJR9orMe7qcGjmPRFyhjAeYQEzp/oZA31DHbmwBDYo4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714158642; a=rsa-sha256; cv=none; b=L9Uy4FmJHKfX13bpAYo37aeYr/PteTCJKFEq6eZp8aB7F/K8BztN5mDpM6LSFtGAzJB0d6 2spdXxk896TJZe7UC9TBj+KnpaQ5sxXzAKw369kk23VgOon+03u5GzoUR0AFiy6plIj8mq qWxcfhTX7FBWEtwvj42cChSm4mdJZGqbrqZfLs01thgmyZnvj+bgDEZhu8lahCynpW1SWa SItvm3rgUWL8w65Tmo/7HYSooQyH5C027yKxPWAdCefh9U/m8opH3gelKNWU7HRIYUf9Au pxo6hDLzYwzmwfG6FuM5Wg3n7jI09li9S8KtgHk92fBIGlMWTWa4CccN2jDu8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714158642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYTEtVidQ8vkR/KE6XtEx+NkBYQbWZmmyOtrOd9UqPg=; b=oxtEQ2b/2/D0a/IHYQwbcDWVCX3xvgExOuBzcBYXNWnNvWBQRszu9P5aLcAioTM77nbvOR 7N1MZoi2nn5RUdthwwVDTe7Hz0GOIt453rCxWtXy8MbTgDbMDtn1X9a3ElFp7Jao/ukHZq lrcypUS8rTLVSTXO4jLZs4RpqQ7qE83+yEo/DDq476gnPgAwQyZ6BJEE4e65qB4WAz+9l2 tnzIO5GZm00/yETw56l9dWLPpW2VS92vMDQna5oiisnTT4ieWH6NeYoddxjv6Ntw6aZzjB BNQN9svgOqo4TKH3F71cuc1N173d5lBu4AKqdVT5efiYX8xjJtKO5JGxtNOcTw== 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 4VR2PF6xJKzvHm; Fri, 26 Apr 2024 19:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43QJAfqF026956; Fri, 26 Apr 2024 19:10:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QJAfvd026953; Fri, 26 Apr 2024 19:10:41 GMT (envelope-from git) Date: Fri, 26 Apr 2024 19:10:41 GMT Message-Id: <202404261910.43QJAfvd026953@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: 099a5d5c67 - main - Status/2024Q1/azure: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 099a5d5c671b03991d9e3f307c4888c0b96bb698 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/doc/commit/?id=099a5d5c671b03991d9e3f307c4888c0b96bb698 commit 099a5d5c671b03991d9e3f307c4888c0b96bb698 Author: Li-Wen Hsu AuthorDate: 2024-04-26 19:04:49 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-26 19:04:49 +0000 Status/2024Q1/azure: Add report Reviewed by: Pau Amma , salvadore Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44963 --- .../en/status/report-2024-01-2024-03/azure.adoc | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/website/content/en/status/report-2024-01-2024-03/azure.adoc b/website/content/en/status/report-2024-01-2024-03/azure.adoc new file mode 100644 index 0000000000..a1e24f66e7 --- /dev/null +++ b/website/content/en/status/report-2024-01-2024-03/azure.adoc @@ -0,0 +1,32 @@ +=== FreeBSD on Microsoft HyperV and Azure + +Links: + +link:https://wiki.freebsd.org/MicrosoftAzure[Microsoft Azure article on FreeBSD wiki] URL: link:https://wiki.freebsd.org/MicrosoftAzure[] + +link:https://wiki.freebsd.org/HyperV[Microsoft HyperV article on FreeBSD wiki] URL: link:https://wiki.freebsd.org/HyperV[] + +Contact: Microsoft FreeBSD Integration Services Team + +Contact: link:https://lists.freebsd.org/subscription/freebsd-cloud[freebsd-cloud Mailing List] + +Contact: The FreeBSD Azure Release Engineering Team + +Contact: Wei Hu + +Contact: Souradeep Chakrabarti + +Contact: Li-Wen Hsu + + +In this quarter, we have solved all the blocking issues and published the link:https://azuremarketplace.microsoft.com/marketplace/apps/thefreebsdfoundation.freebsd-13_3[13.3-RELEASE on Azure Marketplace]. + +Work in progress tasks: + +* Automating the image building and publishing process and merging to [.filename]#src/release/#. +* Building and publishing snapshot builds to link:https://learn.microsoft.com/azure/virtual-machines/share-gallery-community[Azure community gallery]. + +The above tasks are sponsored by The FreeBSD Foundation, with resources provided by Microsoft. + +Open tasks: + +* Update FreeBSD-related doc at link:https://learn.microsoft.com[Microsoft Learn] +* Support FreeBSD in link:https://azure.microsoft.com/products/devops/pipelines/[Azure Pipelines] +* Update link:https://www.freshports.org/sysutils/azure-agent[Azure agent port] to the latest version +* Upstream link:https://github.com/Azure/WALinuxAgent/pull/1892[local modifications of Azure agent] +* Port link:https://github.com/Azure/azure-linux-extensions[Linux Virtual Machine Extensions for Azure] + +Sponsor: Microsoft for people in Microsoft, and for resources for the rest + +Sponsor: The FreeBSD Foundation for everything else From nobody Fri Apr 26 19:10:43 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VR2PH3PTgz5J3SG for ; Fri, 26 Apr 2024 19:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VR2PH19sFz43jJ; Fri, 26 Apr 2024 19:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714158643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BXAAuPDN6KZ+BulDz3Q4M4kypXiVWN5W5pEsfK0pRbk=; b=XY5nieMrTtiUD09ve0Ib1/GCmXn5EDxqw2OUz9X7BNp5ggo8CSq+leSWK07tP+X5NeyzcX mGm2PE6o16Wy/xXXAu75sROO1dnmXX7roeTo/NV9EZl6320TR6CaG/6aXFEKZhm7P1HiWx fevDa8ibedG/kRMozhhzoh9mhq4XfPCCXGg22PMbYZ9HnezT5jk7hGxnahDBfWbL3BbhML gMA45b1oIRfr9f3/oPmoWOU8gTcQb/EZMjDLsbL3TIAUzGKLP11eWuqKfX1ywP2Z6/GK50 W58lu48ved9BTVNFfPVvtznD4HSWFRXVqmcBpnO08fPs3+2NeycOQmVEpRh83A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714158643; a=rsa-sha256; cv=none; b=MpKmfYaVdlIBuNJTfjM2MJI8WrE+xy3F6ssJfVKp2gtC1eMm6KSyMdgvnRvZ0utO/wkaHv OhEiF/ZdJwSxR6C1E1wsdIHdOTJj8HcwY1XpuPrcaSpTz9kG99Ceil4TufGznnYZzRYOPS icuAoCF482GcHNxd19a6kqj++aMyC7eIhJHM1hqrjuv1EeAvwwS3YqvTGeE6ep/GEJ/Dua 67ccKQs2Xnnfx3U/wn370/jYui7pFzSlQ8Es57xPOKAMo4QnFUZoJtbh8NHJFndxXw/qUa /UPmY/Sv1RD8bGDb4DJxzMGRvloy1uC9rkJWfQ9lkX+2cYKvpWXb4+Bpa8fErw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714158643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BXAAuPDN6KZ+BulDz3Q4M4kypXiVWN5W5pEsfK0pRbk=; b=JFZjeF80oU+YB880clJm5H5dQ3tw2gAC5f8cMg6Kxm+IJlGPwH0Toy54TH7HryJqEcNopZ 4ft8ssng58GU/JayF3zymuNNO7hCg50HpfJJ/bAips9Hfv701GVj4st4kHTjysisnG3zDN wKUqcKmpCmfd7SSRZMdapxLYOBVlrwxtiS72bK9G8XfSe3CWz3H5zd/wwkZ9IBzT1OusKu q/uWYQkggXi4/sdLIbb/K3nbu42dMPJQ1HJd8faqD3zT0mc6Eq7O0H8UBswwMSCnS/l8Es aBE9hVZFsMBFcC0bmhpf26jDd1CsibHLsml6iuESW7U4MpW6WaKFkskG6lZm8A== 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 4VR2PH0ncHzv1B; Fri, 26 Apr 2024 19:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43QJAhDn026993; Fri, 26 Apr 2024 19:10:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43QJAhmb026990; Fri, 26 Apr 2024 19:10:43 GMT (envelope-from git) Date: Fri, 26 Apr 2024 19:10:43 GMT Message-Id: <202404261910.43QJAhmb026990@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: fe1dcc80ad - main - Status/2024Q1/core: Add report List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe1dcc80ad3ee3d36f7fba12c3348b577834ad6a Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/doc/commit/?id=fe1dcc80ad3ee3d36f7fba12c3348b577834ad6a commit fe1dcc80ad3ee3d36f7fba12c3348b577834ad6a Author: Li-Wen Hsu AuthorDate: 2024-04-26 19:08:46 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-26 19:08:46 +0000 Status/2024Q1/core: Add report Reviewed by: Pau Amma , salvadore, emaste Differential Revision: https://reviews.freebsd.org/D44973 --- .../en/status/report-2024-01-2024-03/core.adoc | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/website/content/en/status/report-2024-01-2024-03/core.adoc b/website/content/en/status/report-2024-01-2024-03/core.adoc new file mode 100644 index 0000000000..5bec85a164 --- /dev/null +++ b/website/content/en/status/report-2024-01-2024-03/core.adoc @@ -0,0 +1,25 @@ +=== FreeBSD Core Team + +Contact: FreeBSD Core Team + +The FreeBSD Core Team is the governing body of FreeBSD. + +==== 13.3-RELEASE + +FreeBSD 13.3 was released on March 5th, 2024. + +The release announcement is at: + + link:https://www.freebsd.org/releases/13.3R/announce/[] + +Along the release engineering team, the project dedicates the 13.3-RELEASE to Glen Barber, with thanks for his many years of contributions as Release Engineer. + +==== Future of 32-bit platform support + +Core announced link:https://lists.freebsd.org/archives/freebsd-announce/2024-February/000117.html[Future of 32-bit platform support in FreeBSD] for deprecating 32-bit platforms over the next couple of major +releases. + +==== Commit bits + +* Core approved the src commit bit for Bojan Novković (bnovkov@) +* Core reactivated the src commit bits for Mark Peek (mp@),Mark Murray (markm@), and Lawrence Stewart (lstewart@) From nobody Sun Apr 28 11:56:13 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VS4g13dWZz5J5vQ for ; Sun, 28 Apr 2024 11:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VS4g12rBRz4VBg; Sun, 28 Apr 2024 11:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714305373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUeDy9kEb4BLpPvo0UgRt+ePyKLMFjkCM8zYLMyfhYg=; b=RfgAgY4YpCL5WtzwXHn6ba7gwhFYT0TdRKTHEJaqlxDBWny3KKbQP5nyPldKE0XmFFH+rd ZFUSaxHcS+C5X4hPmauzotqeuPaqAfrMPLqK/svort9v2PSp87Z7lmyGx77/wxEdTAWqGM CW0OID/6pcKL+Dd7t4nnFkFrI13aiSUFEj4Xk8nrTNZvTtTQj9Sza9fkLcARrJMR5mv6sJ HBA+ImD8ufahTe/aOQoMHThs+03sJVJYvNHxnUvMZF4c+dGDcp2434K4/QkEdXzq995obQ NV+sHztC9n44X/JdX/qi9npfmjZ0qa8KhfPH5aPN2wc4flDZY5V3/9upOt6Q2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714305373; a=rsa-sha256; cv=none; b=EtxjsLQUlVIVMwqdJdUMd5DWtZwUXa7dhyYIS+EZMq8OBitfCDsawX54asYyWxlhL7TKVM e0z6oiUOB+uQMjUx8LLw+8BjomthDm0+vEhFHkV1uC089wNeZZWHvJf7VgqrNqqZlVXLY7 Z6G5yUb3aONFITpZrQICk4eMVJgprUSGQTKosF8ebE28MEU40KlTKwc/SISEveajxMdvvl k96gtZsyYGkST5upG/FPzOhXHXP/kr7KGi5axr9tJ0ySfbJTFFRe2b8YMF5qY9mQp9hv3i ZWeXYgpODKovsCVNgRsCe/l9zK0TSqBn9lmx6i9PSU1R7jeNq8hKI90JmtkHhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714305373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZUeDy9kEb4BLpPvo0UgRt+ePyKLMFjkCM8zYLMyfhYg=; b=mge3v75Cr1GzXBN+o3YVz8cpoOj2jkkfACBakP7YUkYONn7PVl/Q2rI4Nfxi2JTUImDi+t L9QVzwUN8r4a9v268AbYE3dt6olvVZVGTFKHAEhP6jx5Rr1WzV5N0q/6oDwgWsQXsl5a5i IhuFT10ZFMwRLjvfLNTFGCAQnnhHXGBBytnZE9/4YRq7DwgWPxFAthxu4UkkB92OQzFD9U ke687YTNB6CiIpn1wXUvw9rRMHek+IHVWYZpAojVwjUD06XZyMAoeEYmfwcEePZMeReS8k IwnC2aM2PoW/cAZNRP34V/XjH59syfEJhknCuI13sD0t0lS/v4IRi3o07nhbEg== 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 4VS4g12SHrzPW8; Sun, 28 Apr 2024 11:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43SBuDg5066462; Sun, 28 Apr 2024 11:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SBuDCc066459; Sun, 28 Apr 2024 11:56:13 GMT (envelope-from git) Date: Sun, 28 Apr 2024 11:56:13 GMT Message-Id: <202404281156.43SBuDCc066459@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: a59104fb3c - main - rewrite parser for italic/bold words List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a59104fb3ce0551abb18540b6f5f76cab57f3424 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=a59104fb3ce0551abb18540b6f5f76cab57f3424 commit a59104fb3ce0551abb18540b6f5f76cab57f3424 Author: Wolfram Schneider AuthorDate: 2024-04-28 11:55:58 +0000 Commit: Wolfram Schneider CommitDate: 2024-04-28 11:55:58 +0000 rewrite parser for italic/bold words this should fix the issues with underline links and hyphens PR: 275000, 235567 --- website/content/en/cgi/man.cgi | 156 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 138 insertions(+), 18 deletions(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index 24c11be53b..8ddfa7f27f 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -1999,34 +1999,154 @@ sub encode_attribute { $_; } +sub escape_word { + my $word = shift; + + return join( '', map { escape_char($_) } @$word ); +} + +sub escape_char { + my $c = shift; + + return + $c eq '&' ? "&" + : $c eq '<' ? "<" + : $c eq '>' ? ">" + : $c eq '_BULLET_ITEM_' ? "•" + : $c; +} + +sub tag_ib { + my $tag = shift; + my $word = shift; + + my $data = escape_word($word); + + return + $tag eq 'ib' ? "$data" + : $tag eq 'b' ? "$data" + : $tag eq 'i' ? "$data" + : $data; +} + # encode unknown text data for using as HTML, # treats ^H as overstrike ala nroff. sub encode_data { - local ($_) = @_; - local ($str); + my $line = shift; - # Escape &, < and > - s,\010[><&],,g; - s/\&/\&\;/g; - s/\/\>\;/g; + # optimize for speed: most lines have no special characters + if ($line !~ /[<>&\010]/) { + return $line; + } - # bold bullet - s,\+\010\+\010o\010o,o,g; + # work on a list of characters + my @l = split( '', $line ); - # underline: _^H.^H(.) - s,((_\010[^_]\010.)+),($str = $1) =~ s/_\010..//g; "$str";,ge; + my $data = ""; + my $flag = ""; + my @word = (); - # italic: _^H(.) - s,((_\010[^_])+),($str = $1) =~ s/.\010//g; "$str";,ge; + my $end_of_word = sub { + my $new_flag = shift; - # bold: .^H(.) - s,(([^_]\010.)+),($str = $1) =~ s/.\010//g; "$str";,ge; + return if !scalar(@word); - # cleanup all the rest - s,.\010,,g; + # a tag ended, and a new started immediately + if ( $flag ne "" && $new_flag ne $flag ) { + $data .= tag_ib( $flag, \@word ); + @word = (); + } + }; - $_; + for ( my $i = 0 ; $i <= $#l ; $i++ ) { + + # 7 characters: +^H+^Ho^Ho - bullet list + if ( $i <= ( $#l - 6 ) + && $l[$i] eq "+" + && $l[ $i + 1 ] eq "\010" + && $l[ $i + 2 ] eq "+" + && $l[ $i + 3 ] eq "\010" + && $l[ $i + 4 ] eq "o" + && $l[ $i + 5 ] eq "\010" + && $l[ $i + 6 ] eq "o" ) + { + push @word, '_BULLET_ITEM_'; + $i += 6; + $flag = 'b'; + } + + # 2 characters: +^Ho - bullet list + elsif ( $i <= ( $#l - 2 ) + && $l[$i] eq "+" + && $l[ $i + 1 ] eq "\010" + && $l[ $i + 2 ] eq "o" ) + { + push @word, '_BULLET_ITEM_'; + $i += 2; + $flag = 'b'; + } + + # 5 characters: _\010x\010x - bold and italic + elsif ($i <= ( $#l - 4 ) + && $l[ $i + 1 ] eq "\010" + && $l[ $i + 3 ] eq "\010" + && $l[ $i + 2 ] eq $l[ $i + 4 ] ) + { + $end_of_word->('ib'); + push @word, $l[ $i + 2 ]; + $i += 4; + $flag = 'ib'; + } + + # 3 characters: _\010 - bold or italic + elsif ( $i <= ( $#l - 2 ) && $l[ $i + 1 ] eq "\010" ) { + + # bold + # take care of links with underlines, which are alwasy italic + if ( $l[$i] eq $l[ $i + 2 ] && $flag ne 'i' ) { + $end_of_word->('b'); + push @word, $l[$i]; + $i += 2; + $flag = 'b'; + + #printf STDERR 'B'; + } + + # italic + elsif ( $l[$i] eq "_" && $i + 2 <= $#l ) { + $end_of_word->('i'); + push @word, $l[ $i + 2 ]; + $i += 2; + $flag = 'i'; + + #printf STDERR 'I'; + } + } + + # other, one or two characters + else { + # italic/bold ends here + $end_of_word->('ANY'); + + # simple backslash + if ( $l[$i] eq "\010" ) { + + # just ignore + } + elsif ( $i <= ( $#l - 1 ) && $l[ $i + 1 ] eq "\010" ) { + $i++; + } + else { + $data .= escape_char( $l[$i] ); + } + $flag = ""; + } + } + + # last character + $end_of_word->('ANY'); + + return $data; } sub indexpage { From nobody Sun Apr 28 18:21:40 2024 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VSFCm1M5mz5JjD0 for ; Sun, 28 Apr 2024 18:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VSFCm0vY0z55Mt; Sun, 28 Apr 2024 18:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5/RPsv8p+vsK7vlneqSzjN2Yo4rGV4SAvV+iEE9xhs=; b=U6jMh3yr2jchB6cyVr8jmD7Gs7mSU30yzctqqzhbYn8jhSUngKlsRjN+7jFk4r8hYBW7AT HyDfcQog5UQGI2Y0wCRKHexx0RRXit0X8wbgsWxXgsk5KXVBD0iszA4vFaW+Pv6cd31x8X JGjwnUyhfzJA2y4DLnyM7GPtEDlJhqMs89hXj5UEW/lvsulws1SfjylR0A7BjgcYFT/37h 13b+wvNAP8CSWdcM3teHE99LIVgD21LdqTGVp5C6k6w43t3g2wmkVymBdBWHTx4r155ZaN I2gpdAP4IudhQEqHCMKP5YnnW7M8rgginz3kU8Ry6d3j+WOyYitRCZyhJm1t6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714328500; a=rsa-sha256; cv=none; b=yD0Rk6LhFgK2QGgXzaHx2us11SSALOPZxXaWvq1cydzy+NgktRiFHHzCZGTnQ+C7k7GCdL O/1CqFjWQtkFySStqJGKKWAWUcmzrRgaxT5T22P6Y1eOCspHx3Qc6FYMxBHRQzlQrcC/iu 7HTg2718xNBdT4v+MGl57oryT298nBLRfDhyDPdZzEHaWFdj2Z1Xo4A0G+6E0LHrewO1Vf u4trnCWsKhv0staam9LZAQCvt4WtTDaIUmKJa1v/2h7F8eN6/J0Pdb90+3ZyKIeUjqoM1n rKhxi4JTR+VjIxPVSa0FNuiOVfptaagytUh/jkVfsCuY512RppUig9nPsU2ddg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714328500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z5/RPsv8p+vsK7vlneqSzjN2Yo4rGV4SAvV+iEE9xhs=; b=mCIe4UR+oQ+/kbpNtXF7ICKFSP2mY5iw61GX5Bwo9Ew9QiRtjV5ycrhsCs3R+5xlg8TvcI w2q+ZqG2EFYAT1/xQwABTIr9V44FXqAZ7AHEQmvQ9Vn9hag6+SK1Sja+qJwuOhHft7tetO IKSZFyEwLXdYHWzLsiL//DxguDyWetsJO8CPcQov31wUpCZGY2mxrWtlj2Rt/2X3+h6axx 3opfj7jbVuDAo1LsYT+J6IOWL82NVOm0yzzNFDyE+XsRpksvj2t+I3BI4HVQVO2Ul52GH7 vlsr75hg0we2FSGf5drnAFlK5plN5McCkIG9N5ek/ObgeDDlg1fcWMXOOiWmbQ== 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 4VSFCm0X2zzc5G; Sun, 28 Apr 2024 18:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43SILeF6022437; Sun, 28 Apr 2024 18:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43SILecP022434; Sun, 28 Apr 2024 18:21:40 GMT (envelope-from git) Date: Sun, 28 Apr 2024 18:21:40 GMT Message-Id: <202404281821.43SILecP022434@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Wolfram Schneider Subject: git: e4d3f14695 - main - improve URL matching List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4d3f14695b1e2a23143ca940e3b73df224dcb43 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/doc/commit/?id=e4d3f14695b1e2a23143ca940e3b73df224dcb43 commit e4d3f14695b1e2a23143ca940e3b73df224dcb43 Author: Wolfram Schneider AuthorDate: 2024-04-28 18:19:51 +0000 Commit: Wolfram Schneider CommitDate: 2024-04-28 18:19:51 +0000 improve URL matching for trailing '>', comma and other characters PR: 266336 --- website/content/en/cgi/man.cgi | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index 8ddfa7f27f..d82411491b 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -1579,6 +1579,18 @@ sub manpath_without_ports { return join(":", @list); } +# strip trailing dots, comma etc. from an URL +sub url_strip { + my $url = shift; + my $part = shift; + + if ($url =~ m/(.+)([,\.])$/) { + return ($1, $1, $2); + } else { + return ($url, $url, ""); + } +} + sub man { local ( $name, $section, $arch ) = @_; local ( $_, $title, $head, *MAN ); @@ -1842,8 +1854,8 @@ s/([a-z0-9_\-\.]+\@[a-z0-9\-\.]+\.[a-z]+)/$1<\/A>/gi; } # detect URLs in manpages - if (m,\b(ftp|http|https)://,) { - s,((ftp|http|https)://[^\s<>\)]+),$1,gi; + if (m,\b(http|https)://,) { + s|(https?://[^\s\)&<>'`";\]\[]+)|sprintf("%s%s", &url_strip($1))|egi; } if (s%^(.*?)+\n?$% ($str = $1) =~ s,(|),,g; $str%ge) {