From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 00:55:14 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B3709568B6D for ; Mon, 15 Mar 2021 00:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzHyV4W60z3Gj2; Mon, 15 Mar 2021 00:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8DC7A27693; Mon, 15 Mar 2021 00:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12F0tEPG028792; Mon, 15 Mar 2021 00:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12F0tEpM028791; Mon, 15 Mar 2021 00:55:14 GMT (envelope-from git) Date: Mon, 15 Mar 2021 00:55:14 GMT Message-Id: <202103150055.12F0tEpM028791@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Daniel Ebdrup Jensen Subject: git: 85d4d20558 - main - relnotes/13.0: Add note about new usbhid driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: debdrup X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85d4d20558afa1ce6eb763a64725827e9f262ffb Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 00:55:14 -0000 The branch main has been updated by debdrup: URL: https://cgit.FreeBSD.org/doc/commit/?id=85d4d20558afa1ce6eb763a64725827e9f262ffb commit 85d4d20558afa1ce6eb763a64725827e9f262ffb Author: Daniel Ebdrup Jensen AuthorDate: 2021-03-15 00:54:07 +0000 Commit: Daniel Ebdrup Jensen CommitDate: 2021-03-15 00:54:07 +0000 relnotes/13.0: Add note about new usbhid driver --- website/content/en/releases/13.0R/relnotes.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 5a250195b2..b6c7d78d58 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -176,6 +176,7 @@ This section covers changes and additions to devices and device drivers since {r [[drivers-device]] === Device Drivers +A new man:usbhid[4] driver has been added, and can be loaded by adding `hw.usb.usbhid.enable=1` to /boot/loader.conf and adding `usbhid` `to kld_list=""` in /etc/rc.conf. gitref:b62f6dfaed3d[repository=src] [[storage]] == Storage From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 01:18:57 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 300D9568FEB for ; Mon, 15 Mar 2021 01:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzJTs0hjwz3HV5; Mon, 15 Mar 2021 01:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0508127B83; Mon, 15 Mar 2021 01:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12F1Iu5P055887; Mon, 15 Mar 2021 01:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12F1Iuh3055886; Mon, 15 Mar 2021 01:18:56 GMT (envelope-from git) Date: Mon, 15 Mar 2021 01:18:56 GMT Message-Id: <202103150118.12F1Iuh3055886@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Daniel Ebdrup Jensen Subject: git: 78c640cfbc - main - relnotes/13.0: Fix typo and markup MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: debdrup X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78c640cfbcfa0930eeb14467a19ffddc9a437464 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 01:18:57 -0000 The branch main has been updated by debdrup: URL: https://cgit.FreeBSD.org/doc/commit/?id=78c640cfbcfa0930eeb14467a19ffddc9a437464 commit 78c640cfbcfa0930eeb14467a19ffddc9a437464 Author: Daniel Ebdrup Jensen AuthorDate: 2021-03-15 01:17:27 +0000 Commit: Daniel Ebdrup Jensen CommitDate: 2021-03-15 01:18:15 +0000 relnotes/13.0: Fix typo and markup Pointy hat to: me --- website/content/en/releases/13.0R/relnotes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index b6c7d78d58..bdf85166d4 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -176,7 +176,7 @@ This section covers changes and additions to devices and device drivers since {r [[drivers-device]] === Device Drivers -A new man:usbhid[4] driver has been added, and can be loaded by adding `hw.usb.usbhid.enable=1` to /boot/loader.conf and adding `usbhid` `to kld_list=""` in /etc/rc.conf. gitref:b62f6dfaed3d[repository=src] +A new man:usbhid[4] driver has been added, and can be loaded by adding `hw.usb.usbhid.enable=1` to [.filename]#/boot/loader.conf# and adding `usbhid` to `kld_list=""` in [.filename]#/etc/rc.conf#. gitref:b62f6dfaed3d[repository=src] [[storage]] == Storage From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 11:51:04 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0676357943D for ; Mon, 15 Mar 2021 11:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzZWC6rrRz4jkK; Mon, 15 Mar 2021 11:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DE4837BE4; Mon, 15 Mar 2021 11:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FBp39g098530; Mon, 15 Mar 2021 11:51:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FBp31B098529; Mon, 15 Mar 2021 11:51:03 GMT (envelope-from git) Date: Mon, 15 Mar 2021 11:51:03 GMT Message-Id: <202103151151.12FBp31B098529@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Emmanuel Vadot Subject: git: cfc12e1b1d - main - Add relnotes for 13.0 about Allwinner improvements MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfc12e1b1d880129dc4ad486d3799c77cc1dc8c7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 11:51:04 -0000 The branch main has been updated by manu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=cfc12e1b1d880129dc4ad486d3799c77cc1dc8c7 commit cfc12e1b1d880129dc4ad486d3799c77cc1dc8c7 Author: Emmanuel Vadot AuthorDate: 2021-03-10 15:33:41 +0000 Commit: Emmanuel Vadot CommitDate: 2021-03-15 11:46:19 +0000 Add relnotes for 13.0 about Allwinner improvements Reviewed by: gjb Approved by: gjb Differential Revision: https://reviews.freebsd.org/D29191 --- website/content/en/releases/13.0R/relnotes.adoc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index bdf85166d4..dc2ccf7ba4 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -239,6 +239,21 @@ The {{< manpage "ping" "8" >}} and {{< manpage "ping6" "8" >}} utilities both su This section covers general hardware support for physical machines, hypervisors, and virtualization environments, as well as hardware changes and updates that do not otherwise fit in other sections of this document. +[[ARM-ARM64]] +=== Allwinner + +The aw_gpio driver have been improved to handle GPIO interrupts. gitref:0fe5379c6a9[repository=src] + +A new aw_pwm driver have been added, pwm channels can be configured with {{< manpage "pwm" "8">}}. gitref:277a038d0da[repository=src] + +Battery sensors were added to the AXP803/AXP813 drivers. gitref:66bddb4c701[repository=src] + +Audio is now working on H3/H5 SoCs. gitref:bfcf888a87a[repository=src] + +Infrared receiver now works on H3 SoC. gitref:012fba460ac[repository=src] + +USB DRD is now working on multiple Allwinner SoC, this means that some usb port can be used as peripherals. gitref:aea49d9fed9[repository=src] + [[hardware-virtualization]] === Virtualization Support From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 11:51:05 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7616A578EEA for ; Mon, 15 Mar 2021 11:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzZWF0fp9z4js4; Mon, 15 Mar 2021 11:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 09B8B7C77; Mon, 15 Mar 2021 11:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FBp4dm098548; Mon, 15 Mar 2021 11:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FBp49U098547; Mon, 15 Mar 2021 11:51:04 GMT (envelope-from git) Date: Mon, 15 Mar 2021 11:51:04 GMT Message-Id: <202103151151.12FBp49U098547@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 7b1816465b - main - Add relnotes for 13.0 about Rockchip improvements MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b1816465bc2652e25d045adee45a166cd82f7be Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 11:51:05 -0000 The branch main has been updated by manu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=7b1816465bc2652e25d045adee45a166cd82f7be commit 7b1816465bc2652e25d045adee45a166cd82f7be Author: Emmanuel Vadot AuthorDate: 2021-03-10 15:45:02 +0000 Commit: Emmanuel Vadot CommitDate: 2021-03-15 11:47:09 +0000 Add relnotes for 13.0 about Rockchip improvements Reviewed by: gjb Approved by: gjb Differential Revision: https://reviews.freebsd.org/D29192 --- website/content/en/releases/13.0R/relnotes.adoc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index dc2ccf7ba4..4af60a1d77 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -254,6 +254,18 @@ Infrared receiver now works on H3 SoC. gitref:012fba460ac[repository=src] USB DRD is now working on multiple Allwinner SoC, this means that some usb port can be used as peripherals. gitref:aea49d9fed9[repository=src] +===RockChip + +A new rk_pwm driver have been added, pwm channels can be configured with {{< manpage "pwm" "8">}}. gitref:bcd380e88b2[repository=src] + +A PCIe driver was added for RK3399. gitref:dfd1d0fcabe[repository=src] + +USB3 found in RK3328 and RK3399 is now supported. gitref:7d888a5b2be[repository=src] + +if_dwc now supports flow control. gitref:2b4a66ed171[repository=src] + +if_dwc now supports checksum offloading. gitref:98ea5a7b9a1[repository=src] + [[hardware-virtualization]] === Virtualization Support From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 19:14:00 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C4B595AC83E for ; Mon, 15 Mar 2021 19:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzmLJ5Dk4z3nVw; Mon, 15 Mar 2021 19:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A66D715BE0; Mon, 15 Mar 2021 19:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FJE0Yv088604; Mon, 15 Mar 2021 19:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FJE0XH088603; Mon, 15 Mar 2021 19:14:00 GMT (envelope-from git) Date: Mon, 15 Mar 2021 19:14:00 GMT Message-Id: <202103151914.12FJE0XH088603@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 2443ffe801 - main - Unmark 13.0-RC3 as "as needed" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2443ffe8010684f802cc80ff51bb0e383ec4e52f Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 19:14:00 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=2443ffe8010684f802cc80ff51bb0e383ec4e52f commit 2443ffe8010684f802cc80ff51bb0e383ec4e52f Author: Glen Barber AuthorDate: 2021-03-15 19:13:45 +0000 Commit: Glen Barber CommitDate: 2021-03-15 19:13:45 +0000 Unmark 13.0-RC3 as "as needed" Sponsored by: Rubicon Communications, LLC ("Netgate") --- website/content/en/releases/13.0R/schedule.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/13.0R/schedule.adoc b/website/content/en/releases/13.0R/schedule.adoc index 664bb0d98e..faeb0b9c61 100644 --- a/website/content/en/releases/13.0R/schedule.adoc +++ b/website/content/en/releases/13.0R/schedule.adoc @@ -43,7 +43,7 @@ Announcements regarding the availability of the ALPHA snapshots will be sent to |BETA4 builds begin |26 February 2021 |26 February 2021 |Fourth beta test snapshot. |RC1 builds begin |5 March 2021 |5 March 2021 |First release candidate. |RC2 builds begin |12 March 2021 |12 March 2021 |Second release candidate. -|RC3 builds begin * |19 March 2021 |- |Third release candidate. +|RC3 builds begin |19 March 2021 |- |Third release candidate. |RELEASE builds begin |26 March 2021 |- |{localRel}-RELEASE builds begin. |RELEASE announcement |30 March 2021 |- |{localRel}-RELEASE press release. |Turn over to the secteam |- |- |{localBranchReleng} branch is handed over to the FreeBSD Security Officer Team in one or two weeks after the announcement. From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 23:57:25 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 36DE656BD27 for ; Mon, 15 Mar 2021 23:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DztdK15t2z4dFc; Mon, 15 Mar 2021 23:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 18A01197DA; Mon, 15 Mar 2021 23:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FNvOEc059423; Mon, 15 Mar 2021 23:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FNvOHY059422; Mon, 15 Mar 2021 23:57:24 GMT (envelope-from git) Date: Mon, 15 Mar 2021 23:57:24 GMT Message-Id: <202103152357.12FNvOHY059422@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: John Baldwin Subject: git: 7d8389eafa - main - Various fixes to the 13.0 installation doc. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d8389eafad3df9b918ae6c52ae7f72b8e07a5ca Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 23:57:25 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/doc/commit/?id=7d8389eafad3df9b918ae6c52ae7f72b8e07a5ca commit 7d8389eafad3df9b918ae6c52ae7f72b8e07a5ca Author: John Baldwin AuthorDate: 2021-03-15 23:55:09 +0000 Commit: John Baldwin CommitDate: 2021-03-15 23:57:17 +0000 Various fixes to the 13.0 installation doc. - Remove spurious quotes around the release name and number. - Replace SVN with Git. - Fix a freebsd-update example to expand the localRel attribute. Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D29242 --- website/content/en/releases/13.0R/installation.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/en/releases/13.0R/installation.adoc b/website/content/en/releases/13.0R/installation.adoc index be3ebd8fd5..a154a9076f 100644 --- a/website/content/en/releases/13.0R/installation.adoc +++ b/website/content/en/releases/13.0R/installation.adoc @@ -3,8 +3,8 @@ title: "FreeBSD 13.0-RELEASE Installation Instructions" sidenav: download --- -:releaseCurrent: "13.0-RELEASE" -:localRel: "13.0" +:releaseCurrent: 13.0-RELEASE +:localRel: 13.0 = FreeBSD {localRel}-RELEASE Installation Instructions @@ -34,7 +34,7 @@ If you are upgrading from a previous release of FreeBSD, please read upgrading s The procedure for doing a source code based update is described in Updating FreeBSD from Source. -For SVN use the releng/{localRel} branch which will be where any upcoming Security Advisories or Errata Notices will be applied. +For Git use the releng/{localRel} branch which will be where any upcoming Security Advisories or Errata Notices will be applied. [[upgrade-binary]] == Upgrading Using "FreeBSD Update" @@ -49,7 +49,7 @@ The {{< manpage "freebsd-update" "8">}} utility supports binary upgrades of i386 Now the {{< manpage "freebsd-update" "8">}} utility can fetch bits belonging to {releaseCurrent}. During this process {{< manpage "freebsd-update" "8">}} will ask for help in merging configuration files. -[.screen] +[.screen,subs="verbatim,attributes"] ---- # freebsd-update upgrade -r {localRel}-RELEASE # freebsd-update install From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 23:57:26 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 580FE56C60D for ; Mon, 15 Mar 2021 23:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DztdL23hLz4d6f; Mon, 15 Mar 2021 23:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 39871197DB; Mon, 15 Mar 2021 23:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FNvQiG059446; Mon, 15 Mar 2021 23:57:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FNvQR7059445; Mon, 15 Mar 2021 23:57:26 GMT (envelope-from git) Date: Mon, 15 Mar 2021 23:57:26 GMT Message-Id: <202103152357.12FNvQR7059445@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: John Baldwin Subject: git: 0ad03471aa - main - Various updates to the 13.0 readme. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ad03471aa105158318fdb649095c0a5af72507d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 23:57:26 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/doc/commit/?id=0ad03471aa105158318fdb649095c0a5af72507d commit 0ad03471aa105158318fdb649095c0a5af72507d Author: John Baldwin AuthorDate: 2021-03-15 23:55:15 +0000 Commit: John Baldwin CommitDate: 2021-03-15 23:57:17 +0000 Various updates to the 13.0 readme. - Remove spurious quotes from attributes. - Update the descriptions of supported architectures including adding aarch64 and RISC-V and removing sparc64. - Suggest installing packages via pkg(8) rather than the installer. - Claim 13.0 is a release and not a developer snapshot. - Trim stale info about obtaining FreeBSD and instead point the user at the "where/" page on the main website. - Switch mailing list from current@ to stable@. - Add an explicit link to bugs.freebsd.org and remove mention of send-pr(1). - Just assume bsdinstall works on all platforms. - Other minor edits. Reviewed by: gjb (earlier version) Differential Revision: https://reviews.freebsd.org/D29243 --- website/content/en/releases/13.0R/readme.adoc | 65 +++++++++------------------ 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/website/content/en/releases/13.0R/readme.adoc b/website/content/en/releases/13.0R/readme.adoc index 756d0f7663..aaf0542b86 100644 --- a/website/content/en/releases/13.0R/readme.adoc +++ b/website/content/en/releases/13.0R/readme.adoc @@ -3,11 +3,11 @@ title: "FreeBSD 13.0-RELEASE README" sidenav: download --- -:releaseCurrent: "13.0-RELEASE" -:releaseType: "release" -:releaseBranch: "13-STABLE" -:releasePrevStable: "12.2-RELEASE" -:releasePrev: "12.2-RELEASE" +:releaseCurrent: 13.0-RELEASE +:releaseType: release +:releaseBranch: 13-STABLE +:releasePrevStable: 12.2-RELEASE +:releasePrev: 12.2-RELEASE include::shared/releases.adoc[] include::shared/en/urls.adoc[] @@ -35,51 +35,27 @@ This distribution is a {releaseType} of FreeBSD {releaseCurrent}, the latest poi [[about]] == About FreeBSD -FreeBSD is an operating system based on 4.4 BSD Lite for AMD64 and Intel EM64T based PC hardware (amd64), Intel, AMD, Cyrix or NexGen x86 based PC hardware (i386), and UltraSPARC(R) machines (sparc64). Versions for the ARM(R) (arm), MIPS(R) (mips), and PowerPC(R) (powerpc) architectures are currently under development as well. FreeBSD works with a wide variety of peripherals and configurations and can be used for everything from software development to games to Internet Service Provision. +FreeBSD is an open source operating system derived from 4.4 BSD Lite2 for 64-bit x86-based PC hardware (amd64), 32-bit x86-based PC hardware (i386), 64-bit Arm(R) ARMv8-A AArch64 systems (aarch64), 32-bit Arm(R) ARMv6/7 systems (armv6/7), PowerPC(R) systems (powerpc, powerpc64), RISC-V (riscv64) systems, and MIPS(R) systems (mips, mips64). +FreeBSD works with a wide variety of peripherals and configurations and can be used for everything from software development to games to Internet Service Provision. This release of FreeBSD contains everything you need to run such a system, including full source code for the kernel and all utilities in the base distribution. With the source distribution installed, you can literally recompile the entire system from scratch with one command, making it ideal for students, researchers, or users who simply want to see how it all works. -A large collection of third-party ported software (the Ports Collection) is also provided to make it easy to obtain and install all your favorite traditional UNIX(R) utilities for FreeBSD. Each port consists of a set of scripts to retrieve, configure, build, and install a piece of software, with a single command. Over {numports} ports, from editors to programming languages to graphical applications, make FreeBSD a powerful and comprehensive operating environment that extends far beyond what's provided by many commercial versions of UNIX(R). Most ports are also available as pre-compiled packages, which can be quickly installed from the installation program. +A large collection of third-party ported software (the Ports Collection) is also provided to make it easy to obtain and install all your favorite traditional UNIX(R) utilities for FreeBSD. Each port consists of a set of scripts to retrieve, configure, build, and install a piece of software, with a single command. Over {numports} ports, from editors to programming languages to graphical applications, make FreeBSD a powerful and comprehensive operating environment that extends far beyond what's provided by many commercial versions of UNIX(R). Most ports are also available as pre-compiled packages, which can be quickly installed via the {{< manpage "pkg" "8">}} utility. [[audience]] == Target Audience -This {releaseType} is aimed primarily at early adopters and various other users who want to get involved with the ongoing development of FreeBSD. While the FreeBSD development team tries its best to ensure that each {releaseType} works as advertised, {releaseBranch} is very much a work-in-progress. - -The basic requirements for using this {releaseType} are technical proficiency with FreeBSD and an understanding of the ongoing development process of FreeBSD {releaseBranch} (as discussed on the {freebsd-current}). - -For those more interested in doing business with FreeBSD than in experimenting with new FreeBSD technology, formal releases (such as {releasePrevStable}) are frequently more appropriate. Releases undergo a period of testing and quality assurance checking to ensure high reliability and dependability. - -This {releaseType} is aimed primarily at early adopters and various other users who want to get involved with the ongoing development of FreeBSD. While the FreeBSD development team tries its best to ensure that each {releaseType} works as advertised, {releaseBranch} is very much a work-in-progress. - -The basic requirements for using this {releaseType} are technical proficiency with FreeBSD and an understanding of the ongoing development process of FreeBSD {releaseBranch} (as discussed on the {freebsd-current}). - -For those more interested in doing business with FreeBSD than in experimenting with new FreeBSD technology, formal releases (such as {releasePrevStable}) are frequently more appropriate. Releases undergo a period of testing and quality assurance checking to ensure high reliability and dependability. - This {releaseType} of FreeBSD is suitable for all users. It has undergone a period of testing and quality assurance checking to ensure the highest reliability and dependability. [[obtain]] == Obtaining FreeBSD -FreeBSD may be obtained in a variety of ways. This section focuses on those ways that are primarily useful for obtaining a complete FreeBSD distribution, rather than updating an existing installation. - -[[cdromdvd]] -=== CDROM and DVD - -FreeBSD -RELEASE distributions may be ordered on CDROM or DVD from several publishers. This is frequently the most convenient way to obtain FreeBSD for new installations, as it provides a convenient way to quickly reinstall the system if necessary. Some distributions include some of the optional, precompiled packages from the FreeBSD Ports Collection, or other extra material. - -A list of the CDROM and DVD publishers known to the project are listed in the link:{handbook}#mirrors[Obtaining FreeBSD] appendix to the Handbook. - -[[ftp]] -=== FTP - -You can use FTP to retrieve FreeBSD and any or all of its optional packages from `ftp://ftp.FreeBSD.org/`, which is the official FreeBSD release site, or any of its mirrors. - -Lists of locations that mirror FreeBSD can be found in the link:{handbook}#mirrors-ftp[FTP Sites] section of the Handbook. Finding a close (in networking terms) mirror from which to download the distribution is highly recommended. - -Additional mirror sites are always welcome. Contact `` for more details on becoming an official mirror site. You can also find useful information for mirror sites at the link:{hubs}[Mirroring FreeBSD] article. - -Mirrors generally contain the ISO images generally used to create a CDROM of a FreeBSD release. They usually also contain floppy disk images (for applicable platforms), as well as the files necessary to do an installation over the network. Finally mirrors sites usually contain a set of packages for the most current release. +FreeBSD may be obtained in a variety of ways. +The most convenient way is to download a release image. +Links to images for recent releases can be found on the FreeBSD Web site's +link:../../../where/[download page]. +This page includes information about the different types of images available +as well as other ways to obtain a copy of FreeBSD. [[contacting]] == Contacting the FreeBSD Project @@ -89,7 +65,7 @@ Mirrors generally contain the ISO images generally used to create a CDROM of a F For any questions or general technical support issues, please send mail to the {freebsd-questions}. -If you're tracking the {releaseBranch} development efforts, you must join the {freebsd-current}, in order to keep abreast of recent developments and changes that may affect the way you use and maintain the system. +If you're tracking the {releaseBranch} development efforts, you must join the {freebsd-stable}, in order to keep abreast of recent developments and changes that may affect the way you use and maintain the system. Being a largely-volunteer effort, the FreeBSD Project is always happy to have extra hands willing to help-there are already far more desired enhancements than there is time to implement them. To contact the developers on technical matters, or with offers of help, please send mail to the {freebsd-hackers}. @@ -107,9 +83,7 @@ Do not send email to the lists asking to be subscribed. Use the Mailman interfac Suggestions, bug reports and contributions of code are always valued. Please do not hesitate to report any problems you may find. Bug reports with attached fixes are of course even more welcome. -The preferred method to submit bug reports from a machine with Internet connectivity is to use the Bugzilla bug tracker. Problem Reports (PRs) submitted in this way will be filed and their progress tracked; the FreeBSD developers will do their best to respond to all reported bugs as soon as possible. link:https://bugs.freebsd.org/search/[A list of all active PRs] is available on the FreeBSD Web site; this list is useful to see what potential problems other users have encountered. - -Note that {{< manpage "send-pr" "1">}} is deprecated. +The preferred method to submit bug reports from a machine with Internet connectivity is to use the link:https://bugs.freebsd.org[Bugzilla bug tracker]. Problem Reports (PRs) submitted in this way will be filed and their progress tracked; the FreeBSD developers will do their best to respond to all reported bugs as soon as possible. link:https://bugs.freebsd.org/search/[A list of all active PRs] is available on the FreeBSD Web site; this list is useful to see what potential problems other users have encountered. For more information, link:{problem-reports}["Writing FreeBSD Problem Reports"], available on the FreeBSD Web site, has a number of helpful hints on writing and submitting effective problem reports. @@ -128,11 +102,12 @@ A number of other files provide more specific information about this {releaseTyp * [.filename]`HARDWARE.TXT`: The hardware compatibility list, showing devices with which FreeBSD has been tested and is known to work. * [.filename]`ERRATA.TXT`: Release errata. Late-breaking, post-release information can be found in this file, which is principally applicable to releases (as opposed to snapshots). It is important to consult this file before installing a release of FreeBSD, as it contains the latest information on problems which have been found and fixed since the release was created. -On platforms that support {{< manpage "bsdinstall" "8">}} (currently amd64, i386, and sparc64), these documents are generally available via the Documentation menu during installation. Once the system is installed, you can revisit this menu by re-running the {{< manpage "bsdinstall" "8">}} utility. +During installation, these documents are available via the Documentation menu. Once the system is installed, you can revisit this menu by re-running the {{< manpage "bsdinstall" "8">}} utility. [.note] *Note*: + -It is extremely important to read the errata for any given release before installing it, to learn about any late-breaking news or post-release problems. The errata file accompanying each release (most likely right next to this file) is already out of date by definition, but other copies are kept updated on the Internet and should be consulted as the current errata for this release. These other copies of the errata are located at link:../../releases/[https://www.FreeBSD.org/releases] (as well as any sites which keep up-to-date mirrors of this location). +To learn about any late-breaking news or post-release problems, it is extremely important to read the errata for any given release before installing it. +The errata file accompanying each release (most likely right next to this file) is already out of date by definition, but other copies are kept updated on the Internet and should be consulted as the current errata for this release. These other copies of the errata are located at link:../../releases/[https://www.FreeBSD.org/releases] (as well as any sites which keep up-to-date mirrors of this location). [[manpages]] === Manual Pages @@ -148,7 +123,7 @@ Two highly-useful collections of FreeBSD-related information, maintained by the A number of on-line books and articles, also maintained by the FreeBSD Project, cover more-specialized, FreeBSD-related topics. This material spans a wide range of topics, from effective use of the mailing lists, to dual-booting FreeBSD with other operating systems, to guidelines for new committers. Like the Handbook and FAQ, these documents are available from the FreeBSD Documentation Page or in the doc distribution set. -A listing of other books and documents about FreeBSD can be found in the link:{handbook}#bibliography[bibliography]of the FreeBSD Handbook. Because of FreeBSD's strong UNIX(R) heritage, many other articles and books written for UNIX(R) systems are applicable as well, some of which are also listed in the bibliography. +A listing of other books and documents about FreeBSD can be found in the link:{handbook}#bibliography[bibliography] of the FreeBSD Handbook. Because of FreeBSD's strong UNIX(R) heritage, many other articles and books written for UNIX(R) systems are applicable as well, some of which are also listed in the bibliography. [[acknowledgements]] == Acknowledgments From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 23:57:27 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E49A556C503 for ; Mon, 15 Mar 2021 23:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DztdM417Rz4dFl; Mon, 15 Mar 2021 23:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5AF2E19754; Mon, 15 Mar 2021 23:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FNvRvP059468; Mon, 15 Mar 2021 23:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FNvREf059467; Mon, 15 Mar 2021 23:57:27 GMT (envelope-from git) Date: Mon, 15 Mar 2021 23:57:27 GMT Message-Id: <202103152357.12FNvREf059467@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: John Baldwin Subject: git: acb5bb94c5 - main - Various updates to the 13.0 release notes. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acb5bb94c5a0472faaef1d03504422ecedc68d3b Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 23:57:28 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/doc/commit/?id=acb5bb94c5a0472faaef1d03504422ecedc68d3b commit acb5bb94c5a0472faaef1d03504422ecedc68d3b Author: John Baldwin AuthorDate: 2021-03-15 23:55:37 +0000 Commit: John Baldwin CommitDate: 2021-03-15 23:57:17 +0000 Various updates to the 13.0 release notes. - Remove extraneous quotes from attributes. - Prefer active voice to passive voice when describing changes. - Correct a few entries that claimed functionality changed when the associated changes were changes to the documentation. - Move the VirtIO V1 comment to the device drivers section and make it more generic as well as adding missing context for Q35 (it's specific to QEMU). - Trim the bhyve entries to not include changes already present in 12.2. Also, don't list bugfixes to previous changes, e.g. a single entry for VM snapshots is sufficient from a user's perspective. - Replace some bhyve entries with broader entries such as support for LA57 and Hygon Dhyana. - In the note about the i386 CPUTYPE, shift to present tense instead of future tense. Reviewed by: gjb (earlier version) Discussed with: emaste Differential Revision: https://reviews.freebsd.org/D29244 --- website/content/en/releases/13.0R/relnotes.adoc | 175 +++++++++--------------- 1 file changed, 68 insertions(+), 107 deletions(-) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 4af60a1d77..18e91a2988 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -8,11 +8,11 @@ sidenav: download :toc: macro :toclevels: 1 :icons: font -:releaseCurrent: "13.0-RELEASE" -:releaseBranch: "13-STABLE" +:releaseCurrent: 13.0-RELEASE +:releaseBranch: 13-STABLE :releasePrev: 12.2-RELEASE :releaseNext: 13.1-RELEASE -:releaseType: "release" +:releaseType: release include::shared/en/urls.adoc[] @@ -95,7 +95,7 @@ This section lists the various Security Advisories and Errata Notices since {rel |=== // Sample release notes entry. -//The man:fsck_msdosfs[8] utility has been updated to include a variety of enhancements, including reducing the memory footprint, a new flag, `-M`, which disables the use of man:mmap[2], and others. gitref:9708ba9f29[repository=src] +//The man:fsck_msdosfs[8] utility includes a variety of enhancements, including reducing the memory footprint, a new flag, `-M`, which disables the use of man:mmap[2], and others. gitref:9708ba9f29[repository=src] [[userland]] == Userland @@ -109,16 +109,17 @@ This section covers changes and additions to userland applications, contributed [[userland-programs]] === Userland Application Changes -The {{< manpage "calendar" "1" >}} utility got back support for nested C pre-processor conditionals and gains support for the C++ comment syntax in addition to the C syntax. gitref:19b5c307548[repository=src] +The {{< manpage "calendar" "1" >}} utility again supports nested C pre-processor conditionals and now supports the C++ comment syntax in addition to the C syntax. gitref:19b5c307548[repository=src] -The {{< manpage "calendar" "1" >}} utility has been modified to consistently print dates according to the locale of the invoking user, not the possibly varying locales of included files. gitref:f1560bd080a[repository=src] +The {{< manpage "calendar" "1" >}} utility consistently prints dates according to the locale of the invoking user, not the possibly varying locales of included files. gitref:f1560bd080a[repository=src] -The {{< manpage "calendar" "1" >}} utility has been fixed to use the correct paths for included files if invoked with the -a option. gitref:19b5c307548[repository=src] +The {{< manpage "calendar" "1" >}} utility uses the correct paths for included files if invoked with the -a option. gitref:19b5c307548[repository=src] -The {{< manpage "calendar" "1" >}} utility does no longer install data files other than calendar.freebsd. +The {{< manpage "calendar" "1" >}} utility no longer installs data files other than calendar.freebsd. The data files are now provided by the deskutils/calendar-data port. gitref:d20d6550187[repository=src] -The {{< manpage "daemon" "8" >}} utility now supports the `-H` flag, which causes it to catch SIGHUP and re-open the syslog file received, so log rotation from {{< manpage "newsyslog" "8">}} works properly. gitref:4cd407ec933[repository=src] +The {{< manpage "daemon" "8" >}} utility now supports the `-H` flag to close and re-open the output file when SIGHUP is received. +This permits rotation of the output file via {{< manpage "newsyslog" "8">}}. gitref:4cd407ec933[repository=src] The {{< manpage "daemon" "8" >}} utility no longer blocks SIGTERM during the restart delay. gitref:09a3675d961[repository=src] @@ -128,15 +129,15 @@ The {{< manpage "freebsd-update" "8" >}} utility now displays progress for the " The {{< manpage "freebsd-update" "8" >}} utility now supports the `-p` flag, which ensures password db changes are included in [.filename]#/etc/passwd# via {{< manpage "pwd_mkdb" "8">}}. gitref:9b6591109e8[repository=src] {{< sponsored "The FreeBSD Foundation" >}} -The {{< manpage "freebsd-update" "8" >}} utility now supports the `updatesready` and `showconfig` arguments to check for updates and check the configuration respectively. gitref:8cfda118cbd[repository=src] +The {{< manpage "freebsd-update" "8" >}} utility now supports the `updatesready` and `showconfig` commands to check for updates and check the configuration respectively. gitref:8cfda118cbd[repository=src] -The {{< manpage "freebsd-update" "8" >}} utility includes support for the `PAGER` environment variable, which has now been documented. gitref:32f4592764d[repository=src] +The manual page for the {{< manpage "freebsd-update" "8" >}} utility documents using the `PAGER` environment variable for non-interactive use. gitref:32f4592764d[repository=src] -The {{< manpage "gstat" "8" >}} utility now documents the use of interactive keyboard commands to increase and decrease update interval as well as regular expression filters. gitref:cfaa2958dc4[repository=src] +The manual page for the {{< manpage "gstat" "8" >}} utility now documents the use of interactive keyboard commands. gitref:cfaa2958dc4[repository=src] -The manual page for the {{< manpage "inetd" "8" >}} utility now includes an example of how to use netcat as a HTTP proxy. gitref:a58fc861516[repository=src] +The manual page for the {{< manpage "inetd" "8" >}} utility now includes an example of how to use netcat as an HTTP proxy. gitref:a58fc861516[repository=src] -The {{< manpage "inetd" "8" >}} utility now includes comments for all examples. gitref:26a4a61a285[repository=src] +The manual page for the {{< manpage "inetd" "8" >}} utility now includes comments for all examples. gitref:26a4a61a285[repository=src] [[userland-contrib]] === Contributed Software @@ -153,7 +154,7 @@ The previous implementation is still available in FreeBSD-13 and can be selected [[userland-libraries]] === Runtime Libraries and API -The {{< manpage "getlocalbase" "3" >}} function has been added to libutil to retrieve the LOCALBASE path in a standard way. gitref:30d21d27953[repository=src] +The new {{< manpage "getlocalbase" "3" >}} function in libutil retrieves the LOCALBASE path in a standard way. gitref:30d21d27953[repository=src] [[kernel]] == Kernel @@ -176,7 +177,11 @@ This section covers changes and additions to devices and device drivers since {r [[drivers-device]] === Device Drivers -A new man:usbhid[4] driver has been added, and can be loaded by adding `hw.usb.usbhid.enable=1` to [.filename]#/boot/loader.conf# and adding `usbhid` to `kld_list=""` in [.filename]#/etc/rc.conf#. gitref:b62f6dfaed3d[repository=src] +A new man:usbhid[4] driver uses drivers from the man:hid[4] framework for USB +HID devices instead of man:ukbd[4], man:ums[4], and man:uhid[4]. +man:usbhid[4] is enabled by adding `hw.usb.usbhid.enable=1` to [.filename]#/boot/loader.conf# and adding `usbhid` to `kld_list=""` in [.filename]#/etc/rc.conf#. gitref:b62f6dfaed3d[repository=src] + +The suite of VirtIO device drivers now support the VirtIO V1 spec. This improves FreeBSD's compatibility as a guest operating system with various hypervisors and emulators including the ability to run on the link:https://wiki.qemu.org/images/4/4e/Q35.pdf[Q35 chipset] under QEMU. [[storage]] == Storage @@ -185,7 +190,7 @@ This section covers changes and additions to file systems and other storage subs For {{< manpage "iscsi" "4" >}} and {{< manpage "ctld" "8" >}}, support for specifying network QoS in the form of DiffServ Codepoints (DSCP) and Ethernet Priority Code Point (PCP) was added. gitref:ddf1072aac49[repository=src] {{< sponsored "NetApp" >}} -The {{< manpage "ctld" "8" >}} utility now supports the `-f` flag, which tests the configuration file validity. gitref:7fcbecd004f[repository=src] +The {{< manpage "ctld" "8" >}} utility now supports the `-f` flag to test the validity of configuration files. gitref:7fcbecd004f[repository=src] [[storage-general]] === General Storage @@ -196,11 +201,11 @@ The {{< manpage "ctld" "8" >}} utility now supports the `-f` flag, which tests t This section covers the boot loader, boot menu, and other boot-related changes. -The {{< manpage "efibootmgr" "8" >}} utility now supports the `-b` flag, which lets users specify by bootnum as an index. gitref:a2581e80212[repository=src] {{< sponsored "Netflix" >}} +The {{< manpage "efibootmgr" "8" >}} utility now supports the `-b` flag to specify an index of a specific boot entry to create or modify. gitref:a2581e80212[repository=src] {{< sponsored "Netflix" >}} -The {{< manpage "efibootmgr" "8" >}} utility now supports the `-E` flag, which lets users query which EFI System Partition was used to boot the system. gitref:1cdb8eb8fe1[repository=src] {{< sponsored "Netflix" >}} +The {{< manpage "efibootmgr" "8" >}} utility now supports the `-E` flag to query which EFI System Partition was used to boot the system. gitref:1cdb8eb8fe1[repository=src] {{< sponsored "Netflix" >}} -The {{< manpage "efibootmgr" "8" >}} utility now supports the `-f` and `-F` flags, which lets users tell the system to boot to the UEFI user interface or not. gitref:83c4237258d[repository=src] {{< sponsored "Ampere Computing, Inc." >}} +The {{< manpage "efibootmgr" "8" >}} utility now supports the `-f` and `-F` flags to set or clear a request to boot to the UEFI user interface on the next boot. gitref:83c4237258d[repository=src] {{< sponsored "Ampere Computing, Inc." >}} Prior releases had a complete ms-dos formatted filesystem packaged into boot1.efifat. Older versions of FreeBSD installed this filesystem image into a raw partition. @@ -219,17 +224,24 @@ If the {{< manpage "efibootmgr" "8" >}} utility is used to customize the boot en This section describes changes that affect networking in FreeBSD. -For {{< manpage "tcp" "4">}}, Proportional Rate Reduction, as described by RFC6937, to improve SACK loss recovery during burst loss and ACK thinning scenarios, was implemented and is enabled by default. -A new {{< manpage "sysctl" "8" >}} has been added, `net.inet.tcp.do_prr`, which when set to `0` will restore the prior behavior. -It is expected that PRR generally helps improve loss recovery performance and prevent numerous preventable RTO stalls. +{{< manpage "tcp" "4">}} now supports Proportional Rate Reduction (as described by RFC6937) to improve SACK loss recovery during burst loss and ACK thinning scenarios. +This feature is enabled by default. +A new {{< manpage "sysctl" "8" >}}, `net.inet.tcp.do_prr`, can be set to `0` to restore the prior behavior. + +PRR should generally help improve loss recovery performance and prevent numerous preventable retransmit timeout (RTO) stalls. This surpasses the prior behavior, but a strictly packet conserving variant can be enabled. -When misconfigured token bucket traffic policer can cause persistent loss even during loss recovery, activating the conservative PRR variant may prevent some retransmission timeouts (RTO) and associated session stalls for a few milliseconds while behaving less optimal in the general case. -For this, a new {{< manpage "sysctl" "8">}} was added, `net.inet.tcp.do_prr_conservative`. -Setting this variable to `1` will enable strictly packet conserving behavior (at most 1 segment for each ACK received), while the normal variant may send up to 2 segments per received ACK - helping in cases of ACK thinning or significant burst loss events. gitref:0e1d7c25c5ab[repository=src] {{< sponsored "NetApp" >}} +A misconfigured token bucket traffic policer can cause persistent loss even during loss recovery. +In that case, activating the conservative PRR variant may prevent some retransmission timeouts (RTO) and associated session stalls for a few milliseconds while behaving less optimal in the general case. +A new {{< manpage "sysctl" "8">}}, `net.inet.tcp.do_prr_conservative`, +can be set to `1` to enable strictly packet conserving behavior (at most 1 segment for each ACK received), while the normal variant may send up to 2 segments per received ACK - helping in cases of ACK thinning or significant burst loss events. gitref:0e1d7c25c5ab[repository=src] {{< sponsored "NetApp" >}} + +The {{< manpage "cc_cubic" "4">}} {{< manpage "tcp" "4">}} congestion control algorithm aligns more closely with the standard in RFC8312. gitref:40f9078ff9d9[repository=src] {{< sponsored "NetApp" >}} -The {{< manpage "cc_cubic" "4">}} has been improved to address various corner cases and align more closely with the standard in RFC8312. gitref:40f9078ff9d9[repository=src] {{< sponsored "NetApp" >}} +The {{< manpage "ping" "8" >}} utility now supports setting network QoS, with IP DSCP gitref:6034024daddb[repository=src] and Ethernet PCP gitref:81a6f4c7ae69[repository=src]. {{< sponsored "NetApp" >}} -The {{< manpage "ping" "8" >}} and {{< manpage "ping6" "8" >}} utilities both support setting network QoS, with IP DSCP gitref:6034024daddb[repository=src] and Ethernet PCP gitref:81a6f4c7ae69[repository=src] {{< sponsored "NetApp" >}} +The {{< manpage "ping" "8" >}} and {{< manpage "ping6" "8" >}} utilities have been merged. +{{< manpage "ping" "8" >}} supports both IPv4 and IPv6. +A legacy {{< manpage "ping6" "8" >}} is retained for backwards compatibility. gitref:3cde9171d2d5[repository=src] [[network-general]] === General Network @@ -239,26 +251,32 @@ The {{< manpage "ping" "8" >}} and {{< manpage "ping6" "8" >}} utilities both su This section covers general hardware support for physical machines, hypervisors, and virtualization environments, as well as hardware changes and updates that do not otherwise fit in other sections of this document. +=== AMD64 + +The amd64 architecture now supports Hygon Dhyana Family 18h processors. gitref:2ee49fac82fc[repository=src] + +The amd64 architecture now supports 57-bit virtual addresses (LA57) on supported CPUs. This permits user processes to use up to 56 bits of virtual address space. This also includes support for five layer nested page tables used by bhyve. gitref:9ce875d9b59d[repository=src] {{< sponsored "The FreeBSD Foundation" >}} + [[ARM-ARM64]] === Allwinner -The aw_gpio driver have been improved to handle GPIO interrupts. gitref:0fe5379c6a9[repository=src] +The aw_gpio driver now suppots GPIO interrupts. gitref:0fe5379c6a9[repository=src] -A new aw_pwm driver have been added, pwm channels can be configured with {{< manpage "pwm" "8">}}. gitref:277a038d0da[repository=src] +A new aw_pwm driver supports Pulse Width Modulation (PWM) hardware on Allwinner boards. PWM channels can be configured with {{< manpage "pwm" "8">}}. gitref:277a038d0da[repository=src] -Battery sensors were added to the AXP803/AXP813 drivers. gitref:66bddb4c701[repository=src] +The AXP803/AXP813 drivers now report battery sensor information. gitref:66bddb4c701[repository=src] -Audio is now working on H3/H5 SoCs. gitref:bfcf888a87a[repository=src] +Audio now works on H3/H5 SoCs. gitref:bfcf888a87a[repository=src] -Infrared receiver now works on H3 SoC. gitref:012fba460ac[repository=src] +Infrared receiver now works on the H3 SoC. gitref:012fba460ac[repository=src] -USB DRD is now working on multiple Allwinner SoC, this means that some usb port can be used as peripherals. gitref:aea49d9fed9[repository=src] +USB DRD now works on multiple Allwinner SoCs. This means that some USB ports can be used as peripherals. gitref:aea49d9fed9[repository=src] -===RockChip +=== RockChip -A new rk_pwm driver have been added, pwm channels can be configured with {{< manpage "pwm" "8">}}. gitref:bcd380e88b2[repository=src] +A new rk_pwm driver supports PWM hardware on the RK3399. PWM channels can be configured with {{< manpage "pwm" "8">}}. gitref:bcd380e88b2[repository=src] -A PCIe driver was added for RK3399. gitref:dfd1d0fcabe[repository=src] +External PCI-express adapters are now supports for the RK3399 SoC. gitref:dfd1d0fcabe[repository=src] USB3 found in RK3328 and RK3399 is now supported. gitref:7d888a5b2be[repository=src] @@ -269,76 +287,19 @@ if_dwc now supports checksum offloading. gitref:98ea5a7b9a1[repository=src] [[hardware-virtualization]] === Virtualization Support -The {{< manpage "bhyve" "8">}} utility has been updated to support COM3 and COM4 serial ports. gitref:eed1cc6cdfa[repository=src] - -The {{< manpage "bhyve" "8">}} utility has been updated to remove bvmconsole and bvmdebug now that UART support is in. gitref:c4df8cbfde5[repository=src] - -The {{< manpage "bhyve" "8">}} utility now supports VNC version 3.3, has increased framebuffer poll frequency and doesn't send updates if there are no framebuffer updates. gitref:2bb4be0f865[repository=src] - -The {{< manpage "bhyve" "8">}} utility now suspends I/O on ahci-cd devices during a snapshot. gitref:1b9c78611d9[repository=src] - -The {{< manpage "bhyve" "8">}} utility now permits suspend/resume of a XHCI device model that has not been attached to by a driver in a guest OS. gitref:57b0a3aacad[repository=src] - -The {{< manpage "bhyve" "8">}} utility now honors the disabled setting for MSI-X interrupts for passthrough devices. gitref:1925586e03b[repository=src] {{< sponsored "Chelsio Communications" >}} - -The {{< manpage "bhyve" "8">}} utility now reports version 13.0 in the SMBIOS table. gitref:a2fe464c81d[repository=src] - -The {{< manpage "bhyve" "8">}} utility now has increased the allowed size for 64bit BAR allocation below 4G from 32 to 128 MB. gitref:670b364b76d[repository=src] {{< sponsored "The FreeBSD Foundation" >}} - -The {{< manpage "bhyve" "8">}} utility now avoids allocating BARs above the end of supported physical addresses. gitref:9922872ba29[repository=src] {{< sponsored "The FreeBSD Foundation" >}} - -The {{< manpage "bhyve" "8">}} utility now no longer prints non-printable characters in the smbios.chassis.maker and smbios.system.maker OIDs. gitref:c4fd0cc9ee2[repository=src] {{< sponsored "Netflix" >}} - -The {{< manpage "bhyve" "8">}} utility now supports TRIM via the VirtIO block device. gitref:22769bbe30b[repository=src] {{< sponsored "Klara Inc." >}} - -The {{< manpage "bhyve" "8">}} utility now supports TRIM alignment requirements through VirtIO. gitref:cc3568c1d06[repository=src] {{< sponsored "vStack.com" >}} - -The {{< manpage "bhyve" "8">}} utility now supports virtio-9p (aka VirtFS) filesystem sharing. gitref:100353cfbf8[repository=src] {{< sponsored "Conclusive Engineering (development), vStack.com (funding)" >}} - -The {{< manpage "bhyve" "8">}} utility now reports nominal health values for NVMe. gitref:c4a86c1fc0d[repository=src] - -The {{< manpage "bhyve" "8">}} utility now supports LA57 guest mode. gitref:f3eb12e4a6d[repository=src] {{< sponsored "The FreeBSD Foundation" >}} - -The {{< manpage "bhyve" "8">}} utility now supports setting additional AHCI controller parameters like serial number, firmware revision, model number and NMRR. gitref:9af3bcd7c97[repository=src] - -The {{< manpage "bhyve" "8">}} utility now advertises 64-bit physical-address capability. gitref:fb5f5a17ef0[repository=src] - -The {{< manpage "bhyve" "8">}} utility no longer sends ACPI RTC errors/warnings in some guests. gitref:6a7ff0600bb[repository=src] - -The {{< manpage "bhyve" "8">}} utility now supports NVMe Feature Interrupt Vector Config, Firmware Commit, Asyncronous Event Requests, SMART data I/O statistics, NVMe Format NVM commands, NVMe Namespace Identification Descriptor, the NVMe deallocate command and the NVMe Flush command in a series of commits. - -The {{< manpage "bhyve" "8">}} utility now allows for automatic destruction on power-off. gitref:0a1016f9e8a[repository=src] {{< sponsored "Mysterious Code Ltd." >}} - -The {{< manpage "bhyve" "8">}} utility now exposes kernel-emulated special devices like LAPIC, IOAPIC, and HPET devices to userspace. gitref:8a68ae80f67[repository=src] - -The {{< manpage "bhyve" "8">}} utility now supports a new bhyve network backend that allow connecting the VM to the {{< manpage "netgraph" "4">}} network. gitref:2cd7735d920[repository=src] {{< sponsored "vStack.com" >}} - -The {{< manpage "bhyve" "8">}} utility now has initial support for bhyve save and restore. gitref:483d953a86a[repository=src] {{< sponsored "University Politehnica of Bucharest, Matthew Grooms (student scholarships), iXsystems" >}} - -The {{< manpage "bhyve" "8">}} utility now supports the VM Generation Counter ACPI device. gitref:9cb339cc7b8[repository=src] - -The {{< manpage "bhyve" "8">}} utility has had multiple changes done to the VirtIO network device, like adjustable MTU, mergeable rx buffers, rx backpressure and enabling/disabling VirtIO network device in a series of commits. - -The {{< manpage "bhyve" "8">}} utility now supports the Hygon Dhyana x86 CPU. gitref:5a6d45d0150[repository=src] - -The {{< manpage "bhyve" "8">}} utility now supports software breakpoints in the debug server on Intel CPUs. gitref:cbd03a9df2c[repository=src] - -The {{< manpage "bhyve" "8">}} utility now PCI HDAudio device. gitref:7e3c7420615[repository=src] - -The {{< manpage "bhyve" "8">}} utility now supports the PCIe Integrated Endpoint capability. gitref:129f93c5a76[repository=src] +The {{< manpage "bhyve" "8">}} utility supports additional COM3 and COM4 serial ports. gitref:eed1cc6cdfa[repository=src] -The {{< manpage "bhyve" "8">}} utility is now SMBIOS table topology aware. gitref:3facfc75607[repository=src] +The deprecated bvmconsole and bvmdebug device models have been removed. This includes both the device models from {{< manpage "bhyve" "8">}} and the kernel device drivers for FreeBSD guests. gitref:c4df8cbfde5[repository=src] -The {{< manpage "bhyve" "8">}} utility now supports CTL device specification via the VirtIO SCSI device. gitref:49f8782283d[repository=src] {{< sponsored "iXsystems, Inc." >}} +The {{< manpage "bhyve" "8">}} utility works reliably with more VNC clients including the macOS "Screen Sharing" application. gitref:2bb4be0f865[repository=src] -The {{< manpage "bhyve" "8">}} utility now supports PS/2 scancodes for NumLock, ScrollLock and numerical keypad keys. gitref:6f2d76643e6[repository=src] {{< sponsored "iXsystems Inc." >}} +The {{< manpage "bhyve" "8">}} utility now supports VirtIO-9p (aka VirtFS) filesystem sharing. gitref:100353cfbf8[repository=src] {{< sponsored "Conclusive Engineering (development), vStack.com (funding)" >}} -The {{< manpage "bhyve" "8">}} utility now supports the VNC server to listen on IPv6 for incoming connections. gitref:8883128b8e9[repository=src] +The {{< manpage "bhyve" "8">}} utility now supports virtual machine snapshots. This feature is still in active development and is not yet enabled by default. gitref:483d953a86a[repository=src] {{< sponsored "University Politehnica of Bucharest, Matthew Grooms (student scholarships), iXsystems" >}} -In addition to all of these, bhyve received an amount of minor changes, which are too numerous to mention, and which fixes a number of outstanding issues. +The {{< manpage "bhyve" "8">}} utility now supports a VM Generation Counter ACPI device. gitref:9cb339cc7b8[repository=src] -Besides the VirtIO changes made for bhyve, there are numerous changes to the {{< manpage "virtio" "4">}} subsystems to make it compatible with the VirtIO V1 spec, which means that FreeBSD can -now run on the link:https://wiki.qemu.org/images/4/4e/Q35.pdf[Q35 chipset]. +The {{< manpage "bhyve" "8">}} utility now supports PCI HDAudio devices. gitref:7e3c7420615[repository=src] [[ports]] == Ports Collection and Package Infrastructure @@ -355,21 +316,21 @@ This section covers changes to the FreeBSD Ports Collection, package infrastruct [[future-releases-cputype]] === Default `CPUTYPE` Change -Starting with FreeBSD-13.0, the default `CPUTYPE` for the i386 architecture will change from `486` to `686`. +The default `CPUTYPE` for the i386 architecture is now `686` (instead of `486`). -This means that, by default, binaries produced will require a 686-class CPU, including but not limited to binaries provided by the FreeBSD Release Engineering team. -The FreeBSD 13.0 code base will continue to support older CPUs. -Users needing this functionality, however, will need to build their own releases to obtain this support. +This means that binaries require a 686-class CPU by default including, but not limited to, binaries provided by the FreeBSD Release Engineering team. +The FreeBSD 13.0 code base continues to support older CPUs. +Users who need to run on 486- or 586-class CPUs need to build their own releases. As the embedded market is the primary user of cores based on i486 and i586, end-user impact is expected to be minimal. Most embedded systems have custom builds already. -Althought some minor adjust will be necessary, it will be on par with the effort required to move between major versions. +Although some minor adjustments will be necessary, it will be on par with the effort required to move between major versions. Server and desktop machines based on these CPU types are generally over 20 years old. Most have been retired or are too resource poor to make FreeBSD 13.0 an attractive upgrade. There were several factors taken into account for this change. Most applications need 64-bit atomics for proper operation. -While those operations can be emulated in the kernel on i486, they cannot be emulated in the userland. +While those operations can be emulated in the kernel on i486, they cannot be emulated in userland. Updating the default allows compiler generated code to select the right atomics in those cases, allow better optimizations and produce better error messages when necessary. The older library and/or include file approaches are much less optimal in resulting code and diagnostics. Current compiler technology produces better, faster, and/or smaller binaries for i686 than for i486. From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 23:57:29 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DCAC656C429 for ; Mon, 15 Mar 2021 23:57:29 +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 4DztdP1VvZz4dFt; Mon, 15 Mar 2021 23:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 698E8197DC; Mon, 15 Mar 2021 23:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FNvSon059488; Mon, 15 Mar 2021 23:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FNvS43059487; Mon, 15 Mar 2021 23:57:28 GMT (envelope-from git) Date: Mon, 15 Mar 2021 23:57:28 GMT Message-Id: <202103152357.12FNvS43059487@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: John Baldwin Subject: git: f8c8bd998a - main - Use the man: keyword instead of {{< manpage >}}. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8c8bd998a6ba110e77c0702ee12e775939d66a0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 23:57:30 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/doc/commit/?id=f8c8bd998a6ba110e77c0702ee12e775939d66a0 commit f8c8bd998a6ba110e77c0702ee12e775939d66a0 Author: John Baldwin AuthorDate: 2021-03-15 23:55:57 +0000 Commit: John Baldwin CommitDate: 2021-03-15 23:57:17 +0000 Use the man: keyword instead of {{< manpage >}}. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D29278 --- website/content/en/releases/13.0R/relnotes.adoc | 84 ++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 18e91a2988..5e20ed70de 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -109,40 +109,40 @@ This section covers changes and additions to userland applications, contributed [[userland-programs]] === Userland Application Changes -The {{< manpage "calendar" "1" >}} utility again supports nested C pre-processor conditionals and now supports the C++ comment syntax in addition to the C syntax. gitref:19b5c307548[repository=src] +The man:calendar[1] utility again supports nested C pre-processor conditionals and now supports the C++ comment syntax in addition to the C syntax. gitref:19b5c307548[repository=src] -The {{< manpage "calendar" "1" >}} utility consistently prints dates according to the locale of the invoking user, not the possibly varying locales of included files. gitref:f1560bd080a[repository=src] +The man:calendar[1] utility consistently prints dates according to the locale of the invoking user, not the possibly varying locales of included files. gitref:f1560bd080a[repository=src] -The {{< manpage "calendar" "1" >}} utility uses the correct paths for included files if invoked with the -a option. gitref:19b5c307548[repository=src] +The man:calendar[1] utility uses the correct paths for included files if invoked with the -a option. gitref:19b5c307548[repository=src] -The {{< manpage "calendar" "1" >}} utility no longer installs data files other than calendar.freebsd. +The man:calendar[1] utility no longer installs data files other than calendar.freebsd. The data files are now provided by the deskutils/calendar-data port. gitref:d20d6550187[repository=src] -The {{< manpage "daemon" "8" >}} utility now supports the `-H` flag to close and re-open the output file when SIGHUP is received. -This permits rotation of the output file via {{< manpage "newsyslog" "8">}}. gitref:4cd407ec933[repository=src] +The man:daemon[8] utility now supports the `-H` flag to close and re-open the output file when SIGHUP is received. +This permits rotation of the output file via man:newsyslog[8]. gitref:4cd407ec933[repository=src] -The {{< manpage "daemon" "8" >}} utility no longer blocks SIGTERM during the restart delay. gitref:09a3675d961[repository=src] +The man:daemon[8] utility no longer blocks SIGTERM during the restart delay. gitref:09a3675d961[repository=src] -The {{< manpage "diskinfo" "8" >}} utility now reports the physical device name GEOM attribute when available. gitref:b5961be1ab7[repository=src] +The man:diskinfo[8] utility now reports the physical device name GEOM attribute when available. gitref:b5961be1ab7[repository=src] -The {{< manpage "freebsd-update" "8" >}} utility now displays progress for the "Fetching files..." stage. gitref:d6e1e31a0e6[repository=src] +The man:freebsd-update[8] utility now displays progress for the "Fetching files..." stage. gitref:d6e1e31a0e6[repository=src] -The {{< manpage "freebsd-update" "8" >}} utility now supports the `-p` flag, which ensures password db changes are included in [.filename]#/etc/passwd# via {{< manpage "pwd_mkdb" "8">}}. gitref:9b6591109e8[repository=src] {{< sponsored "The FreeBSD Foundation" >}} +The man:freebsd-update[8] utility now supports the `-p` flag, which ensures password db changes are included in [.filename]#/etc/passwd# via man:pwd_mkdb[8]. gitref:9b6591109e8[repository=src] {{< sponsored "The FreeBSD Foundation" >}} -The {{< manpage "freebsd-update" "8" >}} utility now supports the `updatesready` and `showconfig` commands to check for updates and check the configuration respectively. gitref:8cfda118cbd[repository=src] +The man:freebsd-update[8] utility now supports the `updatesready` and `showconfig` commands to check for updates and check the configuration respectively. gitref:8cfda118cbd[repository=src] -The manual page for the {{< manpage "freebsd-update" "8" >}} utility documents using the `PAGER` environment variable for non-interactive use. gitref:32f4592764d[repository=src] +The manual page for the man:freebsd-update[8] utility documents using the `PAGER` environment variable for non-interactive use. gitref:32f4592764d[repository=src] -The manual page for the {{< manpage "gstat" "8" >}} utility now documents the use of interactive keyboard commands. gitref:cfaa2958dc4[repository=src] +The manual page for the man:gstat[8] utility now documents the use of interactive keyboard commands. gitref:cfaa2958dc4[repository=src] -The manual page for the {{< manpage "inetd" "8" >}} utility now includes an example of how to use netcat as an HTTP proxy. gitref:a58fc861516[repository=src] +The manual page for the man:inetd[8] utility now includes an example of how to use netcat as an HTTP proxy. gitref:a58fc861516[repository=src] -The manual page for the {{< manpage "inetd" "8" >}} utility now includes comments for all examples. gitref:26a4a61a285[repository=src] +The manual page for the man:inetd[8] utility now includes comments for all examples. gitref:26a4a61a285[repository=src] [[userland-contrib]] === Contributed Software -The {{< manpage "bc" "1" >}} and {{< manpage "dc" "1" >}} utilities have been replaced by the version developed by Gavin D. Howard. +The man:bc[1] and man:dc[1] utilities have been replaced by the version developed by Gavin D. Howard. The new versions do not depend on an external large number library, offer GNU bc extensions, are much faster than and fix POSIX compliance issues of the programs they replace. They support POSIX message catalogs and come with localized messages in Chinese, Dutch, English, French, German, Japanese, Polish, Portugueze, and Russian. The previous implementation is still available in FreeBSD-13 and can be selected instead of the new one by the build option `WITHOUT_GH_BC`. gitref:c41fef90a7d[repository=src] @@ -154,7 +154,7 @@ The previous implementation is still available in FreeBSD-13 and can be selected [[userland-libraries]] === Runtime Libraries and API -The new {{< manpage "getlocalbase" "3" >}} function in libutil retrieves the LOCALBASE path in a standard way. gitref:30d21d27953[repository=src] +The new man:getlocalbase[3] function in libutil retrieves the LOCALBASE path in a standard way. gitref:30d21d27953[repository=src] [[kernel]] == Kernel @@ -164,7 +164,7 @@ This section covers changes to kernel configurations, system tuning, and system [[kernel-general]] === General Kernel Changes -Processes that attach to a {{< manpage "jail" "8" >}} will now completely rebase their {{< manpage "cpuset" "1" >}} onto the jail's cpuset. +Processes that attach to a man:jail[8] will now completely rebase their man:cpuset[1] onto the jail's cpuset. Notably, if a process had been assigned a numbered cpuset then it will be assigned a new numbered set that is the combination of CPUs allowed to the attaching process and the jail. Processes belonging to the superuser will implicitly widen their CPU mask as needed if they share no CPUs in common with the jail. @@ -188,9 +188,9 @@ The suite of VirtIO device drivers now support the VirtIO V1 spec. This improve This section covers changes and additions to file systems and other storage subsystems, both local and networked. -For {{< manpage "iscsi" "4" >}} and {{< manpage "ctld" "8" >}}, support for specifying network QoS in the form of DiffServ Codepoints (DSCP) and Ethernet Priority Code Point (PCP) was added. gitref:ddf1072aac49[repository=src] {{< sponsored "NetApp" >}} +For man:iscsi[4] and man:ctld[8], support for specifying network QoS in the form of DiffServ Codepoints (DSCP) and Ethernet Priority Code Point (PCP) was added. gitref:ddf1072aac49[repository=src] {{< sponsored "NetApp" >}} -The {{< manpage "ctld" "8" >}} utility now supports the `-f` flag to test the validity of configuration files. gitref:7fcbecd004f[repository=src] +The man:ctld[8] utility now supports the `-f` flag to test the validity of configuration files. gitref:7fcbecd004f[repository=src] [[storage-general]] === General Storage @@ -201,19 +201,19 @@ The {{< manpage "ctld" "8" >}} utility now supports the `-f` flag to test the va This section covers the boot loader, boot menu, and other boot-related changes. -The {{< manpage "efibootmgr" "8" >}} utility now supports the `-b` flag to specify an index of a specific boot entry to create or modify. gitref:a2581e80212[repository=src] {{< sponsored "Netflix" >}} +The man:efibootmgr[8] utility now supports the `-b` flag to specify an index of a specific boot entry to create or modify. gitref:a2581e80212[repository=src] {{< sponsored "Netflix" >}} -The {{< manpage "efibootmgr" "8" >}} utility now supports the `-E` flag to query which EFI System Partition was used to boot the system. gitref:1cdb8eb8fe1[repository=src] {{< sponsored "Netflix" >}} +The man:efibootmgr[8] utility now supports the `-E` flag to query which EFI System Partition was used to boot the system. gitref:1cdb8eb8fe1[repository=src] {{< sponsored "Netflix" >}} -The {{< manpage "efibootmgr" "8" >}} utility now supports the `-f` and `-F` flags to set or clear a request to boot to the UEFI user interface on the next boot. gitref:83c4237258d[repository=src] {{< sponsored "Ampere Computing, Inc." >}} +The man:efibootmgr[8] utility now supports the `-f` and `-F` flags to set or clear a request to boot to the UEFI user interface on the next boot. gitref:83c4237258d[repository=src] {{< sponsored "Ampere Computing, Inc." >}} Prior releases had a complete ms-dos formatted filesystem packaged into boot1.efifat. Older versions of FreeBSD installed this filesystem image into a raw partition. However, uses of the ESP have proliferated, making this inflexible approach no longer desirable. Users have varied needs for the size of this partition, and multiple booting setups require more detailed access. -To update old ESP partitions, users should stop using the {{< manpage "gpart" "8" >}} utility. +To update old ESP partitions, users should stop using the man:gpart[8] utility. Instead, ESP partitions should be mounted as MS-DOS filesystems as [.filename]#/boot/efi#, and [.filename]#/boot/loader.efi# should be copied to [.filename]#/boot/efi/efi/boot/bootx64.efi# if the default setup is use. -If the {{< manpage "efibootmgr" "8" >}} utility is used to customize the boot environment, this file should be copied to the location set with the `-l` flag. +If the man:efibootmgr[8] utility is used to customize the boot environment, this file should be copied to the location set with the `-l` flag. [[boot-loader]] === Boot Loader Changes @@ -224,24 +224,24 @@ If the {{< manpage "efibootmgr" "8" >}} utility is used to customize the boot en This section describes changes that affect networking in FreeBSD. -{{< manpage "tcp" "4">}} now supports Proportional Rate Reduction (as described by RFC6937) to improve SACK loss recovery during burst loss and ACK thinning scenarios. +man:tcp[4] now supports Proportional Rate Reduction (as described by RFC6937) to improve SACK loss recovery during burst loss and ACK thinning scenarios. This feature is enabled by default. -A new {{< manpage "sysctl" "8" >}}, `net.inet.tcp.do_prr`, can be set to `0` to restore the prior behavior. +A new man:sysctl[8], `net.inet.tcp.do_prr`, can be set to `0` to restore the prior behavior. PRR should generally help improve loss recovery performance and prevent numerous preventable retransmit timeout (RTO) stalls. This surpasses the prior behavior, but a strictly packet conserving variant can be enabled. A misconfigured token bucket traffic policer can cause persistent loss even during loss recovery. In that case, activating the conservative PRR variant may prevent some retransmission timeouts (RTO) and associated session stalls for a few milliseconds while behaving less optimal in the general case. -A new {{< manpage "sysctl" "8">}}, `net.inet.tcp.do_prr_conservative`, +A new man:sysctl[8], `net.inet.tcp.do_prr_conservative`, can be set to `1` to enable strictly packet conserving behavior (at most 1 segment for each ACK received), while the normal variant may send up to 2 segments per received ACK - helping in cases of ACK thinning or significant burst loss events. gitref:0e1d7c25c5ab[repository=src] {{< sponsored "NetApp" >}} -The {{< manpage "cc_cubic" "4">}} {{< manpage "tcp" "4">}} congestion control algorithm aligns more closely with the standard in RFC8312. gitref:40f9078ff9d9[repository=src] {{< sponsored "NetApp" >}} +The man:cc_cubic[4] man:tcp[4] congestion control algorithm aligns more closely with the standard in RFC8312. gitref:40f9078ff9d9[repository=src] {{< sponsored "NetApp" >}} -The {{< manpage "ping" "8" >}} utility now supports setting network QoS, with IP DSCP gitref:6034024daddb[repository=src] and Ethernet PCP gitref:81a6f4c7ae69[repository=src]. {{< sponsored "NetApp" >}} +The man:ping[8] utility now supports setting network QoS, with IP DSCP gitref:6034024daddb[repository=src] and Ethernet PCP gitref:81a6f4c7ae69[repository=src]. {{< sponsored "NetApp" >}} -The {{< manpage "ping" "8" >}} and {{< manpage "ping6" "8" >}} utilities have been merged. -{{< manpage "ping" "8" >}} supports both IPv4 and IPv6. -A legacy {{< manpage "ping6" "8" >}} is retained for backwards compatibility. gitref:3cde9171d2d5[repository=src] +The man:ping[8] and man:ping6[8] utilities have been merged. +man:ping[8] supports both IPv4 and IPv6. +A legacy man:ping6[8] is retained for backwards compatibility. gitref:3cde9171d2d5[repository=src] [[network-general]] === General Network @@ -262,7 +262,7 @@ The amd64 architecture now supports 57-bit virtual addresses (LA57) on supported The aw_gpio driver now suppots GPIO interrupts. gitref:0fe5379c6a9[repository=src] -A new aw_pwm driver supports Pulse Width Modulation (PWM) hardware on Allwinner boards. PWM channels can be configured with {{< manpage "pwm" "8">}}. gitref:277a038d0da[repository=src] +A new aw_pwm driver supports Pulse Width Modulation (PWM) hardware on Allwinner boards. PWM channels can be configured with man:pwm[8]. gitref:277a038d0da[repository=src] The AXP803/AXP813 drivers now report battery sensor information. gitref:66bddb4c701[repository=src] @@ -274,7 +274,7 @@ USB DRD now works on multiple Allwinner SoCs. This means that some USB ports can === RockChip -A new rk_pwm driver supports PWM hardware on the RK3399. PWM channels can be configured with {{< manpage "pwm" "8">}}. gitref:bcd380e88b2[repository=src] +A new rk_pwm driver supports PWM hardware on the RK3399. PWM channels can be configured with man:pwm[8]. gitref:bcd380e88b2[repository=src] External PCI-express adapters are now supports for the RK3399 SoC. gitref:dfd1d0fcabe[repository=src] @@ -287,19 +287,19 @@ if_dwc now supports checksum offloading. gitref:98ea5a7b9a1[repository=src] [[hardware-virtualization]] === Virtualization Support -The {{< manpage "bhyve" "8">}} utility supports additional COM3 and COM4 serial ports. gitref:eed1cc6cdfa[repository=src] +The man:bhyve[8] utility supports additional COM3 and COM4 serial ports. gitref:eed1cc6cdfa[repository=src] -The deprecated bvmconsole and bvmdebug device models have been removed. This includes both the device models from {{< manpage "bhyve" "8">}} and the kernel device drivers for FreeBSD guests. gitref:c4df8cbfde5[repository=src] +The deprecated bvmconsole and bvmdebug device models have been removed. This includes both the device models from man:bhyve[8] and the kernel device drivers for FreeBSD guests. gitref:c4df8cbfde5[repository=src] -The {{< manpage "bhyve" "8">}} utility works reliably with more VNC clients including the macOS "Screen Sharing" application. gitref:2bb4be0f865[repository=src] +The man:bhyve[8] utility works reliably with more VNC clients including the macOS "Screen Sharing" application. gitref:2bb4be0f865[repository=src] -The {{< manpage "bhyve" "8">}} utility now supports VirtIO-9p (aka VirtFS) filesystem sharing. gitref:100353cfbf8[repository=src] {{< sponsored "Conclusive Engineering (development), vStack.com (funding)" >}} +The man:bhyve[8] utility now supports VirtIO-9p (aka VirtFS) filesystem sharing. gitref:100353cfbf8[repository=src] {{< sponsored "Conclusive Engineering (development), vStack.com (funding)" >}} -The {{< manpage "bhyve" "8">}} utility now supports virtual machine snapshots. This feature is still in active development and is not yet enabled by default. gitref:483d953a86a[repository=src] {{< sponsored "University Politehnica of Bucharest, Matthew Grooms (student scholarships), iXsystems" >}} +The man:bhyve[8] utility now supports virtual machine snapshots. This feature is still in active development and is not yet enabled by default. gitref:483d953a86a[repository=src] {{< sponsored "University Politehnica of Bucharest, Matthew Grooms (student scholarships), iXsystems" >}} -The {{< manpage "bhyve" "8">}} utility now supports a VM Generation Counter ACPI device. gitref:9cb339cc7b8[repository=src] +The man:bhyve[8] utility now supports a VM Generation Counter ACPI device. gitref:9cb339cc7b8[repository=src] -The {{< manpage "bhyve" "8">}} utility now supports PCI HDAudio devices. gitref:7e3c7420615[repository=src] +The man:bhyve[8] utility now supports PCI HDAudio devices. gitref:7e3c7420615[repository=src] [[ports]] == Ports Collection and Package Infrastructure From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 23:57:30 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05AE256C6D3 for ; Mon, 15 Mar 2021 23:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DztdP5SzXz4dNn; Mon, 15 Mar 2021 23:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 89A0419AFE; Mon, 15 Mar 2021 23:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FNvT4p059508; Mon, 15 Mar 2021 23:57:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FNvTvw059507; Mon, 15 Mar 2021 23:57:29 GMT (envelope-from git) Date: Mon, 15 Mar 2021 23:57:29 GMT Message-Id: <202103152357.12FNvTvw059507@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: John Baldwin Subject: git: 05314f45e1 - main - Add entries from the stable/13/RELNOTES file. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05314f45e14b8a1857fdc2512ba8f66589ba80ec Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 23:57:30 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/doc/commit/?id=05314f45e14b8a1857fdc2512ba8f66589ba80ec commit 05314f45e14b8a1857fdc2512ba8f66589ba80ec Author: John Baldwin AuthorDate: 2021-03-15 23:56:06 +0000 Commit: John Baldwin CommitDate: 2021-03-15 23:57:17 +0000 Add entries from the stable/13/RELNOTES file. This does not include entries for changes that were included in 12.2 release. Reviewed by: emaste (earlier version) Differential Revision: https://reviews.freebsd.org/D29279 --- website/content/en/releases/13.0R/relnotes.adoc | 188 ++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 5e20ed70de..9bec84e0de 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -105,6 +105,26 @@ This section covers changes and additions to userland applications, contributed [[userland-config]] === Userland Configuration Changes +man:rc.subr[8] now honors `${name}_env` in all man:rc[8] scripts. +Previously, environment variables set by a user via `${name}_env` were ignored +if the service defined a custom `*_cmd` variable to control the behavior +of the `run_rc_command` function, for example, `start_cmd`, instead of relying +on variables like `command` and `command_args`. gitref:d15e810db9a5[repository=src] + +man:init[8], man:service[8], and man:cron[8] will now adopt user/class +environment variables by default (excluding `PATH`). +Notably, environment variables for all cron jobs and man:rc[8] services can +now be set via man:login.conf[5]. +gitref:21c1a93c048f[repository=src], gitref:736a5a6d1dbb[repository=src], +gitref:7466dbd68487[repository=src] + +The kernel now supports enforcing a W^X memory mapping policy for user +processes. +The policy is not enforced by default but can be enabled by setting the +`kern.elf32.allow_wx` and `kern.elf64.allow_wx` sysctls to 0. +Individual binaries can be exempted from the policy by man:elfctl[1] via +the `wxneeded` feature. +gitref:2e1c94aa1fd5[repository=src] {{< sponsored "The FreeBSD Foundation" >}} [[userland-programs]] === Userland Application Changes @@ -123,8 +143,13 @@ This permits rotation of the output file via man:newsyslog[8]. gitref:4cd407ec93 The man:daemon[8] utility no longer blocks SIGTERM during the restart delay. gitref:09a3675d961[repository=src] +The man:devd[8] utility now reports a `kernel` system event when the system +resumes from sleep rather than a `kern` system event. gitref:f87655ec7694[repository=src] + The man:diskinfo[8] utility now reports the physical device name GEOM attribute when available. gitref:b5961be1ab7[repository=src] +The man:elf2aout[1] utility has been removed. gitref:dd99ab06f360[repository=src] + The man:freebsd-update[8] utility now displays progress for the "Fetching files..." stage. gitref:d6e1e31a0e6[repository=src] The man:freebsd-update[8] utility now supports the `-p` flag, which ensures password db changes are included in [.filename]#/etc/passwd# via man:pwd_mkdb[8]. gitref:9b6591109e8[repository=src] {{< sponsored "The FreeBSD Foundation" >}} @@ -133,6 +158,11 @@ The man:freebsd-update[8] utility now supports the `updatesready` and `showconfi The manual page for the man:freebsd-update[8] utility documents using the `PAGER` environment variable for non-interactive use. gitref:32f4592764d[repository=src] +The obsolete version of the GNU debugger installed to [.filename]#/usr/libexec# for use by man:crashinfo[8] has been removed. +Detailed kernel crash information can be obtained by installing modern GDB +from ports or packages. +gitref:1c0ea326aa6d[repository=src] + The manual page for the man:gstat[8] utility now documents the use of interactive keyboard commands. gitref:cfaa2958dc4[repository=src] The manual page for the man:inetd[8] utility now includes an example of how to use netcat as an HTTP proxy. gitref:a58fc861516[repository=src] @@ -156,6 +186,23 @@ The previous implementation is still available in FreeBSD-13 and can be selected The new man:getlocalbase[3] function in libutil retrieves the LOCALBASE path in a standard way. gitref:30d21d27953[repository=src] +The man:cap_random[3] function has been removed as it has been +superseeded by man:getrandom[2]. gitref:a76f78dc3f43[repository=src] + +A new Linux-compatible man:copy_file_range[2] system call supports efficient +file copies. +In particular, this system call permits the kernel to request that an NFSv4.2 +server perform a copy operation locally on the server. gitref:bbbbeca3e9a3[repository=src] + +The man:regex[3] function no longer accepts redundant escapes for most +ordinary characters. +This will cause applications such as man:sed[1] and man:grep[1] to reject +regular expressions using these escapes. +gitref:adeebf4cd47c[repository=src] + +New man:aio_readv[2] and man:aio_writev[2] system calls provide vectored +analogues of man:aio_read[2] and man:aio_write[2]. gitref:022ca2fc7fe0 + [[kernel]] == Kernel @@ -169,6 +216,46 @@ Notably, if a process had been assigned a numbered cpuset then it will be assign allowed to the attaching process and the jail. Processes belonging to the superuser will implicitly widen their CPU mask as needed if they share no CPUs in common with the jail. +The in-kernel cryptographic framework has been overhauled to better support +modern cryptographic algorithms as well as simplify the interface for both +device drivers and framework consumers. +gitref:c03414326909[repository=src] {{< sponsored "Chelsio Communications" >}} + +Support for Kerberos GSS algorithms deprecated by RFCs 6649 and 8429 has been +removed. +gitref:dee3aa83d1b6[repository=src] {{< sponsored "Chelsio Communications" >}} + +Support for previously-deprecated algorithms in man:geli[4] has +been removed. +gitref:e2b9919398c3[repository=src] {{< sponsored "Chelsio Communications" >}} + +Support for IPsec algorithms deprecated by RFC 8221 as well as Triple DES +has been removed. +gitref:16aabb761c0a[repository=src] {{< sponsored "Chelsio Communications" >}} + +Support for previously-deprecated cryptographic algorithms has been removed +from man:cryptodev[4] and the in-kernel cryptographic framework. +gitref:6c80c319ef88[repository=src] {{< sponsored "Chelsio Communications" >}} + +The amd64 DMAR driver has been refactored to provide a generic I/O MMU +framework which can be used by other architectures. +As part of this, the amd64-specific `ACPI_DMAR` kernel option has been +renamed to `IOMMU`. +gitref:6186bfbd1880[repository=src] {{< sponsored "DARPA" >}} {{< sponsored "AFRL" >}} + +A driver for Arm System Memory Management Unity version 3.2 has been added +to the aarch64 architecture. +The driver is enabled by the `IOMMU` kernel option. +gitref:4cc8701067e1[repository=src] {{< sponsored "DARPA" >}} {{< sponsored "AFRL" >}} {{< sponsored "Innovate UK" >}} + +The GENERIC kernels for amd64 and i386 now include man:aesni[4] to support +accelerated software cryptography for man:geli[4] by default. +gitref:074a91f746bd[repository=src] + +The GENERIC kernel for aarch64 now includes man:armv8crypto[4] to support +accelerated software cryptography for man:geli[4] by default. +gitref:074a91f746bd[repository=src] + [[drivers]] == Devices and Drivers @@ -177,12 +264,43 @@ This section covers changes and additions to devices and device drivers since {r [[drivers-device]] === Device Drivers +Several network drivers for obsolete Ethernet adapters have been removed: + +* man:bm[4] BMAC gitref:9e774e53407b[repository=src] +* man:cs[4] Crystal Semiconductor CS8900/CS8920 gitref:e1edf1240b33[repository=src] +* man:de[4] DEC DC21x4x gitref:08ac01a92c88[repository=src] +* man:ed[4] NE-2000 and WD-80x3 gitref:05aa6e583be3[repository=src] +* man:ep[4] 3Com Etherlink III (3c5x9) ISA gitref:e153ee663af1[repository=src] +* man:ex[4] Intel EtherExpress Pro/10 and Pro/10+ gitref:3ee01a13855b[repository=src] +* man:fe[4] Fujitsu MB86960A/MB86965A gitref:dd262716a1e0[repository=src] +* man:hme[4] Sun Microelectronics STP2002-STQ gitref:9ee99cec1f36[repository=src] +* man:pcn[4] AMD PCnet gitref:607790d10fdb[repository=src] +* man:sf[4] Starfire gitref:3b70dd81f56f[repository=src] +* man:sn[4] SMC 91Cxx gitref:90089841deba[repository=src] +* man:tl[4] Texas Instruments ThunderLAN gitref:7c897ca91fe1[repository=src] +* man:tx[4] SMC 83c17x gitref:b1b1c2fe385c[repository=src] +* man:txp[4] 3Com 3XP Typhoon/Sidewinder (3CR990) gitref:be345ff023d9[repository=src] +* man:vx[4] 3Com EtherLink III / Fast EtherLink III (3c59x) PCI gitref:e8504bf9e7a0[repository=src] +* man:wb[4] Winbond W89C840F gitref:02fae06a11b4[repository=src] +* man:xe[4] Xircom PCMCIA gitref:7a582e5374c8[repository=src] + +A new man:safexcel[4] driver supports cryptographic requests via the EIP-97 +packet processing module found on the ESPRESSObin. gitref:b356ddf07671[repository=src] {{< sponsored "Rubicon Communications, LLC" >}} + A new man:usbhid[4] driver uses drivers from the man:hid[4] framework for USB HID devices instead of man:ukbd[4], man:ums[4], and man:uhid[4]. man:usbhid[4] is enabled by adding `hw.usb.usbhid.enable=1` to [.filename]#/boot/loader.conf# and adding `usbhid` to `kld_list=""` in [.filename]#/etc/rc.conf#. gitref:b62f6dfaed3d[repository=src] The suite of VirtIO device drivers now support the VirtIO V1 spec. This improves FreeBSD's compatibility as a guest operating system with various hypervisors and emulators including the ability to run on the link:https://wiki.qemu.org/images/4/4e/Q35.pdf[Q35 chipset] under QEMU. +The man:armv8crypto[4] driver which supports software cryptography on +ARMv8 CPUs now supports AES-XTS which is used by man:geli[4]. +gitref:4979620ece98[repository=src] + +The man:armv8crypto[4] driver now supports AES-GCM which is used by IPsec +and kernel TLS. +gitref:f76393a6305b6[repository=src] {{< sponsored "Ampere Computing" >}} + [[storage]] == Storage @@ -192,6 +310,43 @@ For man:iscsi[4] and man:ctld[8], support for specifying network QoS in the form The man:ctld[8] utility now supports the `-f` flag to test the validity of configuration files. gitref:7fcbecd004f[repository=src] +The man:nand[4] device framework and man:nandfs[5] filesystem and associated +utilities have been removed. gitref:f5a95d9a0794[repository=src] + +man:gnop[8] can now apply configurable delays to read and write requests to +simulate a slow disk. gitref:4f80c85519d5[repository=src] + +The kernel now provides a default implementation for the `SEEK_DATA` and +`SEEK_HOLE` man:ioctl[2]'s for filesystems which do not support +sparse files. gitref:2e1b32c0e3fc[repository=src] + +The NFS client and server now support NFSv4.2 (RFC 7862) and Extended +Attributes (RFC 8276). gitref:c057a378180e[repository=src] + +Attempts to read a directory fail with `EISDIR` by default. +The `-d skip` flags can be passed to man:grep[1] to suppress errors in stderr +when non-recursively grepping a list that includes directories. +gitref:dcef4f65ae39[repository=src] + +The NFS server now permits credentials specified via `-maproot` or `-mapall` +in man:exports[5] to include more than 16 groups. +gitref:cc5efdde94bf[repository=src] + +The NFS client and server now support NFS over TLS. +The additional userland daemons are not built by default but can be +enabled by building a new world that includes a KTLS-enabled OpenSSL +via the `WITH_OPENSSL_KTLS` option. +gitref:6e4b6ff88fde[repository=src], gitref:2c76eebca71b[repository=src], +gitref:59f6f5e23c1a[repository=src] + +A new `nfsv4_server_only` variable can be set to `YES` in [.filename]#/etc/rc.conf# to only enable support for NFSv4. +This avoids the need to run man:rpcbind[8] on an NFS server. +gitref:4389a5661034[repository=src] + +The man:fusefs[5] protocol has been updated to 7.28 along with adding support +for `FUSE_COPY_FILE_RANGE` and `FUSE_LSEEK`. +gitref:92bbfe1f0d1f[repository=src] + [[storage-general]] === General Storage @@ -224,6 +379,24 @@ If the man:efibootmgr[8] utility is used to customize the boot environment, this This section describes changes that affect networking in FreeBSD. +A new type of man:mbuf[9] (network data buffer) can represent multiple, +unmapped physical pages as a single buffer. +This improves the performance of man:sendfile[2] by reducing the length of +mbuf linked lists in socket buffers. gitref:82334850ea45[repository=src], gitref:cec06a3edc52[repository=src] {{< sponsored "Netflix" >}} + +The kernel now supports in-kernel framing and encryption of Transport +Layer Security (TLS) data on TCP sockets for TLS versions 1.0 through 1.3. +Transmit offload via in-kernel crypto drivers is supported for +MtE cipher suites using AES-CBC as well as AEAD cipher suites using +AES-GCM. +Receive offload via in-kernel crypto drivers is supported for AES-GCM +cipher suites for TLS 1.2. +Using KTLS requires the use of a KTLS-aware userland SSL library. +The OpenSSL library included in the base system does not enable KTLS +support by default, +but support can be enabled by building with the `WITH_OPENSSL_KTLS` option. +gitref:b2e60773c6b0[repository=src], gitref:6554362c6640[repository=src], gitref:f1f934754638[repository=src], gitref:3c0e56850511[repository=src], gitref:c1c52cd57e88[repository=src] {{< sponsored "Netflix" >}} {{< sponsored "Chelsio Communications" >}} + man:tcp[4] now supports Proportional Rate Reduction (as described by RFC6937) to improve SACK loss recovery during burst loss and ACK thinning scenarios. This feature is enabled by default. A new man:sysctl[8], `net.inet.tcp.do_prr`, can be set to `0` to restore the prior behavior. @@ -243,6 +416,10 @@ The man:ping[8] and man:ping6[8] utilities have been merged. man:ping[8] supports both IPv4 and IPv6. A legacy man:ping6[8] is retained for backwards compatibility. gitref:3cde9171d2d5[repository=src] +SCTP support is now available as a new [.filename]#sctp.ko# kernel module +and is no longer compiled into GENERIC by default. +gitref:e64080e79c53[repository=src] {{< sponsored "The FreeBSD Foundation" >}} + [[network-general]] === General Network @@ -258,6 +435,12 @@ The amd64 architecture now supports Hygon Dhyana Family 18h processors. gitref: The amd64 architecture now supports 57-bit virtual addresses (LA57) on supported CPUs. This permits user processes to use up to 56 bits of virtual address space. This also includes support for five layer nested page tables used by bhyve. gitref:9ce875d9b59d[repository=src] {{< sponsored "The FreeBSD Foundation" >}} [[ARM-ARM64]] +=== ARMv5 + +Support for version 5 of the 32-bit ARM architecture has been removed. +Building for `TARGET=arm` now defaults to a `TARGET_ARCH` of `armv7`. +gitref:eb4977bd0fb2[repository=src] + === Allwinner The aw_gpio driver now suppots GPIO interrupts. gitref:0fe5379c6a9[repository=src] @@ -284,6 +467,11 @@ if_dwc now supports flow control. gitref:2b4a66ed171[repository=src] if_dwc now supports checksum offloading. gitref:98ea5a7b9a1[repository=src] +=== Sparc + +Support for the `sparc64` architecture (SPARC 9) has been removed. +gitref:58aa35d42975[repository=src] + [[hardware-virtualization]] === Virtualization Support From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 23:57:30 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DA26656BD2C for ; Mon, 15 Mar 2021 23:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DztdQ5V99z4dTh; Mon, 15 Mar 2021 23:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AC1CC197DD; Mon, 15 Mar 2021 23:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FNvU6R059530; Mon, 15 Mar 2021 23:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FNvUBh059529; Mon, 15 Mar 2021 23:57:30 GMT (envelope-from git) Date: Mon, 15 Mar 2021 23:57:30 GMT Message-Id: <202103152357.12FNvUBh059529@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: John Baldwin Subject: git: fc8c979bfe - main - Note the removal of ubsec(4). MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc8c979bfea124267d1c24f4107ccdd630397f82 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 23:57:31 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/doc/commit/?id=fc8c979bfea124267d1c24f4107ccdd630397f82 commit fc8c979bfea124267d1c24f4107ccdd630397f82 Author: John Baldwin AuthorDate: 2021-03-15 22:50:27 +0000 Commit: John Baldwin CommitDate: 2021-03-15 23:57:17 +0000 Note the removal of ubsec(4). --- website/content/en/releases/13.0R/relnotes.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 9bec84e0de..4765883549 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -284,6 +284,9 @@ Several network drivers for obsolete Ethernet adapters have been removed: * man:wb[4] Winbond W89C840F gitref:02fae06a11b4[repository=src] * man:xe[4] Xircom PCMCIA gitref:7a582e5374c8[repository=src] +The man:ubsec[4] driver has been removed. +gitref:883a2dc67213[repository=src] {{< sponsored "Chelsio Communications" >}} + A new man:safexcel[4] driver supports cryptographic requests via the EIP-97 packet processing module found on the ESPRESSObin. gitref:b356ddf07671[repository=src] {{< sponsored "Rubicon Communications, LLC" >}} From owner-dev-commits-doc-all@freebsd.org Mon Mar 15 23:57:33 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0970656C490 for ; Mon, 15 Mar 2021 23:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DztdS4ZcRz4dD0; Mon, 15 Mar 2021 23:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CDA3319857; Mon, 15 Mar 2021 23:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FNvVlu059550; Mon, 15 Mar 2021 23:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FNvVvi059549; Mon, 15 Mar 2021 23:57:31 GMT (envelope-from git) Date: Mon, 15 Mar 2021 23:57:31 GMT Message-Id: <202103152357.12FNvVvi059549@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: John Baldwin Subject: git: 48cb961d96 - main - Add an entry for ossl(4). MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48cb961d96a3d3e7f58cd2b8e2f27f60e7fe3d20 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 23:57:33 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/doc/commit/?id=48cb961d96a3d3e7f58cd2b8e2f27f60e7fe3d20 commit 48cb961d96a3d3e7f58cd2b8e2f27f60e7fe3d20 Author: John Baldwin AuthorDate: 2021-03-15 23:10:42 +0000 Commit: John Baldwin CommitDate: 2021-03-15 23:57:17 +0000 Add an entry for ossl(4). --- website/content/en/releases/13.0R/relnotes.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 4765883549..286ac773ce 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -296,6 +296,11 @@ man:usbhid[4] is enabled by adding `hw.usb.usbhid.enable=1` to [.filename]#/boot The suite of VirtIO device drivers now support the VirtIO V1 spec. This improves FreeBSD's compatibility as a guest operating system with various hypervisors and emulators including the ability to run on the link:https://wiki.qemu.org/images/4/4e/Q35.pdf[Q35 chipset] under QEMU. +A new man:ossl[4] driver supports optimized software cryptography on +aarch64, amd64, and i386 using assembly routines from OpenSSL. +gitref:ba610be90a7c[repository=src] {{< sponsored "Netflix" >}}, +gitref:22bd0c9731d7[repository=src] + The man:armv8crypto[4] driver which supports software cryptography on ARMv8 CPUs now supports AES-XTS which is used by man:geli[4]. gitref:4979620ece98[repository=src] From owner-dev-commits-doc-all@freebsd.org Tue Mar 16 02:55:08 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC66B574C43 for ; Tue, 16 Mar 2021 02:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzyZN6KQnz4stl; Tue, 16 Mar 2021 02:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C19041C294; Tue, 16 Mar 2021 02:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12G2t8Wh096659; Tue, 16 Mar 2021 02:55:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12G2t8TY096658; Tue, 16 Mar 2021 02:55:08 GMT (envelope-from git) Date: Tue, 16 Mar 2021 02:55:08 GMT Message-Id: <202103160255.12G2t8TY096658@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 35b013b735 - main - Remove FuryBSD refenrence and add NomadBSD. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b013b73541a4c961d4e1e5148676dad323ebc5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 02:55:09 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=35b013b73541a4c961d4e1e5148676dad323ebc5 commit 35b013b73541a4c961d4e1e5148676dad323ebc5 Author: Ryusuke SUZUKI AuthorDate: 2021-03-16 02:54:49 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-03-16 02:54:49 +0000 Remove FuryBSD refenrence and add NomadBSD. --- website/content/ja/where.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/content/ja/where.adoc b/website/content/ja/where.adoc index dcb9d93421..513807cfc3 100644 --- a/website/content/ja/where.adoc +++ b/website/content/ja/where.adoc @@ -274,9 +274,11 @@ FreeBDSD の CD-ROM や DVD は、link:http://www.freebsdmall.com/[FreeBSD Mall] FreeBDSD は、 商用やオープンソースのオペレーティングシステムのベースとして、 幅広く利用されています。 広く普及していて、特に FreeBDSD ユーザのみなさんが興味を持ちそうなプロジェクトを以下で紹介します。 * https://www.freenas.org[FreeNAS] は、FreeBDSD ベースのオープンソースのストレージプラットフォームです。 Windows, Apple, UNIX-like システムからの共有に対応しています。 -* https://www.furybsd.org[FuryBSD] は、 新しくできたばかりのオープンソースの FreeBDSD デスクトップです。 FuryBSD は、過去の PC-BSD および TrueOS といったデスクトップ BSD プロジェクトのグラフィカルインターフェスに敬意を払い、 さらに、ライブ、ハイブリッド USB/DVD イメージなどのツールが追加されています。 FuryBSD は完全に無料で利用でき、 BSD ライセンスのもとに配布されています。 * https://ghostbsd.org[GhostBSD] は、FreeBDSD から派生しました。GhostBSD は、GTK 環境を使用し、 美しい見た目や使い勝手の良さを現代の BSD プラットフォームに実現し、 自然でネイティブな UNIX(R) 環境を提供します。 * https://www.midnightbsd.org[MidnightBSD] は、 BSD から派生したオペレーティングシステムで、 デスクトップユーザを念頭において開発されています。 このオペレーティングシステムには、 メール、ウェブブラウザ、ワードプロセッサ、ゲームといった、 日々の生活で必要と思われるすべてのソフトウェアが含まれています。 +* https://www.nomadbsd.org[NomadBSD] は、FreeBSD ベースの USB フラッシュドライブのための永続的な live システムです。 +ハードウェアを自動的に認識してセットアップを行い、すぐにデスクトップシステムとして使えるように設定します。 +データリカバリ、教育および FreeBSD のハードウェア互換性の試験にも使用できます。 * http://www.pfsense.org[pfSense] は、 ファイアウォールやルータとしての使用にカスタマイズされた FreeBDSD ベースのオープンソースのディストリビューションです。 [[apps]] From owner-dev-commits-doc-all@freebsd.org Tue Mar 16 06:09:15 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4987E577CD7 for ; Tue, 16 Mar 2021 06:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F02tM1f3rz3Hrc; Tue, 16 Mar 2021 06:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 274501E2EE; Tue, 16 Mar 2021 06:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12G69FvW049209; Tue, 16 Mar 2021 06:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12G69F5J049208; Tue, 16 Mar 2021 06:09:15 GMT (envelope-from git) Date: Tue, 16 Mar 2021 06:09:15 GMT Message-Id: <202103160609.12G69F5J049208@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ka Ho Ng Subject: git: 872e509c38 - main - Add committer entries for Ka Ho Ng MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 872e509c386ff96b11b8c968ce1a2c93d5b804b2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 06:09:15 -0000 The branch main has been updated by khng (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=872e509c386ff96b11b8c968ce1a2c93d5b804b2 commit 872e509c386ff96b11b8c968ce1a2c93d5b804b2 Author: Ka Ho Ng AuthorDate: 2021-03-16 06:08:55 +0000 Commit: Ka Ho Ng CommitDate: 2021-03-16 06:08:55 +0000 Add committer entries for Ka Ho Ng Steps 1-4 from the Committer's guide: * Add entries for Ka Ho Ng * Add PGP key Reviewed by: philip Approved by: philip (mentor) Differential Revision: https://reviews.freebsd.org/D29282 --- .../articles/contributors/contrib-committers.adoc | 1 + .../content/en/articles/pgpkeys/_index.adoc | 3 + documentation/static/pgpkeys/khng.key | 66 ++++++++++++++++++++++ shared/authors.adoc | 4 ++ website/data/en/news/news.toml | 4 ++ 5 files changed, 78 insertions(+) diff --git a/documentation/content/en/articles/contributors/contrib-committers.adoc b/documentation/content/en/articles/contributors/contrib-committers.adoc index b21aa907d9..83ac72b3db 100644 --- a/documentation/content/en/articles/contributors/contrib-committers.adoc +++ b/documentation/content/en/articles/contributors/contrib-committers.adoc @@ -251,6 +251,7 @@ * {bland} * {joneum} * {gnn} +* {khng} * {tychon} * {obrien} * {nick} diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc index cb924fe54d..26ff22f9ee 100644 --- a/documentation/content/en/articles/pgpkeys/_index.adoc +++ b/documentation/content/en/articles/pgpkeys/_index.adoc @@ -1153,6 +1153,9 @@ include::static/pgpkeys/joneum.key[] === `{gnn}` include::static/pgpkeys/gnn.key[] +=== `{khng}` +include::static/pgpkeys/khng.key[] + === `{simon}` include::static/pgpkeys/simon.key[] diff --git a/documentation/static/pgpkeys/khng.key b/documentation/static/pgpkeys/khng.key new file mode 100644 index 0000000000..ccabd2fb71 --- /dev/null +++ b/documentation/static/pgpkeys/khng.key @@ -0,0 +1,66 @@ +// sh addkey.sh khng F98B65F589AE6371 ; + +[.literal-block-margin] +.... +pub rsa4096/F98B65F589AE6371 2021-03-16 [SCA] [expires: 2024-03-15] + Key fingerprint = FECB 3F06 E64F FFB1 0238 8464 F98B 65F5 89AE 6371 +uid Ka Ho Ng +sub rsa4096/63DA79E9857A8B97 2021-03-16 [E] [expires: 2024-03-15] + +.... + +[.literal-block-margin] +.... +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGBQMg8BEADSaW4SDeBpyX1W64uAFbfGtZX9AOttxBeoM/zHjmqJOGcjNyR/ +8dcPcbBmT3Eq0pOFZkPQrSKFVqzSMGc/jWNjvpSM16aUNmT3nRgqdtVLrGWHNskf +/BrIMffz+WNxZvW2vL6zPeIP2Qa1WO3ioq09Rd3e9zIUuxNz+wlnou1SkVfSvC81 +kTaoOQrrmyCqf73G1lii4/s42CN7+cqrr3swyV/onbqcjjbhUeuVvc8GDFWNZ0mK +sk1q0viZp4jG0zeden0SEBTy9kZOLV9RPCP0/aXwkdTnAUa7cYCvldrWXlEddpkO +wgNzrrowWB2JtOPNmY7ycL7WTl8M3gEij1vZMrrEeIv27T4AmjTM7SMatHWHOQXX +AWuzsIQFSnyoSzBl1liD7MjNhCUF1s49UISU28oaHyoi2rK6okmB+ipz6CzXsZdl +Sn49lYCC6B//Cpy+/OIm7O4l7C9+7wv9VHaam5KYOQjgDDcp2l6PhOy3liGcM+FV +2gz/0sGop5p2XgrPnK+MVCkZu4i5Q1TrgBqYVvGvcNuVGbTFOWL8CzvOmpZSgHpT +rz1lS62WMVYU5dm8Ke4jcECjq2lK7DKbtv0eQhpX8ESjbh5dKEHBYCRmjyKQekAF +LnFpgIMs6bW5WbCPCUkDbFXVQvDJZ9PXOnXFDLM2XMHMdzC24MQ57P52WQARAQAB +tBtLYSBIbyBOZyA8a2huZ0BGcmVlQlNELm9yZz6JAlQEEwEIAD4WIQT+yz8G5k// +sQI4hGT5i2X1ia5jcQUCYFAyDwIbIwUJBaOagAULCQgHAgYVCgkICwIEFgIDAQIe +AQIXgAAKCRD5i2X1ia5jcVkqEACEpZUNxZN4aPR3g/g8MysMQN0dZVHlbcZfNGl2 +lm3LSboWw6luOgk+yTgRN0DmcSBFk40HO2xf2qzrp+Xeh3USL3cWUxvRHfwaop/w +lG1aoULFHrpv+vBAWYz+K0g+ZQds24NYqV8NK3Y6YX7j2JDhyHuIN9+fj8nEdXxZ +avYtDbgyaNpQeXHEFO2yoeb2RCcfu/bETe1EheknHHsGfvuDpfArdzYFISvkNMQc +/2RWPoctVTLvrCodwzshXPOhdlivALWWDAaZsVL+TleXXovzAz9RdClcmxSeBfkk +Jp2kKtCEIQ4OK1x//9Ae8AdfAZpU/hqUfjAKpP7M4Cv4XQjxX57yOjbnq9DnPY+n +C4/J1sOEbHXy4hYt72ZjSonrMYYrMrm3MbrfEAy1vcDXCVYPTGgq4/yef0N4EL1U +mwpwfma/s3qjDUMI9SNBa5I70HZoD67vgIh6b5QkD92aDNYDPD/hxUvrDXobPzNq +CrqphaMe7q3pa1YfcByFk88EjnJV3KMmym1RUE5O5b0FEMe+e7j/TuCC+umRzTaq +icO2MfrsybEItCSJPfsSswO8wzt/2OJ4oTtlmQANfUpWshYeU5kLG/qQhDUdyJCT +QmkMn12DOXi2kVTPYo53WyM4q27fRGwbmLUQZ9QvzHmB3KEN4JmV3bGmRvnTgHi3 +TFgPe7kCDQRgUDIpARAAr0gJWRjrLHEmDbvZr45WwQH9KCFLO7aoj2jvIK2olMZo +Xw8/2NLwbhbeaZlg2YRs2FJk4jAjprsf0sbZfKfpySXEl3yraD51duh6vdiGLwtX +fOGsOkj6J1BKHXpHyhiGpR8P47VIJVmj1j1zE5vgW1eVRoMW8yKC4AbJ1/P+qX6u +uziLkjpaEuxm/LcTvgQE7YptNttwx6hSsKLohFxSa1XyIBxPAq5VDS9iSE4nCaSz +RNSrwkCFg6MxZJKWj/TakJ4Djs//iIOsGjve5hs0iZUVPFi8H0egDCs3MrUpNgcC +XRJcmZZ+ViSxpymYjqAkMgiCmU9JjFQp94B0RMATDivs250tlFiEtqul3IhSySNg +hR5GplCthP2Pqupc0kUkn3zD0OX28fuv3hWOP5QQSK6TBFWb5i7ey2PP45HB2Rhg +0fN43malupJfLFMr1kUK/OQNAkLMfnCbu7jblpLTFY8J25dbtPuGxNk/fGcAsscx +/qL6gn94oSFeztyXIxYA/G0DcFpw9amgst5J0BigjlH2VMSucOuR3BYow5KIEjqe +H4cQYNoBvKTZSBE3RJ1Sce+uR2gjl7S8rhP91VZOt/LeNDX5tzNELluoHcKSOZOv +VeyfUN2wVI8e6lOCO3zDCH6Gx+l3e0KtZJWL9Kk+Ll80oGN7Kq3HvbvV7VP4i80A +EQEAAYkCPAQYAQgAJhYhBP7LPwbmT/+xAjiEZPmLZfWJrmNxBQJgUDIpAhsMBQkF +o5qAAAoJEPmLZfWJrmNxeHQP/iPLh27YloWtfKYi86ksRPYBIAC7yRRMNcA8amGp +RvSRhj2PWai+gEZotEKG6fv8YBzaGKXPY1sI+TLU1Ugy5GQWfvfLSS5/wr0TIZVC +wDNn7nZt9ypIZmBtnAWytLr4qrBw7FD83lVPJJjUSxMgxzmaFN7ePjoY1yLIOfZB +Dm3hIkdGDF4HGYuRdT3ddo581sUq+dXvORgzQoYvjvwJAXE97hhyciNHat4kKKN8 +CCZYIDFh6F5JcPrSQzyITYVFaSpb1gpMRkwHiiDMoq1DouvRBlyboA/zs6+lx8Vi +X7lCWFdbKIvrkSv3Gawoy+druRhUCN0QhA3nvrQ/I3acZ+CQIf+lMtRa+xGOAa7q +ylhgGV+FrhALcUKo1e2tPy6dmKv1MgXKFDP8FjoPJd0HxRLaS04odgeiWNXEFqHF +gDCNGlt0At+Q31d8ZrsvL1iwLPWOET9q71epk3AaLMFYBo80d6w3ADiCFOzAv0ct +wPCinOzcE16xlrGq2s7alwTQeqvc8XfP3KBND1UskgA9N+xByGvd73S6M39tL0T4 +0VFseIIXnY559QDAZZ+X+r1inqs/keD27JORdcTo5rVehf1LD3sFkByn/oDrqAyy +uJjL3oc3/vIha5sOYDl/myZFXMsUbOpR5gMK30bm2S1DYNfxgx3xCPQsaYPF3IdT +jmvL +=SgDc +-----END PGP PUBLIC KEY BLOCK----- +.... diff --git a/shared/authors.adoc b/shared/authors.adoc index 9bfb79697d..572601d6c6 100644 --- a/shared/authors.adoc +++ b/shared/authors.adoc @@ -1783,6 +1783,10 @@ :kevlo-email: kevlo@FreeBSD.org :kevlo: {kevlo-name} <{kevlo-email}> +:khng-name: Ka Ho Ng +:khng-email: khng@FreeBSD.org +:khng: {khng-name} <{khng-email}> + :kib-name: Konstantin Belousov :kib-email: kib@FreeBSD.org :kib: {kib-name} <{kib-email}> diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml index 0b7be406ef..5299e15ce9 100644 --- a/website/data/en/news/news.toml +++ b/website/data/en/news/news.toml @@ -1,6 +1,10 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-03-15" +description = "New committer: Ka Ho Ng (src)" + [[news]] date = "2021-03-12" title = "FreeBSD 13.0-RC2 Available" From owner-dev-commits-doc-all@freebsd.org Tue Mar 16 11:10:37 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BC8065A8F1F for ; Tue, 16 Mar 2021 11:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F09Z54wVhz3vcT; Tue, 16 Mar 2021 11:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9C0DC2298E; Tue, 16 Mar 2021 11:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12GBAbfk052650; Tue, 16 Mar 2021 11:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12GBAbog052649; Tue, 16 Mar 2021 11:10:37 GMT (envelope-from git) Date: Tue, 16 Mar 2021 11:10:37 GMT Message-Id: <202103161110.12GBAbog052649@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: b6c72f65a8 - main - Fix weird generated format 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: b6c72f65a819070ba0b92d30fbe3c67dfbeede01 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 11:10:37 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=b6c72f65a819070ba0b92d30fbe3c67dfbeede01 commit b6c72f65a819070ba0b92d30fbe3c67dfbeede01 Author: Li-Wen Hsu AuthorDate: 2021-03-16 11:08:56 +0000 Commit: Li-Wen Hsu CommitDate: 2021-03-16 11:10:07 +0000 Fix weird generated format Approved by: carlavilla (implicitly) --- documentation/content/en/articles/committers-guide/_index.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 3848a401ff..21b598b08b 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2740,7 +2740,8 @@ FreeBSD committers can get a free 4-CD or DVD set at conferences from http://www [[benefits-irc]] === IRC -In addition, developers may request a cloaked hostmask for their account on the Freenode IRC network in the form of `freebsd/developer/`_freefall name_ or `freebsd/developer/`_NickServ name_. To request a cloak, send an email to `{irc-email}` with your requested hostmask and NickServ account name. +In addition, developers may request a cloaked hostmask for their account on the Freenode IRC network in the form of `freebsd/developer/``_freefall name_` or `freebsd/developer/``_NickServ name_`. +To request a cloak, send an email to `{irc-email}` with your requested hostmask and NickServ account name. [[benefits-gandi]] === `Gandi.net` From owner-dev-commits-doc-all@freebsd.org Tue Mar 16 20:32:23 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BEED656C924 for ; Tue, 16 Mar 2021 20:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0Q2H55C7z3NCN; Tue, 16 Mar 2021 20:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A1C992A217; Tue, 16 Mar 2021 20:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12GKWNfv095962; Tue, 16 Mar 2021 20:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12GKWNTZ095961; Tue, 16 Mar 2021 20:32:23 GMT (envelope-from git) Date: Tue, 16 Mar 2021 20:32:23 GMT Message-Id: <202103162032.12GKWNTZ095961@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 35c2ff4910 - main - Remove sparc64 trademark MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35c2ff49105b171ecc02c0498a97b9aba87a6954 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 20:32:23 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=35c2ff49105b171ecc02c0498a97b9aba87a6954 commit 35c2ff49105b171ecc02c0498a97b9aba87a6954 Author: Warner Losh AuthorDate: 2021-03-16 17:28:14 +0000 Commit: Warner Losh CommitDate: 2021-03-16 20:31:54 +0000 Remove sparc64 trademark We don't reference sparc64 in either of these chapters, so remove it from the trademark list. --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- documentation/content/en/articles/explaining-bsd/_index.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 21b598b08b..be7eb6d7ce 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -4,7 +4,7 @@ authors: - author: The FreeBSD Documentation Project copyright: 1999-2019 The FreeBSD Documentation Project releaseinfo: "$FreeBSD$" -trademarks: ["freebsd", "coverity", "ibm", "intel", "sparc", "general"] +trademarks: ["freebsd", "coverity", "ibm", "intel", "general"] --- = Committer's Guide diff --git a/documentation/content/en/articles/explaining-bsd/_index.adoc b/documentation/content/en/articles/explaining-bsd/_index.adoc index 3f443ef7b8..1f76b113e1 100644 --- a/documentation/content/en/articles/explaining-bsd/_index.adoc +++ b/documentation/content/en/articles/explaining-bsd/_index.adoc @@ -4,7 +4,7 @@ authors: - author: Greg Lehey email: grog@FreeBSD.org releaseinfo: "$FreeBSD$" -trademarks: ["freebsd", "amd", "apple", "intel", "linux", "opengroup", "sparc", "sun", "unix", "general"] +trademarks: ["freebsd", "amd", "apple", "intel", "linux", "opengroup", "sun", "unix", "general"] --- = Explaining BSD From owner-dev-commits-doc-all@freebsd.org Tue Mar 16 21:05:42 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA8A956D7FF for ; Tue, 16 Mar 2021 21:05: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 4F0Qmk5MLsz3QGX; Tue, 16 Mar 2021 21:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AAED62A464; Tue, 16 Mar 2021 21:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12GL5gda036718; Tue, 16 Mar 2021 21:05:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12GL5gFa036717; Tue, 16 Mar 2021 21:05:42 GMT (envelope-from git) Date: Tue, 16 Mar 2021 21:05:42 GMT Message-Id: <202103162105.12GL5gFa036717@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: a2fbd7a750 - main - Remove svn vendor import information. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2fbd7a750cd2ec731aa91c8dd8bb70c761d4f73 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 21:05:42 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=a2fbd7a750cd2ec731aa91c8dd8bb70c761d4f73 commit a2fbd7a750cd2ec731aa91c8dd8bb70c761d4f73 Author: Warner Losh AuthorDate: 2021-03-16 20:43:40 +0000 Commit: Warner Losh CommitDate: 2021-03-16 20:43:40 +0000 Remove svn vendor import information. It is no longer relevant to the day-to-day operations of the project. It's all done with git now. We have the old content in the doc repo should someone need this information in the future. --- .../en/articles/committers-guide/_index.adoc | 210 --------------------- 1 file changed, 210 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index be7eb6d7ce..c7892c36ff 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -836,216 +836,6 @@ If something looks fishy, ask for help. Make sure to commit a top level directory to have the mergeinfo included as well. Do not specify individual files on the command line. For more information about committing files in general, see the relevant section of this primer. -[[svn-advanced-use-vendor-imports]] -==== Vendor Imports with SVN - -[IMPORTANT] -==== -Please read this entire section before starting a vendor import. -==== - -[NOTE] -==== -Patches to vendor code fall into two categories: - -* Vendor patches: these are patches that have been issued by the vendor, or that have been extracted from the vendor's version control system, which address issues which cannot wait until the next vendor release. -* FreeBSD patches: these are patches that modify the vendor code to address FreeBSD-specific issues. - -The nature of a patch dictates where it should be committed: - -* Vendor patches must be committed to the vendor branch, and merged from there to head. If the patch addresses an issue in a new release that is currently being imported, it _must not_ be committed along with the new release: the release must be imported and tagged first, then the patch can be applied and committed. There is no need to re-tag the vendor sources after committing the patch. -* FreeBSD patches are committed directly to head. - -==== - -===== Preparing the Tree - -If importing for the first time after the switch to Subversion, flattening and cleaning up the vendor tree is necessary, as well as bootstrapping the merge history in the main tree. - -====== Flattening - -During the conversion from `CVS` to Subversion, vendor branches were imported with the same layout as the main tree. This means that the `pf` vendor sources ended up in [.filename]#vendor/pf/dist/contrib/pf#. The vendor source is best directly in [.filename]#vendor/pf/dist#. - -To flatten the `pf` tree: - -[source,shell] -.... -% cd vendor/pf/dist/contrib/pf -% svn mv $(svn list) ../.. -% cd ../.. -% svn rm contrib -% svn propdel -R svn:mergeinfo . -% svn commit -.... - -The `propdel` bit is necessary because starting with 1.5, Subversion will automatically add `svn:mergeinfo` to any directory that is copied or moved. In this case, as nothing is being merged from the deleted tree, they just get in the way. - -Tags may be flattened as well (3, 4, 3.5 etc.); the procedure is exactly the same, only changing `dist` to `3.5` or similar, and putting the `svn commit` off until the end of the process. - -====== Cleaning Up - -The `dist` tree can be cleaned up as necessary. Disabling keyword expansion is recommended, as it makes no sense on unmodified vendor code and in some cases it can even be harmful. OpenSSH, for example, includes two files that originated with FreeBSD and still contain the original version tags. To do this: - -[source,shell] -.... -% svn propdel svn:keywords -R . -% svn commit -.... - -====== Bootstrapping Merge History - -If importing for the first time after the switch to Subversion, bootstrap `svn:mergeinfo` on the target directory in the main tree to the revision that corresponds to the last related change to the vendor tree, prior to importing new sources: - -[source,shell] -.... -% cd head/contrib/pf -% svn merge --record-only svn+ssh://repo.freebsd.org/base/vendor/pf/dist@180876 . -% svn commit -.... - -===== Importing New Sources - -With two commits-one for the import itself and one for the tag-this step can optionally be repeated for every upstream release between the last import and the current import. - -====== Preparing the Vendor Sources - -Subversion is able to store a full distribution in the vendor tree. So, import everything, but merge only what is required. - -A `svn add` is required to add any files that were added since the last vendor import, and `svn rm` is required to remove any that were removed since. Preparing sorted lists of the contents of the vendor tree and of the sources that are about to be imported is recommended, to facilitate the process. - -[source,shell] -.... -% cd vendor/pf/dist -% svn list -R | grep -v '/$' | sort >../old -% cd ../pf-4.3 -% find . -type f | cut -c 3- | sort >../new -.... - -With these two files, `comm -23 ../old ../new` will list removed files (files only in [.filename]#old#), while `comm -13 ../old ../new` will list added files only in [.filename]#new#. - -====== Importing into the Vendor Tree - -Now, the sources must be copied into [.filename]#dist# and the `svn add` and `svn rm` commands are used as needed: - -[source,shell] -.... -% cd vendor/pf/pf-4.3 -% tar cf - . | tar xf - -C ../dist -% cd ../dist -% comm -23 ../old ../new | xargs svn rm -% comm -13 ../old ../new | xargs svn add --parents -.... - -If any directories were removed, they will have to be ``svn rm``-ed manually. Nothing will break if they are not, but they will remain in the tree. - -Check properties on any new files. All text files should have `svn:eol-style` set to `native`. All binary files should have `svn:mime-type` set to `application/octet-stream` unless there is a more appropriate media type. Executable files should have `svn:executable` set to `*`. No other properties should exist on any file in the tree. - -Committing is now possible. However, it is good practice to make sure that everything is okay by using the `svn stat` and `svn diff` commands. - -====== Tagging - -Once committed, vendor releases are tagged for future reference. The best and quickest way to do this is directly in the repository: - -[source,shell] -.... -% svn cp svn+ssh://repo.freebsd.org/base/vendor/pf/dist svn+ssh://repo.freebsd.org/base/vendor/pf/4.3 -.... - -Once that is complete, `svn up` the working copy of [.filename]#vendor/pf# to get the new tag, although this is rarely needed. - -If creating the tag in the working copy of the tree, `svn:mergeinfo` results must be removed: - -[source,shell] -.... -% cd vendor/pf -% svn cp dist 4.3 -% svn propdel svn:mergeinfo -R 4.3 -.... - -===== Merging to Head - -[source,shell] -.... -% cd head/contrib/pf -% svn up -% svn merge --accept=postpone svn+ssh://repo.freebsd.org/base/vendor/pf/dist . -.... - -The `--accept=postpone` tells Subversion not to complain about merge conflicts as they will be handled manually. - -[TIP] -==== - -The `cvs2svn` changeover occurred on June 3, 2008. When performing vendor merges for packages which were already present and converted by the `cvs2svn` process, the command used to merge [.filename]#/vendor/package_name/dist# to [.filename]#/head/package_location# (for example, [.filename]#head/contrib/sendmail#) must use `-c _REV_` to indicate the revision to merge from the [.filename]#/vendor# tree. For example: - -[source,shell] -.... -% svn checkout svn+ssh://repo.freebsd.org/base/head/contrib/sendmail -% cd sendmail -% svn merge -c r261190 '^/vendor/sendmail/dist' . -.... - -`^` is an alias for the repository path. -==== - -[NOTE] -==== -If using the Zsh shell, the `^` must be escaped with `\` or quoted. -==== - -It is necessary to resolve any merge conflicts. - -Make sure that any files that were added or removed in the vendor tree have been properly added or removed in the main tree. To check diffs against the vendor branch: - -[source,shell] -.... -% svn diff --no-diff-deleted --old=svn+ssh://repo.freebsd.org/base/vendor/pf/dist --new=. -.... - -The `--no-diff-deleted` tells Subversion not to complain about files that are in the vendor tree but not in the main tree. Things that would have previously been removed before the vendor import, like the vendor's makefiles and configure scripts. - -Using CVS, once a file was off the vendor branch, it was not able to be put back. With Subversion, there is no concept of on or off the vendor branch. If a file that previously had local modifications, to make it not show up in diffs in the vendor tree, all that has to be done is remove any left-over cruft like FreeBSD version tags, which is much easier. - -If any changes are required for the world to build with the new sources, make them now, and keep testing until everything builds and runs perfectly. - -===== Committing the Vendor Import - -Committing is now possible! Everything must be committed in one go. If done properly, the tree will move from a consistent state with old code, to a consistent state with new code. - -===== From Scratch - -====== Importing into the Vendor Tree - -This section is an example of importing and tagging byacc into [.filename]#head#. - -First, prepare the directory in [.filename]#vendor#: - -[source,shell] -.... -% svn co --depth immediates $FSVN/vendor -% cd vendor -% svn mkdir byacc -% svn mkdir byacc/dist -.... - -Now, import the sources into the [.filename]#dist# directory. Once the files are in place, `svn add` the new ones, then `svn commit` and tag the imported version. To save time and bandwidth, direct remote committing and tagging is possible: - -[source,shell] -.... -% svn cp -m "Tag byacc 20120115" $FSVN/vendor/byacc/dist $FSVN/vendor/byacc/20120115 -.... - -====== Merging to `head` - -Due to this being a new file, copy it for the merge: - -[source,shell] -.... -% svn cp -m "Import byacc to contrib" $FSVN/vendor/byacc/dist $FSVN/head/contrib/byacc -.... - -Working normally on newly imported sources is still possible. - [[svn-advanced-use-reverting-a-commit]] ==== Reverting a Commit From owner-dev-commits-doc-all@freebsd.org Tue Mar 16 23:33:28 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B64B571BDF for ; Tue, 16 Mar 2021 23:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0V3C6vbcz3rF6; Tue, 16 Mar 2021 23:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DFFBE2C901; Tue, 16 Mar 2021 23:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12GNXRIe034651; Tue, 16 Mar 2021 23:33:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12GNXRMa034650; Tue, 16 Mar 2021 23:33:27 GMT (envelope-from git) Date: Tue, 16 Mar 2021 23:33:27 GMT Message-Id: <202103162333.12GNXRMa034650@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 371c80a880 - main - git: Move vendor branch stuff to the new git-primer section of committer guide MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 371c80a880b5047891ea943412bf0b1977b08653 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 23:33:28 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=371c80a880b5047891ea943412bf0b1977b08653 commit 371c80a880b5047891ea943412bf0b1977b08653 Author: Warner Losh AuthorDate: 2021-03-16 21:30:54 +0000 Commit: Warner Losh CommitDate: 2021-03-16 21:30:54 +0000 git: Move vendor branch stuff to the new git-primer section of committer guide Vendor branch managed belongs in the comitter guide, as it is relevant to comitters and not to the larger community of people developing for FreeBSD, which the developer's guide more genereal development. --- .../en/articles/committers-guide/_index.adoc | 228 +++++++++++++++++++++ .../developers-handbook/policies/chapter.adoc | 219 +------------------- 2 files changed, 229 insertions(+), 218 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index c7892c36ff..c5027a970d 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -233,6 +233,234 @@ Committers are encouraged to seek review for their work as part of the normal de * Committers can acquire an additional bit by the usual process of finding a mentor who will propose them to core, doceng, or portmgr, as appropriate. When approved, they will be added to 'access' and the normal mentoring period will ensue, which will involve a continuing of "Approved by" for some period. * "Approved by" is only acceptable from non-mentored src committers -- mentored committers can provide a "Reviewed by" but not an "Approved by". +[[git-primer]] +== Git Primer + +[NOTE] +==== +this section is a work in progress... +==== + +[[vendor-import-git]] +=== Vendor Imports with Git + +This section describes the vendor import procedure with Git in detail. + +==== Branch naming convention +All vendor branches and tags start with `vendor/`. These branches and +tags are visible by default. + +[NOTE] +==== +This chapter follows the convention that the `freebsd` origin is the source of truth. If you use a different convention, replace `freebsd` with your name as appopriate. +==== + + +We'll explore an example for updating NetBSD's mtree that's in our +tree. The vendor branch for this is `vendor/NetBSD/mtree`. + +==== Updating an old vendor import +Since the trees we have in vendor branches are usually a tiny subset of +the FreeBSD, it's best to do them with work trees since the process is +quite fast. Make sure that whatever directory you choose (the +`../mtree`) argument is empty and doesn't conflict. +[source,shell] +.... +% git worktree add ../mtree vendor/NetBSD/mtree +.... +==== Update the Sources in the Vendor Branch + +Prepare a full, clean tree of the vendor sources. Import everything but merge only what is needed. + +I have my copy of NetBSD checked out from their GitHub mirror in +`~/git/NetBSD`, so I'll update from there: Note that "upstream" might +have added or removed files, so we want to make sure deletions are +propagated as well. rsync(1) is commonly installed, so I'll use that. +[source,shell] +.... +% cd ../mtree +% rsync -va --del --exclude=".git" ~/git/NetBSD/usr.sbin/mtree/ . +% git add -A +% git status +... +% git diff --staged +... +% git commit -m"Vendor import of NetBSD's mtree at 2020-12-11" +[vendor/NetBSD/mtree 8e7aa25fcf1] Vendor import of NetBSD's mtree at 2020-12-11 + 7 files changed, 114 insertions(+), 82 deletions(-) +% git tag -a vendor/NetBSD/mtree/20201211 +.... + +Note: I run the `git diff` and `git status` commands to make sure nothing weird +was present. Also I used `-m` to illustrate, but you should compose a proper +message in an editor (using a commit message template). + +It's also important to create an annotated tag, otherwise the push +will be rejected. Only annotated tags are allowed to be pushed. The +annoated tag gives you a chance to enter a commit message. Enter +the version you are importing, along with any salient new features +or fixes in that version. + +==== Updating the FreeBSD Copy +At this point you can push the import to vendor into our repo. +[source,shell] +.... +% git push --follow-tags freebsd vendor/NetBSD/mtree +.... + +`--follow-tags` tells `git push` to also push tags associated with the locally committed revision. +==== Updating the FreeBSD source tree +Now you need to update the mtree in FreeBSD. The sources live in +`contrib/mtree` since it is upstream software. +[source,shell] +.... +% cd ../src +% git subtree merge -P contrib/mtree vendor/NetBSD/mtree +.... +This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing. + +==== Rebasing your change against latest FreeBSD source tree +Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward +before you get a chance to push, you would have to redo the merge. + +Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit **as a merge commit**, +so instead of that you would have to recreate the commit. + +The easiest way to do this would be to create a side branch with the **contents** of the merged tree: + +[source,shell] +.... +% cd ../src +% git fetch freebsd +% git checkout -b merge_result +% git merge freebsd/main +.... + +Typically, there would be no merge conflicts here (because developers tends to work on different components). +In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this +should be really rare. + +Now, checkout `freebsd/main` again as `new_merge`, and redo the merge: +[source,shell] +.... +% git checkout -b new_merge freebsd/main +% git subtree merge -P contrib/mtree vendor/NetBSD/mtree +.... +Instead of resolving the conflicts, perform this instead: +[source,shell] +.... +% git checkout merge_result . +.... +Which will overwrite the files with conflicts with the version found in `merge_result`. + +Examine the tree against `merge_result` to make sure that you haven't missed deleted files: +[source,shell] +.... +% git diff merge_result +.... +==== Pushing the changes +Once you are sure that you have a set of deltas you think is good, you can push it to +a fork off github or gitlab for others to review. Once nice thin about Git is that it +allows you to publish rough drafts of your work for others to review. + +After review, when you are sure it is a good change, you can push it to the FreeBSD repo: +[source,shell] +.... +% git push freebsd main +.... + +=== Creating a new vendor branch +There's a number of ways to create a new vendor branch. The recommended way is +to create a new repository and then merge that with FreeBSD. Let's say +we're importing `glorbnitz` into the FreeBSD tree, release 3.1415. For +the sake of simplicity, we'll not trim this release. It's a user +command that puts the nitz device into different magical glorb states. + +==== Create the repo +[source,shell] +.... +% cd /some/where +% mkdir glorbnitz +% cd glorbnitz +% git init +% git checkout -b vendor/glorbnitz +.... +At this point, you have a new repo, where all new commits will go on +the `vendor/glorbnitz` branch. + +(Git professionals can also do this right in their FreeBSD clone, if they know +how to create a new root commit that's not attached to anything, e.g. +`git checkout --orphan vendor/glorbnitz`) + +==== Copy the sources in +Since this is a new import, you can just cp the sources in, or use tar or +even rsync as shown above. And we'll add everything, assuming no dot files. +[source,shell] +.... +% cp -r ~/glorbnitz/* . +% git add * +.... + +At this point, you should have a pristine copy of glorbnitz ready to commit. + +[source,shell] +.... +% git commit -m"Import GlorbNitz frobnosticator revision 3.1415" +.... +As above, I used `-m` for simplicity, but you should likely create a +commit message that explains what a Glorb is and why you'd use a Nitz +to get it. Not everybody will know. + +==== Now import it into our repository +Now you need to import the branch into our repository. +[source,shell] +.... +% cd /path/to/freebsd/repo/src +% git remote add glorbnitz /some/where/glorbnitz +% git fetch glorbnitz vendor/glorbnitz +.... +Note the vendor/glorbnitz branch is in the repo. At this point the +`/some/where/glorbnitz` can be deleted, if you like. It was only a means +to an end. + +==== Tag and push +Steps from here on out are much the same as they are in the case of +updating a vendor branch, though w/o the updating the vendor +branch step. +[source,shell] +.... +% git worktree add ../glorbnitz vendor/glorbnitz +% cd ../glorbnitz +% git tag --annotate vendor/glorbnitz/3.1415 +# Make sure it's good +% git push --follow-tags freebsd vendor/glorbnitz +.... +By 'good' we mean: + +. All the right files are present +. None of the wrong files are present +. The vendor branch points at something sensible +. The tag looks good, and is annotated. + +==== Time to finally merge it into the base tree* +[source,shell] +.... +% cd ../src +% git subtree add -P contrib/glorbnitz vendor/glorbnitz +# Make sure it's good +% git push freebsd +.... +Here 'good' means: + +. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz. +. No other changes are in the tree +. The commit messages look good. + +[NOTE] +==== +This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported. +==== + [[subversion-primer]] == Subversion Primer diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc index ca24fcb11d..d6465e51ff 100644 --- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc +++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc @@ -77,225 +77,8 @@ Ultimately, however, it comes down to the people actually doing the work. If usi Because it makes it harder to import future versions minor, trivial and/or cosmetic changes are _strongly discouraged_ on files that are still tracking the vendor branch. ==== -[[vendor-import-git]] -=== Vendor Imports with Git +For details on how do do a vendor import please see link:http://www.FreeBSD.org/en/articles/committers-guide/#git-primer[the committers guide] -This section describes the vendor import procedure with Git in detail. - -==== Branch naming convention -All vendor branches and tags start with `vendor/`. These branches and -tags are visible by default. - -[NOTE] -==== -This chapter follows the convention that the `freebsd` origin is the source of truth. If you use a different convention, replace `freebsd` with your name as appopriate. -==== - - -We'll explore an example for updating NetBSD's mtree that's in our -tree. The vendor branch for this is `vendor/NetBSD/mtree`. - -==== Updating an old vendor import -Since the trees we have in vendor branches are usually a tiny subset of -the FreeBSD, it's best to do them with work trees since the process is -quite fast. Make sure that whatever directory you choose (the -`../mtree`) argument is empty and doesn't conflict. -[source,shell] -.... -% git worktree add ../mtree vendor/NetBSD/mtree -.... -==== Update the Sources in the Vendor Branch - -Prepare a full, clean tree of the vendor sources. Import everything but merge only what is needed. - -I have my copy of NetBSD checked out from their GitHub mirror in -`~/git/NetBSD`, so I'll update from there: Note that "upstream" might -have added or removed files, so we want to make sure deletions are -propagated as well. rsync(1) is commonly installed, so I'll use that. -[source,shell] -.... -% cd ../mtree -% rsync -va --del --exclude=".git" ~/git/NetBSD/usr.sbin/mtree/ . -% git add -A -% git status -... -% git diff --staged -... -% git commit -m"Vendor import of NetBSD's mtree at 2020-12-11" -[vendor/NetBSD/mtree 8e7aa25fcf1] Vendor import of NetBSD's mtree at 2020-12-11 - 7 files changed, 114 insertions(+), 82 deletions(-) -% git tag -a vendor/NetBSD/mtree/20201211 -.... - -Note: I run the `git diff` and `git status` commands to make sure nothing weird -was present. Also I used `-m` to illustrate, but you should compose a proper -message in an editor (using a commit message template). - -It's also important to create an annotated tag, otherwise the push -will be rejected. Only annotated tags are allowed to be pushed. The -annoated tag gives you a chance to enter a commit message. Enter -the version you are importing, along with any salient new features -or fixes in that version. - -==== Updating the FreeBSD Copy -At this point you can push the import to vendor into our repo. -[source,shell] -.... -% git push --follow-tags freebsd vendor/NetBSD/mtree -.... - -`--follow-tags` tells `git push` to also push tags associated with the locally committed revision. -==== Updating the FreeBSD source tree -Now you need to update the mtree in FreeBSD. The sources live in -`contrib/mtree` since it is upstream software. -[source,shell] -.... -% cd ../src -% git subtree merge -P contrib/mtree vendor/NetBSD/mtree -.... -This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing. - -==== Rebasing your change against latest FreeBSD source tree -Because the current policy recommends against using merges, if the upstream FreeBSD `main` moved forward -before you get a chance to push, you would have to redo the merge. - -Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a merge commit **as a merge commit**, -so instead of that you would have to recreate the commit. - -The easiest way to do this would be to create a side branch with the **contents** of the merged tree: - -[source,shell] -.... -% cd ../src -% git fetch freebsd -% git checkout -b merge_result -% git merge freebsd/main -.... - -Typically, there would be no merge conflicts here (because developers tends to work on different components). -In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this -should be really rare. - -Now, checkout `freebsd/main` again as `new_merge`, and redo the merge: -[source,shell] -.... -% git checkout -b new_merge freebsd/main -% git subtree merge -P contrib/mtree vendor/NetBSD/mtree -.... -Instead of resolving the conflicts, perform this instead: -[source,shell] -.... -% git checkout merge_result . -.... -Which will overwrite the files with conflicts with the version found in `merge_result`. - -Examine the tree against `merge_result` to make sure that you haven't missed deleted files: -[source,shell] -.... -% git diff merge_result -.... -==== Pushing the changes -Once you are sure that you have a set of deltas you think is good, you can push it to -a fork off github or gitlab for others to review. Once nice thin about Git is that it -allows you to publish rough drafts of your work for others to review. - -After review, when you are sure it is a good change, you can push it to the FreeBSD repo: -[source,shell] -.... -% git push freebsd main -.... - -=== Creating a new vendor branch -There's a number of ways to create a new vendor branch. The recommended way is -to create a new repository and then merge that with FreeBSD. Let's say -we're importing `glorbnitz` into the FreeBSD tree, release 3.1415. For -the sake of simplicity, we'll not trim this release. It's a user -command that puts the nitz device into different magical glorb states. - -==== Create the repo -[source,shell] -.... -% cd /some/where -% mkdir glorbnitz -% cd glorbnitz -% git init -% git checkout -b vendor/glorbnitz -.... -At this point, you have a new repo, where all new commits will go on -the `vendor/glorbnitz` branch. - -(Git professionals can also do this right in their FreeBSD clone, if they know -how to create a new root commit that's not attached to anything, e.g. -`git checkout --orphan vendor/glorbnitz`) - -==== Copy the sources in -Since this is a new import, you can just cp the sources in, or use tar or -even rsync as shown above. And we'll add everything, assuming no dot files. -[source,shell] -.... -% cp -r ~/glorbnitz/* . -% git add * -.... - -At this point, you should have a pristine copy of glorbnitz ready to commit. - -[source,shell] -.... -% git commit -m"Import GlorbNitz frobnosticator revision 3.1415" -.... -As above, I used `-m` for simplicity, but you should likely create a -commit message that explains what a Glorb is and why you'd use a Nitz -to get it. Not everybody will know. - -==== Now import it into our repository -Now you need to import the branch into our repository. -[source,shell] -.... -% cd /path/to/freebsd/repo/src -% git remote add glorbnitz /some/where/glorbnitz -% git fetch glorbnitz vendor/glorbnitz -.... -Note the vendor/glorbnitz branch is in the repo. At this point the -`/some/where/glorbnitz` can be deleted, if you like. It was only a means -to an end. - -==== Tag and push -Steps from here on out are much the same as they are in the case of -updating a vendor branch, though w/o the updating the vendor -branch step. -[source,shell] -.... -% git worktree add ../glorbnitz vendor/glorbnitz -% cd ../glorbnitz -% git tag --annotate vendor/glorbnitz/3.1415 -# Make sure it's good -% git push --follow-tags freebsd vendor/glorbnitz -.... -By 'good' we mean: - -. All the right files are present -. None of the wrong files are present -. The vendor branch points at something sensible -. The tag looks good, and is annotated. - -==== Time to finally merge it into the base tree* -[source,shell] -.... -% cd ../src -% git subtree add -P contrib/glorbnitz vendor/glorbnitz -# Make sure it's good -% git push freebsd -.... -Here 'good' means: - -. All the right files, and none of the wrong ones, were merged into contrib/glorbnitz. -. No other changes are in the tree -. The commit messages look good. - -[NOTE] -==== -This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported. -==== [[policies-encumbered]] == Encumbered Files From owner-dev-commits-doc-all@freebsd.org Tue Mar 16 23:45:09 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4545957219B for ; Tue, 16 Mar 2021 23:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0VJj1Xd0z3rkS; Tue, 16 Mar 2021 23:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 238EE2C923; Tue, 16 Mar 2021 23:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12GNj92H047868; Tue, 16 Mar 2021 23:45:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12GNj9QZ047867; Tue, 16 Mar 2021 23:45:09 GMT (envelope-from git) Date: Tue, 16 Mar 2021 23:45:09 GMT Message-Id: <202103162345.12GNj9QZ047867@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: b4b797a0ce - main - Fix link to committer's guide MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4b797a0ce06778328b39a802e07b67265b5da9e Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 23:45:09 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=b4b797a0ce06778328b39a802e07b67265b5da9e commit b4b797a0ce06778328b39a802e07b67265b5da9e Author: Warner Losh AuthorDate: 2021-03-16 23:44:48 +0000 Commit: Warner Losh CommitDate: 2021-03-16 23:44:48 +0000 Fix link to committer's guide --- .../content/en/books/developers-handbook/policies/chapter.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc index d6465e51ff..5893cbf682 100644 --- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc +++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc @@ -77,7 +77,7 @@ Ultimately, however, it comes down to the people actually doing the work. If usi Because it makes it harder to import future versions minor, trivial and/or cosmetic changes are _strongly discouraged_ on files that are still tracking the vendor branch. ==== -For details on how do do a vendor import please see link:http://www.FreeBSD.org/en/articles/committers-guide/#git-primer[the committers guide] +For details on how do do a vendor import please see link:https://docs.freebsd.org/en/articles/committers-guide/#git-primer#git-primer[the committers guide] [[policies-encumbered]] == Encumbered Files From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 00:08:16 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD8A1573236 for ; Wed, 17 Mar 2021 00:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0VqN51snz3tgm; Wed, 17 Mar 2021 00:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9F9692CAEF; Wed, 17 Mar 2021 00:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H08G7B075240; Wed, 17 Mar 2021 00:08:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H08Gf3075239; Wed, 17 Mar 2021 00:08:16 GMT (envelope-from git) Date: Wed, 17 Mar 2021 00:08:16 GMT Message-Id: <202103170008.12H08Gf3075239@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: a7f71f22a4 - main - Doh! The double #git-primer slipped in w/o my noticing it. Remove second one MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7f71f22a4261888d603ec4d34035de7f9b9c0a3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 00:08:16 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=a7f71f22a4261888d603ec4d34035de7f9b9c0a3 commit a7f71f22a4261888d603ec4d34035de7f9b9c0a3 Author: Warner Losh AuthorDate: 2021-03-17 00:08:01 +0000 Commit: Warner Losh CommitDate: 2021-03-17 00:08:01 +0000 Doh! The double #git-primer slipped in w/o my noticing it. Remove second one --- .../content/en/books/developers-handbook/policies/chapter.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/developers-handbook/policies/chapter.adoc b/documentation/content/en/books/developers-handbook/policies/chapter.adoc index 5893cbf682..ea7c98d70c 100644 --- a/documentation/content/en/books/developers-handbook/policies/chapter.adoc +++ b/documentation/content/en/books/developers-handbook/policies/chapter.adoc @@ -77,7 +77,7 @@ Ultimately, however, it comes down to the people actually doing the work. If usi Because it makes it harder to import future versions minor, trivial and/or cosmetic changes are _strongly discouraged_ on files that are still tracking the vendor branch. ==== -For details on how do do a vendor import please see link:https://docs.freebsd.org/en/articles/committers-guide/#git-primer#git-primer[the committers guide] +For details on how do do a vendor import please see link:https://docs.freebsd.org/en/articles/committers-guide/#git-primer[the committers guide] [[policies-encumbered]] == Encumbered Files From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 00:45:29 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 340C45743D9 for ; Wed, 17 Mar 2021 00:45:29 +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 4F0WfK11Cyz3wXH; Wed, 17 Mar 2021 00:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 159192CF7D; Wed, 17 Mar 2021 00:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H0jSpH027146; Wed, 17 Mar 2021 00:45:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H0jS1P027145; Wed, 17 Mar 2021 00:45:28 GMT (envelope-from git) Date: Wed, 17 Mar 2021 00:45:28 GMT Message-Id: <202103170045.12H0jS1P027145@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 86836673be - main - Fix more typos from the original github docs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86836673be10d5e844953ef89aaebfd341700148 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 00:45:29 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=86836673be10d5e844953ef89aaebfd341700148 commit 86836673be10d5e844953ef89aaebfd341700148 Author: Warner Losh AuthorDate: 2021-03-17 00:43:35 +0000 Commit: Warner Losh CommitDate: 2021-03-17 00:43:35 +0000 Fix more typos from the original github docs Fix a number of typos. Note why one would prefer publishing a repo over phabricator. Try to minimize use of contractions. Clarify the mysterious 'source of truth' phrase. Noticed by: Pau Amma (except the contractions) --- .../en/articles/committers-guide/_index.adoc | 60 +++++++++++----------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index c5027a970d..5ae3aef191 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -252,18 +252,19 @@ tags are visible by default. [NOTE] ==== -This chapter follows the convention that the `freebsd` origin is the source of truth. If you use a different convention, replace `freebsd` with your name as appopriate. +This chapter follows the convention that the `freebsd` origin is the origin name for the official FreeBSD git repository. +If you use a different convention, replace `freebsd` with the name you use instead in the examples below. ==== -We'll explore an example for updating NetBSD's mtree that's in our -tree. The vendor branch for this is `vendor/NetBSD/mtree`. +We will explore an example for updating NetBSD's mtree that is in our tree. +The vendor branch for this is `vendor/NetBSD/mtree`. ==== Updating an old vendor import -Since the trees we have in vendor branches are usually a tiny subset of -the FreeBSD, it's best to do them with work trees since the process is -quite fast. Make sure that whatever directory you choose (the -`../mtree`) argument is empty and doesn't conflict. +The vendor trees usually have only the subset of the third-party software that is appropriate to FreeBSD. +These trees are usually tiny in comparison to the FreeBSD tree. +Git workrees are thus quite small and fast and the preferred method to use. +Make sure that whatever directory you choose below (the `../mtree`) does not currently exist. [source,shell] .... % git worktree add ../mtree vendor/NetBSD/mtree @@ -272,10 +273,9 @@ quite fast. Make sure that whatever directory you choose (the Prepare a full, clean tree of the vendor sources. Import everything but merge only what is needed. -I have my copy of NetBSD checked out from their GitHub mirror in -`~/git/NetBSD`, so I'll update from there: Note that "upstream" might -have added or removed files, so we want to make sure deletions are -propagated as well. rsync(1) is commonly installed, so I'll use that. +This example assumes the NetBSD checked out from their GitHub mirror in `~/git/NetBSD`. +Note that "upstream" might have added or removed files, so we want to make sure deletions are propagated as well. +rsync(1) is commonly installed, so I'll use that. [source,shell] .... % cd ../mtree @@ -295,9 +295,9 @@ Note: I run the `git diff` and `git status` commands to make sure nothing weird was present. Also I used `-m` to illustrate, but you should compose a proper message in an editor (using a commit message template). -It's also important to create an annotated tag, otherwise the push +It is also important to create an annotated tag, otherwise the push will be rejected. Only annotated tags are allowed to be pushed. The -annoated tag gives you a chance to enter a commit message. Enter +annotated tag gives you a chance to enter a commit message. Enter the version you are importing, along with any salient new features or fixes in that version. @@ -336,7 +336,7 @@ The easiest way to do this would be to create a side branch with the **contents* % git merge freebsd/main .... -Typically, there would be no merge conflicts here (because developers tends to work on different components). +Typically, there would be no merge conflicts here (because developers tend to work on different components). In the worst case scenario, you would still have to resolve merge conflicts, if there was any, but this should be really rare. @@ -359,9 +359,9 @@ Examine the tree against `merge_result` to make sure that you haven't missed del % git diff merge_result .... ==== Pushing the changes -Once you are sure that you have a set of deltas you think is good, you can push it to -a fork off github or gitlab for others to review. Once nice thin about Git is that it -allows you to publish rough drafts of your work for others to review. +Once you are sure that you have a set of deltas you think is good, you can push it to a fork off github or gitlab for others to review. +Once nice thing about Git is that it allows you to publish rough drafts of your work for others to review. +While phabricator is good for content review, publishing the updated vendor branch and merge commits lets others check the details as they will eventually appear in the repository. After review, when you are sure it is a good change, you can push it to the FreeBSD repo: [source,shell] @@ -370,11 +370,11 @@ After review, when you are sure it is a good change, you can push it to the Free .... === Creating a new vendor branch -There's a number of ways to create a new vendor branch. The recommended way is -to create a new repository and then merge that with FreeBSD. Let's say -we're importing `glorbnitz` into the FreeBSD tree, release 3.1415. For -the sake of simplicity, we'll not trim this release. It's a user -command that puts the nitz device into different magical glorb states. +There are a number of ways to create a new vendor branch. +The recommended way is to create a new repository and then merge that with FreeBSD. +If one is importing `glorbnitz` into the FreeBSD tree, release 3.1415. +For the sake of simplicity, we will not trim this release. +It is a simple user command that puts the nitz device into different magical glorb states and is small enough trimming will not save much. ==== Create the repo [source,shell] @@ -388,13 +388,11 @@ command that puts the nitz device into different magical glorb states. At this point, you have a new repo, where all new commits will go on the `vendor/glorbnitz` branch. -(Git professionals can also do this right in their FreeBSD clone, if they know -how to create a new root commit that's not attached to anything, e.g. -`git checkout --orphan vendor/glorbnitz`) +Git experts can also do this right in their FreeBSD clone, using `git checkout --orphan vendor/glorbnitz` if they are more comfortable with that. ==== Copy the sources in -Since this is a new import, you can just cp the sources in, or use tar or -even rsync as shown above. And we'll add everything, assuming no dot files. +Since this is a new import, you can just cp the sources in, or use tar or even rsync as shown above. +And we will add everything, assuming no dot files. [source,shell] .... % cp -r ~/glorbnitz/* . @@ -425,14 +423,14 @@ to an end. ==== Tag and push Steps from here on out are much the same as they are in the case of -updating a vendor branch, though w/o the updating the vendor +updating a vendor branch, though without the updating the vendor branch step. [source,shell] .... % git worktree add ../glorbnitz vendor/glorbnitz % cd ../glorbnitz % git tag --annotate vendor/glorbnitz/3.1415 -# Make sure it's good +# Make sure the commit is good with "git show" % git push --follow-tags freebsd vendor/glorbnitz .... By 'good' we mean: @@ -442,12 +440,12 @@ By 'good' we mean: . The vendor branch points at something sensible . The tag looks good, and is annotated. -==== Time to finally merge it into the base tree* +==== Time to finally merge it into the base tree [source,shell] .... % cd ../src % git subtree add -P contrib/glorbnitz vendor/glorbnitz -# Make sure it's good +# Make sure the commit is good with "git show" % git push freebsd .... Here 'good' means: From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 01:04:26 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91D23575008 for ; Wed, 17 Mar 2021 01:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0X4B3j1zz4Rwt; Wed, 17 Mar 2021 01:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 71F522D77D; Wed, 17 Mar 2021 01:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H14QAd054106; Wed, 17 Mar 2021 01:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H14Q0K054105; Wed, 17 Mar 2021 01:04:26 GMT (envelope-from git) Date: Wed, 17 Mar 2021 01:04:26 GMT Message-Id: <202103170104.12H14Q0K054105@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 3a52e436d3 - main - Two more typos I made while fixing the last typos. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a52e436d37bb08fa1371b0bc7ba0280d4fd579a Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 01:04:26 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=3a52e436d37bb08fa1371b0bc7ba0280d4fd579a commit 3a52e436d37bb08fa1371b0bc7ba0280d4fd579a Author: Warner Losh AuthorDate: 2021-03-17 01:03:56 +0000 Commit: Warner Losh CommitDate: 2021-03-17 01:03:56 +0000 Two more typos I made while fixing the last typos. Noticed by: Pau Amma --- documentation/content/en/articles/committers-guide/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 5ae3aef191..10ac725642 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -263,7 +263,7 @@ The vendor branch for this is `vendor/NetBSD/mtree`. ==== Updating an old vendor import The vendor trees usually have only the subset of the third-party software that is appropriate to FreeBSD. These trees are usually tiny in comparison to the FreeBSD tree. -Git workrees are thus quite small and fast and the preferred method to use. +Git worktrees are thus quite small and fast and the preferred method to use. Make sure that whatever directory you choose below (the `../mtree`) does not currently exist. [source,shell] .... @@ -360,7 +360,7 @@ Examine the tree against `merge_result` to make sure that you haven't missed del .... ==== Pushing the changes Once you are sure that you have a set of deltas you think is good, you can push it to a fork off github or gitlab for others to review. -Once nice thing about Git is that it allows you to publish rough drafts of your work for others to review. +One nice thing about Git is that it allows you to publish rough drafts of your work for others to review. While phabricator is good for content review, publishing the updated vendor branch and merge commits lets others check the details as they will eventually appear in the repository. After review, when you are sure it is a good change, you can push it to the FreeBSD repo: From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 02:14:05 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B409E5766B7 for ; Wed, 17 Mar 2021 02:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0YcY4kZkz4VgZ; Wed, 17 Mar 2021 02:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 954612E452; Wed, 17 Mar 2021 02:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H2E5FV046062; Wed, 17 Mar 2021 02:14:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H2E5vZ046061; Wed, 17 Mar 2021 02:14:05 GMT (envelope-from git) Date: Wed, 17 Mar 2021 02:14:05 GMT Message-Id: <202103170214.12H2E5vZ046061@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 965da1835e - main - Move the MFC doc from my freebsd-git-docs repo to handbook MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 965da1835ef371c71e528b211406b05aa16452d8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 02:14:05 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=965da1835ef371c71e528b211406b05aa16452d8 commit 965da1835ef371c71e528b211406b05aa16452d8 Author: Warner Losh AuthorDate: 2021-03-17 02:09:36 +0000 Commit: Warner Losh CommitDate: 2021-03-17 02:09:36 +0000 Move the MFC doc from my freebsd-git-docs repo to handbook Integreate MFC procedures into the committer's handbook. This was originally in my freebsd-git-docs repo where it was collaberatively created. The changes here are light edits and a conversion from markdown to asciidoc. Contributions from: jhb@, lwhsu@, delphij@, Ceri Davies, Alexandre --- .../en/articles/committers-guide/_index.adoc | 494 +++++++++++++++++++++ 1 file changed, 494 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 10ac725642..5dda2f0f91 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -241,6 +241,500 @@ Committers are encouraged to seek review for their work as part of the normal de this section is a work in progress... ==== +[[mfc-with-git]] +=== MFC (Merge From Current) Procedures +==== Summary + +MFC workflow can be summarized as `git cherry-pick -x` plus git commit +--amend to adjust the commit message. For multiple commits, use `git rebase -i` +to squash them together and edit the commit message. + +==== Single commit MFC + +[source,shell] +.... +% git checkout stable/X +% git cherry-pick -x $HASH --edit +.... + +For MFC commits, for example a vendor import, you would need to specify one parent for cherry-pick +purposes. Normally, that would be the "first parent" of the branch you are cherry-picking from, so: + +[source,shell] +.... +% git checkout stable/X +% git cherry-pick -x $HASH -m 1 --edit +.... + +If things go wrong, you'll either need to abort the cherry-pick with `git cherry-pick --abort` or fix it +up and do a `git cherry-pick --continue`. + +Once the cherry-pick is finished, push with `git push`. If you get an error due to losing the commit race, +use `git pull --rebase` and try to push again. + +==== Multiple commit MFC + +[source,shell] +.... +% git checkout -b tmp-branch stable/X +% for h in $HASH_LIST; do git cherry-pick -x $h; done +% git rebase -i stable/X +# mark each of the commits after the first as 'squash' +# edit the commit message to be sane +% git push freebsd HEAD:stable/X +.... + +If the push fails due to losing the commit race, rebase and try again: + +[source,shell] +.... +% git checkout stable/X +% git pull +% git checkout tmp-branch +% git rebase stable/X +% git push freebsd HEAD:stable/X +.... + +Once the MFC is complete, you can delete the temporary branch: + +[source,shell] +.... +% git checkout stable/X +% git branch -d tmp-branch +.... + +==== MFC a vendor import + +Vendor imports are the only thing in the tree that creates a merge +commit in the main line. Cherry picking merge commits into stable/XX +presents an additional difficulty because there are two parents for a +merge commit. Generally, you'll want the first parent's diff since +that's the diff to mainline (though there may be some exceptions). + +[source,shell] +.... +% git cherry-pick -x -m 1 $HASH +.... +is typically what you want. This will tell cherry-pick to apply the correct diff. + +There are some, hopefully, rare cases where it's possible that the +mainline was merged backwards by the conversion script. Should that be +the case (and we've not found any yet), you'd change the above to '-m 2' +to pickup the proper parent. Just do +[source,shell] +.... +% git cherry-pick --abort +% git cherry-pick -x -m 2 $HASH +.... +to do that. The `--aboort` will cleanup the failed first attempt. + +==== Redoing a MFC + +If you do a MFC, and it goes horribly wrong and you want to start over, +then the easiest way is to use `git reset --hard` like so: +[source,shell] +.... +% git reset --hard freebsd/stable/12 +.... +though if you have some revs you want to keep, and others you don't, +using 'git rebase -i' is better. + +==== Considerations when MFCing + +When committing source commits to stable and releng branches, we have +the following goals: + +1. Clearly mark direct commits distinct from commits that land a + change from another branch +2. Avoid introducing known breakage into stable and releng branches +3. Allow developers to determine which changes have or have not been + landed from one branch to another + +With subversion, we used the following practices to achieve these goals: + +1. Using 'MFC' and 'MFS' tags to mark commits that merged changes from + another branch +2. Squashing fixup commits into the main commit when merging a change +3. Recording mergeinfo so that `svn mergeinfo --show-revs` worked + +With Git, we will need to use different strategies to achieve the same +goals. This document aims to define best practices when merging +source commits using git that achieve these goals. In general, we aim +to use git's native support to achieve these goals rather than +enforcing practices built on subversion's model. + +One general note: due to technical differences with Git, we will not +be using git "merge commits" (created via `git merge`) in stable or +releng branches. Instead, when this document refers to "merge +commits", it means a commit originally made to `main` that is +replicated or "landed" to a stable branch, or a commit from a stable +branch that is replicated to a releng branch with some varation of +`git cherry-pick`. + +==== Commit message standards +===== Marking MFCs + +There are two main options for marking MFCs as distinct from direct +commits: + +1. One option that matches our existing practice (the wisdom of which + I'm not commenting on) would mark MFCs like this in the commit + message: `MFC: 12def6789a3a,ac32ee4a5c2e` + + where the first 12 digits of the hash is used to mark the commit message. + This "abbreviated hash" can be retrieved by: `git show --format=%p --no-patch $full_hash` + + This preserves the information, but isn't 'git standard'. It also + requires committers to manually edit commit messages to include + this information when merging. + +2. Use the `-x` flag with `git cherry-pick`. This adds a line to the + commit message that includes the hash of the original commit when + merging. Since it is added by Git directly, committers do not have + to manually edit the commit log when merging. + +We feel that the second option is simpler going forward. + +===== Finding Eligible Hashes to MFC + +Git provides some built-in support for this via the `git cherry` and +`git log --cherry` commands. These commands compare the raw diffs of +commits (but not other metadata such as log messages) to determine if +two commits are identical. This works well when each commit from head +is landed as a single commit to a stable branch, but it falls over if +multiple commits from main are squashed together as a single commit to +a stable branch. + +There are a few options for resolving this: + +1. We could ban squashing of commits and instead require that committers + stage all of the fixup / follow-up commits to stable into a single + push. This would still achieve the goal of stability in stable and + releng branches since pushes are atomic and users doing a simple pull + will never end up with a tree that has the main commit without the + fixup(s). `git bisect` is also able to cope with this model via + `git bisect skip`. + +2. We could adopt a consistent style for describing MFCs and write + our own tooling to wrap around `git cherry` to determine the list + of eligible commits. A simple approach here might be to use the + syntax from `git cherry-pick -x`, but require that a squashed + commit list all of the hashes (one line per hash) at the end of + the commit message. Developers could do this by using + `git cherry-pick -x` of each individual commit into a branch and + then use `git rebase` to squash the commits down into a single + commit, but collecting the `-x` annotations at the end of the + landed commit log. + +===== Trim Metadata? + +One area that was not clearly documented with subversion (or even CVS) +is how to format metadata in log messages for MFC commits. Should +it include the metadata from the original commit unchanged, or should +it be altered to reflect information about the MFC commit itself? + +Historical practice has varied, though some of the variance is by +field. For example, MFCs that are relevant to a PR generally +include the PR field in the MFC so that MFC commits are included +in the bug tracker's audit trail. Other fields are less clear. For +example, Phabricator shows the diff of the last commit tagged to a +review, so including Phabricator URLs replaces the `main` commit with +the landed commits. The list of reviewers is also not clear. If a +reviewer has approved a change to `main`, does that mean they have +approved the MFC commit? Is that true if it's identical code only, +or with merely trivial reworkes? It's clearly not true for more +extensive reworks. Even for identical code what if the commit doesn't +conflict but introduces an ABI change? A reviewer may have ok'd a +commit for `main` due to the ABI breakage but may not approve of +merging the same commit as-is. One will have to use one's best +judgement until clear guidelines can be agreed upon. + +For MFCs regulated by re@, new metadata fields are added, such as +the Approved by tag for approved commits. This new metadata will have +to be added via `git commit --amend` or similar after the original +commit has been reviewed and approved. We may also want to reserve +some metadata fields in MFC commits such as Phabricator URLs for use +by re@ in the future. + +Preserving existing metadata provides a very simple workflow. +Developers can just use `git cherry-pick -x` without having to edit +the log message. + +If instead we choose to adjust metadata in MFCs, developers will +have to edit log messages explicitly via the use of `git cherry-pick +--edit` or `git commit --amend`. However, as compared to svn, at +least the existing commit message can be pre-populated and metadata +fields can be added or removed without having to re-enter the entire +commit message. + +The bottom line is that developers will likely need to curate their +commit message for MFCs that are non-trivial. + +==== Examples + +===== Merging a Single Subversion Commit + +This walks through the process of merging a commit to stable/12 that +was originally committed to head in Subversion. In this case, the +original commit is r368685. + +The first step is to map the Subversion commit to a Git hash. Once +you have fetched refs/notes/commits, you can pass the revision number +to `git log --grep`: + +[source,shell] +.... +% git log main --grep 368685 +commit ce8395ecfda2c8e332a2adf9a9432c2e7f35ea81 +Author: John Baldwin +Date: Wed Dec 16 00:11:30 2020 +0000 + + Use the 't' modifier to print a ptrdiff_t. + + Reviewed by: imp + Obtained from: CheriBSD + Sponsored by: DARPA + Differential Revision: https://reviews.freebsd.org/D27576 + +Notes: + svn path=/head/; revision=368685 +.... + +Next, MFC the commit to a `stable/12` checkout: + +[source,shell] +.... +git checkout stable/12 +git cherry-pick -x ce8395ecfda2c8e332a2adf9a9432c2e7f35ea81 --edit +.... + +Git will invoke the editor. Use this to remove the metadata that only +applied to the original commit (Phabricator URL and Reviewed by). +After the editor saves the updated log message, Git completes the +commit: + +[source,shell] +.... +[stable/12 3e3a548c4874] Use the 't' modifier to print a ptrdiff_t. + Date: Wed Dec 16 00:11:30 2020 +0000 + 1 file changed, 1 insertion(+), 1 deletion(-) +.... + +The contents of the MFCd commit can be examined via `git show`: + +[source,shell] +.... +% git show +commit 3e3a548c487450825679e4bd63d8d1a67fd8bd2d (HEAD -> stable/12) +Author: John Baldwin +Date: Wed Dec 16 00:11:30 2020 +0000 + + Use the 't' modifier to print a ptrdiff_t. + + Obtained from: CheriBSD + Sponsored by: DARPA + + (cherry picked from commit ce8395ecfda2c8e332a2adf9a9432c2e7f35ea81) + +diff --git a/sys/compat/linuxkpi/common/include/linux/printk.h b/sys/compat/linuxkpi/common/include/linux/printk.h +index 31802bdd2c99..e6510e9e9834 100644 +--- a/sys/compat/linuxkpi/common/include/linux/printk.h ++++ b/sys/compat/linuxkpi/common/include/linux/printk.h +@@ -68,7 +68,7 @@ print_hex_dump(const char *level, const char *prefix_str, + printf("[%p] ", buf); + break; + case DUMP_PREFIX_OFFSET: +- printf("[%p] ", (const char *)((const char *)buf - ++ printf("[%#tx] ", ((const char *)buf - + (const char *)buf_old)); + break; + default: +.... + +The MFC commit can now be published via `git push` + +[source,shell] +.... +% git push freebsd +Enumerating objects: 17, done. +Counting objects: 100% (17/17), done. +Delta compression using up to 4 threads +Compressing objects: 100% (7/7), done. +Writing objects: 100% (9/9), 817 bytes | 204.00 KiB/s, done. +Total 9 (delta 5), reused 1 (delta 1), pack-reused 0 +To gitrepo-dev.FreeBSD.org:src.git + 525bd9c9dda7..3e3a548c4874 stable/12 -> stable/12 +.... + +===== Merging a Single Subversion Commit with a Conflict + +This example is similar to the previous example except that the +commit in question encounters a merge conflict. In this case, the +original commit is r368314. + +As above, the first step is to map the Subversion commit to a Git +hash: + +[source,shell] +.... +% git log main --grep 368314 +commit 99963f5343a017e934e4d8ea2371a86789a46ff9 +Author: John Baldwin +Date: Thu Dec 3 22:01:13 2020 +0000 + + Don't transmit mbufs that aren't yet ready on TOE sockets. + + This includes mbufs waiting for data from sendfile() I/O requests, or + mbufs awaiting encryption for KTLS. + + Reviewed by: np + MFC after: 2 weeks + Sponsored by: Chelsio Communications + Differential Revision: https://reviews.freebsd.org/D27469 + +Notes: + svn path=/head/; revision=368314 +.... + +Next, MFC the commit to a `stable/12` checkout: + +[source,shell] +.... +% git checkout stable/12 +% git cherry-pick -x 99963f5343a017e934e4d8ea2371a86789a46ff9 --edit +Auto-merging sys/dev/cxgbe/tom/t4_cpl_io.c +CONFLICT (content): Merge conflict in sys/dev/cxgbe/tom/t4_cpl_io.c +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 7123 and retry the command. +error: could not apply 99963f5343a0... Don't transmit mbufs that aren't yet ready on TOE sockets. +hint: after resolving the conflicts, mark the corrected paths +hint: with 'git add ' or 'git rm ' +hint: and commit the result with 'git commit' +.... + +In this case, the commit encountered a merge conflict in +sys/dev/cxge/tom/t4_cpl_io.c as kernel TLS is not present in +stable/12. Note that Git does not invoke an editor to adjust the +commit message due to the conflict. `git status` confirms that this +file has merge conflicts: + +[source,shell] +.... +% git status +On branch stable/12 +Your branch is up to date with 'upstream/stable/12'. + +You are currently cherry-picking commit 99963f5343a0. + (fix conflicts and run "git cherry-pick --continue") + (use "git cherry-pick --skip" to skip this patch) + (use "git cherry-pick --abort" to cancel the cherry-pick operation) + +Unmerged paths: + (use "git add ..." to mark resolution) + both modified: sys/dev/cxgbe/tom/t4_cpl_io.c + +no changes added to commit (use "git add" and/or "git commit -a") +.... + +After editing the file to resolve the conflict, `git status` shows the +conflict as resolved: + +[source,shell] +.... +% git status +On branch stable/12 +Your branch is up to date with 'upstream/stable/12'. + +You are currently cherry-picking commit 99963f5343a0. + (all conflicts fixed: run "git cherry-pick --continue") + (use "git cherry-pick --skip" to skip this patch) + (use "git cherry-pick --abort" to cancel the cherry-pick operation) + +Changes to be committed: + modified: sys/dev/cxgbe/tom/t4_cpl_io.c +.... + +The cherry-pick can now be completed: + +[source,shell] +.... +% git cherry-pick --continue +.... + +Since there was a merge conflict, Git invokes the editor to +adjust the commit message. Trim the metadata fields from the +commit log from the original commit to head and save the +updated log message. + +The contents of the MFC commit can be examined via `git show`: + +[source,shell] +.... +% git show +commit 525bd9c9dda7e7c7efad2d4570c7fd8e1a8ffabc (HEAD -> stable/12) +Author: John Baldwin +Date: Thu Dec 3 22:01:13 2020 +0000 + + Don't transmit mbufs that aren't yet ready on TOE sockets. + + This includes mbufs waiting for data from sendfile() I/O requests, or + mbufs awaiting encryption for KTLS. + + Sponsored by: Chelsio Communications + + (cherry picked from commit 99963f5343a017e934e4d8ea2371a86789a46ff9) + +diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c +index 8e8c2b8639e6..43861f10b689 100644 +--- a/sys/dev/cxgbe/tom/t4_cpl_io.c ++++ b/sys/dev/cxgbe/tom/t4_cpl_io.c +@@ -746,6 +746,8 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop) + for (m = sndptr; m != NULL; m = m->m_next) { + int n; + ++ if ((m->m_flags & M_NOTAVAIL) != 0) ++ break; + if (IS_AIOTX_MBUF(m)) + n = sglist_count_vmpages(aiotx_mbuf_pages(m), + aiotx_mbuf_pgoff(m), m->m_len); +@@ -821,8 +823,9 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop) + + /* nothing to send */ + if (plen == 0) { +- KASSERT(m == NULL, +- ("%s: nothing to send, but m != NULL", __func__)); ++ KASSERT(m == NULL || (m->m_flags & M_NOTAVAIL) != 0, ++ ("%s: nothing to send, but m != NULL is ready", ++ __func__)); + break; + } + +@@ -910,7 +913,7 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop) + toep->txsd_avail--; + + t4_l2t_send(sc, wr, toep->l2te); +- } while (m != NULL); ++ } while (m != NULL && (m->m_flags & M_NOTAVAIL) == 0); + + /* Send a FIN if requested, but only if there's no more data to send */ + if (m == NULL && toep->flags & TPF_SEND_FIN) +.... + +The MFC commit can now be published via `git push` + +[source,shell] +.... +git push freebsd +Enumerating objects: 13, done. +Counting objects: 100% (13/13), done. +Delta compression using up to 4 threads +Compressing objects: 100% (7/7), done. +Writing objects: 100% (7/7), 819 bytes | 117.00 KiB/s, done. +Total 7 (delta 6), reused 0 (delta 0), pack-reused 0 +To gitrepo.FreeBSD.org:src.git + f4d0bc6aa6b9..525bd9c9dda7 stable/12 -> stable/12 +.... + [[vendor-import-git]] === Vendor Imports with Git From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 02:47:59 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 315A7576F56 for ; Wed, 17 Mar 2021 02:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0ZMg10LQz4XCw; Wed, 17 Mar 2021 02:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 10C582F182; Wed, 17 Mar 2021 02:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H2lwg9086479; Wed, 17 Mar 2021 02:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H2lwvk086478; Wed, 17 Mar 2021 02:47:58 GMT (envelope-from git) Date: Wed, 17 Mar 2021 02:47:58 GMT Message-Id: <202103170247.12H2lwvk086478@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ka Ho Ng Subject: git: aa0d0c1422 - main - Alternative formatting on freebsd/developer/* blocks MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa0d0c142274f475ce153142c649747e92773c80 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 02:47:59 -0000 The branch main has been updated by khng (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=aa0d0c142274f475ce153142c649747e92773c80 commit aa0d0c142274f475ce153142c649747e92773c80 Author: Ka Ho Ng AuthorDate: 2021-03-17 02:44:32 +0000 Commit: Ka Ho Ng CommitDate: 2021-03-17 02:47:04 +0000 Alternative formatting on freebsd/developer/* blocks Use angle brackets instead of italic to denote mandatory fields after "freebsd/developer/" blocks. "freefall name" and "NickServ name" are also renamed to "freefall username"` and "FreeNode account". Reviewed by: debdrup, ygy, lwhsu Approved by: philip (mentor) Differential Revision: https://reviews.freebsd.org/D29285 --- documentation/content/en/articles/committers-guide/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 5dda2f0f91..3b93de2d72 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -3250,8 +3250,8 @@ FreeBSD committers can get a free 4-CD or DVD set at conferences from http://www [[benefits-irc]] === IRC -In addition, developers may request a cloaked hostmask for their account on the Freenode IRC network in the form of `freebsd/developer/``_freefall name_` or `freebsd/developer/``_NickServ name_`. -To request a cloak, send an email to `{irc-email}` with your requested hostmask and NickServ account name. +In addition, developers may request a cloaked hostmask for their account on the Freenode IRC network in the form of `freebsd/developer/` or `freebsd/developer/`. +To request a cloak, send an email to `{irc-email}` with your requested hostmask and NickServ account name. See the https://wiki.freebsd.org/IRC/Cloaks[IRC Cloaks] wiki page for more details. [[benefits-gandi]] === `Gandi.net` From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 04:23:59 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25DAC579359 for ; Wed, 17 Mar 2021 04:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0cVR0czrz4cvp; Wed, 17 Mar 2021 04:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 081CE348; Wed, 17 Mar 2021 04:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H4Nwln019091; Wed, 17 Mar 2021 04:23:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H4Nw3s019090; Wed, 17 Mar 2021 04:23:58 GMT (envelope-from git) Date: Wed, 17 Mar 2021 04:23:58 GMT Message-Id: <202103170423.12H4Nw3s019090@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: abff932fe8 - main - Merge in the migration from subversion / github MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abff932fe818c144380fd5ebfdcdf44f93de46de Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 04:23:59 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=abff932fe818c144380fd5ebfdcdf44f93de46de commit abff932fe818c144380fd5ebfdcdf44f93de46de Author: Warner Losh AuthorDate: 2021-03-17 03:55:44 +0000 Commit: Warner Losh CommitDate: 2021-03-17 04:23:19 +0000 Merge in the migration from subversion / github Add in the migrating from the old subversion / git docs. This section should be removed in a few months maybe. Contributions by: lwshu@, Alexander Richardson, kib@, Ceri Davies --- .../en/articles/committers-guide/_index.adoc | 275 ++++++++++++++++++++- 1 file changed, 268 insertions(+), 7 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 3b93de2d72..9edbef3945 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -241,6 +241,21 @@ Committers are encouraged to seek review for their work as part of the normal de this section is a work in progress... ==== +[[git-basics]] +=== Git basics + +There are many primers on how to use Git on the web. There's a lot of +them (google "Git primer"). This one comes up first, and is generally +good. https://danielmiessler.com/study/git/ and +https://gist.github.com/williewillus/068e9a8543de3a7ef80adb2938657b6b +are good overviews. The Git book is also complete, but much longer +https://git-scm.com/book/en/v2. There is also this website +https://ohshitgit.com/ for common traps and pitfalls of Git, in case +you need guidance to fix things up. + +This document will assume that you've read through it and will try not +to belabor the basics (though it will cover them briefly). + [[mfc-with-git]] === MFC (Merge From Current) Procedures ==== Summary @@ -490,7 +505,7 @@ Author: John Baldwin Date: Wed Dec 16 00:11:30 2020 +0000 Use the 't' modifier to print a ptrdiff_t. - + Reviewed by: imp Obtained from: CheriBSD Sponsored by: DARPA @@ -530,10 +545,10 @@ Author: John Baldwin Date: Wed Dec 16 00:11:30 2020 +0000 Use the 't' modifier to print a ptrdiff_t. - + Obtained from: CheriBSD Sponsored by: DARPA - + (cherry picked from commit ce8395ecfda2c8e332a2adf9a9432c2e7f35ea81) diff --git a/sys/compat/linuxkpi/common/include/linux/printk.h b/sys/compat/linuxkpi/common/include/linux/printk.h @@ -583,10 +598,10 @@ Author: John Baldwin Date: Thu Dec 3 22:01:13 2020 +0000 Don't transmit mbufs that aren't yet ready on TOE sockets. - + This includes mbufs waiting for data from sendfile() I/O requests, or mbufs awaiting encryption for KTLS. - + Reviewed by: np MFC after: 2 weeks Sponsored by: Chelsio Communications @@ -679,9 +694,9 @@ Date: Thu Dec 3 22:01:13 2020 +0000 This includes mbufs waiting for data from sendfile() I/O requests, or mbufs awaiting encryption for KTLS. - + Sponsored by: Chelsio Communications - + (cherry picked from commit 99963f5343a017e934e4d8ea2371a86789a46ff9) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -953,6 +968,252 @@ Here 'good' means: This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported. ==== +=== FreeBSD Src Committer Transition Guide + +This section is designed to walk people through the conversion +process from Subversion to Git, written from the source committer's point +of view. + +==== Migrating from a Subversion tree + +This section will cover a couple of common scenarios for migrating +from using the FreeBSD Subversion repo to the FreeBSD source git repo. The +FreeBSD Git conversion is still in beta status, so some minor things +may change between this and going into production. + +Before you git started, you'll need a copy of Git. Any Git will do, +though the latest ones are always recommended. Either build it from +ports, or install it using pkg (though some folks might use `su` or +`doas` instead of `sudo`): + + +[source,shell] +.... +% sudo pkg install git +.... + +===== No staged changes migration + +If you have no changes pending, the migration is straight forward. In +this, you abandon the Subversion tree and clone the Git repo. It's +likely best to retain your subversion tree, in case there's something +you've forgotten about there. First, let's clone a repo: +[source,shell] +.... +% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/src.git freebsd-src +.... +will create a clone of the FreeBSD src repo into a subdirectory called +`freebsd-src` and include the 'notes' about the revisions. +The current plan for GitHub mirroring is to mirror to +https://github.com/freebsd/freebsd.git as well. When the transition +starts, the github `master` branch will be frozen. We will be using the name `main` instead +of `master` that was used in the beta version of the github.com mirror. +The exact logistics of this are still being finalized, as there are over 2k forks and 5k stars. +We will also mirror the repo to gitlab at https://gitlab.com/FreeBSD/src.git . +Its transition plan is also being finalized. + +It's useful to have the old Subversion revisions available. This data is stored +using Git notes, but Git doesn't fetch those by default. The --config +and the argument above changed the default to fetch the notes. If +you've cloned the repo without this, or wish to add notes to an +previously clone repository, use the following commands: +[source,shell] +.... +% git config --add remote.freebsd.fetch "+refs/notes/*:refs/notes/*" +% git fetch +.... +At this point you have the src checked out into a Git tree, ready to +do other things. + +===== But I have changes that I've not committed + +If you are migrating from a tree that has changes you've not yet +committed to FreeBSD, you'll need to follow the steps from the +previous section first, and then follow these. +[source,shell] +.... +% cd path-to-svn-checkout-tree +% svn diff > /tmp/src.diff +% cd mumble/freebsd-src +% git checkout -b working +.... +This will create a diff of your current changes. The last command +creates a branch called `working` though you can call it whatever you +want. + +[source,shell] +.... +% git apply /tmp/src.diff +.... +this will apply all your pending changes to the working tree. This +doesn't commit the change, so you'll need to make this permanent: + +[source,shell] +.... +% git commit +.... + +The last command will commit these changes to the branch. The editor +will prompt you for a commit message. Enter one as if you were +committing to FreeBSD. + +At this point, your work is preserved, and in the Git repo. + +===== Keeping current + +So, time passes. It's time now to update the tree for the latest +changes upstream. When you checkout `main` make sure that you have no +diffs. It's a lot easier to commit those to a branch (or use `git +stash`) before doing the following. + +If you are used to `git pull`, I would strongly recommend using the +`--ff-only` option, and further setting it as the default option. +Alternatively, `git pull --rebase` is useful if you have changes staged +in the main directory. + +[source,shell] +.... +% git config --global pull.ff only +.... + +[source,shell] +.... +% cd freebsd-src +% git checkout main +% git pull (--ff-only|--rebase) +.... + +There is a common trap, that the combination command `git pull` will +try to perform a merge, which would sometimes creates a merge commit +sha that didn't exist before. This can be harder to recover from. + +The longer form is also recommended. + +[source,shell] +.... +% cd freebsd-src +% git checkout main +% git fetch freebsd +% git merge --ff-only freebsd/main +.... + +These commands reset your tree to the main branch, and then update it +from where you pulled the tree from originally. It's important to +switch to `main` before doing this so it moves forward. Now, it's time +to move the changes forward: + +[source,shell] +.... +% git rebase -i main working +.... + +This will bring up an interactive screen to change the defaults. +For now, just exit the editor. +Everything should just apply. +If not, then you'll need to resolve the diffs. +https://docs.github.com/en/free-pro-team@latest/github/using-git/resolving-merge-conflicts-after-a-git-rebase[This github document] can help you navigate this process. + +===== Time to push changes upstream + +First, ensure that the push URL is properly configured for the upstream +repository. +[source,shell] +.... +% git remote set-url --push freebsd ssh://git@gitrepo.freebsd.org/src.git +.... + +Then, verify that user name and email are configured right. We require +that they exactly match the passwd entry in FreeBSD cluster. Use +[source,shell] +.... +freefall% gen-gitconfig.sh +.... +on freefall.freebsd.org to get recipe that you can use directly, assuming +/usr/local/bin is in the PATH. + +The below command merges the 'working' branch into the upstream main line. +It's important that you curate your changes to be just +like you want them in the FreeBSD source repo before doing this. +[source,shell] +.... +% git push freebsd working:main +.... + +If your push is rejected due to losing a commit race, rebase your branch +before trying again: +[source,shell] +.... +% git checkout working +% git fetch freebsd +% git rebase freebsd/main +% git push freebsd working:main +.... + +===== Finding the Subversion Revision + +You'll need to make sure that you've fetched the notes (see the `No +staged changes migration` section above for details. Once you have +these, notes will show up in the git log command like so: +[source,shell] +.... +% git log +.... + +If you have a specific version in mind, you can use this construct: +[source,shell] +.... +% git log --grep revision=XXXX +.... + +to find the specific revision. The hex number after 'commit' is the +hash you can use to refer to this commit. + +==== Migrating from GitHub fork + +Note: as of this writing, the https://github.com/freebsd/freebsd-src +is mirroring all official branches, along with a `master` branch which +is the leagcy svn2git result. The `master` branch will not be updated anymore, +and the [last commit](https://github.com/freebsd/freebsd-src/commit/de1aa3dab23c06fec962a14da3e7b4755c5880cf) +contains the instructions of migrating to new `main` branch. +We'll likely retain the `master` branch for a certain time, but in the future +it will only be kept in the +[freebsd-legacy](https://github.com/freebsd/freebsd-legacy) repository. + +When migrating branches from a github fork from the old github mirror +to the official repo, the process is straight forward. This assumes that +you have a `freebsd` upstream pointing to github, adjust if necessary. +This also assumes a clean tree before starting... + +===== Add the new `freebsd` upstream repository: +[source,shell] +.... +% git remote add freebsd https://git.freebsd.org/src.git +% git fetch freebsd +% git checkout --track freebsd/main +.... + +===== Rebase all your WIP branches. +For each branch FOO, do the following after fetching the `freebsd` sources and creating a local `main` reference with the above checkout: +[source,shell] +.... +% git rebase -i freebsd/master FOO --onto main +.... +And you'll now be tracking the official source of truth. +You can then follow the `Keeping Current` section above to stay up to date. + +If you need to then commit work to FreeBSD, you can do so following the `Time to push changes upstream` instructions. +You'll need to do the following once to update the push URL if you are a FreeBSD committer: +[source,shell] +.... +% git remote set-url --push freebsd ssh://git@gitrepo.freebsd.org/src.git +.... +(note that gitrepo.freebsd.org will be change to repo.freebsd.org in the future.) + +You will also need to add `freebsd` as the location to push to. The +author recommends that your upstream github repo remain the default +push location so that you only push things into FreeBSD you intend to +by making it explicit. + [[subversion-primer]] == Subversion Primer From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 06:26:48 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B08C457BD75 for ; Wed, 17 Mar 2021 06:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0gD84fTKz4jyN; Wed, 17 Mar 2021 06:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8E5E01D43; Wed, 17 Mar 2021 06:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12H6Qm78077115; Wed, 17 Mar 2021 06:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12H6QmsT077114; Wed, 17 Mar 2021 06:26:48 GMT (envelope-from git) Date: Wed, 17 Mar 2021 06:26:48 GMT Message-Id: <202103170626.12H6QmsT077114@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: d24ea0f845 - main - Document what Signed-off-by means MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d24ea0f8456592362f6ff9067a39b30e4614fef3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 06:26:48 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=d24ea0f8456592362f6ff9067a39b30e4614fef3 commit d24ea0f8456592362f6ff9067a39b30e4614fef3 Author: Warner Losh AuthorDate: 2021-03-17 06:25:24 +0000 Commit: Warner Losh CommitDate: 2021-03-17 06:25:24 +0000 Document what Signed-off-by means We get submissions with this from time to time, so document what signed-off-by means. It's not used extensively in FreeBSD at this time. --- documentation/content/en/articles/committers-guide/_index.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 9edbef3945..af27f24735 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2446,6 +2446,10 @@ number, for ports) and the title line of a commit that is fixed by this change. |`Differential Revision:` |The full URL of the Phabricator review. This line __must be the last line__. For example: `https://reviews.freebsd.org/D1708`. + +|`Signed-off-by:` +|ID certifies compliance with https://developercertificate.org/ + |=== .Commit Log for a Commit Based on a PR From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 16:39:33 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4C3FC5700DB for ; Wed, 17 Mar 2021 16:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0wq91dtZz4hF0; Wed, 17 Mar 2021 16:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2B0331249B; Wed, 17 Mar 2021 16:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HGdXdM084147; Wed, 17 Mar 2021 16:39:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HGdXu6084146; Wed, 17 Mar 2021 16:39:33 GMT (envelope-from git) Date: Wed, 17 Mar 2021 16:39:33 GMT Message-Id: <202103171639.12HGdXu6084146@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: 2191c44469 - main - Committer's Guide: list the new commits mailing lists to replace svn ones 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: 2191c44469ce70c1cf939b3131873270fa787a56 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 16:39:33 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=2191c44469ce70c1cf939b3131873270fa787a56 commit 2191c44469ce70c1cf939b3131873270fa787a56 Author: Li-Wen Hsu AuthorDate: 2021-03-17 16:36:57 +0000 Commit: Li-Wen Hsu CommitDate: 2021-03-17 16:36:57 +0000 Committer's Guide: list the new commits mailing lists to replace svn ones Approved by: carlavilla (implicitly) --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index af27f24735..1b4a242f2e 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2048,7 +2048,7 @@ Wiki Information - After gaining access to the wiki, some people add entries to [.filename]#ports/astro/xearth/files/freebsd.committers.markers# and [.filename]#src/usr.bin/calendar/calendars/calendar.freebsd# - Some people add entries for themselves to these files to show where they are located or the date of their birthday. . Optional: Prevent Duplicate Mailings + -Subscribers to {svn-src-all}, {svn-ports-all} or {svn-doc-all} might wish to unsubscribe to avoid receiving duplicate copies of commit messages and followups. +Subscribers to {dev-commits-doc-all}, {dev-commits-ports-all} or {dev-commits-src-all} might wish to unsubscribe to avoid receiving duplicate copies of commit messages and followups. ==== [[conventions-everyone]] From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:01:30 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ECE8B57110D for ; Wed, 17 Mar 2021 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0xJV6R84z4jtx; Wed, 17 Mar 2021 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CFE72127A1; Wed, 17 Mar 2021 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HH1U6Z021561; Wed, 17 Mar 2021 17:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HH1UGx021560; Wed, 17 Mar 2021 17:01:30 GMT (envelope-from git) Date: Wed, 17 Mar 2021 17:01:30 GMT Message-Id: <202103171701.12HH1UGx021560@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Chris Rees Subject: git: ecc2b1a6a0 - main - Remove instructions on boot splash screens MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: crees X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecc2b1a6a0c0979474f6bdb2c59cafbaa33dd958 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:01:31 -0000 The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/doc/commit/?id=ecc2b1a6a0c0979474f6bdb2c59cafbaa33dd958 commit ecc2b1a6a0c0979474f6bdb2c59cafbaa33dd958 Author: Chris Rees AuthorDate: 2021-03-17 17:00:03 +0000 Commit: Chris Rees CommitDate: 2021-03-17 17:00:03 +0000 Remove instructions on boot splash screens They haven't worked for years in the way described, and following further advice online to enable VESA results in an unbootable system! It can be put back when vt(4) supports them. PR: kern/210432 --- .../content/en/books/handbook/boot/_index.adoc | 47 ---------------------- 1 file changed, 47 deletions(-) diff --git a/documentation/content/en/books/handbook/boot/_index.adoc b/documentation/content/en/books/handbook/boot/_index.adoc index 8edd5eeac7..6e281e8ab3 100644 --- a/documentation/content/en/books/handbook/boot/_index.adoc +++ b/documentation/content/en/books/handbook/boot/_index.adoc @@ -52,7 +52,6 @@ After reading this chapter, you will recognize: * The components of the FreeBSD bootstrap system and how they interact. * The options that can be passed to the components in the FreeBSD bootstrap in order to control the boot process. -* How to configure a customized boot splash screen. * The basics of setting device hints. * How to boot into single- and multi-user mode and how to properly shut down a FreeBSD system. @@ -319,52 +318,6 @@ The resource configuration system reads in configuration defaults from [.filenam To learn more about the resource configuration system, refer to man:rc[8] and examine the scripts located in [.filename]#/etc/rc.d#. -[[boot-splash]] -== Configuring Boot Time Splash Screens - -Typically when a FreeBSD system boots, it displays its progress as a series of messages at the console. A boot splash screen creates an alternate boot screen that hides all of the boot probe and service startup messages. A few boot loader messages, including the boot options menu and a timed wait countdown prompt, are displayed at boot time, even when the splash screen is enabled. The display of the splash screen can be turned off by hitting any key on the keyboard during the boot process. - -There are two basic environments available in FreeBSD. The first is the default legacy virtual console command line environment. After the system finishes booting, a console login prompt is presented. The second environment is a configured graphical environment. Refer to crossref:x11[x11,The X Window System] for more information on how to install and configure a graphical display manager and a graphical login manager. - -Once the system has booted, the splash screen defaults to being a screen saver. After a time period of non-use, the splash screen will display and will cycle through steps of changing intensity of the image, from bright to very dark and over again. The configuration of the splash screen saver can be overridden by adding a `saver=` line to [.filename]#/etc/rc.conf#. Several built-in screen savers are available and described in man:splash[4]. The `saver=` option only applies to virtual consoles and has no effect on graphical display managers. - -By installing the package:sysutils/bsd-splash-changer[] package or port, a random splash image from a collection will display at boot. The splash screen function supports 256-colors in the bitmap ([.filename]#.bmp#), ZSoft PCX ([.filename]#.pcx#), or TheDraw ([.filename]#.bin#) formats. The [.filename]#.bmp#, [.filename]#.pcx#, or [.filename]#.bin# image has to be placed on the root partition, for example in [.filename]#/boot#. The splash image files must have a resolution of 320 by 200 pixels or less in order to work on standard VGA adapters. For the default boot display resolution of 256-colors and 320 by 200 pixels or less, add the following lines to [.filename]#/boot/loader.conf#. Replace _splash.bmp_ with the name of the bitmap file to use: - -[.programlisting] -.... -splash_bmp_load="YES" -bitmap_load="YES" -bitmap_name="/boot/splash.bmp" -.... - -To use a PCX file instead of a bitmap file: - -[.programlisting] -.... -splash_pcx_load="YES" -bitmap_load="YES" -bitmap_name="/boot/splash.pcx" -.... - -To instead use ASCII art in the https://en.wikipedia.org/wiki/TheDraw[https://en.wikipedia.org/wiki/TheDraw] format: - -[.programlisting] -.... -splash_txt="YES" -bitmap_load="YES" -bitmap_name="/boot/splash.bin" -.... - -Other interesting [.filename]#loader.conf# options include: - -`beastie_disable="YES"`:: -This will stop the boot options menu from being displayed, but the timed wait count down prompt will still be present. Even with the display of the boot options menu disabled, entering an option selection at the timed wait count down prompt will enact the corresponding boot option. - -`loader_logo="beastie"`:: -This will replace the default words "FreeBSD", which are displayed to the right of the boot options menu, with the colored beastie logo. - -For more information, refer to man:splash[4], man:loader.conf[5], and man:vga[4]. - [[device-hints]] == Device Hints From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:24:13 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BFC6E5716D8 for ; Wed, 17 Mar 2021 17:24: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 4F0xpj54tkz4lfx; Wed, 17 Mar 2021 17:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A130B12DAC; Wed, 17 Mar 2021 17:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HHODtS049870; Wed, 17 Mar 2021 17:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HHODic049869; Wed, 17 Mar 2021 17:24:13 GMT (envelope-from git) Date: Wed, 17 Mar 2021 17:24:13 GMT Message-Id: <202103171724.12HHODic049869@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 8401b7bbb6 - main - Add the git miniprimer MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8401b7bbb60a8a3ae37ee53f2fa07d94c8f3295c Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:24:13 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=8401b7bbb60a8a3ae37ee53f2fa07d94c8f3295c commit 8401b7bbb60a8a3ae37ee53f2fa07d94c8f3295c Author: Warner Losh AuthorDate: 2021-03-17 06:54:51 +0000 Commit: Warner Losh CommitDate: 2021-03-17 17:23:46 +0000 Add the git miniprimer Add in the git minirpimer from my github. It contains the basics that you'll need to track the tree and/or contribute. Contributions by: rwatson@, Rainer Hurling, jhb@, Ceri Davies, lwhsu@, chuck@, Robert Gogolok --- .../en/articles/committers-guide/_index.adoc | 424 +++++++++++++++++++++ 1 file changed, 424 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 1b4a242f2e..d4a39d8d06 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -256,6 +256,430 @@ you need guidance to fix things up. This document will assume that you've read through it and will try not to belabor the basics (though it will cover them briefly). +[[git-mini-primer]] +=== Git Mini Primer + +This primer is less ambitiously scoped than the old Subversion Primer, but should cover the basics. + +==== Scope + +If you want to download FreeBSD, compile it from sources and generally keep up to date that way, this primer is for you. +It covers getting the sources, updating the sources, how to bisect and touches briefly on how to cope with a few local changes. +It covers the basics, and tries to give good pointers to more in-depth treatment for when the readers finds the basics insufficient. +Other sections of this guide cover more advanced topics related to contributing to the project. + +The goal of this section is to highlight those bits of git needed to track sources. +They assume a basic understanding of git. +There are many primers for git on the web, but the https://git-scm.com/book/en/v2[Git Book] provides one of the better treatments. + +==== Keeping Current With FreeBSD src tree +First step: cloning a tree. +This downloads the entire tree. +There are two ways to download. +Most people will want to do a deep clone of the repo. +However, there are times that you may wish to do a shallow clone. + +===== Branch names +The branch names in the new git repo are similar to the old names. +For the stable branches, they are stable/X where X is the major release (like 11 or 12). +The main branch in the new repo is 'main'. +The main branch in the old GitHub mirror was 'master', but is now 'main'. +Both reflect the defaults of git at the time they were created. +The 'main' branch is the default branch if you omit the '-b branch' or '--branch branch' options below. + +===== Repositories +XXX cross reference handbook XXX +Please see [URLs.md] for the latest information on where to get FreeBSD soruces. +$URL below can be obstained from that page. + +Note: The project doesn't use submodules as they are a poor fit for our workflows and development model. +How we track changes in third-party applications is discussed elsewhere and generally of little concern to the casual user. + +===== Deep Clone +A deep clone pulls in the entire tree, as well as all the history and branches. +It is the easiest to do. +It also allows you to use git's worktree feature to have all your active branches checked out into separate directories but with only one copy of the repository. +[source,shell] +.... +% git clone -o freebsd $URL -b branch [dir] +.... +is how you make a deep clone. +'branch' should be one of the branches listed in the previous section. +It is optional if it is the main branch. +'dir' is an optional directory to place it in (the default will be the name of the repo you are cloning (src, doc, etc)). + +You will want a deep clone if you are interested in the history, plan on making local changes, or plan on working on more than one branch. +It is the easiest to keep up to date as well. +If you are interested in the history, but are working with only one branch and are short on space, you can also use --single-branch to only download the one branch +(though some merge commits will not reference the merged-from branch which may be important for some users who are interested in detailed versions of history). + +===== Shallow Clone + +A shallow clone copies just the most current code, but none or little of the history. +This can be useful when you need to build a specific revision of FreeBSD, or when you are just starting out and plan to track the tree more fully. +You can also use it to limit history to only so many revisions. +However, see below for a significant limitation of this approach. + +[source,shell] +.... +% git clone -o freebsd -b branch --depth 1 $URL [dir] +.... + +This clones the repository, but only has the most recent version in the repository. +The rest of the history is not downloaded. +Should you change your mind later, you can do 'git fetch --unshallow' to get the old history. + +WARNING: When you make a shallow clone, you will lose the commit count in your uname output. +This can make it more difficult to determine if your system needs to be updated when a security advisory is issued. + +===== Building + +Once you've downloaded, building is done as described in the handbook, +eg: +[source,shell] +.... +% cd src +% make buildworld +% make buildkernel +% make installkernel +% make installworld +.... +so that won't be covered in depth here. + +If you want to build a custom kernel, chapter 8.4 of the FreeBSD Handbook recommends creating a file MYKERNEL under sys/${ARCH}/conf with your changes against GENERIC. +To have MYKERNEL disregarded by git, it can be added to .git/info/exclude. +XXX cross reference handbook XXX + +===== Updating + +To update both types of trees uses the same commands. +This pulls in all the revisions since your last update. +[source,shell] +.... +% git pull --ff-only +.... +will update the tree. +In git, a 'fast forward' merge is one that only needs to set a new branch pointer and doesn't need to re-create the commits. +By always doing a 'fast forward' merge/pull, you'll ensure that you have an identical copy of the FreeBSD tree. +This will be important if you want to maintain local patches. + +See below for how to manage local changes. +The simplest is to use --autostash on the 'git pull' command, but more sophisticated options are available. + +==== Selecting a Specific Version + +In git, the 'git checkout' checks out both branches and specific versions. +Git's versions are the long hashes rather than a sequential number. + +When you checkout a specific version, just specify the hash you want on the command line (the git log command can help you decide which hash you might want): +[source,shell] +.... +% git checkout 08b8197a74 +.... +and you have that checked out. +You will be greeted with a message similar to the following: +[source,shell] +.... +Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'. + +You are in 'detached HEAD' state. You can look around, make experimental +changes and commit them, and you can discard any commits you make in this +state without impacting any branches by performing another checkout. + +If you want to create a new branch to retain commits you create, you may +do so (now or later) by using -b with the checkout command again. Example: + + git checkout -b + +HEAD is now at 08b8197a742a hook gpiokeys.4 to the build +.... +where the last line is generated from the hash you are checking out and the first line of the commit message from that revision. +The hash can be abbreviated to the shortest unique length. +Git itself is inconsistent about how many digits it displays. + +==== Bisecting +Sometimes, things go wrong. +The last version worked, bu t the one you just updated to does not. +A developer may ask to bisect the problem to track down which commit caused the regression. + +If you have read the last section, you may be thinking to yourself "How the heck do I bisect with crazy version numbers like that?" then this section is for you. +It is also for you if you did not think that, but also want to bisect. + +Fortunately, one uses the 'git bisect' command. +Here's a brief outline in how to use it. +For more information, you can view https://www.metaltoad.com/blog/beginners-guide-git-bisect-process-elimination or https://git-scm.com/docs/git-bisect for more details. +The man git-bisect page is good at describing what can go wrong, what to do when versions won't build, when you want to use terms other than 'good' and 'bad', etc, none of which will be covered here. + +`git bisect start` will start the bisection process. +Next, you need to tell a range to go through. +'git bisect good XXXXXX' will tell it the working version and 'git bisect bad XXXXX' will tell it the bad version. +The bad version will almost always be HEAD (a special tag for what you have checked out). +The good version will be the last one you checked out. + +A quick aside: if you want to know the last version you checked out, you should use 'git reflog': +[source,shell] +.... +5ef0bd68b515 (HEAD -> master, freebsd/master, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward +a8163e165c5b (upstream/master) HEAD@{1}: checkout: moving from b6fb97efb682994f59b21fe4efb3fcfc0e5b9eeb to master +... +.... +shows me moving the working tree to the master branch (a816...) and then updating from upstream (to 5ef0...). +In this case, bad would be HEAD (or 5rf0bd68) and good would be a8163e165. +As you can see from the output, HEAD@{1} also often works, but isn't foolproof if you have done other things to your git tree after updating, but before you discover the need to bisect. + +Back to git bisect. +Set the 'good' version first, then set the bad (though the order doesn't matter). +When you set the bad version, it will give you some statistics on the process: +[source,shell] +.... +% git bisect start +% git bisect good a8163e165c5b +% git bisect bad HEAD +Bisecting: 1722 revisions left to test after this (roughly 11 steps) +[c427b3158fd8225f6afc09e7e6f62326f9e4de7e] Fixup r361997 by balancing parens. Duh. +.... + +You would then build/install that version. +If it's good you'd type 'git bisect good' otherwise 'git bisect bad'. +If the version doesn't compile, type 'git bisect skip'. +You will get a similar message to the above after each step. +When you are done, report the bad version to the developer (or fix the bug yourself and send a patch). +'git bisect reset' will end the process and return you back to where you started (usually tip of main). +Again, the git-bisect manual (linked above) is a good resource for when things go wrong or for unusual cases. + +==== Ports Considerations +The ports tree operates the same way. +The branch names are different and the repos are in different locations. + +The legacy GitHub mirror is at https://github.com/freebsd/freebsd-ports.git . +The canonical cgit mirror is https://cgit-beta.freebsd.org/ports.git . +The production git repo will be https://git.freebsd.org/ports.git and ssh://anongit@git.FreeBSD.org/ports.git (or anongit@git.FreeBSD.org:ports.git) when the time comes. + +As with ports, the 'current' branches are 'master' (legacy) and 'main' (new) respectively. +The quarterly branches are named the same as in FreeBSD's svn repo. + +[NOTE] +==== +The cgit repo for ports is considered beta. +The git hashes may change as problems are found in the conversion prior to the cutover. +==== + +==== Coping with Local Changes +This section addresses tracking local changes. +If you have no local changes, you can stop reading now (it is the last section and OK to skip). + +One item that is important for all of them: all changes are local until pushed. +Unlike svn, git uses a distributed model. +For users, for most things, there is very little difference. +However, if you have local changes, you can use the same tool to manage them as you use to pull in changes from FreeBSD. +All changes that you have not pushed are local and can easily be modified (git rebase, discussed below does this). + + +===== Keeping local changes +The simplest way to keep local changes (especially trivial ones) is to use 'git stash'. +In its simples form, you use 'git stash' to record the changes (which pushes them onto the stash stack). +Most people use this to save changes before updating the tree as described above. +They then use 'git stash apply' to re-apply them to the tree. +The stash is a stack of changes that can be examined with 'git stash list'. +The git-stash man page (https://git-scm.com/docs/git-stash) has all the details. + +This method is suitable when you have tiny tweaks to the tree. +When you have anything non trivial, you'll likely be better off keeping a local branch and rebasing. +Stashing is also integrated with the 'git pull' command: just add '--autostash' to the command line. + +===== Keeping a local branch +It is much easier to keep a local branch with git than subversion. +In subversion you need to merge the commit, and resolve the conflicts. +This is manageable, but can lead to a convoluted history that's hard to upstream should that ever be necessary, or hard to replicate if you need to do so. +Git also allows one to merge, along with the same problems. +That's one way to manage the branch, but it's the least flexible. + +In addition to merging, git supports the concept of 'rebasing' which avoids these issues. +The 'git rebase' command replays all the commits of a branch at a newer location on the parent branch. +We will cover the most common scenarios that arise using it. + +====== Create a branch + +Let's say you want to make a hack to FreeBSD's ls command to never, ever do color. +There are many reasons to do this, but this example will use that as a baseline. +The FreeBSD ls command changes from time to time, and you'll need to cope with those changes. +Fortunately, with git rebase it usually is automatic. +[source,shell] +.... +% cd src +% git checkout main +% git checkout -b no-color-ls +% cd bin/ls +% vi ls.c # hack the changes in +% git diff # check the changes +diff --git a/bin/ls/ls.c b/bin/ls/ls.c +index 7378268867ef..cfc3f4342531 100644 +--- a/bin/ls/ls.c ++++ b/bin/ls/ls.c +@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); + #include + #include + #include ++#undef COLORLS + #ifdef COLORLS + #include + #include +% # these look good, make the commit... +% git commit ls.c +.... + +The commit will pop you into an editor to describe what you've done. +Once you enter that, you have your own **local** branch in the git repo. +Build and install it like you normally would, following the directions in the handbook. +git differs from other version control systems in that you have to tell it explicitly which files to use. +I have opted to do it on the commit command line, but you can also do it with 'git add' which many of the more in depth tutorials cover. + +====== Time to update +When it is time to bring in a new version, it is almost the same as w/o the branches. +You would update like you would above, but there is one extra command before you update, and one after. +The following assumes you are starting with an unmodified tree. +It is important to start rebasing operations with a clean tree (git usually requires this). + +[source,shell] +.... +% git checkout main +% git pull --no-ff +% git rebase -i main no-color-ls +.... + +This will bring up an editor that lists all the commits in it. +For this example, do not change it at all. +This is typically what you are doing while updating the baseline (though you also use the git rebase command to curate the commits you have in the branch). + +Once you are done with the above, you have to move the commits to ls.c forward from the old version of FreeBSD to the newer one. + +Sometimes there are merge conflicts. +That is OK. +Do not panic. +You wouldhandle them the same as you would any other merge conflicts. +To keep it simple, I will just describe a common issue you might see. +A pointer to a more complete treatment can be found at the end of this section. + +Let's say the includes changes upstream in a radical shift to terminfo as well as a name change for the option. +When you updated, you might see something like this: +[source,shell] +.... +Auto-merging bin/ls/ls.c +CONFLICT (content): Merge conflict in bin/ls/ls.c +error: could not apply 646e0f9cda11... no color ls +Resolve all conflicts manually, mark them as resolved with +"git add/rm ", then run "git rebase --continue". +You can instead skip this commit: run "git rebase --skip". +To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply 646e0f9cda11... no color ls +.... +which looks scary. +If you bring up an editor, you will see it is a typical 3-way merge conflict resolution that you may be familiar with from other source code systems (the rest of ls.c has been omitted): +[source,shell] +.... +<<<<<<< HEAD +#ifdef COLORLS_NEW +#include +======= +#undef COLORLS +#ifdef COLORLS +#include +>>>>>>> 646e0f9cda11... no color ls +.... +The new code is first, and your code is second. +The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then delete the old changes: +[source,shell] +.... +#undef COLORLS_NEW +#ifdef COLORLS_NEW +#include +.... +save the file. +The rebase was interrupted, so you have to complete it: +[source,shell] +.... +% git add ls.c +% git rebase --continue +.... + +which tells git that ls.c has been fixed and to continue the rebase operation. +Since there was a conflict, you will get kicked into the editor to update the commit message if necessary. +If the commit message is still accurate, just exit the editor. + +If you get stuck during the rebase, do not panic. +git rebase --abort will take you back to a clean slate. +It is important, though, to start with an unmodified tree. +An aside: The above mentioned 'git reflog' comes in handy here, as it will have a list of all the (intermediate) commits that you can view or inspect or cherry-pick. + +For more on this topic, https://www.freecodecamp.org/news/the-ultimate-guide-to-git-merge-and-git-rebase/ provides a rather extensive treatment. +It is a good resource for issues that arise occasionally but are too obscure for this guide. + +===== Switching to a Different FreeBSD Branch +If you wish to shift from stable/12 to the current branch. +If you have a deep clone, the following will suffice: +[source,shell] +.... +% git checkout main +% # build and install here... +.... +If you have a local branch, though, there are one or two caveats. +First, rebase will rewrite history, so you will likely want to do something to save it. +Second, jumping branches tends to encounter more conflicts. +If we pretend the example above was relative to stable/12, then to move to main, I'd suggest the following: +[source,shell] +.... +% git checkout no-color-ls +% git checkout -b no-color-ls-stable-12 # create another name for this branch +% git rebase -i stable/12 no-color-ls --onto main +.... + +What the above does is checkout no-color-ls. +Then create a new name for it (no-color-ls-stable-12) in case you need to get back to it. +Then you rebase onto the main branch. +This will find all the commits to the current no-color-ls branch (back to where it meets up with the stable/12 branch) and then it will +replay them onto the main branch creating a new no-color-ls branch there (which is why I had you create a place holder name). + +===== Migrating from an existing git clone +If you have work based on a previous git conversion or a locally running git-svn conversion, migrating to new repository can encounter problems because git has no knowledge about the connection between the two. + +If do not have a lot of local changes, the easiest way would be to cherry-pick your changes to the new base: +[source,shell] +.... +% git checkout main +% git cherry-pick old_branch..your_branch +.... +Or alternatively, you can do the same thing with rebase: +[source,shell] +.... +% git rebase --onto main master your_branch +.... + +If you do have a lot of changes, you would probably want to perform a merge instead. +The idea is to create a merge point that consolidates the history of the old_branch, and the new source of truth (main). + +You can find out by looking up the same commit that are found on both parents: +[source,shell] +.... +% git show old_branch +.... +You will see a commit message, now search for that in the new branch: +[source,shell] +.... +% git log --grep="commit message on old_branch" freebsd/main +.... +You would get a SHA1 on the new main branch, create a helper branch (in the example we call it 'stage') from that SHA1: +[source,shell] +.... +% git checkout -b stage SHA1_found_from_git_log +.... +Then perform a merge of the old branch: +[source,shell] +.... +% git merge -s ours -m "Mark old branch as merged" old_branch +.... +With that, it's possible to merge your work branch or the main branch in any order without problem. +Eventually, when you are ready to commit your work back to main, you can perform a rebase to main, or do a squash commit by combining everything into one commit. + [[mfc-with-git]] === MFC (Merge From Current) Procedures ==== Summary From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:24:14 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E04C1571AB5 for ; Wed, 17 Mar 2021 17:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0xpk62JNz4lZD; Wed, 17 Mar 2021 17:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C226312FA4; Wed, 17 Mar 2021 17:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HHOE3E049890; Wed, 17 Mar 2021 17:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HHOE6F049889; Wed, 17 Mar 2021 17:24:14 GMT (envelope-from git) Date: Wed, 17 Mar 2021 17:24:14 GMT Message-Id: <202103171724.12HHOE6F049889@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: ad41defcd5 - main - Update vendor import with suggestions MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad41defcd5766604e33e6f3b847c4d0e1c307839 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:24:14 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=ad41defcd5766604e33e6f3b847c4d0e1c307839 commit ad41defcd5766604e33e6f3b847c4d0e1c307839 Author: Warner Losh AuthorDate: 2021-03-17 17:15:57 +0000 Commit: Warner Losh CommitDate: 2021-03-17 17:23:46 +0000 Update vendor import with suggestions Add git commit --amend with a comment about doing a final check of the commit message before the push. Update with some more specific guidance on a good commit message. Add link to commit message section. Minor tweaks I noticed while doing this as well for having one setence one line. Submitted by cy@ --- .../en/articles/committers-guide/_index.adoc | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index d4a39d8d06..b75ddf2274 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -719,7 +719,7 @@ use `git pull --rebase` and try to push again. % for h in $HASH_LIST; do git cherry-pick -x $h; done % git rebase -i stable/X # mark each of the commits after the first as 'squash' -# edit the commit message to be sane +# edit the commit message to be sane, if necessary % git push freebsd HEAD:stable/X .... @@ -1100,10 +1100,8 @@ The cherry-pick can now be completed: % git cherry-pick --continue .... -Since there was a merge conflict, Git invokes the editor to -adjust the commit message. Trim the metadata fields from the -commit log from the original commit to head and save the -updated log message. +Since there was a merge conflict, Git invokes the editor to adjust the commit message. +Trim the metadata fields from the commit log from the original commit to head and save the updated log message. The contents of the MFC commit can be examined via `git show`: @@ -1228,11 +1226,10 @@ Note: I run the `git diff` and `git status` commands to make sure nothing weird was present. Also I used `-m` to illustrate, but you should compose a proper message in an editor (using a commit message template). -It is also important to create an annotated tag, otherwise the push -will be rejected. Only annotated tags are allowed to be pushed. The -annotated tag gives you a chance to enter a commit message. Enter -the version you are importing, along with any salient new features -or fixes in that version. +It is also important to create an annotated tag, otherwise the push will be rejected. +Only annotated tags are allowed to be pushed. +The annotated tag gives you a chance to enter a commit message. +Enter the version you are importing, along with any salient new features or fixes in that version. ==== Updating the FreeBSD Copy At this point you can push the import to vendor into our repo. @@ -1338,9 +1335,9 @@ At this point, you should have a pristine copy of glorbnitz ready to commit. .... % git commit -m"Import GlorbNitz frobnosticator revision 3.1415" .... -As above, I used `-m` for simplicity, but you should likely create a -commit message that explains what a Glorb is and why you'd use a Nitz -to get it. Not everybody will know. +As above, I used `-m` for simplicity, but you should likely create a commit message that explains what a Glorb is and why you'd use a Nitz to get it. +Not everybody will know. +But for your actual commmit, you should follow the <> section instead of emulate the brief style here. ==== Now import it into our repository Now you need to import the branch into our repository. @@ -1372,6 +1369,7 @@ By 'good' we mean: . None of the wrong files are present . The vendor branch points at something sensible . The tag looks good, and is annotated. +. The commit message for the tag has a quick summary of what's new since the last tag ==== Time to finally merge it into the base tree [source,shell] @@ -1379,17 +1377,20 @@ By 'good' we mean: % cd ../src % git subtree add -P contrib/glorbnitz vendor/glorbnitz # Make sure the commit is good with "git show" +% git commit --amend # one last sanity check on commit message % git push freebsd .... Here 'good' means: . All the right files, and none of the wrong ones, were merged into contrib/glorbnitz. -. No other changes are in the tree -. The commit messages look good. +. No other changes are in the tree. +. The commit messages look <>. It should contain a summary of what's changed since the last merge to the FreeBSD main line and any caveats. +. UPDATING should be updated if there is anything of note, such as user visible changes, important upgrade concerns, etc. [NOTE] ==== -This hasn't connected `glorbnitz` to the build yet. How so do that is specific to the software being imported. +This hasn't connected `glorbnitz` to the build yet. +How so do that is specific to the software being imported and is beyond the scope of this tutorial. ==== === FreeBSD Src Committer Transition Guide From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:29:24 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6DC5B571B2F for ; Wed, 17 Mar 2021 17:29:24 +0000 (UTC) (envelope-from kaduk@mit.edu) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0xwh1nfyz4mTp; Wed, 17 Mar 2021 17:29:23 +0000 (UTC) (envelope-from kaduk@mit.edu) Received: from kduck.mit.edu ([24.16.140.251]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.14.7/8.12.4) with ESMTP id 12HHTHBN008444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 13:29:22 -0400 Date: Wed, 17 Mar 2021 10:29:16 -0700 From: Benjamin Kaduk To: Warner Losh Cc: doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org Subject: Re: git: 8401b7bbb6 - main - Add the git miniprimer Message-ID: <20210317172916.GR79563@kduck.mit.edu> References: <202103171724.12HHODic049869@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202103171724.12HHODic049869@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4F0xwh1nfyz4mTp X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:29:24 -0000 On Wed, Mar 17, 2021 at 05:24:13PM +0000, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/doc/commit/?id=8401b7bbb60a8a3ae37ee53f2fa07d94c8f3295c [...] > +===== Repositories > +XXX cross reference handbook XXX There seem to be a couple of these left in; is there a plan to remedy? Thanks, Ben From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:36:00 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 40E03572D8E for ; Wed, 17 Mar 2021 17:36:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0y4J15Hzz4nh3 for ; Wed, 17 Mar 2021 17:36:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x833.google.com with SMTP id u7so2005007qtq.12 for ; Wed, 17 Mar 2021 10:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=s7OCRyKdjJbFy4SzgW9EJmIk+33QFzvrsB5RCnzthUg=; b=ZFxA5rAYtqqOCJ/RbGFG6ZKqPFxlodRGcj2LUThpQEMUL8vCIm9D9Tb37TTslC6ygE Ge0wM2lHcsqX+9iYZFM0s08NDiIwS8uRodLULyhsCpEbfm0eMiEiC+OCPuMjxOKyf1W5 /sPhu+Cv0oNpe0xLwwxoWRaZWTJ6I5YTOOTtBMmfrUpJVLv6jtmsR0cVBvUY5ndlUM+y 0AmzpgxygUxGt9mLQqaUbssmuEZuLEPzvrn0YSQ+svcAg0xt19gErUjAoACrtjVYu4le vnCnuUZEk956n3pEK31vRMnCgb7OY5xy0ETQ+mOy9Swp6SVu5mQhthhKTLw4bd992xmG s3Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=s7OCRyKdjJbFy4SzgW9EJmIk+33QFzvrsB5RCnzthUg=; b=QFrqVGYLUJL89082El220RcAMt8nCSuDjIaKqMeNWloeCBQe8M5CIjpMIhc7RK6Rij wrKOpU7SMeE4XRcNG+wdDOozNL3vy4EU10Myl1jm0Da7LrduVsQs5yydrMRlIRxDIF08 IB5dT594DQjkmZ2EI3t04EL7PtGQQtR3SBYdChwr01TmPlQvx8eyhzNas3/BtS8uo6Fx C2NBAOIvJS3Tg13lTwLc5jiyHHZES5zFZ3y9Ki7DEwTsaruZCTZUFImWeslIuAOxpjnA O+CgTN/084H5IOXNd5kGfQX0n7Cdj2Q24zPcgJ3cpI2cVA1oYoORLgj6or/926FBvQO9 7Q1w== X-Gm-Message-State: AOAM532ZugJexWzXBNmcG6VDwVBnISedaF94u8+YIeus39FGRiIBtlJv 0LnRXSQQNSOR234AAEE77VItLU03C2WC0yjwrnQB9Q== X-Google-Smtp-Source: ABdhPJwYgR10MjGA4NftC2GK6uqGkS40S5keYyjO28bfSd8SzwzzhklWtZIrsaC564A8wexnZWteXoTKaOfEWiHH2nY= X-Received: by 2002:ac8:4f10:: with SMTP id b16mr107928qte.235.1616002558674; Wed, 17 Mar 2021 10:35:58 -0700 (PDT) MIME-Version: 1.0 References: <202103171724.12HHODic049869@gitrepo.freebsd.org> <20210317172916.GR79563@kduck.mit.edu> In-Reply-To: <20210317172916.GR79563@kduck.mit.edu> From: Warner Losh Date: Wed, 17 Mar 2021 11:35:47 -0600 Message-ID: Subject: Re: git: 8401b7bbb6 - main - Add the git miniprimer To: Benjamin Kaduk Cc: Warner Losh , doc-committers@freebsd.org, dev-commits-doc-all@freebsd.org X-Rspamd-Queue-Id: 4F0y4J15Hzz4nh3 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:36:00 -0000 On Wed, Mar 17, 2021 at 11:29 AM Benjamin Kaduk wrote: > On Wed, Mar 17, 2021 at 05:24:13PM +0000, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/doc/commit/?id=8401b7bbb60a8a3ae37ee53f2fa07d94c8f3295c > [...] > > +===== Repositories > > +XXX cross reference handbook XXX > > There seem to be a couple of these left in; is there a plan to remedy? > I had a dozen of these and missed these two :(. I'll fix it, or accept patches from others if they are faster than I am. Warner From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:42:37 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 84BE3572FB9 for ; Wed, 17 Mar 2021 17:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0yCx3L9tz4nys; Wed, 17 Mar 2021 17:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 65887133CB; Wed, 17 Mar 2021 17:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HHgbdk076101; Wed, 17 Mar 2021 17:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HHgbcB076100; Wed, 17 Mar 2021 17:42:37 GMT (envelope-from git) Date: Wed, 17 Mar 2021 17:42:37 GMT Message-Id: <202103171742.12HHgbcB076100@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: c78343dcce - main - xxx: remove xxx MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c78343dcce0ca27f561ddb8e6b9269f07dad1ee7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:42:37 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=c78343dcce0ca27f561ddb8e6b9269f07dad1ee7 commit c78343dcce0ca27f561ddb8e6b9269f07dad1ee7 Author: Warner Losh AuthorDate: 2021-03-17 17:41:51 +0000 Commit: Warner Losh CommitDate: 2021-03-17 17:41:51 +0000 xxx: remove xxx Remove a couple of links that I didn't go back and fix before committing. --- documentation/content/en/articles/committers-guide/_index.adoc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index b75ddf2274..cc3ba45df9 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -288,8 +288,7 @@ Both reflect the defaults of git at the time they were created. The 'main' branch is the default branch if you omit the '-b branch' or '--branch branch' options below. ===== Repositories -XXX cross reference handbook XXX -Please see [URLs.md] for the latest information on where to get FreeBSD soruces. +Please see the <> for the latest information on where to get FreeBSD soruces. $URL below can be obstained from that page. Note: The project doesn't use submodules as they are a poor fit for our workflows and development model. @@ -346,9 +345,8 @@ eg: .... so that won't be covered in depth here. -If you want to build a custom kernel, chapter 8.4 of the FreeBSD Handbook recommends creating a file MYKERNEL under sys/${ARCH}/conf with your changes against GENERIC. +If you want to build a custom kernel, link:{handbook}#kernelconfig[the kernel config section] of the FreeBSD Handbook recommends creating a file MYKERNEL under sys/${ARCH}/conf with your changes against GENERIC. To have MYKERNEL disregarded by git, it can be added to .git/info/exclude. -XXX cross reference handbook XXX ===== Updating From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:48:43 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A146573334 for ; Wed, 17 Mar 2021 17:48: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 4F0yLz0J9wz4pXg; Wed, 17 Mar 2021 17:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F16F41323B; Wed, 17 Mar 2021 17:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HHmg6g077127; Wed, 17 Mar 2021 17:48:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HHmgPr077126; Wed, 17 Mar 2021 17:48:42 GMT (envelope-from git) Date: Wed, 17 Mar 2021 17:48:42 GMT Message-Id: <202103171748.12HHmgPr077126@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: 71c8f2998f - main - Remove freebsd-office-hours-2021-03-17, this event got rescheduled 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: 71c8f2998ff5c499a795d43cd5f467e7ba2ed9f0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:48:43 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=71c8f2998ff5c499a795d43cd5f467e7ba2ed9f0 commit 71c8f2998ff5c499a795d43cd5f467e7ba2ed9f0 Author: Li-Wen Hsu AuthorDate: 2021-03-17 17:47:11 +0000 Commit: Li-Wen Hsu CommitDate: 2021-03-17 17:48:20 +0000 Remove freebsd-office-hours-2021-03-17, this event got rescheduled Approved by: carlavilla (implicitly) --- website/data/en/events/events2021.toml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/website/data/en/events/events2021.toml b/website/data/en/events/events2021.toml index 7600673208..57657e5bc0 100644 --- a/website/data/en/events/events2021.toml +++ b/website/data/en/events/events2021.toml @@ -20,15 +20,6 @@ endDate = "2021-02-07" site = "Online" description = "Every year, thousands of developers of free and open source software from all over the world gather at the event in Brussels. In 2021, they will gather online. Be sure to stop by the FreeBSD stand and BSD devroom to get the latest on FreeBSD." -[[events]] -id = "freebsd-office-hours-2021-03-17" -name = "FreeBSD Office Hours" -url = "https://live.freebsd.org/FreeBSD/officehours/" -startDate = "2021-03-17" -endDate = "2021-03-17" -site = "live.FreeBSD.org" -description = "On March 17th at 18:00 UTC we will hold a \"FreeBSD Office Hours\", an interactive online event where users, contributors, and developers can ask questions or to offer comments. The topic will be \"Survey Results\", hosted by Sean Chittenden. For more information, please see the Office Hours page on the FreeBSD wiki." - [[events]] id = "freebsd-office-hours-2021-03-24" name = "FreeBSD Office Hours" From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 17:50:51 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8DC4572DDD for ; Wed, 17 Mar 2021 17:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0yPR6N4bz4pY8; Wed, 17 Mar 2021 17:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CDE1513241; Wed, 17 Mar 2021 17:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HHopYh085606; Wed, 17 Mar 2021 17:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HHopLu085605; Wed, 17 Mar 2021 17:50:51 GMT (envelope-from git) Date: Wed, 17 Mar 2021 17:50:51 GMT Message-Id: <202103171750.12HHopLu085605@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Benjamin Kaduk Subject: git: 1f654f7b88 - main - Fix typo in committers guide MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bjk X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f654f7b8853bbc8e1f0f6a132bcc1835dd43c8b Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 17:50:52 -0000 The branch main has been updated by bjk: URL: https://cgit.FreeBSD.org/doc/commit/?id=1f654f7b8853bbc8e1f0f6a132bcc1835dd43c8b commit 1f654f7b8853bbc8e1f0f6a132bcc1835dd43c8b Author: Benjamin Kaduk AuthorDate: 2021-03-17 17:50:44 +0000 Commit: Benjamin Kaduk CommitDate: 2021-03-17 17:50:44 +0000 Fix typo in committers guide --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index cc3ba45df9..b25a555367 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -397,7 +397,7 @@ Git itself is inconsistent about how many digits it displays. ==== Bisecting Sometimes, things go wrong. -The last version worked, bu t the one you just updated to does not. +The last version worked, but the one you just updated to does not. A developer may ask to bisect the problem to track down which commit caused the regression. If you have read the last section, you may be thinking to yourself "How the heck do I bisect with crazy version numbers like that?" then this section is for you. From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 18:58:24 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6206257514E for ; Wed, 17 Mar 2021 18:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0zvN2Kzfz4ttd; Wed, 17 Mar 2021 18:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4398C1401D; Wed, 17 Mar 2021 18:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HIwOvX069270; Wed, 17 Mar 2021 18:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HIwOkA069269; Wed, 17 Mar 2021 18:58:24 GMT (envelope-from git) Date: Wed, 17 Mar 2021 18:58:24 GMT Message-Id: <202103171858.12HIwOkA069269@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: a941df226d - main - Add freebsd-office-hours-2021-03-31 event 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: a941df226d6345ebd43b19d6703086e7c3a2fffb Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 18:58:24 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=a941df226d6345ebd43b19d6703086e7c3a2fffb commit a941df226d6345ebd43b19d6703086e7c3a2fffb Author: Li-Wen Hsu AuthorDate: 2021-03-17 18:57:04 +0000 Commit: Li-Wen Hsu CommitDate: 2021-03-17 18:57:04 +0000 Add freebsd-office-hours-2021-03-31 event This is rescheduled freebsd-office-hours-2021-03-17 Approved by: carlavilla (implicitly) --- website/data/en/events/events2021.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/data/en/events/events2021.toml b/website/data/en/events/events2021.toml index 57657e5bc0..b590000c29 100644 --- a/website/data/en/events/events2021.toml +++ b/website/data/en/events/events2021.toml @@ -28,3 +28,12 @@ startDate = "2021-03-24" endDate = "2021-03-24" site = "live.FreeBSD.org" description = "On March 24th at 21:00 UTC we will hold a \"FreeBSD Office Hours\", an interactive online event where users, contributors, and developers can ask questions or to offer comments. The topic will be \"Bhyve Q&A\", hosted by Peter Grehan. For more information, please see the Office Hours page on the FreeBSD wiki." + +[[events]] +id = "freebsd-office-hours-2021-03-31" +name = "FreeBSD Office Hours" +url = "https://live.freebsd.org/FreeBSD/officehours/" +startDate = "2021-03-31" +endDate = "2021-03-31" +site = "live.FreeBSD.org" +description = "On March 31st at 18:00 UTC we will hold a \"FreeBSD Office Hours\", an interactive online event where users, contributors, and developers can ask questions or to offer comments. The topic will be \"Survey Results\", hosted by Sean Chittenden. For more information, please see the Office Hours page on the FreeBSD wiki." From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 22:53:39 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 03EFD57BE6F for ; Wed, 17 Mar 2021 22:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F156p6TvXz3kjT; Wed, 17 Mar 2021 22:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D1791171E0; Wed, 17 Mar 2021 22:53:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HMrcBG085467; Wed, 17 Mar 2021 22:53:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HMrcgv085466; Wed, 17 Mar 2021 22:53:38 GMT (envelope-from git) Date: Wed, 17 Mar 2021 22:53:38 GMT Message-Id: <202103172253.12HMrcgv085466@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: d5ea2ebac2 - main - committer handbook: Fix typos and reformat MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5ea2ebac2092499c91b262679d62778e7bfd147 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 22:53:39 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=d5ea2ebac2092499c91b262679d62778e7bfd147 commit d5ea2ebac2092499c91b262679d62778e7bfd147 Author: Warner Losh AuthorDate: 2021-03-17 22:51:12 +0000 Commit: Warner Losh CommitDate: 2021-03-17 22:53:22 +0000 committer handbook: Fix typos and reformat Fix a few typos and reformat a few paragraphs to one line per sentence style. Try to use repository insteast of 'repo' or even 'source of truth'. Clarify a few places and fix some grammar errors. Submitted by: Pau Amma --- .../en/articles/committers-guide/_index.adoc | 120 +++++++++------------ 1 file changed, 50 insertions(+), 70 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index b25a555367..d0b66e1a52 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1393,22 +1393,15 @@ How so do that is specific to the software being imported and is beyond the scop === FreeBSD Src Committer Transition Guide -This section is designed to walk people through the conversion -process from Subversion to Git, written from the source committer's point -of view. +This section is designed to walk people through the conversion process from Subversion to Git, written from the source committer's point of view. ==== Migrating from a Subversion tree -This section will cover a couple of common scenarios for migrating -from using the FreeBSD Subversion repo to the FreeBSD source git repo. The -FreeBSD Git conversion is still in beta status, so some minor things -may change between this and going into production. - -Before you git started, you'll need a copy of Git. Any Git will do, -though the latest ones are always recommended. Either build it from -ports, or install it using pkg (though some folks might use `su` or -`doas` instead of `sudo`): +This section will cover a couple of common scenarios for migrating from using the FreeBSD Subversion repo to the FreeBSD source git repo. +The FreeBSD Git conversion is still in beta status, so some minor things may change between this and going into production. +The fist thing to do is install git. Any version of Git will do, though the latest one in ports / packages generally will be good. +Either build it from ports, or install it using pkg (though some folks might use `su` or `doas` instead of `sudo`): [source,shell] .... @@ -1417,87 +1410,79 @@ ports, or install it using pkg (though some folks might use `su` or ===== No staged changes migration -If you have no changes pending, the migration is straight forward. In -this, you abandon the Subversion tree and clone the Git repo. It's -likely best to retain your subversion tree, in case there's something -you've forgotten about there. First, let's clone a repo: +If you have no changes pending, the migration is straightforward. +In this, you abandon the Subversion tree and clone the Git repoository. +It's likely best to retain your subversion tree, in case there's something you've forgotten about there. +First, let's clone the repository: [source,shell] .... % git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/src.git freebsd-src .... -will create a clone of the FreeBSD src repo into a subdirectory called -`freebsd-src` and include the 'notes' about the revisions. -The current plan for GitHub mirroring is to mirror to -https://github.com/freebsd/freebsd.git as well. When the transition -starts, the github `master` branch will be frozen. We will be using the name `main` instead -of `master` that was used in the beta version of the github.com mirror. -The exact logistics of this are still being finalized, as there are over 2k forks and 5k stars. -We will also mirror the repo to gitlab at https://gitlab.com/FreeBSD/src.git . -Its transition plan is also being finalized. +will create a clone of the FreeBSD src repository into a subdirectory called `freebsd-src` and include the 'notes' about the revisions. +We are currently mirroring the source repository to https://github.com/freebsd/freebsd-src.git as well. +https://github.com/freebsd/freebsd-legacy.git has the old github mirror with the old hashes should you need that for your migration. +The github `master` branch has been frozen. +As the default in git has change, we've shifted from `master` to `main`, the new repository uses `main`. +We also mirror the repository to gitlab at https://gitlab.com/FreeBSD/src.git . -It's useful to have the old Subversion revisions available. This data is stored -using Git notes, but Git doesn't fetch those by default. The --config -and the argument above changed the default to fetch the notes. If -you've cloned the repo without this, or wish to add notes to an -previously clone repository, use the following commands: +It's useful to have the old Subversion revisions available. +This data is stored using Git notes, but Git doesn't fetch those by default. +The --config and the argument above changed the default to fetch the notes. +If you've cloned the repository without this, or wish to add notes to a previously clone repository, use the following commands: [source,shell] .... % git config --add remote.freebsd.fetch "+refs/notes/*:refs/notes/*" % git fetch .... -At this point you have the src checked out into a Git tree, ready to -do other things. +At this point you have the src checked out into a Git tree, ready to do other things. ===== But I have changes that I've not committed -If you are migrating from a tree that has changes you've not yet -committed to FreeBSD, you'll need to follow the steps from the -previous section first, and then follow these. +If you are migrating from a tree that has changes you've not yet committed to FreeBSD, you'll need to follow the steps from the previous section first, and then follow these. [source,shell] .... % cd path-to-svn-checkout-tree % svn diff > /tmp/src.diff -% cd mumble/freebsd-src +% cd _mumble_/freebsd-src % git checkout -b working .... -This will create a diff of your current changes. The last command -creates a branch called `working` though you can call it whatever you -want. +This will create a diff of your current changes. +The last command creates a branch called `working` though you can call it whatever you want. [source,shell] .... % git apply /tmp/src.diff .... -this will apply all your pending changes to the working tree. This -doesn't commit the change, so you'll need to make this permanent: +this will apply all your pending changes to the working tree. +This doesn't commit the change, so you'll need to make this permanent: [source,shell] .... +% git add _files_ % git commit .... -The last command will commit these changes to the branch. The editor -will prompt you for a commit message. Enter one as if you were -committing to FreeBSD. +The last command will commit these changes to the branch. +The editor will prompt you for a commit message. +Enter one as if you were committing to FreeBSD. -At this point, your work is preserved, and in the Git repo. +At this point, your work is preserved, and in the Git repository. ===== Keeping current -So, time passes. It's time now to update the tree for the latest -changes upstream. When you checkout `main` make sure that you have no -diffs. It's a lot easier to commit those to a branch (or use `git -stash`) before doing the following. +So, time passes. +It's time now to update the tree for the latest changes upstream. +When you checkout `main` make sure that you have no diffs. +It's a lot easier to commit those to a branch (or use `git stash`) before doing the following. -If you are used to `git pull`, I would strongly recommend using the -`--ff-only` option, and further setting it as the default option. -Alternatively, `git pull --rebase` is useful if you have changes staged -in the main directory. +If you are used to `git pull`, we strongly recommend using the `--ff-only` option, and further setting it as the default option. +Alternatively, `git pull --rebase` is useful if you have changes staged in the main branch. [source,shell] .... % git config --global pull.ff only .... +You may need to omit the --global if you want this setting to only this repository. [source,shell] .... @@ -1506,9 +1491,8 @@ in the main directory. % git pull (--ff-only|--rebase) .... -There is a common trap, that the combination command `git pull` will -try to perform a merge, which would sometimes creates a merge commit -sha that didn't exist before. This can be harder to recover from. +There is a common trap, that the combination command `git pull` will try to perform a merge, which would sometimes creates a merge commit sha that didn't exist before. +This can be harder to recover from. The longer form is also recommended. @@ -1551,19 +1535,16 @@ that they exactly match the passwd entry in FreeBSD cluster. Use .... freefall% gen-gitconfig.sh .... -on freefall.freebsd.org to get recipe that you can use directly, assuming -/usr/local/bin is in the PATH. +on freefall.freebsd.org to get a recipe that you can use directly, assuming /usr/local/bin is in the PATH. The below command merges the 'working' branch into the upstream main line. -It's important that you curate your changes to be just -like you want them in the FreeBSD source repo before doing this. +It's important that you curate your changes to be just like you want them in the FreeBSD source repo before doing this. [source,shell] .... % git push freebsd working:main .... -If your push is rejected due to losing a commit race, rebase your branch -before trying again: +If your push is rejected due to losing a commit race, rebase your branch before trying again: [source,shell] .... % git checkout working @@ -1593,13 +1574,12 @@ hash you can use to refer to this commit. ==== Migrating from GitHub fork -Note: as of this writing, the https://github.com/freebsd/freebsd-src +Note: as of this writing, https://github.com/freebsd/freebsd-src is mirroring all official branches, along with a `master` branch which -is the leagcy svn2git result. The `master` branch will not be updated anymore, +is the legacy svn2git result. The `master` branch will not be updated anymore, and the [last commit](https://github.com/freebsd/freebsd-src/commit/de1aa3dab23c06fec962a14da3e7b4755c5880cf) -contains the instructions of migrating to new `main` branch. -We'll likely retain the `master` branch for a certain time, but in the future -it will only be kept in the +contains the instructions for migrating to the new `main` branch. +We'll retain the `master` branch for a certain time, but in the future it will only be kept in the [freebsd-legacy](https://github.com/freebsd/freebsd-legacy) repository. When migrating branches from a github fork from the old github mirror @@ -1616,15 +1596,15 @@ This also assumes a clean tree before starting... .... ===== Rebase all your WIP branches. -For each branch FOO, do the following after fetching the `freebsd` sources and creating a local `main` reference with the above checkout: +For each branch FOO, do the following after fetching the `freebsd` sources and creating a local `main` branch with the above checkout: [source,shell] .... % git rebase -i freebsd/master FOO --onto main .... -And you'll now be tracking the official source of truth. +And you'll now be tracking the official repository. You can then follow the `Keeping Current` section above to stay up to date. -If you need to then commit work to FreeBSD, you can do so following the `Time to push changes upstream` instructions. +If you need to then commit work to FreeBSD, you can do so following the `Time to push changes upstream` instructions. You'll need to do the following once to update the push URL if you are a FreeBSD committer: [source,shell] .... From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 23:30:56 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D107E57CDFD for ; Wed, 17 Mar 2021 23:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F15xr5f9hz3mdB; Wed, 17 Mar 2021 23:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AA12A1783E; Wed, 17 Mar 2021 23:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HNUusw036415; Wed, 17 Mar 2021 23:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HNUuSw036414; Wed, 17 Mar 2021 23:30:56 GMT (envelope-from git) Date: Wed, 17 Mar 2021 23:30:56 GMT Message-Id: <202103172330.12HNUuSw036414@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 43ae2e8007 - main - Improve text in several ways MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43ae2e8007424ad43a7cc22b9a5a8d2f0da53bd2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 23:30:56 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=43ae2e8007424ad43a7cc22b9a5a8d2f0da53bd2 commit 43ae2e8007424ad43a7cc22b9a5a8d2f0da53bd2 Author: Warner Losh AuthorDate: 2021-03-17 23:29:17 +0000 Commit: Warner Losh CommitDate: 2021-03-17 23:29:17 +0000 Improve text in several ways Fix typos, improve wording, remove redundantly repetitive words, fix punctuation and grammer errors. Submitted by: Pau Amma --- .../en/articles/committers-guide/_index.adoc | 71 +++++++++++----------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index d0b66e1a52..290210be48 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -263,8 +263,8 @@ This primer is less ambitiously scoped than the old Subversion Primer, but shoul ==== Scope -If you want to download FreeBSD, compile it from sources and generally keep up to date that way, this primer is for you. -It covers getting the sources, updating the sources, how to bisect and touches briefly on how to cope with a few local changes. +If you want to download FreeBSD, compile it from sources, and generally keep up to date that way, this primer is for you. +It covers getting the sources, updating the sources, bisecting and touches briefly on how to cope with a few local changes. It covers the basics, and tries to give good pointers to more in-depth treatment for when the readers finds the basics insufficient. Other sections of this guide cover more advanced topics related to contributing to the project. @@ -272,24 +272,24 @@ The goal of this section is to highlight those bits of git needed to track sourc They assume a basic understanding of git. There are many primers for git on the web, but the https://git-scm.com/book/en/v2[Git Book] provides one of the better treatments. -==== Keeping Current With FreeBSD src tree +==== Keeping Current With The FreeBSD src Tree First step: cloning a tree. This downloads the entire tree. There are two ways to download. -Most people will want to do a deep clone of the repo. -However, there are times that you may wish to do a shallow clone. +Most people will want to do a deep clone of the repository. +However, there are times when you may wish to do a shallow clone. ===== Branch names -The branch names in the new git repo are similar to the old names. +The branch names in the new git repository are similar to the old names. For the stable branches, they are stable/X where X is the major release (like 11 or 12). -The main branch in the new repo is 'main'. +The main branch in the new repository is 'main'. The main branch in the old GitHub mirror was 'master', but is now 'main'. Both reflect the defaults of git at the time they were created. The 'main' branch is the default branch if you omit the '-b branch' or '--branch branch' options below. ===== Repositories -Please see the <> for the latest information on where to get FreeBSD soruces. -$URL below can be obstained from that page. +Please see the <> for the latest information on where to get FreeBSD sources. +$URL below can be obtained from that page. Note: The project doesn't use submodules as they are a poor fit for our workflows and development model. How we track changes in third-party applications is discussed elsewhere and generally of little concern to the casual user. @@ -328,8 +328,11 @@ This clones the repository, but only has the most recent version in the reposito The rest of the history is not downloaded. Should you change your mind later, you can do 'git fetch --unshallow' to get the old history. -WARNING: When you make a shallow clone, you will lose the commit count in your uname output. +[WARNING] +==== +When you make a shallow clone, you will lose the commit count in your uname output. This can make it more difficult to determine if your system needs to be updated when a security advisory is issued. +==== ===== Building @@ -358,7 +361,7 @@ This pulls in all the revisions since your last update. .... will update the tree. In git, a 'fast forward' merge is one that only needs to set a new branch pointer and doesn't need to re-create the commits. -By always doing a 'fast forward' merge/pull, you'll ensure that you have an identical copy of the FreeBSD tree. +By always doing a 'fast forward' merge/pull, you'll ensure that you have an exact copy of the FreeBSD tree. This will be important if you want to maintain local patches. See below for how to manage local changes. @@ -380,7 +383,7 @@ You will be greeted with a message similar to the following: .... Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'. -You are in 'detached HEAD' state. You can look around, make experimental +You are in a 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. @@ -398,13 +401,10 @@ Git itself is inconsistent about how many digits it displays. ==== Bisecting Sometimes, things go wrong. The last version worked, but the one you just updated to does not. -A developer may ask to bisect the problem to track down which commit caused the regression. - -If you have read the last section, you may be thinking to yourself "How the heck do I bisect with crazy version numbers like that?" then this section is for you. -It is also for you if you did not think that, but also want to bisect. +A developer may ask you to bisect the problem to track down which commit caused the regression. -Fortunately, one uses the 'git bisect' command. -Here's a brief outline in how to use it. +Git makes bisecting changes easy with a powerful 'git bisect' command. +Here's a brief outline of how to use it. For more information, you can view https://www.metaltoad.com/blog/beginners-guide-git-bisect-process-elimination or https://git-scm.com/docs/git-bisect for more details. The man git-bisect page is good at describing what can go wrong, what to do when versions won't build, when you want to use terms other than 'good' and 'bad', etc, none of which will be covered here. @@ -414,7 +414,9 @@ Next, you need to tell a range to go through. The bad version will almost always be HEAD (a special tag for what you have checked out). The good version will be the last one you checked out. -A quick aside: if you want to know the last version you checked out, you should use 'git reflog': +[TIP] +==== +If you want to know the last version you checked out, you should use 'git reflog': [source,shell] .... 5ef0bd68b515 (HEAD -> master, freebsd/master, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward @@ -424,8 +426,8 @@ a8163e165c5b (upstream/master) HEAD@{1}: checkout: moving from b6fb97efb682994f5 shows me moving the working tree to the master branch (a816...) and then updating from upstream (to 5ef0...). In this case, bad would be HEAD (or 5rf0bd68) and good would be a8163e165. As you can see from the output, HEAD@{1} also often works, but isn't foolproof if you have done other things to your git tree after updating, but before you discover the need to bisect. +==== -Back to git bisect. Set the 'good' version first, then set the bad (though the order doesn't matter). When you set the bad version, it will give you some statistics on the process: [source,shell] @@ -446,14 +448,15 @@ When you are done, report the bad version to the developer (or fix the bug yours Again, the git-bisect manual (linked above) is a good resource for when things go wrong or for unusual cases. ==== Ports Considerations +The ports migration is in progress, and some of this section may change before that is complete. The ports tree operates the same way. -The branch names are different and the repos are in different locations. +The branch names are different and the repositories are in different locations. The legacy GitHub mirror is at https://github.com/freebsd/freebsd-ports.git . The canonical cgit mirror is https://cgit-beta.freebsd.org/ports.git . The production git repo will be https://git.freebsd.org/ports.git and ssh://anongit@git.FreeBSD.org/ports.git (or anongit@git.FreeBSD.org:ports.git) when the time comes. -As with ports, the 'current' branches are 'master' (legacy) and 'main' (new) respectively. +The 'current' branches are 'master' (legacy) and 'main' (new) respectively. The quarterly branches are named the same as in FreeBSD's svn repo. [NOTE] @@ -462,7 +465,7 @@ The cgit repo for ports is considered beta. The git hashes may change as problems are found in the conversion prior to the cutover. ==== -==== Coping with Local Changes +==== Managing Local Changes This section addresses tracking local changes. If you have no local changes, you can stop reading now (it is the last section and OK to skip). @@ -498,7 +501,7 @@ We will cover the most common scenarios that arise using it. ====== Create a branch -Let's say you want to make a hack to FreeBSD's ls command to never, ever do color. +Let's say you want to make a change to FreeBSD's ls command to never, ever do color. There are many reasons to do this, but this example will use that as a baseline. The FreeBSD ls command changes from time to time, and you'll need to cope with those changes. Fortunately, with git rebase it usually is automatic. @@ -529,7 +532,7 @@ index 7378268867ef..cfc3f4342531 100644 The commit will pop you into an editor to describe what you've done. Once you enter that, you have your own **local** branch in the git repo. Build and install it like you normally would, following the directions in the handbook. -git differs from other version control systems in that you have to tell it explicitly which files to use. +git differs from other version control systems in that you have to tell it explicitly which files to commit. I have opted to do it on the commit command line, but you can also do it with 'git add' which many of the more in depth tutorials cover. ====== Time to update @@ -554,8 +557,8 @@ Once you are done with the above, you have to move the commits to ls.c forward f Sometimes there are merge conflicts. That is OK. Do not panic. -You wouldhandle them the same as you would any other merge conflicts. -To keep it simple, I will just describe a common issue you might see. +Instead, handle them the same as any other merge conflicts. +To keep it simple, I will just describe a common issue that may arise. A pointer to a more complete treatment can be found at the end of this section. Let's say the includes changes upstream in a radical shift to terminfo as well as a name change for the option. @@ -622,7 +625,7 @@ If you have a deep clone, the following will suffice: .... If you have a local branch, though, there are one or two caveats. First, rebase will rewrite history, so you will likely want to do something to save it. -Second, jumping branches tends to encounter more conflicts. +Second, jumping branches tends to cause more conflicts. If we pretend the example above was relative to stable/12, then to move to main, I'd suggest the following: [source,shell] .... @@ -640,20 +643,20 @@ replay them onto the main branch creating a new no-color-ls branch there (which ===== Migrating from an existing git clone If you have work based on a previous git conversion or a locally running git-svn conversion, migrating to new repository can encounter problems because git has no knowledge about the connection between the two. -If do not have a lot of local changes, the easiest way would be to cherry-pick your changes to the new base: +When you have only a few local changes, the easiest way would be to cherry-pick those changes to the new base: [source,shell] .... % git checkout main % git cherry-pick old_branch..your_branch .... -Or alternatively, you can do the same thing with rebase: +Or alternatively, do the same thing with rebase: [source,shell] .... % git rebase --onto main master your_branch .... If you do have a lot of changes, you would probably want to perform a merge instead. -The idea is to create a merge point that consolidates the history of the old_branch, and the new source of truth (main). +The idea is to create a merge point that consolidates the history of the old_branch, and the new FreeBSD repository (main). You can find out by looking up the same commit that are found on both parents: [source,shell] @@ -665,10 +668,10 @@ You will see a commit message, now search for that in the new branch: .... % git log --grep="commit message on old_branch" freebsd/main .... -You would get a SHA1 on the new main branch, create a helper branch (in the example we call it 'stage') from that SHA1: +You would help locat the commit hash on the new main branch, create a helper branch (in the example we call it 'stage') from that hash: [source,shell] .... -% git checkout -b stage SHA1_found_from_git_log +% git checkout -b stage _hash_found_from_git_log_ .... Then perform a merge of the old branch: [source,shell] @@ -1491,7 +1494,7 @@ You may need to omit the --global if you want this setting to only this reposito % git pull (--ff-only|--rebase) .... -There is a common trap, that the combination command `git pull` will try to perform a merge, which would sometimes creates a merge commit sha that didn't exist before. +There is a common trap, that the combination command `git pull` will try to perform a merge, which would sometimes creates a merge commit that didn't exist before. This can be harder to recover from. The longer form is also recommended. From owner-dev-commits-doc-all@freebsd.org Wed Mar 17 23:36:32 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C99A957CBB8 for ; Wed, 17 Mar 2021 23:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F164J5QhPz3n4q; Wed, 17 Mar 2021 23:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AD394177D7; Wed, 17 Mar 2021 23:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12HNaWul038919; Wed, 17 Mar 2021 23:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12HNaWY3038918; Wed, 17 Mar 2021 23:36:32 GMT (envelope-from git) Date: Wed, 17 Mar 2021 23:36:32 GMT Message-Id: <202103172336.12HNaWY3038918@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: a7ec32b97b - main - Wording improvements MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7ec32b97beee65b3a05778232110a93ed323a72 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 23:36:32 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=a7ec32b97beee65b3a05778232110a93ed323a72 commit a7ec32b97beee65b3a05778232110a93ed323a72 Author: Warner Losh AuthorDate: 2021-03-17 23:35:37 +0000 Commit: Warner Losh CommitDate: 2021-03-17 23:35:37 +0000 Wording improvements Describe how to collapse multiple MFCs better. Use consistent punctuation. fix some typos. Submitted by: Pau Amma --- documentation/content/en/articles/committers-guide/_index.adoc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 290210be48..8c4d20fa0d 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -720,7 +720,8 @@ use `git pull --rebase` and try to push again. % for h in $HASH_LIST; do git cherry-pick -x $h; done % git rebase -i stable/X # mark each of the commits after the first as 'squash' -# edit the commit message to be sane, if necessary +# Update the commit message to reflect all elements of commit, if necessary. +# Be sure to retain the "cherry picked from" lines. % git push freebsd HEAD:stable/X .... @@ -1338,7 +1339,7 @@ At this point, you should have a pristine copy of glorbnitz ready to commit. .... As above, I used `-m` for simplicity, but you should likely create a commit message that explains what a Glorb is and why you'd use a Nitz to get it. Not everybody will know. -But for your actual commmit, you should follow the <> section instead of emulate the brief style here. +But for your actual commit, you should follow the <> section instead of emulating the brief style used here. ==== Now import it into our repository Now you need to import the branch into our repository. @@ -1369,7 +1370,7 @@ By 'good' we mean: . All the right files are present . None of the wrong files are present . The vendor branch points at something sensible -. The tag looks good, and is annotated. +. The tag looks good, and is annotated . The commit message for the tag has a quick summary of what's new since the last tag ==== Time to finally merge it into the base tree From owner-dev-commits-doc-all@freebsd.org Thu Mar 18 00:30:56 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4D77657DED0 for ; Thu, 18 Mar 2021 00:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F17H41pg1z3qdY; Thu, 18 Mar 2021 00:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3100B183F0; Thu, 18 Mar 2021 00:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12I0Uuu5013308; Thu, 18 Mar 2021 00:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12I0UuQs013307; Thu, 18 Mar 2021 00:30:56 GMT (envelope-from git) Date: Thu, 18 Mar 2021 00:30:56 GMT Message-Id: <202103180030.12I0UuQs013307@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: f18f371e01 - main - Another round of typos MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f18f371e018badac92fa542c0f238c337fe65787 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 00:30:56 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=f18f371e018badac92fa542c0f238c337fe65787 commit f18f371e018badac92fa542c0f238c337fe65787 Author: Warner Losh AuthorDate: 2021-03-18 00:30:17 +0000 Commit: Warner Losh CommitDate: 2021-03-18 00:30:17 +0000 Another round of typos Submitted by: Pau Amma --- .../content/en/articles/committers-guide/_index.adoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 8c4d20fa0d..264750a636 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -265,7 +265,7 @@ This primer is less ambitiously scoped than the old Subversion Primer, but shoul If you want to download FreeBSD, compile it from sources, and generally keep up to date that way, this primer is for you. It covers getting the sources, updating the sources, bisecting and touches briefly on how to cope with a few local changes. -It covers the basics, and tries to give good pointers to more in-depth treatment for when the readers finds the basics insufficient. +It covers the basics, and tries to give good pointers to more in-depth treatment for when the reader finds the basics insufficient. Other sections of this guide cover more advanced topics related to contributing to the project. The goal of this section is to highlight those bits of git needed to track sources. @@ -668,7 +668,7 @@ You will see a commit message, now search for that in the new branch: .... % git log --grep="commit message on old_branch" freebsd/main .... -You would help locat the commit hash on the new main branch, create a helper branch (in the example we call it 'stage') from that hash: +You would help locate the commit hash on the new main branch, create a helper branch (in the example we call it 'stage') from that hash: [source,shell] .... % git checkout -b stage _hash_found_from_git_log_ @@ -1404,7 +1404,7 @@ This section is designed to walk people through the conversion process from Subv This section will cover a couple of common scenarios for migrating from using the FreeBSD Subversion repo to the FreeBSD source git repo. The FreeBSD Git conversion is still in beta status, so some minor things may change between this and going into production. -The fist thing to do is install git. Any version of Git will do, though the latest one in ports / packages generally will be good. +The first thing to do is install git. Any version of Git will do, though the latest one in ports / packages generally will be good. Either build it from ports, or install it using pkg (though some folks might use `su` or `doas` instead of `sudo`): [source,shell] @@ -1415,7 +1415,7 @@ Either build it from ports, or install it using pkg (though some folks might use ===== No staged changes migration If you have no changes pending, the migration is straightforward. -In this, you abandon the Subversion tree and clone the Git repoository. +In this, you abandon the Subversion tree and clone the Git repository. It's likely best to retain your subversion tree, in case there's something you've forgotten about there. First, let's clone the repository: [source,shell] @@ -1426,13 +1426,13 @@ will create a clone of the FreeBSD src repository into a subdirectory called `fr We are currently mirroring the source repository to https://github.com/freebsd/freebsd-src.git as well. https://github.com/freebsd/freebsd-legacy.git has the old github mirror with the old hashes should you need that for your migration. The github `master` branch has been frozen. -As the default in git has change, we've shifted from `master` to `main`, the new repository uses `main`. +As the default in git has changed, we've shifted from `master` to `main`; the new repository uses `main`. We also mirror the repository to gitlab at https://gitlab.com/FreeBSD/src.git . It's useful to have the old Subversion revisions available. This data is stored using Git notes, but Git doesn't fetch those by default. The --config and the argument above changed the default to fetch the notes. -If you've cloned the repository without this, or wish to add notes to a previously clone repository, use the following commands: +If you've cloned the repository without this, or wish to add notes to a previously cloned repository, use the following commands: [source,shell] .... % git config --add remote.freebsd.fetch "+refs/notes/*:refs/notes/*" @@ -1486,7 +1486,7 @@ Alternatively, `git pull --rebase` is useful if you have changes staged in the m .... % git config --global pull.ff only .... -You may need to omit the --global if you want this setting to only this repository. +You may need to omit the --global if you want this setting to apply to only this repository. [source,shell] .... From owner-dev-commits-doc-all@freebsd.org Thu Mar 18 01:33:09 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0DF835A8790 for ; Thu, 18 Mar 2021 01:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F18fr731Cz3w6n; Thu, 18 Mar 2021 01:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E458119413; Thu, 18 Mar 2021 01:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12I1X8RM096310; Thu, 18 Mar 2021 01:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12I1X8bO096309; Thu, 18 Mar 2021 01:33:08 GMT (envelope-from git) Date: Thu, 18 Mar 2021 01:33:08 GMT Message-Id: <202103180133.12I1X8bO096309@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ka Ho Ng Subject: git: b4977a4f42 - main - Document __FreeBSD_version 1400006 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4977a4f42310f9dc6ba3524d5b3bd636a9c74dd Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 01:33:09 -0000 The branch main has been updated by khng (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=b4977a4f42310f9dc6ba3524d5b3bd636a9c74dd commit b4977a4f42310f9dc6ba3524d5b3bd636a9c74dd Author: Ka Ho Ng AuthorDate: 2021-03-18 01:31:30 +0000 Commit: Ka Ho Ng CommitDate: 2021-03-18 01:32:58 +0000 Document __FreeBSD_version 1400006 Sponsored by: The FreeBSD Foundation Approved by: philip (mentor) Differential Revision: https://reviews.freebsd.org/D29312 --- .../content/en/books/porters-handbook/versions/chapter.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/content/en/books/porters-handbook/versions/chapter.adoc b/documentation/content/en/books/porters-handbook/versions/chapter.adoc index 59fbb1b4fe..201081035c 100644 --- a/documentation/content/en/books/porters-handbook/versions/chapter.adoc +++ b/documentation/content/en/books/porters-handbook/versions/chapter.adoc @@ -71,6 +71,11 @@ Here is a convenient list of `__FreeBSD_version` values as defined in https://cg |gitref:45eabf5754ac1d291bd677fdf29f59ce4bbc2c8f[repository="src",length=12] |February 17, 2021 |14.0-CURRENT after changing the API of `ptrace(2)` `PT_GETDBREGS`/`PT_SETDBREGS` on arm64. + +|1400006 +|gitref:c96151d33509655efb7fb26768cb56a041c176f1[repository="src",length=12] +|March 17, 2021 +|14.0-CURRENT after adding sndstat(4) enumeration ioctls. |=== [[versions-13]] From owner-dev-commits-doc-all@freebsd.org Thu Mar 18 20:32:35 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0147C5ABDE2 for ; Thu, 18 Mar 2021 20:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1dxX4PLkz4jn8; Thu, 18 Mar 2021 20:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CD53D150; Thu, 18 Mar 2021 20:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12IKWVbc002049; Thu, 18 Mar 2021 20:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12IKWVUH002048; Thu, 18 Mar 2021 20:32:31 GMT (envelope-from git) Date: Thu, 18 Mar 2021 20:32:31 GMT Message-Id: <202103182032.12IKWVUH002048@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 0181ba1611 - main - MFC: update advice on MFC practices MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0181ba16117f05569d0ebd7989dd53bae1821598 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 20:32:35 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=0181ba16117f05569d0ebd7989dd53bae1821598 commit 0181ba16117f05569d0ebd7989dd53bae1821598 Author: Warner Losh AuthorDate: 2021-03-18 20:30:53 +0000 Commit: Warner Losh CommitDate: 2021-03-18 20:30:53 +0000 MFC: update advice on MFC practices Highlight MFC to a branch needing approval Rearrange a couple sections to improve document structure. Change some enumeration lists to bulleted lists since I think that looks nicer. --- .../en/articles/committers-guide/_index.adoc | 72 ++++++++++++---------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 264750a636..9bf60fefbf 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -712,6 +712,24 @@ up and do a `git cherry-pick --continue`. Once the cherry-pick is finished, push with `git push`. If you get an error due to losing the commit race, use `git pull --rebase` and try to push again. +==== MFC to RELENG branch + +MFCs to branches that require approval require a bit more care. +The process is the same for either a typical merge or an exceptional direct commit. + +* Merge or direct commit to the appropriate `stable/X` branch first before merging to the `releng/X.Y` branch. +* Use the hash that's in the `stable/X` branch for the MFC to `releng/X.Y` branch. +* Leave both "cherry picked from" lines in the commit message. +* Be sure to add the `Approved by:` line when you are in the editor. + +[source,shell] +.... +% git checkout releng/13.0 +% git cherry-pick -x $HASH --edit +.... + +If you forget to to add the `Approved by:` line, you can do a `git commit --amend` to edit the commit message before you push the change. + ==== Multiple commit MFC [source,shell] @@ -785,18 +803,15 @@ using 'git rebase -i' is better. When committing source commits to stable and releng branches, we have the following goals: -1. Clearly mark direct commits distinct from commits that land a - change from another branch -2. Avoid introducing known breakage into stable and releng branches -3. Allow developers to determine which changes have or have not been - landed from one branch to another +* Clearly mark direct commits distinct from commits that land a change from another branch. +* Avoid introducing known breakage into stable and releng branches. +* Allow developers to determine which changes have or have not been landed from one branch to another. With subversion, we used the following practices to achieve these goals: -1. Using 'MFC' and 'MFS' tags to mark commits that merged changes from - another branch -2. Squashing fixup commits into the main commit when merging a change -3. Recording mergeinfo so that `svn mergeinfo --show-revs` worked +* Using 'MFC' and 'MFS' tags to mark commits that merged changes from another branch. +* Squashing fixup commits into the main commit when merging a change. +* Recording mergeinfo so that `svn mergeinfo --show-revs` worked. With Git, we will need to use different strategies to achieve the same goals. This document aims to define best practices when merging @@ -812,31 +827,7 @@ replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some varation of `git cherry-pick`. -==== Commit message standards -===== Marking MFCs - -There are two main options for marking MFCs as distinct from direct -commits: - -1. One option that matches our existing practice (the wisdom of which - I'm not commenting on) would mark MFCs like this in the commit - message: `MFC: 12def6789a3a,ac32ee4a5c2e` - - where the first 12 digits of the hash is used to mark the commit message. - This "abbreviated hash" can be retrieved by: `git show --format=%p --no-patch $full_hash` - - This preserves the information, but isn't 'git standard'. It also - requires committers to manually edit commit messages to include - this information when merging. - -2. Use the `-x` flag with `git cherry-pick`. This adds a line to the - commit message that includes the hash of the original commit when - merging. Since it is added by Git directly, committers do not have - to manually edit the commit log when merging. - -We feel that the second option is simpler going forward. - -===== Finding Eligible Hashes to MFC +==== Finding Eligible Hashes to MFC Git provides some built-in support for this via the `git cherry` and `git log --cherry` commands. These commands compare the raw diffs of @@ -867,6 +858,19 @@ There are a few options for resolving this: commit, but collecting the `-x` annotations at the end of the landed commit log. +==== Commit message standards +===== Marking MFCs + +There are two main options for marking MFCs as distinct from direct +commits: + +* Use the `-x` flag with `git cherry-pick`. This adds a line to the + commit message that includes the hash of the original commit when + merging. Since it is added by Git directly, committers do not have + to manually edit the commit log when merging. + +When merging multiple commits, keep all the "cherry picked from" lines. + ===== Trim Metadata? One area that was not clearly documented with subversion (or even CVS) From owner-dev-commits-doc-all@freebsd.org Thu Mar 18 20:47:39 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD9F35ACBBC for ; Thu, 18 Mar 2021 20:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1fGz4Ztqz4lkC; Thu, 18 Mar 2021 20:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8BEB23E3; Thu, 18 Mar 2021 20:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12IKldtP016076; Thu, 18 Mar 2021 20:47:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12IKld9w016075; Thu, 18 Mar 2021 20:47:39 GMT (envelope-from git) Date: Thu, 18 Mar 2021 20:47:39 GMT Message-Id: <202103182047.12IKld9w016075@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 28d4e1377a - main - MFC: tweak the langauge MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28d4e1377abb15ab0e2222035be0289725d4218e Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 20:47:39 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=28d4e1377abb15ab0e2222035be0289725d4218e commit 28d4e1377abb15ab0e2222035be0289725d4218e Author: Warner Losh AuthorDate: 2021-03-18 20:45:46 +0000 Commit: Warner Losh CommitDate: 2021-03-18 20:45:46 +0000 MFC: tweak the langauge Don't say there are two options and then give only one. Update that sentence to reflect where the project seems to have landed in terms of how to do MFCs. The original was written prior to the transtion and the existing practice has shifted to cherry-pick -x almost exclusively. --- documentation/content/en/articles/committers-guide/_index.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 9bf60fefbf..9069eb8f42 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -861,8 +861,7 @@ There are a few options for resolving this: ==== Commit message standards ===== Marking MFCs -There are two main options for marking MFCs as distinct from direct -commits: +The project has adopted the following practice for marking MFCs: * Use the `-x` flag with `git cherry-pick`. This adds a line to the commit message that includes the hash of the original commit when From owner-dev-commits-doc-all@freebsd.org Thu Mar 18 21:59:03 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FF455AEE0A for ; Thu, 18 Mar 2021 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1gsM1SQNz4qls; Thu, 18 Mar 2021 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 246E11713; Thu, 18 Mar 2021 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12ILx3XG008693; Thu, 18 Mar 2021 21:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12ILx3R6008692; Thu, 18 Mar 2021 21:59:03 GMT (envelope-from git) Date: Thu, 18 Mar 2021 21:59:03 GMT Message-Id: <202103182159.12ILx3R6008692@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 3bbe81a675 - main - git: add FAQ MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bbe81a6753dfcd17b49dd4e770581babd6e1f72 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 21:59:03 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=3bbe81a6753dfcd17b49dd4e770581babd6e1f72 commit 3bbe81a6753dfcd17b49dd4e770581babd6e1f72 Author: Warner Losh AuthorDate: 2021-03-18 21:55:16 +0000 Commit: Warner Losh CommitDate: 2021-03-18 21:55:16 +0000 git: add FAQ Add in the FAQ from the github docs I did for the transition. Submissions from: rpokala@, jrm@, Marc Branchaud and "mirror176". --- .../en/articles/committers-guide/_index.adoc | 410 +++++++++++++++++++++ 1 file changed, 410 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 9069eb8f42..e4ec27cb4c 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1624,6 +1624,416 @@ author recommends that your upstream github repo remain the default push location so that you only push things into FreeBSD you intend to by making it explicit. +[[git-faq]] +=== Git FAQ + +This section provides a number of targeted answers to questions that are likely to come up often for users, developer and integrators. + +Note, we use the common convention of having the origin for the FreeBSD repo being 'freebsd' rather than the default 'origin' to allow +people to use that for their own development and to minimize "whoopse" pushes to source of truth. + +==== Users + +===== How do I track -current and -stable with only one copy of the repo? + +**Q:** Although disk space is not a huge issue, it's more efficient to use +only one copy of the repository. With SVN mirroring, I could checkout +multiple trees from the same repo. How do I do this with Git? + +**A:** You can use Git worktrees. There's a number of ways to do this, +but the simplest way is to use a clone to track -current, and a +worktree to track stable releases. While using a 'bare repository' +has been put forward as a way to cope, it's more complicated and will not +be documented here. + +First, you need to clone the FreeBSD repository, shown here cloning into +`freebsd-current` to reduce confusion. $URL is whatever mirror works +best for you: +[source,shell] +.... +% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' $URL freebsd-current +.... +then once that's cloned, you can simply create a worktree from it: +[source,shell] +.... +% cd freebsd-current +% git worktree add ../freebsd-stable-12 stable/12 +.... +this will checkout `stable/12` into a directory named `freebsd-stable-12` +that's a peer to the `freebsd-current` directory. Once created, it's updated +very similarly to how you might expect: +[source,shell] +.... +% cd freebsd-current +% git checkout main +% git pull --ff-only +# changes from upstream now local and current tree updated +% cd ../freebsd-stable-12 +% git merge --ff-only freebsd/stable/12 +# now your stable/12 is up to date too +.... +I recommend using `--ff-only` because it's safer and you avoid +accidentally getting into a 'merge nightmare' where you have an extra +change in your tree, forcing a complicated merge rather than a simple +one. + +Here's https://adventurist.me/posts/00296 a good writeup that goes into more detail. + +==== Developers + +===== Ooops! I committed to `main` instead of a branch. + +**Q:** From time to time, I goof up and commit to main instead of to a +branch. What do I do? + +**A:** First, don't panic. + +Second, don't push. In fact, you can fix almost anything if you +haven't pushed. All the answers in this section assume no push +has happened. + +The following answer assumes you committed to `main` and want to +create a branch called `issue`: +[source,shell] +.... +% git branch issue # Create the 'issue' branch +% git reset --hard freebsd/main # Reset 'main' back to the official tip +% git checkout issue # Back to where you were +.... + +===== Ooops! I committed something to the wrong branch! + +**Q:** I was working on feature on the `wilma` branch, but +accidentally committed a change relevant to the `fred` branch +in 'wilma'. What do I do? + +**A:** The answer is similar to the previous one, but with +cherry picking. This assumes there's only one commit on wilma, +but will generalize to more complicated situations. It also +assumes that it's the last commit on wilma (hence using wilma +in the `git cherry-pick` command), but that too can be generalized. + +[source,shell] +.... +# We're on branch wilma +% git checkout fred # move to fred branch +% git cherry-pick wilma # copy the misplaced commit +% git checkout wilma # go back to wilma branch +% git reset --hard HEAD^ # move what wilma refers to back 1 commit +.... +Git experts would first rewind the wilma branch by 1 commit, switch over to +fred and then use `git reflog` to see what that 1 deleted commit was and +cherry-pick it over. + +**Q:** But what if I want to commit a few changes to `main`, but +keep the rest in `wilma` for some reason? + +**A:** The same technique above also works if you are wanting to +'land' parts of the branch you are working on into `main` before the +rest of the branch is ready (say you noticed an unrelated typo, or +fixed an incidental bug). You can cherry pick those changes into main, +then push to the parent repo. Once you've done that, cleanup couldn't +be simpler: just `git rebase -i`. Git will notice you've done +this and skip the common changes automatically (even if you had to +change the commit message or tweak the commit slightly). There's no +need to switch back to wilma to adjust it: just rebase! + +**Q:** I want to split off some changes from branch `wilma` into branch `fred` + +**A:** The more general answer would be the same as the +previous. You'd checkout/create the `fred` branch, cherry pick the +changes you want from `wilma` one at a time, then rebase `wilma` to +remove those changes you cherry picked. `git rebase -i main wilma` +will toss you into an editor, and remove the `pick` lines that +correspond to the commits you copied to `fred`. If all goes well, +and there are no conflicts, you're done. If not, you'll need to +resolve the conflicts as you go. + +The other way to do this would be to checkout `wilma` and then create +the branch `fred` to point to the same point in the tree. You can then +`git rebase -i` both these branches, selecting the changes you want in +`fred` or `wilma` by retaining the pick likes, and deleting the rest +from the editor. Some people would create a tag/branch called +`pre-split` before starting in case something goes wrong in the split, +you can undo it with the following sequence: +[source,shell] +.... +% git checkout pre-split # Go back +% git branch -D fred # delete the fred branch +% git checkout -B wilma # reset the wilma branch +% git branch -d pre-split # Pretend it didn't happen +.... +the last step is optional. If you are going to try again to +split, you'd omit it. + +**Q:** But I did things as I read along and didn't see your advice at +the end to create a branch, and now `fred` and `wilma` are all +screwed up. How do I find what `wilma` was before I started. I don't +know how many times I moved things around. + +**A:** All is not lost. You can figure out it, so long as it hasn't +been too long, or too many commits (hundreds). + +So I created a wilma branch and committed a couple of things to it, then +decided I wanted to split it into fred and wilma. Nothing weird +happened when I did that, but let's say it did. The way to look at +what you've done is with the `git reflog`: +[source,shell] +.... +% git reflog +6ff9c25 (HEAD -> wilma) HEAD@{0}: rebase -i (finish): returning to refs/heads/wilma +6ff9c25 (HEAD -> wilma) HEAD@{1}: rebase -i (start): checkout main +869cbd3 HEAD@{2}: rebase -i (start): checkout wilma +a6a5094 (fred) HEAD@{3}: rebase -i (finish): returning to refs/heads/fred +a6a5094 (fred) HEAD@{4}: rebase -i (pick): Encourage contributions +1ccd109 (freebsd/main, main) HEAD@{5}: rebase -i (start): checkout main +869cbd3 HEAD@{6}: rebase -i (start): checkout fred +869cbd3 HEAD@{7}: checkout: moving from wilma to fred +869cbd3 HEAD@{8}: commit: Encourage contributions +... +% +.... + +Here we see the changes I've made. You can use it to figure out where +things when wrong. I'll just point out a few things here. The first +one is that HEAD@{X} is a 'commitish' thing, so you can use that as an +argument to a command. Though if that command commits anything to the +repo, the X numbers change. You can also use the hash (first column) +as well. + +Next 'Encourage contributions' was the last commit I did to `wilma` +before I decided to split things up. You can also see the same hash is +there when I created the `fred` branch to do that. I started by +rebasing `fred` and you see the 'start', each step, and the 'finish' +for that process. While we don't need it here, you can figure out +exactly what happened. Fortunately, to fix this, you can follow the +prior answer's steps, but with the hash `869cbd3` instead of +`pre-split`. While that set of a bit verbose, it's easy to remember +since you're doing one thing at a time. You can also stack: +[source,shell] +.... +% git checkout -B wilma 869cbd3 +% git branch -D fred +.... +and you are ready to try again. The 'checkout -B' with the hash combines +checking out and creating a branch for it. The -B instead of -b forces +the movement of a pre-existing branch. Either way works, which is what's +great (and awful) about Git. One reason I tend to use `git checkout -B xxxx hash` +instead of checking out the hash, and then creating / moving the branch +is purely to avoid the slightly distressing message about detached heads: +[source,shell] +.... +% git checkout 869cbd3 +M faq.md +Note: checking out '869cbd3'. + +You are in 'detached HEAD' state. You can look around, make experimental +changes and commit them, and you can discard any commits you make in this +state without impacting any branches by performing another checkout. + +If you want to create a new branch to retain commits you create, you may +do so (now or later) by using -b with the checkout command again. Example: + + git checkout -b + +HEAD is now at 869cbd3 Encourage contributions +% git checkout -B wilma +.... +this produces the same effect, but I have to read a lot more and severed heads +aren't an image I like to contemplate. + +===== Ooops! I did a 'git pull' and it created a merge commit, what do I do? + +**Q:** I was on autopilot and did a 'git pull' for my development tree and +that created a merge commit on the mainline. How do I recover? + +**A:** This can happen when you invoke the pull with your development branch +checked out. + +Right after the pull, you will have the new merge commit checked out. Git +supports a `HEAD^#` syntax to examine the parents of a merge commit: +[source,shell] +.... +git log --oneline HEAD^1 # Look at the first parent's commits +git log --oneline HEAD^2 # Look at the second parent's commits +.... +From those logs, you can easily identify which commit is your development +work. Then you simply reset your branch to the corresponding `HEAD^#`: +[source,shell] +.... +git reset --hard HEAD^2 +.... + +**Q:** But I also need to fix my 'main' branch. How do I do that? + +**A:** Git keeps track of the remote repository branches in a `freebsd/` +namespace. To fix your 'main' branch, just make it point to the remote's +'main': +[source,shell] +.... +git branch -f main freebsd/main +.... +There's nothing magical about branches in git: they are just labels on a DAG +that are automatically moved forward by making commits. So the above works +because you're just moving a label. There's no metadata about the branch +that needs to be preserved due to this. + +===== Mixing and matching branches + +**Q:** So I have two branches `worker` and `async` that I'd like to combine into one branch called `feature` +while maintaining the commits in both. + +**A:** This is a job for cherry pick. + +[source,shell] +.... +% git checkout worker +% git checkout -b feature # create a new branch +% git cherry-pick main..async # bring in the changes +.... +You now have one branch called `feature`. This branch combines commits +from both branches. You can further curate it with `git rebase`. + +**Q:** OK Wise Guy. That was too easy. I have a branch called `driver` and I'd like +to break it up into `kernel` and `userland` so I can evolve them separately and commit +each branch as it becomes ready. + +**A:** This takes a little bit of prep work, but `git rebase` will do the heavy +lifting here. + +[source,shell] +.... +% git checkout driver # Checkout the driver +% git checkout -b kernel # Create kernel branch +% git checkout -b userland # Create userland branch +.... +Now you have two identical branches. So, it's time to separate out the commits. +We'll assume first that all the commits in `driver` go into either the `kernel` +or the `userland` branch, but not both. + +[source,shell] +.... +% git rebase -i main kernel +.... +and just include the changes you want (with a 'p' or 'pick' line) and +just delete the commits you don't (this sounds scary, but if worse +comes to worse, you can throw this all away and start over with the +`driver` branch since you've not yet moved it). + +[source,shell] +.... +% git rebase -i main userland +.... +and do the same thing you did with the `kernel` branch. + +**Q:** Oh great! I followed the above and forgot a commit in the `kernel` branch. +How do I recover? + +**A:** You can use the `driver` branch to find the hash of the commit is missing and +cherry pick it. +[source,shell] +.... +% git checkout kernel +% git log driver +% git cherry-pick $HASH +.... + +**Q:** OK. I have the same situation as the above, but my commits are all mixed up. I need +parts of one commit to go to one branch and the rest to go to the other. In fact, I have +several. Your rebase method to select sounds tricky. + +**A:** In this situation, you'd be better off to curate the original branch to separate +out the commits, and then use the above method to split the branch. + +So let's assume that there's just one commit with a clean tree. You +can either use `git rebase` with an `edit` line, or you can use this +with the commit on the tip. The steps are the same either way. The +first thing we need to do is to back up one commit while leaving the +changes uncommitted in the tree: +[source,shell] +.... +% git reset HEAD^ +.... +Note: Do not, repeat do not, add `--hard` here since that also removes the changes from your tree. + +Now, if you are lucky, the change needing to be split up falls entirely along file lines. In that +case you can just do the usual `git add` for the files in each group than do a `git commit`. Note: +when you do this, you'll lose the commit message when you do the reset, so if you need it for +some reason, you should save a copy (though `git log $HASH` can recover it). + +If you are not lucky, you'll need to split apart files. There's another tool to do that which you +can apply one file at a time. +[source,shell] +.... +git add -i foo/bar.c +.... +will step through the diffs, prompting you, one at time, whether to include or exclude the hunk. +Once you're done, `git commit` and you'll have the remainder in your tree. You can run it +multiple times as well, and even over multiple files (though I find it easier to do one file at a time +and use the `git rebase -i` to fold the related commits together). + +==== Cloning and Mirroring + +**Q:** I'd like to mirror the entire git repo, how do I do that? + +**A:** If all you want to do is mirror, then +[source,shell] +.... +% git clone --mirror $URL +.... +will do the trick. However, there are two disadvantages to this if you +want to use it for anything other than a mirror you'll reclone. + +First, this is a 'bare repo' which has the repository database, but no +checked out worktree. This is great for mirroring, but terrible for day to +day work. There's a number of ways around this with 'git worktree': +[source,shell] +.... +% git clone --mirror https://cgit-beta.freebsd.org/ports.git ports.git +% cd ports.git +% git worktree add ../ports main +% git worktree add ../quarterly branches/2020Q4 +% cd ../ports +.... +But if you aren't using your mirror for further local clones, then it's a poor match. + +The second disadvantage is that Git normally rewrites the refs (branch name, tags, etc) +from upstream so that your local refs can evolve independently of +upstream. This means that you'll lose changes if you are committing to +this repo on anything other than private project branches. + +**Q:** So what can I do instead? + +**A:** Well, you can stuff all of the upstream repo's refs into a private +namespace in your local repo. Git clones everything via a 'refspec' and +the default refspec is: +[source,shell] +.... + fetch = +refs/heads/*:refs/remotes/freebsd/* +.... +which says just fetch the branch refs. + +However, the FreeBSD repo has a number of other things in it. To see +those, you can add explicit refspecs for each ref namespace, or you +can fetch everything. To setup your repo to do that: +[source,shell] +.... +git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*' +.... +which will put everything in the upstream repo into your local repo's +'res/freebsd/' namespace. Please note, that this +also grabs all the unconverted vendor branches and the number of refs +associated with them is quite large. + +You'll need to refer to these 'refs' with their full name because they +aren't in and of Git's regular namespaces. +[source,shell] +.... +git log refs/freebsd/vendor/zlib/1.2.10 +.... +would look at the log for the vendor branch for zlib starting at 1.2.10. + + [[subversion-primer]] == Subversion Primer From owner-dev-commits-doc-all@freebsd.org Thu Mar 18 22:22:45 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2E46B5AF605 for ; Thu, 18 Mar 2021 22:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1hNj0n6Rz4rk7; Thu, 18 Mar 2021 22:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0DC68194D; Thu, 18 Mar 2021 22:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12IMMi56047856; Thu, 18 Mar 2021 22:22:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12IMMie8047855; Thu, 18 Mar 2021 22:22:44 GMT (envelope-from git) Date: Thu, 18 Mar 2021 22:22:44 GMT Message-Id: <202103182222.12IMMie8047855@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 78a21ab121 - main - Misc tweaks for arm64 and sparc64 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78a21ab12134ef50719e8576b0b2c34691c67f6e Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 22:22:45 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=78a21ab12134ef50719e8576b0b2c34691c67f6e commit 78a21ab12134ef50719e8576b0b2c34691c67f6e Author: Warner Losh AuthorDate: 2021-03-18 22:21:09 +0000 Commit: Warner Losh CommitDate: 2021-03-18 22:22:22 +0000 Misc tweaks for arm64 and sparc64 Add arm and arm64 minimal requirements Remove sparc64 reqiurements and VTOC since that's been removed. --- .../content/en/books/handbook/bsdinstall/_index.adoc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/documentation/content/en/books/handbook/bsdinstall/_index.adoc b/documentation/content/en/books/handbook/bsdinstall/_index.adoc index a294000363..c70efeef47 100644 --- a/documentation/content/en/books/handbook/bsdinstall/_index.adoc +++ b/documentation/content/en/books/handbook/bsdinstall/_index.adoc @@ -91,19 +91,22 @@ i386:: Older desktops and laptops often use this 32-bit, x86 architecture. + Almost all i386-compatible processors with a floating point unit are supported. All Intel(R) processors 486 or higher are supported. +However, binaries released by the project are compiled for the 686 processor, so a special build will be needed for 486 and 586 systems. + FreeBSD will take advantage of Physical Address Extensions (PAE) support on CPUs with this feature. A kernel with the PAE feature enabled will detect memory above 4 GB and allow it to be used by the system. However, using PAE places constraints on device drivers and other features of FreeBSD. +arm64:: +Most embedded boards are 64-bit ARM computers. +A number of arm64 servers are supported. + +arm:: +Older armv7 boards are supported. + powerpc:: All New World ROM Apple(R) Mac(R) systems with built-in USB are supported. SMP is supported on machines with multiple CPUs. + A 32-bit kernel can only use the first 2 GB of RAM. -sparc64:: -Systems supported by FreeBSD/sparc64 are listed at the link:https://www.FreeBSD.org/platforms/sparc/[FreeBSD/sparc64 Project]. -+ -SMP is supported on all systems with more than 1 processor. A dedicated disk is required as it is not possible to share a disk with another operating system at this time. - [[bsdinstall-pre]] == Pre-Installation Tasks @@ -505,9 +508,6 @@ GPT is usually the most appropriate choice for amd64 computers. Older computers |MBR |Master Boot Record (http://en.wikipedia.org/wiki/Master_boot_record[http://en.wikipedia.org/wiki/Master_boot_record]). - -|VTOC8 -|Volume Table Of Contents used by Sun SPARC64 and UltraSPARC computers. |=== After the partitioning scheme has been selected and created, select btn:[Create] again to create the partitions. The kbd:[Tab] key is used to move the cursor between fields. From owner-dev-commits-doc-all@freebsd.org Fri Mar 19 02:08:40 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C95B5B4013 for ; Fri, 19 Mar 2021 02:08: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 4F1nPN1psmz3Kgv; Fri, 19 Mar 2021 02:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2CFC348C0; Fri, 19 Mar 2021 02:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12J28ejg039662; Fri, 19 Mar 2021 02:08:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12J28eiv039661; Fri, 19 Mar 2021 02:08:40 GMT (envelope-from git) Date: Fri, 19 Mar 2021 02:08:40 GMT Message-Id: <202103190208.12J28eiv039661@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 9fc1c18c75 - main - Lots of improvements. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fc1c18c75b418b3be4f9a0238dae26165ff5992 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2021 02:08:40 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=9fc1c18c75b418b3be4f9a0238dae26165ff5992 commit 9fc1c18c75b418b3be4f9a0238dae26165ff5992 Author: Warner Losh AuthorDate: 2021-03-19 02:06:36 +0000 Commit: Warner Losh CommitDate: 2021-03-19 02:08:17 +0000 Lots of improvements. Lots of wording improvements, grammar errors, punctuation error and wrong word fixes. Also, do some limited one sentence one line (1s1l) conversion. Submitted by: Pau Amma (though not the 1s1l stuff). --- .../en/articles/committers-guide/_index.adoc | 116 ++++++++++----------- 1 file changed, 53 insertions(+), 63 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index e4ec27cb4c..edf7815827 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1620,25 +1620,28 @@ You'll need to do the following once to update the push URL if you are a FreeBSD (note that gitrepo.freebsd.org will be change to repo.freebsd.org in the future.) You will also need to add `freebsd` as the location to push to. The -author recommends that your upstream github repo remain the default +author recommends that your upstream github repository remain the default push location so that you only push things into FreeBSD you intend to by making it explicit. [[git-faq]] === Git FAQ -This section provides a number of targeted answers to questions that are likely to come up often for users, developer and integrators. +This section provides a number of targeted answers to questions that are likely to come up often for users and developers. -Note, we use the common convention of having the origin for the FreeBSD repo being 'freebsd' rather than the default 'origin' to allow -people to use that for their own development and to minimize "whoopse" pushes to source of truth. +[NOTE] +==== +We use the common convention of having the origin for the FreeBSD repository being 'freebsd' rather than the default 'origin' to allow +people to use that for their own development and to minimize "whoopse" pushes to the wrong repository. +==== ==== Users -===== How do I track -current and -stable with only one copy of the repo? +===== How do I track -current and -stable with only one copy of the repository? **Q:** Although disk space is not a huge issue, it's more efficient to use only one copy of the repository. With SVN mirroring, I could checkout -multiple trees from the same repo. How do I do this with Git? +multiple trees from the same repository. How do I do this with Git? **A:** You can use Git worktrees. There's a number of ways to do this, but the simplest way is to use a clone to track -current, and a @@ -1677,7 +1680,7 @@ accidentally getting into a 'merge nightmare' where you have an extra change in your tree, forcing a complicated merge rather than a simple one. -Here's https://adventurist.me/posts/00296 a good writeup that goes into more detail. +Here's https://adventurist.me/posts/00296[a good writeup] that goes into more detail. ==== Developers @@ -1732,7 +1735,7 @@ keep the rest in `wilma` for some reason? 'land' parts of the branch you are working on into `main` before the rest of the branch is ready (say you noticed an unrelated typo, or fixed an incidental bug). You can cherry pick those changes into main, -then push to the parent repo. Once you've done that, cleanup couldn't +then push to the parent repository. Once you've done that, cleanup couldn't be simpler: just `git rebase -i`. Git will notice you've done this and skip the common changes automatically (even if you had to change the commit message or tweak the commit slightly). There's no @@ -1749,13 +1752,9 @@ correspond to the commits you copied to `fred`. If all goes well, and there are no conflicts, you're done. If not, you'll need to resolve the conflicts as you go. -The other way to do this would be to checkout `wilma` and then create -the branch `fred` to point to the same point in the tree. You can then -`git rebase -i` both these branches, selecting the changes you want in -`fred` or `wilma` by retaining the pick likes, and deleting the rest -from the editor. Some people would create a tag/branch called -`pre-split` before starting in case something goes wrong in the split, -you can undo it with the following sequence: +The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree. +You can then `git rebase -i` both these branches, selecting the changes you want in `fred` or `wilma` by retaining the pick likes, and deleting the rest from the editor. +Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split, you can undo it with the following sequence: [source,shell] .... % git checkout pre-split # Go back @@ -1763,8 +1762,8 @@ you can undo it with the following sequence: % git checkout -B wilma # reset the wilma branch % git branch -d pre-split # Pretend it didn't happen .... -the last step is optional. If you are going to try again to -split, you'd omit it. +The last step is optional. +If you are going to try again to split, you'd omit it. **Q:** But I did things as I read along and didn't see your advice at the end to create a branch, and now `fred` and `wilma` are all @@ -1794,33 +1793,30 @@ a6a5094 (fred) HEAD@{4}: rebase -i (pick): Encourage contributions % .... -Here we see the changes I've made. You can use it to figure out where -things when wrong. I'll just point out a few things here. The first -one is that HEAD@{X} is a 'commitish' thing, so you can use that as an -argument to a command. Though if that command commits anything to the -repo, the X numbers change. You can also use the hash (first column) -as well. +Here we see the changes I've made. +You can use it to figure out where things went wrong. +I'll just point out a few things here. +The first one is that HEAD@{X} is a 'commitish' thing, so you can use that as an argument to a command. +Though if that command commits anything to the repository, the X numbers change. +You can also use the hash (first column) as well. -Next 'Encourage contributions' was the last commit I did to `wilma` -before I decided to split things up. You can also see the same hash is -there when I created the `fred` branch to do that. I started by -rebasing `fred` and you see the 'start', each step, and the 'finish' -for that process. While we don't need it here, you can figure out -exactly what happened. Fortunately, to fix this, you can follow the -prior answer's steps, but with the hash `869cbd3` instead of -`pre-split`. While that set of a bit verbose, it's easy to remember -since you're doing one thing at a time. You can also stack: +Next 'Encourage contributions' was the last commit I did to `wilma` before I decided to split things up. +You can also see the same hash is there when I created the `fred` branch to do that. +I started by rebasing `fred` and you see the 'start', each step, and the 'finish' for that process. +While we don't need it here, you can figure out exactly what happened. +Fortunately, to fix this, you can follow the prior answer's steps, but with the hash `869cbd3` instead of `pre-split`. +While that seems a bit verbose, it's easy to remember since you're doing one thing at a time. +You can also stack: [source,shell] .... % git checkout -B wilma 869cbd3 % git branch -D fred .... -and you are ready to try again. The 'checkout -B' with the hash combines -checking out and creating a branch for it. The -B instead of -b forces -the movement of a pre-existing branch. Either way works, which is what's -great (and awful) about Git. One reason I tend to use `git checkout -B xxxx hash` -instead of checking out the hash, and then creating / moving the branch -is purely to avoid the slightly distressing message about detached heads: +and you are ready to try again. +The 'checkout -B' with the hash combines checking out and creating a branch for it. +The -B instead of -b forces the movement of a pre-existing branch. +Either way works, which is what's great (and awful) about Git. +One reason I tend to use `git checkout -B xxxx hash` instead of checking out the hash, and then creating / moving the branch is purely to avoid the slightly distressing message about detached heads: [source,shell] .... % git checkout 869cbd3 @@ -1839,8 +1835,7 @@ do so (now or later) by using -b with the checkout command again. Example: HEAD is now at 869cbd3 Encourage contributions % git checkout -B wilma .... -this produces the same effect, but I have to read a lot more and severed heads -aren't an image I like to contemplate. +this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate. ===== Ooops! I did a 'git pull' and it created a merge commit, what do I do? @@ -1873,10 +1868,9 @@ namespace. To fix your 'main' branch, just make it point to the remote's .... git branch -f main freebsd/main .... -There's nothing magical about branches in git: they are just labels on a DAG -that are automatically moved forward by making commits. So the above works -because you're just moving a label. There's no metadata about the branch -that needs to be preserved due to this. +There's nothing magical about branches in git: they are just labels on a graph that are automatically moved forward by making commits. +So the above works because you're just moving a label. +There's no metadata about the branch that needs to be preserved due to this. ===== Mixing and matching branches @@ -1891,12 +1885,11 @@ while maintaining the commits in both. % git checkout -b feature # create a new branch % git cherry-pick main..async # bring in the changes .... -You now have one branch called `feature`. This branch combines commits -from both branches. You can further curate it with `git rebase`. +You now have a new branch called `feature`. +This branch combines commits from both branches. +You can further curate it with `git rebase`. -**Q:** OK Wise Guy. That was too easy. I have a branch called `driver` and I'd like -to break it up into `kernel` and `userland` so I can evolve them separately and commit -each branch as it becomes ready. +**Q:** I have a branch called `driver` and I'd like to break it up into `kernel` and `userland` so I can evolve them separately and commit each branch as it becomes ready. **A:** This takes a little bit of prep work, but `git rebase` will do the heavy lifting here. @@ -1974,7 +1967,7 @@ and use the `git rebase -i` to fold the related commits together). ==== Cloning and Mirroring -**Q:** I'd like to mirror the entire git repo, how do I do that? +**Q:** I'd like to mirror the entire git repository, how do I do that? **A:** If all you want to do is mirror, then [source,shell] @@ -1984,12 +1977,12 @@ and use the `git rebase -i` to fold the related commits together). will do the trick. However, there are two disadvantages to this if you want to use it for anything other than a mirror you'll reclone. -First, this is a 'bare repo' which has the repository database, but no +First, this is a 'bare repository' which has the repository database, but no checked out worktree. This is great for mirroring, but terrible for day to day work. There's a number of ways around this with 'git worktree': [source,shell] .... -% git clone --mirror https://cgit-beta.freebsd.org/ports.git ports.git +% git clone --mirror https://cgit.freebsd.org/ports.git ports.git % cd ports.git % git worktree add ../ports main % git worktree add ../quarterly branches/2020Q4 @@ -2000,12 +1993,12 @@ But if you aren't using your mirror for further local clones, then it's a poor m The second disadvantage is that Git normally rewrites the refs (branch name, tags, etc) from upstream so that your local refs can evolve independently of upstream. This means that you'll lose changes if you are committing to -this repo on anything other than private project branches. +this repository on anything other than private project branches. **Q:** So what can I do instead? -**A:** Well, you can stuff all of the upstream repo's refs into a private -namespace in your local repo. Git clones everything via a 'refspec' and +**A:** Well, you can stuff all of the upstream repository's refs into a private +namespace in your local repository. Git clones everything via a 'refspec' and the default refspec is: [source,shell] .... @@ -2013,20 +2006,17 @@ the default refspec is: .... which says just fetch the branch refs. -However, the FreeBSD repo has a number of other things in it. To see +However, the FreeBSD repository has a number of other things in it. To see those, you can add explicit refspecs for each ref namespace, or you -can fetch everything. To setup your repo to do that: +can fetch everything. To setup your repository to do that: [source,shell] .... git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*' .... -which will put everything in the upstream repo into your local repo's -'res/freebsd/' namespace. Please note, that this -also grabs all the unconverted vendor branches and the number of refs -associated with them is quite large. +which will put everything in the upstream repository into your local repository's 'ref/freebsd/' namespace. +Please note, that this also grabs all the unconverted vendor branches and the number of refs associated with them is quite large. -You'll need to refer to these 'refs' with their full name because they -aren't in and of Git's regular namespaces. +You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces. [source,shell] .... git log refs/freebsd/vendor/zlib/1.2.10 From owner-dev-commits-doc-all@freebsd.org Fri Mar 19 02:09:34 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B39015B3DB6 for ; Fri, 19 Mar 2021 02:09:34 +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 4F1nQQ4msqz3KhF; Fri, 19 Mar 2021 02:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 96D454E20; Fri, 19 Mar 2021 02:09:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12J29YEb039896; Fri, 19 Mar 2021 02:09:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12J29YHd039895; Fri, 19 Mar 2021 02:09:34 GMT (envelope-from git) Date: Fri, 19 Mar 2021 02:09:34 GMT Message-Id: <202103190209.12J29YHd039895@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: df7847b887 - main - spdx: document usage MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df7847b8870b5d647c755014c0ac4e9e91d3c282 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2021 02:09:34 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=df7847b8870b5d647c755014c0ac4e9e91d3c282 commit df7847b8870b5d647c755014c0ac4e9e91d3c282 Author: Warner Losh AuthorDate: 2021-03-19 02:08:53 +0000 Commit: Warner Losh CommitDate: 2021-03-19 02:08:53 +0000 spdx: document usage Document that we try to follow SPDX 2.2 for the SPDX-License-Idneitfier: tags that are in the source. Note that they are informative only. Give pointers to the standards and a status of the files marked in-tree. Suggestions by: Pau Amma Differential Revision: https://reviews.freebsd.org/D29330 --- .../content/en/articles/committers-guide/_index.adoc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index edf7815827..5e8e39441f 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -3427,6 +3427,20 @@ Once the {core-email} is satisfied that all the necessary details have been gath The license archive should contain only details of license grants; this is not the place for any discussions around licensing or other subjects. Access to data within the license archive will be available on request to the {core-email}. +[[spdx.tags]] +== SPDX Tags in the tree + +The project uses https://spdx.dev[SPDX] tags in our source base. +At present, these tags are indented to help automated tools reconstruct license requirements mechanically. +All _SPDX-License-Identifier_ tags in the tree should be considered to be informative. +All files in the FreeBSD source tree with these tags also have a copy of the license which governs use of that file. +In the event of a discrepency, the verbatim license is controlling. +The project tries to follow the https://spdx.github.io/spdx-spec/[SPDX Specification, Version 2.2]. +How to mark source files and valid algebraic expressions are found in https://spdx.github.io/spdx-spec/appendix-IV-SPDX-license-expressions/[Appendix IV] and https://spdx.github.io/spdx-spec/appendix-V-using-SPDX-short-identifiers-in-source-files/[Appendix V]. +The project draws identifiers from SPDX's list of valid https://spdx.org/licenses/[short license identifiers]. +The project uses only the _SPDX-License-Identifier_ tag. + +As of March 2021, approximately 25,000 out of 90,000 files in the tree have been marked. [[developer.relations]] == Developer Relations From owner-dev-commits-doc-all@freebsd.org Fri Mar 19 11:16:37 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15DFB5BF904 for ; Fri, 19 Mar 2021 11:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F21Yd06R5z4Zxx; Fri, 19 Mar 2021 11:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E66CE13B71; Fri, 19 Mar 2021 11:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12JBGaHj066559; Fri, 19 Mar 2021 11:16:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12JBGaHN066558; Fri, 19 Mar 2021 11:16:36 GMT (envelope-from git) Date: Fri, 19 Mar 2021 11:16:36 GMT Message-Id: <202103191116.12JBGaHN066558@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: c1c834f558 - main - Add press entry about WireGuard on FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1c834f558edcab47a57661d69238611b4b968fb Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2021 11:16:37 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=c1c834f558edcab47a57661d69238611b4b968fb commit c1c834f558edcab47a57661d69238611b4b968fb Author: Sergio Carlavilla Delgado AuthorDate: 2021-03-19 11:15:50 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-03-19 11:15:50 +0000 Add press entry about WireGuard on FreeBSD --- website/data/en/press/press.toml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/website/data/en/press/press.toml b/website/data/en/press/press.toml index f413d4823b..5a3b85038c 100644 --- a/website/data/en/press/press.toml +++ b/website/data/en/press/press.toml @@ -1,4 +1,14 @@ -# Sort the entries by name +# Sort the entries by date + +[[press]] +name = "In-kernel WireGuard is on its way to FreeBSD and the pfSense router" +url = "https://arstechnica.com/gadgets/2021/03/in-kernel-wireguard-is-on-its-way-to-freebsd-and-the-pfsense-router/" +siteName = "arstechnica.com" +siteUrl = "https://arstechnica.com/" +date = "2021-03-15" +author = "Jim Salter" +description = "This morning, WireGuard founding developer Jason Donenfeld announced a working, in-kernel implementation of his WireGuard VPN protocol for the FreeBSD 13 kernel." + [[press]] name = "License to thrill" From owner-dev-commits-doc-all@freebsd.org Fri Mar 19 14:05:15 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B2950575738 for ; Fri, 19 Mar 2021 14:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F25JC4XCkz4pj0; Fri, 19 Mar 2021 14:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8A23616807; Fri, 19 Mar 2021 14:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12JE5FQ0090921; Fri, 19 Mar 2021 14:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12JE5FfE090920; Fri, 19 Mar 2021 14:05:15 GMT (envelope-from git) Date: Fri, 19 Mar 2021 14:05:15 GMT Message-Id: <202103191405.12JE5FfE090920@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 1cdbcb161b - main - Fix typos, style and fix AsciiDoc syntax in bsdl-gpl, building products and committers guide MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cdbcb161b5f002a21212e0d7d1992d298898fcd Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2021 14:05:15 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=1cdbcb161b5f002a21212e0d7d1992d298898fcd commit 1cdbcb161b5f002a21212e0d7d1992d298898fcd Author: Sergio Carlavilla Delgado AuthorDate: 2021-03-19 14:01:14 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-03-19 14:01:14 +0000 Fix typos, style and fix AsciiDoc syntax in bsdl-gpl, building products and committers guide bsdl-gpl: style line building products: style line and fix images path committers-guide: style line, convert some MarkDown links to Asciidoc and upgrade some entries still making reference to the old Docbook tech. --- .../content/en/articles/bsdl-gpl/_index.adoc | 202 ++- .../en/articles/building-products/_index.adoc | 118 +- .../en/articles/committers-guide/_index.adoc | 1426 ++++++++++++-------- 3 files changed, 1100 insertions(+), 646 deletions(-) diff --git a/documentation/content/en/articles/bsdl-gpl/_index.adoc b/documentation/content/en/articles/bsdl-gpl/_index.adoc index 6ee939f367..01b9cbebec 100644 --- a/documentation/content/en/articles/bsdl-gpl/_index.adoc +++ b/documentation/content/en/articles/bsdl-gpl/_index.adoc @@ -24,53 +24,102 @@ toc::[] [[intro]] == Introduction -This document makes a case for using a BSD style license for software and data; specifically it recommends using a BSD style license in place of the GPL. It can also be read as a BSD versus GPL Open Source License introduction and summary. +This document makes a case for using a BSD style license for software and data; +specifically it recommends using a BSD style license in place of the GPL. +It can also be read as a BSD versus GPL Open Source License introduction and summary. [[history]] == Very Brief Open Source History -Long before the term "Open Source" was used, software was developed by loose associations of programmers and freely exchanged. Starting in the early 1950's, organizations such as http://www.share.org[SHARE] and http://www.decus.org[DECUS] developed much of the software that computer hardware companies bundled with their hardware offerings. At that time computer companies were in the hardware business; anything that reduced software cost and made more programs available made the hardware companies more competitive. +Long before the term "Open Source" was used, software was developed by loose associations of programmers and freely exchanged. +Starting in the early 1950's, organizations such as http://www.share.org[SHARE] and http://www.decus.org[DECUS] developed much of the software that computer hardware companies bundled with their hardware offerings. +At that time computer companies were in the hardware business; +anything that reduced software cost and made more programs available made the hardware companies more competitive. -This model changed in the 1960's. In 1965 ADR developed the first licensed software product independent of a hardware company. ADR was competing against a free IBM package originally developed by IBM customers. ADR patented their software in 1968. To stop sharing of their program, they provided it under an equipment lease in which payment was spread over the lifetime of the product. ADR thus retained ownership and could control resale and reuse. +This model changed in the 1960's. +In 1965 ADR developed the first licensed software product independent of a hardware company. +ADR was competing against a free IBM package originally developed by IBM customers. +ADR patented their software in 1968. +To stop sharing of their program, they provided it under an equipment lease in which payment was spread over the lifetime of the product. +ADR thus retained ownership and could control resale and reuse. -In 1969 the US Department of Justice charged IBM with destroying businesses by bundling free software with IBM hardware. As a result of this suit, IBM unbundled its software; that is, software became independent products separate from hardware. +In 1969 the US Department of Justice charged IBM with destroying businesses by bundling free software with IBM hardware. +As a result of this suit, IBM unbundled its software; that is, software became independent products separate from hardware. -In 1968 Informatics introduced the first commercial killer-app and rapidly established the concept of the software product, the software company, and very high rates of return. Informatics developed the perpetual license which is now standard throughout the computer industry, wherein ownership is never transferred to the customer. +In 1968 Informatics introduced the first commercial killer-app and rapidly established the concept of the software product, +the software company, and very high rates of return. +Informatics developed the perpetual license which is now standard throughout the computer industry, +wherein ownership is never transferred to the customer. [[unix-license]] == Unix from a BSD Licensing Perspective -AT&T, who owned the original Unix implementation, was a publicly regulated monopoly tied up in anti-trust court; it was legally unable to sell a product into the software market. It was, however, able to provide it to academic institutions for the price of media. +AT&T, who owned the original Unix implementation, +was a publicly regulated monopoly tied up in anti-trust court; +it was legally unable to sell a product into the software market. +It was, however, able to provide it to academic institutions for the price of media. -Universities rapidly adopted Unix after an OS conference publicized its availability. It was extremely helpful that Unix ran on the PDP-11, a very affordable 16-bit computer, and was coded in a high-level language that was demonstrably good for systems programming. The DEC PDP-11 had, in effect, an open hardware interface designed to make it easy for customers to write their own OS, which was common. As DEC founder Ken Olsen famously proclaimed, "software comes from heaven when you have good hardware". +Universities rapidly adopted Unix after an OS conference publicized its availability. +It was extremely helpful that Unix ran on the PDP-11, a very affordable 16-bit computer, +and was coded in a high-level language that was demonstrably good for systems programming. +The DEC PDP-11 had, in effect, an open hardware interface designed to make it easy for customers to write their own OS, which was common. +As DEC founder Ken Olsen famously proclaimed, "software comes from heaven when you have good hardware". -Unix author Ken Thompson returned to his alma mater, University of California Berkeley (UCB), in 1975 and taught the kernel line-by-line. This ultimately resulted in an evolving system known as BSD (Berkeley Standard Distribution). UCB converted Unix to 32-bits, added virtual memory, and implemented the version of the TCP/IP stack upon which the Internet was essentially built. UCB made BSD available for the cost of media, under what became known as "the BSD license". A customer purchased Unix from AT&T and then ordered a BSD tape from UCB. +Unix author Ken Thompson returned to his alma mater, University of California Berkeley (UCB), in 1975 and taught the kernel line-by-line. +This ultimately resulted in an evolving system known as BSD (Berkeley Standard Distribution). +UCB converted Unix to 32-bits, added virtual memory, and implemented the version of the TCP/IP stack upon which the Internet was essentially built. +UCB made BSD available for the cost of media, under what became known as "the BSD license". +A customer purchased Unix from AT&T and then ordered a BSD tape from UCB. -In the mid-1980s a government anti-trust case against AT&T ended with the break-up of AT&T. AT&T still owned Unix and was now able to sell it. AT&T embarked on an aggressive licensing effort and most commercial Unixes of the day became AT&T-derived. +In the mid-1980s a government anti-trust case against AT&T ended with the break-up of AT&T. +AT&T still owned Unix and was now able to sell it. +AT&T embarked on an aggressive licensing effort and most commercial Unixes of the day became AT&T-derived. -In the early 1990's AT&T sued UCB over license violations related to BSD. UCB discovered that AT&T had incorporated, without acknowledgment or payment, many improvements due to BSD into AT&T's products, and a lengthy court case, primarily between AT&T and UCB, ensued. During this period some UCB programmers embarked on a project to rewrite any AT&T code associated with BSD. This project resulted in a system called BSD 4.4-lite (lite because it was not a complete system; it lacked 6 key AT&T files). +In the early 1990's AT&T sued UCB over license violations related to BSD. +UCB discovered that AT&T had incorporated, without acknowledgment or payment, +many improvements due to BSD into AT&T's products, and a lengthy court case, primarily between AT&T and UCB, ensued. +During this period some UCB programmers embarked on a project to rewrite any AT&T code associated with BSD. +This project resulted in a system called BSD 4.4-lite (lite because it was not a complete system; it lacked 6 key AT&T files). -A lengthy series of articles published slightly later in Dr. Dobbs magazine described a BSD-derived 386 PC version of Unix, with BSD-licensed replacement files for the 6 missing 4.4 lite files. This system, named 386BSD, was due to ex-UCB programmer William Jolitz. It became the original basis of all the PC BSDs in use today. +A lengthy series of articles published slightly later in Dr. Dobbs magazine described a BSD-derived 386 PC version of Unix, with BSD-licensed replacement files for the 6 missing 4.4 lite files. +This system, named 386BSD, was due to ex-UCB programmer William Jolitz. +It became the original basis of all the PC BSDs in use today. -In the mid 1990s, Novell purchased AT&T's Unix rights and a (then secret) agreement was reached to terminate the lawsuit. UCB soon terminated its support for BSD. +In the mid 1990s, Novell purchased AT&T's Unix rights and a (then secret) agreement was reached to terminate the lawsuit. +UCB soon terminated its support for BSD. [[current-bsdl]] == The Current State of FreeBSD and BSD Licenses -The so-called http://www.opensource.org/licenses/bsd-license.php[new BSD license] applied to FreeBSD within the last few years is effectively a statement that you can do anything with the program or its source, but you do not have any warranty and none of the authors has any liability (basically, you cannot sue anybody). This new BSD license is intended to encourage product commercialization. Any BSD code can be sold or included in proprietary products without any restrictions on the availability of your code or your future behavior. +The so-called http://www.opensource.org/licenses/bsd-license.php[new BSD license] applied to FreeBSD within the last few years is effectively a statement that you can do anything with the program or its source, +but you do not have any warranty and none of the authors has any liability (basically, you cannot sue anybody). +This new BSD license is intended to encourage product commercialization. +Any BSD code can be sold or included in proprietary products without any restrictions on the availability of your code or your future behavior. -Do not confuse the new BSD license with "public domain". While an item in the public domain is also free for all to use, it has no owner. +Do not confuse the new BSD license with "public domain". +While an item in the public domain is also free for all to use, it has no owner. [[origins-gpl]] == The origins of the GPL -While the future of Unix had been so muddled in the late 1980s and early 1990s, the GPL, another development with important licensing considerations, reached fruition. +While the future of Unix had been so muddled in the late 1980s and early 1990s, the GPL, +another development with important licensing considerations, reached fruition. -Richard Stallman, the developer of Emacs, was a member of the staff at MIT when his lab switched from home-grown to proprietary systems. Stallman became upset when he found that he could not legally add minor improvements to the system. (Many of Stallman's co-workers had left to form two companies based on software developed at MIT and licensed by MIT; there appears to have been disagreement over access to the source code for this software). Stallman devised an alternative to the commercial software license and called it the GPL, or "GNU Public License". He also started a non-profit foundation, the http://www.fsf.org[Free Software Foundation] (FSF), which intended to develop an entire operating system, including all associated software, that would not be subject to proprietary licensing. This system was called GNU, for "GNU is Not Unix". +Richard Stallman, the developer of Emacs, was a member of the staff at MIT when his lab switched from home-grown to proprietary systems. +Stallman became upset when he found that he could not legally add minor improvements to the system. +(Many of Stallman's co-workers had left to form two companies based on software developed at MIT and licensed by MIT; +there appears to have been disagreement over access to the source code for this software). +Stallman devised an alternative to the commercial software license and called it the GPL, or "GNU Public License". +He also started a non-profit foundation, the http://www.fsf.org[Free Software Foundation] (FSF), +which intended to develop an entire operating system, including all associated software, that would not be subject to proprietary licensing. +This system was called GNU, for "GNU is Not Unix". -The GPL was designed to be the antithesis of the standard proprietary license. To this end, any modifications that were made to a GPL program were required to be given back to the GPL community (by requiring that the source of the program be available to the user) and any program that used or linked to GPL code was required to be under the GPL. The GPL was intended to keep software from becoming proprietary. As the last paragraph of the GPL states: +The GPL was designed to be the antithesis of the standard proprietary license. +To this end, any modifications that were made to a GPL program were required to be given back to the GPL community (by requiring that the source of the program be available to the user) and any program that used or linked to GPL code was required to be under the GPL. +The GPL was intended to keep software from becoming proprietary. +As the last paragraph of the GPL states: -"This General Public License does not permit incorporating your program into proprietary programs."[1] +"This General Public License does not permit incorporating your program into proprietary programs."<> The http://www.opensource.org/licenses/gpl-license.php[GPL] is a complex license so here are some rules of thumb when using the GPL: @@ -81,53 +130,90 @@ The http://www.opensource.org/licenses/gpl-license.php[GPL] is a complex license * output of a program does not count as a derivative work. This enables the gcc compiler to be used in commercial environments without legal problems. * since the Linux kernel is under the GPL, any code statically linked with the Linux kernel must be GPLed. This requirement can be circumvented by dynamically linking loadable kernel modules. This permits companies to distribute binary drivers, but often has the disadvantage that they will only work for particular versions of the Linux kernel. -Due in part to its complexity, in many parts of the world today the legalities of the GPL are being ignored in regard to Linux and related software. The long-term ramifications of this are unclear. +Due in part to its complexity, in many parts of the world today the legalities of the GPL are being ignored in regard to Linux and related software. +The long-term ramifications of this are unclear. [[origins-lgpl]] == The origins of Linux and the LGPL -While the commercial Unix wars raged, the Linux kernel was developed as a PC Unix clone. Linus Torvalds credits the existence of the GNU C compiler and the associated GNU tools for the existence of Linux. He put the Linux kernel under the GPL. +While the commercial Unix wars raged, the Linux kernel was developed as a PC Unix clone. +Linus Torvalds credits the existence of the GNU C compiler and the associated GNU tools for the existence of Linux. +He put the Linux kernel under the GPL. -Remember that the GPL requires anything that statically links to any code under the GPL also be placed under the GPL. The source for this code must thus be made available to the user of the program. Dynamic linking, however, is not considered a violation of the GPL. Pressure to put proprietary applications on Linux became overwhelming. Such applications often must link with system libraries. This resulted in a modified version of the GPL called the http://www.opensource.org/licenses/lgpl-license.php[LGPL] ("Library", since renamed to "Lesser", GPL). The LGPL allows proprietary code to be linked to the GNU C library, glibc. You do not have to release the source code which has been dynamically linked to an LGPLed library. +Remember that the GPL requires anything that statically links to any code under the GPL also be placed under the GPL. +The source for this code must thus be made available to the user of the program. +Dynamic linking, however, is not considered a violation of the GPL. +Pressure to put proprietary applications on Linux became overwhelming. +Such applications often must link with system libraries. +This resulted in a modified version of the GPL called the http://www.opensource.org/licenses/lgpl-license.php[LGPL] ("Library", since renamed to "Lesser", GPL). +The LGPL allows proprietary code to be linked to the GNU C library, glibc. +You do not have to release the source code which has been dynamically linked to an LGPLed library. -If you statically link an application with glibc, such as is often required in embedded systems, you cannot keep your application proprietary, that is, the source must be released. Both the GPL and LGPL require any modifications to the code directly under the license to be released. +If you statically link an application with glibc, such as is often required in embedded systems, +you cannot keep your application proprietary, that is, the source must be released. +Both the GPL and LGPL require any modifications to the code directly under the license to be released. [[orphaning]] == Open Source licenses and the Orphaning Problem -One of the serious problems associated with proprietary software is known as "orphaning". This occurs when a single business failure or change in a product strategy causes a huge pyramid of dependent systems and companies to fail for reasons beyond their control. Decades of experience have shown that the momentary size or success of a software supplier is no guarantee that their software will remain available, as current market conditions and strategies can change rapidly. +One of the serious problems associated with proprietary software is known as "orphaning". +This occurs when a single business failure or change in a product strategy causes a huge pyramid of dependent systems and companies to fail for reasons beyond their control. +Decades of experience have shown that the momentary size or success of a software supplier is no guarantee that their software will remain available, as current market conditions and strategies can change rapidly. The GPL attempts to prevent orphaning by severing the link to proprietary intellectual property. -A BSD license gives a small company the equivalent of software-in-escrow without any legal complications or costs. If a BSD-licensed program becomes orphaned, a company can simply take over, in a proprietary manner, the program on which they are dependent. An even better situation occurs when a BSD code-base is maintained by a small informal consortium, since the development process is not dependent on the survival of a single company or product line. The survivability of the development team when they are mentally in the zone is much more important than simple physical availability of the source code. +A BSD license gives a small company the equivalent of software-in-escrow without any legal complications or costs. +If a BSD-licensed program becomes orphaned, a company can simply take over, in a proprietary manner, the program on which they are dependent. +An even better situation occurs when a BSD code-base is maintained by a small informal consortium, since the development process is not dependent on the survival of a single company or product line. +The survivability of the development team when they are mentally in the zone is much more important than simple physical availability of the source code. [[license-cannot]] == What a license cannot do -No license can guarantee future software availability. Although a copyright holder can traditionally change the terms of a copyright at anytime, the presumption in the BSD community is that such an attempt simply causes the source to fork. +No license can guarantee future software availability. +Although a copyright holder can traditionally change the terms of a copyright at anytime, the presumption in the BSD community is that such an attempt simply causes the source to fork. -The GPL explicitly disallows revoking the license. It has occurred, however, that a company (Mattel) purchased a GPL copyright (cphack), revoked the entire copyright, went to court, and prevailed [2]. That is, they legally revoked the entire distribution and all derivative works based on the copyright. Whether this could happen with a larger and more dispersed distribution is an open question; there is also some confusion regarding whether the software was really under the GPL. +The GPL explicitly disallows revoking the license. +It has occurred, however, that a company (Mattel) purchased a GPL copyright (cphack), revoked the entire copyright, went to court, and prevailed <>. +That is, they legally revoked the entire distribution and all derivative works based on the copyright. +Whether this could happen with a larger and more dispersed distribution is an open question; +there is also some confusion regarding whether the software was really under the GPL. -In another example, Red Hat purchased Cygnus, an engineering company that had taken over development of the FSF compiler tools. Cygnus was able to do so because they had developed a business model in which they sold support for GNU software. This enabled them to employ some 50 engineers and drive the direction of the programs by contributing the preponderance of modifications. As Donald Rosenberg states "projects using licenses like the GPL...live under constant threat of having someone take over the project by producing a better version of the code and doing it faster than the original owners." [3] +In another example, Red Hat purchased Cygnus, an engineering company that had taken over development of the FSF compiler tools. +Cygnus was able to do so because they had developed a business model in which they sold support for GNU software. +This enabled them to employ some 50 engineers and drive the direction of the programs by contributing the preponderance of modifications. +As Donald Rosenberg states "projects using licenses like the GPL...live under constant threat of having someone take over the project by producing a better version of the code and doing it faster than the original owners." <> [[gpl-advantages]] == GPL Advantages and Disadvantages -A common reason to use the GPL is when modifying or extending the gcc compiler. This is particularly apt when working with one-off specialty CPUs in environments where all software costs are likely to be considered overhead, with minimal expectations that others will use the resulting compiler. +A common reason to use the GPL is when modifying or extending the gcc compiler. +This is particularly apt when working with one-off specialty CPUs in environments where all software costs are likely to be considered overhead, with minimal expectations that others will use the resulting compiler. -The GPL is also attractive to small companies selling CDs in an environment where "buy-low, sell-high" may still give the end-user a very inexpensive product. It is also attractive to companies that expect to survive by providing various forms of technical support, including documentation, for the GPLed intellectual property world. +The GPL is also attractive to small companies selling CDs in an environment where "buy-low, sell-high" may still give the end-user a very inexpensive product. +It is also attractive to companies that expect to survive by providing various forms of technical support, including documentation, for the GPLed intellectual property world. -A less publicized and unintended use of the GPL is that it is very favorable to large companies that want to undercut software companies. In other words, the GPL is well suited for use as a marketing weapon, potentially reducing overall economic benefit and contributing to monopolistic behavior. +A less publicized and unintended use of the GPL is that it is very favorable to large companies that want to undercut software companies. +In other words, the GPL is well suited for use as a marketing weapon, potentially reducing overall economic benefit and contributing to monopolistic behavior. -The GPL can present a real problem for those wishing to commercialize and profit from software. For example, the GPL adds to the difficulty a graduate student will have in directly forming a company to commercialize his research results, or the difficulty a student will have in joining a company on the assumption that a promising research project will be commercialized. +The GPL can present a real problem for those wishing to commercialize and profit from software. +For example, the GPL adds to the difficulty a graduate student will have in directly forming a company to commercialize his research results, or the difficulty a student will have in joining a company on the assumption that a promising research project will be commercialized. -For those who must work with statically-linked implementations of multiple software standards, the GPL is often a poor license, because it precludes using proprietary implementations of the standards. The GPL thus minimizes the number of programs that can be built using a GPLed standard. The GPL was intended to not provide a mechanism to develop a standard on which one engineers proprietary products. (This does not apply to Linux applications because they do not statically link, rather they use a trap-based API.) +For those who must work with statically-linked implementations of multiple software standards, the GPL is often a poor license, because it precludes using proprietary implementations of the standards. +The GPL thus minimizes the number of programs that can be built using a GPLed standard. +The GPL was intended to not provide a mechanism to develop a standard on which one engineers proprietary products. +(This does not apply to Linux applications because they do not statically link, rather they use a trap-based API.) -The GPL attempts to make programmers contribute to an evolving suite of programs, then to compete in the distribution and support of this suite. This situation is unrealistic for many required core system standards, which may be applied in widely varying environments which require commercial customization or integration with legacy standards under existing (non-GPL) licenses. Real-time systems are often statically linked, so the GPL and LGPL are definitely considered potential problems by many embedded systems companies. +The GPL attempts to make programmers contribute to an evolving suite of programs, then to compete in the distribution and support of this suite. +This situation is unrealistic for many required core system standards, which may be applied in widely varying environments which require commercial customization or integration with legacy standards under existing (non-GPL) licenses. +Real-time systems are often statically linked, so the GPL and LGPL are definitely considered potential problems by many embedded systems companies. -The GPL is an attempt to keep efforts, regardless of demand, at the research and development stages. This maximizes the benefits to researchers and developers, at an unknown cost to those who would benefit from wider distribution. +The GPL is an attempt to keep efforts, regardless of demand, at the research and development stages. +This maximizes the benefits to researchers and developers, at an unknown cost to those who would benefit from wider distribution. -The GPL was designed to keep research results from transitioning to proprietary products. This step is often assumed to be the last step in the traditional technology transfer pipeline and it is usually difficult enough under the best of circumstances; the GPL was intended to make it impossible. +The GPL was designed to keep research results from transitioning to proprietary products. +This step is often assumed to be the last step in the traditional technology transfer pipeline and it is usually difficult enough under the best of circumstances; +the GPL was intended to make it impossible. [[bsd-advantages]] == BSD Advantages @@ -140,19 +226,32 @@ A BSD style license is a good choice for long duration research or other project This final consideration may often be the dominant one, as it was when the Apache project decided upon its license: -"This type of license is ideal for promoting the use of a reference body of code that implements a protocol for common service. This is another reason why we choose it for the Apache group - many of us wanted to see HTTP survive and become a true multiparty standard, and would not have minded in the slightest if Microsoft or Netscape choose to incorporate our HTTP engine or any other component of our code into their products, if it helped further the goal of keeping HTTP common... All this means that, strategically speaking, the project needs to maintain sufficient momentum, and that participants realize greater value by contributing their code to the project, even code that would have had value if kept proprietary." +"This type of license is ideal for promoting the use of a reference body of code that implements a protocol for common service. +This is another reason why we choose it for the Apache group - many of us wanted to see HTTP survive and become a true multiparty standard, +and would not have minded in the slightest if Microsoft or Netscape choose to incorporate our HTTP engine or any other component of our code into their products, if it helped further the goal of keeping HTTP common... All this means that, strategically speaking, the project needs to maintain sufficient momentum, and that participants realize greater value by contributing their code to the project, even code that would have had value if kept proprietary." -Developers tend to find the BSD license attractive as it keeps legal issues out of the way and lets them do whatever they want with the code. In contrast, those who expect primarily to use a system rather than program it, or expect others to evolve the code, or who do not expect to make a living from their work associated with the system (such as government employees), find the GPL attractive, because it forces code developed by others to be given to them and keeps their employer from retaining copyright and thus potentially "burying" or orphaning the software. If you want to force your competitors to help you, the GPL is attractive. +Developers tend to find the BSD license attractive as it keeps legal issues out of the way and lets them do whatever they want with the code. +In contrast, those who expect primarily to use a system rather than program it, or expect others to evolve the code, or who do not expect to make a living from their work associated with the system (such as government employees), find the GPL attractive, because it forces code developed by others to be given to them and keeps their employer from retaining copyright and thus potentially "burying" or orphaning the software. +If you want to force your competitors to help you, the GPL is attractive. -A BSD license is not simply a gift. The question "why should we help our competitors or let them steal our work?" comes up often in relation to a BSD license. Under a BSD license, if one company came to dominate a product niche that others considered strategic, the other companies can, with minimal effort, form a mini-consortium aimed at reestablishing parity by contributing to a competitive BSD variant that increases market competition and fairness. This permits each company to believe that it will be able to profit from some advantage it can provide, while also contributing to economic flexibility and efficiency. The more rapidly and easily the cooperating members can do this, the more successful they will be. A BSD license is essentially a minimally complicated license that enables such behavior. +A BSD license is not simply a gift. +The question "why should we help our competitors or let them steal our work?" comes up often in relation to a BSD license. +Under a BSD license, if one company came to dominate a product niche that others considered strategic, the other companies can, with minimal effort, form a mini-consortium aimed at reestablishing parity by contributing to a competitive BSD variant that increases market competition and fairness. +This permits each company to believe that it will be able to profit from some advantage it can provide, while also contributing to economic flexibility and efficiency. +The more rapidly and easily the cooperating members can do this, the more successful they will be. +A BSD license is essentially a minimally complicated license that enables such behavior. -A key effect of the GPL, making a complete and competitive Open Source system widely available at cost of media, is a reasonable goal. A BSD style license, in conjunction with ad-hoc-consortiums of individuals, can achieve this goal without destroying the economic assumptions built around the deployment-end of the technology transfer pipeline. +A key effect of the GPL, making a complete and competitive Open Source system widely available at cost of media, is a reasonable goal. +A BSD style license, in conjunction with ad-hoc-consortiums of individuals, can achieve this goal without destroying the economic assumptions built around the deployment-end of the technology transfer pipeline. [[recommendations]] == Specific Recommendations for using a BSD license -* The BSD license is preferable for transferring research results in a way that will widely be deployed and most benefit an economy. As such, research funding agencies, such as the NSF, ONR and DARPA, should encourage in the earliest phases of funded research projects, the adoption of BSD style licenses for software, data, results, and open hardware. They should also encourage formation of standards based around implemented Open Source systems and ongoing Open Source projects. -* Government policy should minimize the costs and difficulties in moving from research to deployment. When possible, grants should require results to be available under a commercialization friendly BSD style license. +* The BSD license is preferable for transferring research results in a way that will widely be deployed and most benefit an economy. +As such, research funding agencies, such as the NSF, ONR and DARPA, should encourage in the earliest phases of funded research projects, the adoption of BSD style licenses for software, data, results, and open hardware. +They should also encourage formation of standards based around implemented Open Source systems and ongoing Open Source projects. +* Government policy should minimize the costs and difficulties in moving from research to deployment. +When possible, grants should require results to be available under a commercialization friendly BSD style license. * In many cases, the long-term results of a BSD style license more accurately reflect the goals proclaimed in the research charter of universities than what occurs when results are copyrighted or patented and subject to proprietary university licensing. Anecdotal evidence exists that universities are financially better rewarded in the long run by releasing research results and then appealing to donations from commercially successful alumni. * Companies have long recognized that the creation of de facto standards is a key marketing technique. The BSD license serves this role well, if a company really has a unique advantage in evolving the system. The license is legally attractive to the widest audience while the company's expertise ensures their control. There are times when the GPL may be the appropriate vehicle for an attempt to create such a standard, especially when attempting to undermine or co-opt others. The GPL, however, penalizes the evolution of that standard, because it promotes a suite rather than a commercially applicable standard. Use of such a suite constantly raises commercialization and legal issues. It may not be possible to mix standards when some are under the GPL and others are not. A true technical standard should not mandate exclusion of other standards for non-technical reasons. * Companies interested in promoting an evolving standard, which can become the core of other companies' commercial products, should be wary of the GPL. Regardless of the license used, the resulting software will usually devolve to whoever actually makes the majority of the engineering changes and most understands the state of the system. The GPL simply adds more legal friction to the result. @@ -163,25 +262,22 @@ A key effect of the GPL, making a complete and competitive Open Source system wi [[conclusion]] == Conclusion -In contrast to the GPL, which is designed to prevent the proprietary commercialization of Open Source code, the BSD license places minimal restrictions on future behavior. This allows BSD code to remain Open Source or become integrated into commercial solutions, as a project's or company's needs change. In other words, the BSD license does not become a legal time-bomb at any point in the development process. +In contrast to the GPL, which is designed to prevent the proprietary commercialization of Open Source code, the BSD license places minimal restrictions on future behavior. +This allows BSD code to remain Open Source or become integrated into commercial solutions, as a project's or company's needs change. +In other words, the BSD license does not become a legal time-bomb at any point in the development process. In addition, since the BSD license does not come with the legal complexity of the GPL or LGPL licenses, it allows developers and companies to spend their time creating and promoting good code rather than worrying if that code violates licensing. [[addenda]] +[bibliography] == Bibliographical References -[.programlisting] -.... -[1] http://www.gnu.org/licenses/gpl.html +* [[[one,1]]] http://www.gnu.org/licenses/gpl.html -[2] http://archives.cnn.com/2000/TECH/computing/03/28/cyberpatrol.mirrors/ +* [[[two,2]]] http://archives.cnn.com/2000/TECH/computing/03/28/cyberpatrol.mirrors/ -[3] Open Source: the Unauthorized White Papers, Donald K. Rosenberg, IDG Books, - 2000. Quotes are from page 114, ``Effects of the GNU GPL''. +* [[[three,3]]] Open Source: the Unauthorized White Papers, Donald K. Rosenberg, IDG Books, 2000. Quotes are from page 114, "Effects of the GNU GPL". -[4] In the "What License to Use?" section of - http://www.oreilly.com/catalog/opensources/book/brian.html +* [[[four,4]]] In the "What License to Use?" section of http://www.oreilly.com/catalog/opensources/book/brian.html -This whitepaper is a condensation of an original work available at -http://alumni.cse.ucsc.edu/~brucem/open_source_license.htm -.... +This whitepaper is a condensation of an original work available at http://alumni.cse.ucsc.edu/~brucem/open_source_license.htm diff --git a/documentation/content/en/articles/building-products/_index.adoc b/documentation/content/en/articles/building-products/_index.adoc index ce85ee3757..8538aea5e8 100644 --- a/documentation/content/en/articles/building-products/_index.adoc +++ b/documentation/content/en/articles/building-products/_index.adoc @@ -24,7 +24,7 @@ include::shared/en/mailing-lists.adoc[] include::shared/en/urls.adoc[] ifeval::["{backend}" == "html5"] -:imagesdir: ../../images/articles/building-products/ +:imagesdir: ../../../images/articles/building-products/ endif::[] ifeval::["{backend}" == "pdf"] @@ -38,9 +38,13 @@ endif::[] [.abstract-title] Abstract -The FreeBSD project is a worldwide, volunteer based, and collaborative project, which develops a portable and high-quality operating system. The FreeBSD project distributes the source code for its product under a liberal license, with the intention of encouraging the use of its code. Collaborating with the FreeBSD project can help organizations reduce their time to market, reduce engineering costs and improve their product quality. +The FreeBSD project is a worldwide, volunteer based, and collaborative project, which develops a portable and high-quality operating system. +The FreeBSD project distributes the source code for its product under a liberal license, with the intention of encouraging the use of its code. +Collaborating with the FreeBSD project can help organizations reduce their time to market, reduce engineering costs and improve their product quality. -This article examines the issues in using FreeBSD code in appliances and software products. It highlights the characteristics of FreeBSD that make it an excellent substrate for product development. The article concludes by suggesting a few "best practices" for organizations collaborating with the FreeBSD project. +This article examines the issues in using FreeBSD code in appliances and software products. +It highlights the characteristics of FreeBSD that make it an excellent substrate for product development. +The article concludes by suggesting a few "best practices" for organizations collaborating with the FreeBSD project. ''' @@ -49,13 +53,18 @@ toc::[] [[introduction]] == Introduction -FreeBSD today is well-known as a high-performance server operating system. It is deployed on millions of web servers and internet-facing hosts worldwide. FreeBSD code also forms an integral part of many products, ranging from appliances such as network routers, firewalls, and storage devices, to personal computers. Portions of FreeBSD have also been used in commercial shrink-wrapped software (see <>). +FreeBSD today is well-known as a high-performance server operating system. +It is deployed on millions of web servers and internet-facing hosts worldwide. +FreeBSD code also forms an integral part of many products, ranging from appliances such as network routers, firewalls, and storage devices, to personal computers. +Portions of FreeBSD have also been used in commercial shrink-wrapped software (see <>). In this article we look at the link:https://www.FreeBSD.org/[FreeBSD project] as a software engineering resource-as a collection of building blocks and processes which you can use to build products. -While FreeBSD's source is distributed freely to the public, to fully enjoy the benefits of the project's work, organizations need to _collaborate_ with the project. In subsequent sections of this article we discuss effective means of collaboration with the project and the pitfalls that need to be avoided while doing so. +While FreeBSD's source is distributed freely to the public, to fully enjoy the benefits of the project's work, organizations need to _collaborate_ with the project. +In subsequent sections of this article we discuss effective means of collaboration with the project and the pitfalls that need to be avoided while doing so. -*Caveat Reader.* The author believes that the characteristics of the FreeBSD Project listed in this article were substantially true at the time the article was conceived and written (2005). However, the reader should keep in mind that the practices and processes used by open-source communities can change over time, and that the information in this article should therefore be taken as indicative rather than normative. +*Caveat Reader.* The author believes that the characteristics of the FreeBSD Project listed in this article were substantially true at the time the article was conceived and written (2005). +However, the reader should keep in mind that the practices and processes used by open-source communities can change over time, and that the information in this article should therefore be taken as indicative rather than normative. === Target Audience @@ -94,7 +103,8 @@ FreeBSD makes an excellent foundation on which to build products: * The project offers exceptional transparency into its workings, allowing organizations using its code to plan effectively for the future. * The culture of the FreeBSD project, carried over from the Computer Science Research Group at The University of California, Berkeley <>, fosters high-quality work. Some features in FreeBSD define the state of the art. -<> examines the business reasons for using open-source in greater detail. For organizations, the benefits of using FreeBSD components in their products include a shorter time to market, lower development costs and lower development risks. +<> examines the business reasons for using open-source in greater detail. +For organizations, the benefits of using FreeBSD components in their products include a shorter time to market, lower development costs and lower development risks. === Building with FreeBSD @@ -108,21 +118,28 @@ By being "downstream" of the project, organizations leverage the new features, b FreeBSD ships with a self-hosting development environment that allows easy creation of such configurations. * As a Unix compatible environment for the management functions of high-end storage and networking devices, running on a separate processor "blade". + -FreeBSD provides the tools for creating dedicated OS and application program images. Its implementation of a BSD unix API is mature and tested. FreeBSD can also provide a stable cross-development environment for the other components of the high-end device. +FreeBSD provides the tools for creating dedicated OS and application program images. +Its implementation of a BSD unix API is mature and tested. +FreeBSD can also provide a stable cross-development environment for the other components of the high-end device. * As a vehicle to get widespread testing and support from a worldwide team of developers for non-critical "intellectual property". + -In this model, organizations contribute useful infrastructural frameworks to the FreeBSD project (for example, see man:netgraph[3]). The widespread exposure that the code gets helps to quickly identify performance issues and bugs. The involvement of top-notch developers also leads to useful extensions to the infrastructure that the contributing organization also benefits from. +In this model, organizations contribute useful infrastructural frameworks to the FreeBSD project (for example, see man:netgraph[3]). +The widespread exposure that the code gets helps to quickly identify performance issues and bugs. +The involvement of top-notch developers also leads to useful extensions to the infrastructure that the contributing organization also benefits from. * As a development environment supporting cross-development for embedded OSes like http://www.rtems.com/[RTEMS] and http://ecos.sourceware.org/[eCOS]. + There are many full-fledged development environments in the {numports}-strong collection of applications ported and packaged with FreeBSD. * As a way to support a Unix-like API in an otherwise proprietary OS, increasing its palatability for application developers. + -Here parts of FreeBSD's kernel and application programs are "ported" to run alongside other tasks in the proprietary OS. The availability of a stable and well tested Unix(TM) API implementation can reduce the effort needed to port popular applications to the proprietary OS. As FreeBSD ships with high-quality documentation for its internals and has effective vulnerability management and release engineering processes, the costs of keeping up-to-date are kept low. +Here parts of FreeBSD's kernel and application programs are "ported" to run alongside other tasks in the proprietary OS. +The availability of a stable and well tested Unix(TM) API implementation can reduce the effort needed to port popular applications to the proprietary OS. +As FreeBSD ships with high-quality documentation for its internals and has effective vulnerability management and release engineering processes, the costs of keeping up-to-date are kept low. [[freebsd-technologies]] === Technologies -There are a large number of technologies supported by the FreeBSD project. A selection of these are listed below: +There are a large number of technologies supported by the FreeBSD project. +A selection of these are listed below: * A complete system that can cross-host itself for link:https://www.FreeBSD.org/platforms/[many architectures:] * A modular symmetric multiprocessing capable kernel, with loadable kernel modules and a flexible and easy to use configuration system. @@ -145,20 +162,25 @@ FreeBSD's organizational structure is non-hierarchical. There are essentially two kinds of contributors to FreeBSD, general users of FreeBSD, and developers with write access (known as _committers_ in the jargon) to the source base. -There are many thousands of contributors in the first group; the vast majority of contributions to FreeBSD come from individuals in this group. Commit rights (write access) to the repository are granted to individuals who contribute consistently to the project. Commit rights come with additional responsibilities, and new committers are assigned mentors to help them learn the ropes. +There are many thousands of contributors in the first group; the vast majority of contributions to FreeBSD come from individuals in this group. +Commit rights (write access) to the repository are granted to individuals who contribute consistently to the project. +Commit rights come with additional responsibilities, and new committers are assigned mentors to help them learn the ropes. .FreeBSD Organization image::freebsd-organization.png[] Conflict resolution is performed by a nine member "Core Team" that is elected from the group of committers. -FreeBSD does not have "corporate" committers. Individual committers are required to take responsibility for the changes they introduce to the code. The link:{committers-guide}[FreeBSD Committer's guide] <> documents the rules and responsibilities for committers. +FreeBSD does not have "corporate" committers. +Individual committers are required to take responsibility for the changes they introduce to the code. +The link:{committers-guide}[FreeBSD Committer's guide] <> documents the rules and responsibilities for committers. FreeBSD's project model is examined in detail in <>. === FreeBSD Release Engineering Processes -FreeBSD's release engineering processes play a major role in ensuring that its released versions are of a high quality. At any point of time, FreeBSD's volunteers support multiple code lines (<>): +FreeBSD's release engineering processes play a major role in ensuring that its released versions are of a high quality. +At any point of time, FreeBSD's volunteers support multiple code lines (<>): * New features and disruptive code enters on the development branch, also known as the _-CURRENT_ branch. * _-STABLE_ branches are code lines that are branched from HEAD at regular intervals. Only tested code is allowed onto a -STABLE branch. New features are allowed once they have been tested and stabilized in the -CURRENT branch. @@ -170,9 +192,11 @@ image::freebsd-branches.png[] Code lines are kept alive for as long as there is user and developer interest in them. -Machine architectures are grouped into "tiers"; _Tier 1_ architectures are fully supported by the project's release engineering and security teams, _Tier 2_ architectures are supported on a best effort basis, and experimental architectures comprise _Tier 3_. The list of link:{committers-guide}#archs[supported architectures] is part of the FreeBSD documentation collection. +Machine architectures are grouped into "tiers"; _Tier 1_ architectures are fully supported by the project's release engineering and security teams, _Tier 2_ architectures are supported on a best effort basis, and experimental architectures comprise _Tier 3_. +The list of link:{committers-guide}#archs[supported architectures] is part of the FreeBSD documentation collection. -The release engineering team publishes a link:https://www.FreeBSD.org/releng/[road map] for future releases of FreeBSD on the project's web site. The dates laid down in the road map are not deadlines; FreeBSD is released when its code and documentation are ready. +The release engineering team publishes a link:https://www.FreeBSD.org/releng/[road map] for future releases of FreeBSD on the project's web site. +The dates laid down in the road map are not deadlines; FreeBSD is released when its code and documentation are ready. FreeBSD's release engineering processes are described in <>. @@ -181,7 +205,10 @@ FreeBSD's release engineering processes are described in <>. Open-source projects like FreeBSD offer finished code of a very high quality. -While access to quality source code can reduce the cost of initial development, in the long-term the costs of managing change begin to dominate. As computing environments change over the years and new security vulnerabilities are discovered, your product too needs to change and adapt. Using open-source code is best viewed not as a one-off activity, but as an __ongoing process__. The best projects to collaborate with are the ones that are __live__; i.e., with an active community, clear goals and a transparent working style. +While access to quality source code can reduce the cost of initial development, in the long-term the costs of managing change begin to dominate. +As computing environments change over the years and new security vulnerabilities are discovered, your product too needs to change and adapt. +Using open-source code is best viewed not as a one-off activity, but as an __ongoing process__. +The best projects to collaborate with are the ones that are __live__; i.e., with an active community, clear goals and a transparent working style. * FreeBSD has an active developer community around it. At the time of writing there are many thousands of contributors from every populated continent in the world and over 300 individuals with write access to the project's source repositories. * The goals of the FreeBSD project are <>: @@ -196,7 +223,8 @@ While access to quality source code can reduce the cost of initial development, To be able to work effectively with the FreeBSD project, you need to understand the project's culture. -Volunteer driven projects operate under different rules than for-profit corporates. A common mistake that companies make when venturing into the open-source world is that of underplaying these differences. +Volunteer driven projects operate under different rules than for-profit corporates. +A common mistake that companies make when venturing into the open-source world is that of underplaying these differences. *Motivation.* Most contributions to FreeBSD are done voluntarily without monetary rewards entering the picture. The factors that motivate individuals are complex, ranging from altruism, to an interest in solving the kinds of problems that FreeBSD attempts to solve. In this environment, "elegance is never optional"<>. @@ -204,13 +232,15 @@ Volunteer driven projects operate under different rules than for-profit corporat The project values long-term perspectives <>. A frequent acronym encountered in the project is DTRT, which stands for "Do The Right Thing". -*Development Processes.* Computer programs are tools for communication: at one level programmers communicate their intentions using a precise notation to a tool (a compiler) that translates their instructions to executable code. At another level, the same notation is used for communication of intent between two programmers. +*Development Processes.* Computer programs are tools for communication: at one level programmers communicate their intentions using a precise notation to a tool (a compiler) that translates their instructions to executable code. +At another level, the same notation is used for communication of intent between two programmers. -Formal specifications and design documents are seldom used in the project. Clear and well-written code and well-written change logs (<>) are used in their place. FreeBSD development happens by "rough consensus and running code"<>. +Formal specifications and design documents are seldom used in the project. +Clear and well-written code and well-written change logs (<>) are used in their place. +FreeBSD development happens by "rough consensus and running code"<>. [.programlisting] .... - r151864 | bde | 2005-10-29 09:34:50 -0700 (Sat, 29 Oct 2005) | 13 lines Changed paths: M /head/lib/msun/src/e_rem_pio2f.c @@ -232,22 +262,25 @@ This speeds up arg reduction by a factor of 2 for |x| between 3*pi/4 and Communication between programmers is enhanced by the use of a common coding standard man:style[9]. -*Communication Channels.* FreeBSD's contributors are spread across the world. Email (and to a lesser extent, IRC) is the preferred means of communication in the project. +*Communication Channels.* FreeBSD's contributors are spread across the world. +Email (and to a lesser extent, IRC) is the preferred means of communication in the project. === Best Practices for collaborating with the FreeBSD project We now look at a few best practices for making the best use of FreeBSD in product development. Plan for the long term:: -Setup processes that help in tracking the development of FreeBSD. For example: +Setup processes that help in tracking the development of FreeBSD. +For example: + *Track FreeBSD source code.* The project makes it easy to mirror its SVN repository using link:{committers-guide}#svn-advanced-use-setting-up-svnsync[svnsync]. Having the complete history of the source is useful when debugging complex problems and offers valuable insight into the intentions of the original developers. Use a capable source control system that allows you to easily merge changes between the upstream FreeBSD code base and your own in-house code. + -<> shows a portion of an annotated listing of the file referenced by the change log in <>. The ancestry of each line of the source is clearly visible. Annotated listings showing the history of every file that is part of FreeBSD are https://svnweb.freebsd.org/[available on the web]. +<> shows a portion of an annotated listing of the file referenced by the change log in <>. +The ancestry of each line of the source is clearly visible. +Annotated listings showing the history of every file that is part of FreeBSD are https://svnweb.freebsd.org/[available on the web]. + [.programlisting] .... - #REV #WHO #DATE #TEXT 176410 bde 2008-02-19 07:42:46 -0800 (Tue, 19 Feb 2008) #include @@ -268,31 +301,48 @@ Setup processes that help in tracking the development of FreeBSD. For example: + *Use a gatekeeper.* Appoint a _gatekeeper_ to monitor FreeBSD development, to keep an eye out for changes that could potentially impact your products. + -*Report bugs upstream.* If you notice bug in the FreeBSD code that you are using, file a https://www.FreeBSD.org/support/bugreports/[bug report]. This step helps ensure that you do not have to fix the bug the next time you take a code drop from upstream. +*Report bugs upstream.* If you notice bug in the FreeBSD code that you are using, file a https://www.FreeBSD.org/support/bugreports/[bug report]. +This step helps ensure that you do not have to fix the bug the next time you take a code drop from upstream. Leverage FreeBSD's release engineering efforts:: -Use code from a -STABLE development branch of FreeBSD. These development branches are formally supported by FreeBSD's release engineering and security teams and comprise of tested code. +Use code from a -STABLE development branch of FreeBSD. +These development branches are formally supported by FreeBSD's release engineering and security teams and comprise of tested code. Donate code to reduce costs:: -A major proportion of the costs associated with developing products is that of doing maintenance. By donating non-critical code to the project, you benefit by having your code see much wider exposure than it would otherwise get. This in turn leads to more bugs and security vulnerabilities being flushed out and performance anomalies being identified and fixed. +A major proportion of the costs associated with developing products is that of doing maintenance. +By donating non-critical code to the project, you benefit by having your code see much wider exposure than it would otherwise get. +This in turn leads to more bugs and security vulnerabilities being flushed out and performance anomalies being identified and fixed. Get support effectively:: -For products with tight deadlines, it is recommended that you hire or enter into a consulting agreement with a developer or firm with FreeBSD experience. The {freebsd-jobs} is a useful communication channel to find talent. The FreeBSD project maintains a link:https://www.FreeBSD.org/commercial/consult_bycat/[gallery of consultants and consulting firms] undertaking FreeBSD work. The http://www.bsdcertification.org/[BSD Certification Group] offers certification for all the major BSD derived OSes. +For products with tight deadlines, it is recommended that you hire or enter into a consulting agreement with a developer or firm with FreeBSD experience. +The {freebsd-jobs} is a useful communication channel to find talent. +The FreeBSD project maintains a link:https://www.FreeBSD.org/commercial/consult_bycat/[gallery of consultants and consulting firms] undertaking FreeBSD work. +The http://www.bsdcertification.org/[BSD Certification Group] offers certification for all the major BSD derived OSes. + -For less critical needs, you can ask for help on the http://lists.FreeBSD.org/mailman/listinfo[project mailing lists]. A useful guide to follow when asking for help is given in <>. +For less critical needs, you can ask for help on the http://lists.FreeBSD.org/mailman/listinfo[project mailing lists]. +A useful guide to follow when asking for help is given in <>. Publicize your involvement:: You are not required to publicize your use of FreeBSD, but doing so helps both your effort as well as that of the project. + -Letting the FreeBSD community know that your company uses FreeBSD helps improve your chances of attracting high quality talent. A large roster of support for FreeBSD also means more mind share for it among developers. This in turn yields a healthier foundation for your future. +Letting the FreeBSD community know that your company uses FreeBSD helps improve your chances of attracting high quality talent. +A large roster of support for FreeBSD also means more mind share for it among developers. +This in turn yields a healthier foundation for your future. Support FreeBSD developers:: -Sometimes the most direct way to get a desired feature into FreeBSD is to support a developer who is already looking at a related problem. Help can range from hardware donations to direct financial assistance. In some countries, donations to the FreeBSD project enjoy tax benefits. The project has a dedicated link:https://www.FreeBSD.org/donations/[donations liaison] to assist donors. The project also maintains a web page where developers link:https://www.FreeBSD.org/donations/wantlist/[list their needs]. +Sometimes the most direct way to get a desired feature into FreeBSD is to support a developer who is already looking at a related problem. +Help can range from hardware donations to direct financial assistance. +In some countries, donations to the FreeBSD project enjoy tax benefits. +The project has a dedicated link:https://www.FreeBSD.org/donations/[donations liaison] to assist donors. +The project also maintains a web page where developers link:https://www.FreeBSD.org/donations/wantlist/[list their needs]. + As a policy the FreeBSD project link:{contributors}[acknowledges] all contributions received on its web site. [[conclusion]] == Conclusion -The FreeBSD project's goals are to create and give away the source code for a high-quality operating system. By working with the FreeBSD project you can reduce development costs and improve your time to market in a number of product development scenarios. +The FreeBSD project's goals are to create and give away the source code for a high-quality operating system. +By working with the FreeBSD project you can reduce development costs and improve your time to market in a number of product development scenarios. -We examined the characteristics of the FreeBSD project that make it an excellent choice for being part of an organization's product strategy. We then looked at the prevailing culture of the project and examined effective ways of interacting with its developers. The article concluded with a list of best-practices that could help organizations collaborating with the project. +We examined the characteristics of the FreeBSD project that make it an excellent choice for being part of an organization's product strategy. +We then looked at the prevailing culture of the project and examined effective ways of interacting with its developers. +The article concluded with a list of best-practices that could help organizations collaborating with the project. :sectnums!: diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 5e8e39441f..8237c47680 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2,7 +2,7 @@ title: Committer's Guide authors: - author: The FreeBSD Documentation Project -copyright: 1999-2019 The FreeBSD Documentation Project +copyright: 1999-2021 The FreeBSD Documentation Project releaseinfo: "$FreeBSD$" trademarks: ["freebsd", "coverity", "ibm", "intel", "general"] --- @@ -25,9 +25,13 @@ include::shared/en/urls.adoc[] [.abstract-title] Abstract -This document provides information for the FreeBSD committer community. All new committers should read this document before they start, and existing committers are strongly encouraged to review it from time to time. +This document provides information for the FreeBSD committer community. +All new committers should read this document before they start, and existing committers are strongly encouraged to review it from time to time. -Almost all FreeBSD developers have commit rights to one or more repositories. However, a few developers do not, and some of the information here applies to them as well. (For instance, some people only have rights to work with the Problem Report database). Please see <> for more information. +Almost all FreeBSD developers have commit rights to one or more repositories. +However, a few developers do not, and some of the information here applies to them as well. +(For instance, some people only have rights to work with the Problem Report database). +Please see <> for more information. This document may also be of interest to members of the FreeBSD community who want to learn more about how the project works. @@ -84,12 +88,15 @@ Useful links: [[pgpkeys]] == OpenPGP Keys for FreeBSD -Cryptographic keys conforming to the OpenPGP (__Pretty Good Privacy__) standard are used by the FreeBSD project to authenticate committers. Messages carrying important information like public SSH keys can be signed with the OpenPGP key to prove that they are really from the committer. See http://www.nostarch.com/pgp_ml.htm[PGP & GPG: Email for the Practical Paranoid by Michael Lucas] and http://en.wikipedia.org/wiki/Pretty_Good_Privacy[] for more information. +Cryptographic keys conforming to the OpenPGP (__Pretty Good Privacy__) standard are used by the FreeBSD project to authenticate committers. +Messages carrying important information like public SSH keys can be signed with the OpenPGP key to prove that they are really from the committer. +See http://www.nostarch.com/pgp_ml.htm[PGP & GPG: Email for the Practical Paranoid by Michael Lucas] and http://en.wikipedia.org/wiki/Pretty_Good_Privacy[] for more information. [[pgpkeys-creating]] === Creating a Key -Existing keys can be used, but should be checked with [.filename]#documentation/tools/checkkey.sh# first. In this case, make sure the key has a FreeBSD user ID. +Existing keys can be used, but should be checked with [.filename]#documentation/tools/checkkey.sh# first. +In this case, make sure the key has a FreeBSD user ID. For those who do not yet have an OpenPGP key, or need a new key to meet FreeBSD security requirements, here we show how to generate one. @@ -156,17 +163,22 @@ You need a Passphrase to protect your secret key. <.> Use your real name here, preferably matching that shown on government-issued ID to make it easier for others to verify your identity. Text that may help others identify you can be entered in the `Comment` section. + -After the email address is entered, a passphrase is requested. Methods of creating a secure passphrase are contentious. Rather than suggest a single way, here are some links to sites that describe various methods: http://world.std.com/~reinhold/diceware.html[], http://www.iusmentis.com/security/passphrasefaq/[], http://xkcd.com/936/[], http://en.wikipedia.org/wiki/Passphrase[]. +After the email address is entered, a passphrase is requested. +Methods of creating a secure passphrase are contentious. +Rather than suggest a single way, here are some links to sites that describe various methods: http://world.std.com/~reinhold/diceware.html[], http://www.iusmentis.com/security/passphrasefaq/[], http://xkcd.com/936/[], http://en.wikipedia.org/wiki/Passphrase[]. ==== -Protect the private key and passphrase. If either the private key or passphrase may have been compromised or disclosed, immediately notify mailto:accounts@FreeBSD.org[accounts@FreeBSD.org] and revoke the key. +Protect the private key and passphrase. +If either the private key or passphrase may have been compromised or disclosed, immediately notify mailto:accounts@FreeBSD.org[accounts@FreeBSD.org] and revoke the key. Committing the new key is shown in <>. [[kerberos-ldap]] == Kerberos and LDAP web Password for FreeBSD Cluster -The FreeBSD cluster requires a Kerberos password to access certain services. The Kerberos password also serves as the LDAP web password, since LDAP is proxying to Kerberos in the cluster. Some of the services which require this include: +The FreeBSD cluster requires a Kerberos password to access certain services. +The Kerberos password also serves as the LDAP web password, since LDAP is proxying to Kerberos in the cluster. +Some of the services which require this include: * https://bugs.freebsd.org/bugzilla[Bugzilla] * https://ci.freebsd.org[Jenkins] @@ -192,13 +204,17 @@ A Kerberos password can also be set manually by logging into `freefall.FreeBSD.o [NOTE] ==== -Unless the Kerberos-authenticated services of the FreeBSD.org cluster have been used previously, `Client unknown` will be shown. This error means that the `ssh kpasswd.freebsd.org` method shown above must be used first to initialize the Kerberos account. +Unless the Kerberos-authenticated services of the FreeBSD.org cluster have been used previously, `Client unknown` will be shown. +This error means that the `ssh kpasswd.freebsd.org` method shown above must be used first to initialize the Kerberos account. ==== [[committer.types]] == Commit Bit Types -The FreeBSD repository has a number of components which, when combined, support the basic operating system source, documentation, third party application ports infrastructure, and various maintained utilities. When FreeBSD commit bits are allocated, the areas of the tree where the bit may be used are specified. Generally, the areas associated with a bit reflect who authorized the allocation of the commit bit. Additional areas of authority may be added at a later date: when this occurs, the committer should follow normal commit bit allocation procedures for that area of the tree, seeking approval from the appropriate entity and possibly getting a mentor for that area for some period of time. +The FreeBSD repository has a number of components which, when combined, support the basic operating system source, documentation, third party application ports infrastructure, and various maintained utilities. +When FreeBSD commit bits are allocated, the areas of the tree where the bit may be used are specified. +Generally, the areas associated with a bit reflect who authorized the allocation of the commit bit. +Additional areas of authority may be added at a later date: when this occurs, the committer should follow normal commit bit allocation procedures for that area of the tree, seeking approval from the appropriate entity and possibly getting a mentor for that area for some period of time. [.informaltable] [cols="1,1,1", frame="none"] @@ -221,7 +237,9 @@ The FreeBSD repository has a number of components which, when combined, support |ports/ |=== -Commit bits allocated prior to the development of the notion of areas of authority may be appropriate for use in many parts of the tree. However, common sense dictates that a committer who has not previously worked in an area of the tree seek review prior to committing, seek approval from the appropriate responsible party, and/or work with a mentor. Since the rules regarding code maintenance differ by area of the tree, this is as much for the benefit of the committer working in an area of less familiarity as it is for others working on the tree. +Commit bits allocated prior to the development of the notion of areas of authority may be appropriate for use in many parts of the tree. +However, common sense dictates that a committer who has not previously worked in an area of the tree seek review prior to committing, seek approval from the appropriate responsible party, and/or work with a mentor. +Since the rules regarding code maintenance differ by area of the tree, this is as much for the benefit of the committer working in an area of less familiarity as it is for others working on the tree. Committers are encouraged to seek review for their work as part of the normal development process, regardless of the area of the tree where the work is occurring. @@ -244,17 +262,14 @@ this section is a work in progress... [[git-basics]] === Git basics -There are many primers on how to use Git on the web. There's a lot of -them (google "Git primer"). This one comes up first, and is generally -good. https://danielmiessler.com/study/git/ and -https://gist.github.com/williewillus/068e9a8543de3a7ef80adb2938657b6b -are good overviews. The Git book is also complete, but much longer -https://git-scm.com/book/en/v2. There is also this website -https://ohshitgit.com/ for common traps and pitfalls of Git, in case -you need guidance to fix things up. +There are many primers on how to use Git on the web. +There's a lot of them (google "Git primer"). +This one comes up first, and is generally good. +https://danielmiessler.com/study/git/ and https://gist.github.com/williewillus/068e9a8543de3a7ef80adb2938657b6b are good overviews. +The Git book is also complete, but much longer https://git-scm.com/book/en/v2. +There is also this website https://ohshitgit.com/ for common traps and pitfalls of Git, in case you need guidance to fix things up. -This document will assume that you've read through it and will try not -to belabor the basics (though it will cover them briefly). +This document will assume that you've read through it and will try not to belabor the basics (though it will cover them briefly). [[git-mini-primer]] === Git Mini Primer @@ -475,7 +490,6 @@ For users, for most things, there is very little difference. However, if you have local changes, you can use the same tool to manage them as you use to pull in changes from FreeBSD. All changes that you have not pushed are local and can easily be modified (git rebase, discussed below does this). - ===== Keeping local changes The simplest way to keep local changes (especially trivial ones) is to use 'git stash'. In its simples form, you use 'git stash' to record the changes (which pushes them onto the stash stack). @@ -685,9 +699,8 @@ Eventually, when you are ready to commit your work back to main, you can perform === MFC (Merge From Current) Procedures ==== Summary -MFC workflow can be summarized as `git cherry-pick -x` plus git commit ---amend to adjust the commit message. For multiple commits, use `git rebase -i` -to squash them together and edit the commit message. +MFC workflow can be summarized as `git cherry-pick -x` plus git commit--amend to adjust the commit message. +For multiple commits, use `git rebase -i` to squash them together and edit the commit message. ==== Single commit MFC @@ -697,8 +710,8 @@ to squash them together and edit the commit message. % git cherry-pick -x $HASH --edit .... -For MFC commits, for example a vendor import, you would need to specify one parent for cherry-pick -purposes. Normally, that would be the "first parent" of the branch you are cherry-picking from, so: +For MFC commits, for example a vendor import, you would need to specify one parent for cherry-pick purposes. +Normally, that would be the "first parent" of the branch you are cherry-picking from, so: [source,shell] .... @@ -706,11 +719,10 @@ purposes. Normally, that would be the "first parent" of the branch you are cher % git cherry-pick -x $HASH -m 1 --edit .... -If things go wrong, you'll either need to abort the cherry-pick with `git cherry-pick --abort` or fix it -up and do a `git cherry-pick --continue`. +If things go wrong, you'll either need to abort the cherry-pick with `git cherry-pick --abort` or fix it up and do a `git cherry-pick --continue`. -Once the cherry-pick is finished, push with `git push`. If you get an error due to losing the commit race, -use `git pull --rebase` and try to push again. +Once the cherry-pick is finished, push with `git push`. +If you get an error due to losing the commit race, use `git pull --rebase` and try to push again. ==== MFC to RELENG branch @@ -764,22 +776,20 @@ Once the MFC is complete, you can delete the temporary branch: ==== MFC a vendor import -Vendor imports are the only thing in the tree that creates a merge -commit in the main line. Cherry picking merge commits into stable/XX -presents an additional difficulty because there are two parents for a -merge commit. Generally, you'll want the first parent's diff since -that's the diff to mainline (though there may be some exceptions). +Vendor imports are the only thing in the tree that creates a merge commit in the main line. +Cherry picking merge commits into stable/XX presents an additional difficulty because there are two parents for a merge commit. +Generally, you'll want the first parent's diff since that's the diff to mainline (though there may be some exceptions). [source,shell] .... % git cherry-pick -x -m 1 $HASH .... -is typically what you want. This will tell cherry-pick to apply the correct diff. +is typically what you want. +This will tell cherry-pick to apply the correct diff. -There are some, hopefully, rare cases where it's possible that the -mainline was merged backwards by the conversion script. Should that be -the case (and we've not found any yet), you'd change the above to '-m 2' -to pickup the proper parent. Just do +There are some, hopefully, rare cases where it's possible that the mainline was merged backwards by the conversion script. +Should that be the case (and we've not found any yet), you'd change the above to '-m 2' to pickup the proper parent. +Just do [source,shell] .... % git cherry-pick --abort @@ -800,8 +810,7 @@ using 'git rebase -i' is better. ==== Considerations when MFCing -When committing source commits to stable and releng branches, we have -the following goals: +When committing source commits to stable and releng branches, we have the following goals: * Clearly mark direct commits distinct from commits that land a change from another branch. * Avoid introducing known breakage into stable and releng branches. @@ -813,118 +822,73 @@ With subversion, we used the following practices to achieve these goals: * Squashing fixup commits into the main commit when merging a change. * Recording mergeinfo so that `svn mergeinfo --show-revs` worked. -With Git, we will need to use different strategies to achieve the same -goals. This document aims to define best practices when merging -source commits using git that achieve these goals. In general, we aim -to use git's native support to achieve these goals rather than -enforcing practices built on subversion's model. +With Git, we will need to use different strategies to achieve the same goals. +This document aims to define best practices when merging source commits using git that achieve these goals. +In general, we aim to use git's native support to achieve these goals rather than enforcing practices built on subversion's model. -One general note: due to technical differences with Git, we will not -be using git "merge commits" (created via `git merge`) in stable or -releng branches. Instead, when this document refers to "merge -commits", it means a commit originally made to `main` that is -replicated or "landed" to a stable branch, or a commit from a stable -branch that is replicated to a releng branch with some varation of -`git cherry-pick`. +One general note: due to technical differences with Git, we will not be using git "merge commits" (created via `git merge`) in stable or releng branches. +Instead, when this document refers to "merge commits", it means a commit originally made to `main` that is replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some varation of `git cherry-pick`. ==== Finding Eligible Hashes to MFC -Git provides some built-in support for this via the `git cherry` and -`git log --cherry` commands. These commands compare the raw diffs of -commits (but not other metadata such as log messages) to determine if -two commits are identical. This works well when each commit from head -is landed as a single commit to a stable branch, but it falls over if -multiple commits from main are squashed together as a single commit to -a stable branch. +Git provides some built-in support for this via the `git cherry` and `git log --cherry` commands. +These commands compare the raw diffs of commits (but not other metadata such as log messages) to determine if two commits are identical. +This works well when each commit from head is landed as a single commit to a stable branch, but it falls over if multiple commits from main are squashed together as a single commit to a stable branch. There are a few options for resolving this: -1. We could ban squashing of commits and instead require that committers - stage all of the fixup / follow-up commits to stable into a single - push. This would still achieve the goal of stability in stable and - releng branches since pushes are atomic and users doing a simple pull - will never end up with a tree that has the main commit without the - fixup(s). `git bisect` is also able to cope with this model via - `git bisect skip`. - -2. We could adopt a consistent style for describing MFCs and write - our own tooling to wrap around `git cherry` to determine the list - of eligible commits. A simple approach here might be to use the - syntax from `git cherry-pick -x`, but require that a squashed - commit list all of the hashes (one line per hash) at the end of - the commit message. Developers could do this by using - `git cherry-pick -x` of each individual commit into a branch and - then use `git rebase` to squash the commits down into a single - commit, but collecting the `-x` annotations at the end of the - landed commit log. +1. We could ban squashing of commits and instead require that committers stage all of the fixup / follow-up commits to stable into a single push. +This would still achieve the goal of stability in stable and releng branches since pushes are atomic and users doing a simple pull will never end up with a tree that has the main commit without the fixup(s). +`git bisect` is also able to cope with this model via `git bisect skip`. + +2. We could adopt a consistent style for describing MFCs and write our own tooling to wrap around `git cherry` to determine the list of eligible commits. +A simple approach here might be to use the syntax from `git cherry-pick -x`, but require that a squashed commit list all of the hashes (one line per hash) at the end of the commit message. +Developers could do this by using `git cherry-pick -x` of each individual commit into a branch and then use `git rebase` to squash the commits down into a single commit, but collecting the `-x` annotations at the end of the landed commit log. ==== Commit message standards ===== Marking MFCs The project has adopted the following practice for marking MFCs: -* Use the `-x` flag with `git cherry-pick`. This adds a line to the - commit message that includes the hash of the original commit when - merging. Since it is added by Git directly, committers do not have - to manually edit the commit log when merging. +* Use the `-x` flag with `git cherry-pick`. This adds a line to the commit message that includes the hash of the original commit when merging. Since it is added by Git directly, committers do not have to manually edit the commit log when merging. When merging multiple commits, keep all the "cherry picked from" lines. ===== Trim Metadata? -One area that was not clearly documented with subversion (or even CVS) -is how to format metadata in log messages for MFC commits. Should -it include the metadata from the original commit unchanged, or should -it be altered to reflect information about the MFC commit itself? - -Historical practice has varied, though some of the variance is by -field. For example, MFCs that are relevant to a PR generally -include the PR field in the MFC so that MFC commits are included -in the bug tracker's audit trail. Other fields are less clear. For -example, Phabricator shows the diff of the last commit tagged to a -review, so including Phabricator URLs replaces the `main` commit with -the landed commits. The list of reviewers is also not clear. If a -reviewer has approved a change to `main`, does that mean they have -approved the MFC commit? Is that true if it's identical code only, -or with merely trivial reworkes? It's clearly not true for more -extensive reworks. Even for identical code what if the commit doesn't -conflict but introduces an ABI change? A reviewer may have ok'd a -commit for `main` due to the ABI breakage but may not approve of -merging the same commit as-is. One will have to use one's best -judgement until clear guidelines can be agreed upon. - -For MFCs regulated by re@, new metadata fields are added, such as -the Approved by tag for approved commits. This new metadata will have -to be added via `git commit --amend` or similar after the original -commit has been reviewed and approved. We may also want to reserve -some metadata fields in MFC commits such as Phabricator URLs for use -by re@ in the future. +One area that was not clearly documented with subversion (or even CVS) is how to format metadata in log messages for MFC commits. +Should it include the metadata from the original commit unchanged, or should it be altered to reflect information about the MFC commit itself? + +Historical practice has varied, though some of the variance is by field. +For example, MFCs that are relevant to a PR generally include the PR field in the MFC so that MFC commits are included in the bug tracker's audit trail. +Other fields are less clear. +For example, Phabricator shows the diff of the last commit tagged to a review, so including Phabricator URLs replaces the `main` commit with the landed commits. +The list of reviewers is also not clear. +If a reviewer has approved a change to `main`, does that mean they have approved the MFC commit? Is that true if it's identical code only, or with merely trivial reworkes? It's clearly not true for more extensive reworks. +Even for identical code what if the commit doesn't conflict but introduces an ABI change? A reviewer may have ok'd a commit for `main` due to the ABI breakage but may not approve of merging the same commit as-is. +One will have to use one's best judgement until clear guidelines can be agreed upon. + +For MFCs regulated by re@, new metadata fields are added, such as the Approved by tag for approved commits. +This new metadata will have to be added via `git commit --amend` or similar after the original commit has been reviewed and approved. +We may also want to reserve some metadata fields in MFC commits such as Phabricator URLs for use by re@ in the future. Preserving existing metadata provides a very simple workflow. -Developers can just use `git cherry-pick -x` without having to edit -the log message. +Developers can just use `git cherry-pick -x` without having to edit the log message. -If instead we choose to adjust metadata in MFCs, developers will -have to edit log messages explicitly via the use of `git cherry-pick ---edit` or `git commit --amend`. However, as compared to svn, at -least the existing commit message can be pre-populated and metadata -fields can be added or removed without having to re-enter the entire -commit message. +If instead we choose to adjust metadata in MFCs, developers will have to edit log messages explicitly via the use of `git cherry-pick --edit` or `git commit --amend`. +However, as compared to svn, at least the existing commit message can be pre-populated and metadata fields can be added or removed without having to re-enter the entire commit message. -The bottom line is that developers will likely need to curate their -commit message for MFCs that are non-trivial. +The bottom line is that developers will likely need to curate their commit message for MFCs that are non-trivial. ==== Examples ===== Merging a Single Subversion Commit -This walks through the process of merging a commit to stable/12 that -was originally committed to head in Subversion. In this case, the -original commit is r368685. +This walks through the process of merging a commit to stable/12 that was originally committed to head in Subversion. +In this case, the original commit is r368685. -The first step is to map the Subversion commit to a Git hash. Once -you have fetched refs/notes/commits, you can pass the revision number -to `git log --grep`: +The first step is to map the Subversion commit to a Git hash. +Once you have fetched refs/notes/commits, you can pass the revision number to `git log --grep`: [source,shell] .... @@ -952,10 +916,9 @@ git checkout stable/12 git cherry-pick -x ce8395ecfda2c8e332a2adf9a9432c2e7f35ea81 --edit .... -Git will invoke the editor. Use this to remove the metadata that only -applied to the original commit (Phabricator URL and Reviewed by). -After the editor saves the updated log message, Git completes the -commit: +Git will invoke the editor. +Use this to remove the metadata that only applied to the original commit (Phabricator URL and Reviewed by). +After the editor saves the updated log message, Git completes the commit: [source,shell] .... @@ -1012,12 +975,10 @@ To gitrepo-dev.FreeBSD.org:src.git ===== Merging a Single Subversion Commit with a Conflict *** 2573 LINES SKIPPED *** From owner-dev-commits-doc-all@freebsd.org Fri Mar 19 18:17:20 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8684557D75F for ; Fri, 19 Mar 2021 18:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2Bv43Qd7z3Pqd; Fri, 19 Mar 2021 18:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 64088198B9; Fri, 19 Mar 2021 18:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12JIHKjL020900; Fri, 19 Mar 2021 18:17:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12JIHKT9020899; Fri, 19 Mar 2021 18:17:20 GMT (envelope-from git) Date: Fri, 19 Mar 2021 18:17:20 GMT Message-Id: <202103191817.12JIHKT9020899@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 01a65ae4f7 - main - Remove press entry about WireGuard and FreeBSD 13 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01a65ae4f7183f32c5d81f1e27eec424ef5918da Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2021 18:17:20 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=01a65ae4f7183f32c5d81f1e27eec424ef5918da commit 01a65ae4f7183f32c5d81f1e27eec424ef5918da Author: Sergio Carlavilla Delgado AuthorDate: 2021-03-19 18:15:55 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-03-19 18:15:55 +0000 Remove press entry about WireGuard and FreeBSD 13 Finally WireGuard will not be included in FreeBSD 13 --- website/data/en/press/press.toml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/website/data/en/press/press.toml b/website/data/en/press/press.toml index 5a3b85038c..d1a40ab188 100644 --- a/website/data/en/press/press.toml +++ b/website/data/en/press/press.toml @@ -1,15 +1,5 @@ # Sort the entries by date -[[press]] -name = "In-kernel WireGuard is on its way to FreeBSD and the pfSense router" -url = "https://arstechnica.com/gadgets/2021/03/in-kernel-wireguard-is-on-its-way-to-freebsd-and-the-pfsense-router/" -siteName = "arstechnica.com" -siteUrl = "https://arstechnica.com/" -date = "2021-03-15" -author = "Jim Salter" -description = "This morning, WireGuard founding developer Jason Donenfeld announced a working, in-kernel implementation of his WireGuard VPN protocol for the FreeBSD 13 kernel." - - [[press]] name = "License to thrill" url = "https://www.theregister.com/2021/03/10/the_state_of_freebsd/" From owner-dev-commits-doc-all@freebsd.org Fri Mar 19 20:20:40 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 065D85AA87C for ; Fri, 19 Mar 2021 20:20: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 4F2FdM6nKyz3qYZ; Fri, 19 Mar 2021 20:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DBD5B1B43E; Fri, 19 Mar 2021 20:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12JKKd3t090186; Fri, 19 Mar 2021 20:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12JKKde2090185; Fri, 19 Mar 2021 20:20:39 GMT (envelope-from git) Date: Fri, 19 Mar 2021 20:20:39 GMT Message-Id: <202103192020.12JKKde2090185@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Warner Losh Subject: git: 05792e1b62 - main - Minor word smithing MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05792e1b62221dc9cb7e6985f71e074f84d3b4c5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Mar 2021 20:20:40 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/doc/commit/?id=05792e1b62221dc9cb7e6985f71e074f84d3b4c5 commit 05792e1b62221dc9cb7e6985f71e074f84d3b4c5 Author: Warner Losh AuthorDate: 2021-03-19 20:19:28 +0000 Commit: Warner Losh CommitDate: 2021-03-19 20:19:28 +0000 Minor word smithing Fix a few typoes, grammar errors, wrong word choices, and a bad url. Submitted by: Pau Amma --- .../content/en/articles/committers-guide/_index.adoc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 8237c47680..3f39b45571 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1738,7 +1738,8 @@ If not, you'll need to resolve the conflicts as you go. The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree. You can then `git rebase -i` both these branches, selecting the changes you want in `fred` or `wilma` by retaining the pick likes, and deleting the rest from the editor. -Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split, you can undo it with the following sequence: +Some people would create a tag/branch called `pre-split` before starting in case something goes wrong in the split. +You can undo it with the following sequence: [source,shell] .... @@ -1781,10 +1782,10 @@ Here we see the changes I've made. You can use it to figure out where things went wrong. I'll just point out a few things here. The first one is that HEAD@{X} is a 'commitish' thing, so you can use that as an argument to a command. -Though if that command commits anything to the repository, the X numbers change. -You can also use the hash (first column) as well. +Although if that command commits anything to the repository, the X numbers change. +You can also use the hash (first column). -Next 'Encourage contributions' was the last commit I did to `wilma` before I decided to split things up. +Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up. You can also see the same hash is there when I created the `fred` branch to do that. I started by rebasing `fred` and you see the 'start', each step, and the 'finish' for that process. While we don't need it here, you can figure out exactly what happened. @@ -1981,7 +1982,7 @@ There's a number of ways around this with 'git worktree': [source,shell] .... -% git clone --mirror https://cgit.freebsd.org/ports.git ports.git +% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd ports.git % git worktree add ../ports main % git worktree add ../quarterly branches/2020Q4 @@ -2014,7 +2015,7 @@ To setup your repository to do that: git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*' .... -which will put everything in the upstream repository into your local repository's 'ref/freebsd/' namespace. +which will put everything in the upstream repository into your local repository's 'refs/freebsd/' namespace. Please note, that this also grabs all the unconverted vendor branches and the number of refs associated with them is quite large. You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces. From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 06:57:00 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C6F9574C23 for ; Sat, 20 Mar 2021 06:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2Wlc1H6Rz3JWN; Sat, 20 Mar 2021 06:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1ED51237B9; Sat, 20 Mar 2021 06:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12K6v04g026602; Sat, 20 Mar 2021 06:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12K6v05T026601; Sat, 20 Mar 2021 06:57:00 GMT (envelope-from git) Date: Sat, 20 Mar 2021 06:57:00 GMT Message-Id: <202103200657.12K6v05T026601@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: 72db7e7f09 - main - Add translated 2021-03-15 entry. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72db7e7f09f3dc1d731aa752754bdee5faa12d36 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 06:57:00 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=72db7e7f09f3dc1d731aa752754bdee5faa12d36 commit 72db7e7f09f3dc1d731aa752754bdee5faa12d36 Author: Ryusuke SUZUKI AuthorDate: 2021-03-20 06:56:10 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-03-20 06:56:10 +0000 Add translated 2021-03-15 entry. --- website/data/ja/news/news.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/data/ja/news/news.toml b/website/data/ja/news/news.toml index a7dbc57bb9..80e27d8e1d 100644 --- a/website/data/ja/news/news.toml +++ b/website/data/ja/news/news.toml @@ -1,6 +1,10 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-03-15" +description = "新コミッタ就任: Ka Ho Ng (src)" + [[news]] date = "2021-03-12" title = "FreeBSD 13.0-RC2 公開" From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 07:41:52 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9FA04575671 for ; Sat, 20 Mar 2021 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2XlN47VPz3LNb; Sat, 20 Mar 2021 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 80D7024137; Sat, 20 Mar 2021 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12K7fqDC089944; Sat, 20 Mar 2021 07:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12K7fqDi089943; Sat, 20 Mar 2021 07:41:52 GMT (envelope-from git) Date: Sat, 20 Mar 2021 07:41:52 GMT Message-Id: <202103200741.12K7fqDi089943@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 762d41ceb7 - main - Fix manual pages macros in rc-scripting and linux-users MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 762d41ceb715758eb1a9f303180779de19876402 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 07:41:52 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=762d41ceb715758eb1a9f303180779de19876402 commit 762d41ceb715758eb1a9f303180779de19876402 Author: Sergio Carlavilla Delgado AuthorDate: 2021-03-20 07:40:50 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-03-20 07:41:39 +0000 Fix manual pages macros in rc-scripting and linux-users --- documentation/content/en/articles/rc-scripting/_index.adoc | 2 +- documentation/content/es/articles/linux-users/_index.adoc | 2 +- documentation/content/pt-br/articles/rc-scripting/_index.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/content/en/articles/rc-scripting/_index.adoc b/documentation/content/en/articles/rc-scripting/_index.adoc index 4f72531606..2d9556bd4f 100644 --- a/documentation/content/en/articles/rc-scripting/_index.adoc +++ b/documentation/content/en/articles/rc-scripting/_index.adoc @@ -40,7 +40,7 @@ Later there was an attempt to split out some parts of [.filename]#/etc/rc# for t Without a clean and well-designed framework, the startup scripts had to bend over backwards to satisfy the needs of rapidly developing BSD-based operating systems. It became obvious at last that more steps are necessary on the way to a fine-grained and extensible [.filename]#rc# system. Thus BSD [.filename]#rc.d# was born. Its acknowledged fathers were Luke Mewburn and the NetBSD community. Later it was imported into FreeBSD. Its name refers to the location of system scripts for individual services, which is in [.filename]#/etc/rc.d#. Soon we will learn about more components of the [.filename]#rc.d# system and see how the individual scripts are invoked. -The basic ideas behind BSD [.filename]#rc.d# are _fine modularity_ and __code reuse__. _Fine modularity_ means that each basic "service" such as a system daemon or primitive startup task gets its own man:sh[1] script able to start the service, stop it, reload it, check its status. A particular action is chosen by the command-line argument to the script. The [.filename]#/etc/rc# script still drives system startup, but now it merely invokes the smaller scripts one by one with the `start` argument. It is easy to perform shutdown tasks as well by running the same set of scripts with the `stop` argument, which is done by [.filename]#/etc/rc.shutdown#. Note how closely this follows the Unix way of having a set of small specialized tools, each fulfilling its task as well as possible. _Code reuse_ means that common operations are implemented as man:sh" "1" >}} functions and collected in [.filename]#/etc/rc.subr#. Now a typical script can be just a few lines' worth of man:sh" "1" >}} code. F inally, an important part of the [.filename]#rc.d# framework is man:rcorder[8], which helps [.filename]#/etc/rc# to run the small scripts orderly with respect to dependencies between them. It can help [.filename]#/etc/rc.shutdown#, too, because the proper order for the shutdown sequence is opposite to that of startup. +The basic ideas behind BSD [.filename]#rc.d# are _fine modularity_ and __code reuse__. _Fine modularity_ means that each basic "service" such as a system daemon or primitive startup task gets its own man:sh[1] script able to start the service, stop it, reload it, check its status. A particular action is chosen by the command-line argument to the script. The [.filename]#/etc/rc# script still drives system startup, but now it merely invokes the smaller scripts one by one with the `start` argument. It is easy to perform shutdown tasks as well by running the same set of scripts with the `stop` argument, which is done by [.filename]#/etc/rc.shutdown#. Note how closely this follows the Unix way of having a set of small specialized tools, each fulfilling its task as well as possible. _Code reuse_ means that common operations are implemented as man:sh[1] functions and collected in [.filename]#/etc/rc.subr#. Now a typical script can be just a few lines' worth of man:sh[1] code. Finally, an i mportant part of the [.filename]#rc.d# framework is man:rcorder[8], which helps [.filename]#/etc/rc# to run the small scripts orderly with respect to dependencies between them. It can help [.filename]#/etc/rc.shutdown#, too, because the proper order for the shutdown sequence is opposite to that of startup. The BSD [.filename]#rc.d# design is described in <>, and the [.filename]#rc.d# components are documented in great detail in <>. However, it might not appear obvious to an [.filename]#rc.d# newbie how to tie the numerous bits and pieces together in order to create a well-styled script for a particular task. Therefore this article will try a different approach to describe [.filename]#rc.d#. It will show which features should be used in a number of typical cases, and why. Note that this is not a how-to document because our aim is not at giving ready-made recipes, but at showing a few easy entrances into the [.filename]#rc.d# realm. Neither is this article a replacement for the relevant manual pages. Do not hesitate to refer to them for more formal and complete documentation while reading this article. diff --git a/documentation/content/es/articles/linux-users/_index.adoc b/documentation/content/es/articles/linux-users/_index.adoc index 31a6c78b58..84aa72587f 100644 --- a/documentation/content/es/articles/linux-users/_index.adoc +++ b/documentation/content/es/articles/linux-users/_index.adoc @@ -87,7 +87,7 @@ Para obtener más información sobre los paquetes, consulte la sección 5.4 del La Colección de Ports de FreeBSD es un framework de [.filename]#Makefiles# y parches específicamente personalizados para instalar aplicaciones con su código fuente en FreeBSD. Al instalar un port, el sistema buscará el códifo fuente, aplicará los parches necesarios, compilará el código e instalará la aplicación y las dependencias necesarias. -La Colección de Ports, a veces llamada el árbol de ports, se puede instalar en [.filename]#/usr/ports# utilizando man:portsnap" "8" >}}. Se pueden encontrar instrucciones detalladas para instalar la Colección de Ports en la link:{handbook}#ports-using[sección 5.5] del Manual de FreeBSD. +La Colección de Ports, a veces llamada el árbol de ports, se puede instalar en [.filename]#/usr/ports# utilizando man:portsnap[8]. Se pueden encontrar instrucciones detalladas para instalar la Colección de Ports en la link:{handbook}#ports-using[sección 5.5] del Manual de FreeBSD. Para compilar un port, acceda al directorio del port e inicie el proceso de build. El siguiente ejemplo instala Apache 2.4 de la colección de ports: diff --git a/documentation/content/pt-br/articles/rc-scripting/_index.adoc b/documentation/content/pt-br/articles/rc-scripting/_index.adoc index 58144c2a27..37dff7e0dd 100644 --- a/documentation/content/pt-br/articles/rc-scripting/_index.adoc +++ b/documentation/content/pt-br/articles/rc-scripting/_index.adoc @@ -505,7 +505,7 @@ Quando chamado durante a inicialização ou desligamento, um script [.filename]# Felizmente, man:rc.subr[8] permite passar qualquer número de argumentos para os métodos do script (dentro dos limites do sistema). Devido a isso, as alterações no próprio script podem ser mínimas. -Como o man:rc.subr[8] pode obter acesso aos argumentos de linha de comando extra. Deveria pegá-los diretamente? Não por qualquer meio. Primeiro, uma função man:sh" "1" >}} não tem acesso aos parâmetros posicionais de seu chamador, mas o man:rc.subr[8] é apenas uma despedida de tais funções. Em segundo lugar, a boa maneira de [.filename]#rc.d# determina que é para o script principal decidir quais argumentos devem ser passados para seus métodos. +Como o man:rc.subr[8] pode obter acesso aos argumentos de linha de comando extra. Deveria pegá-los diretamente? Não por qualquer meio. Primeiro, uma função man:sh[1] não tem acesso aos parâmetros posicionais de seu chamador, mas o man:rc.subr[8] é apenas uma despedida de tais funções. Em segundo lugar, a boa maneira de [.filename]#rc.d# determina que é para o script principal decidir quais argumentos devem ser passados para seus métodos. Portanto, a abordagem adotada por man:rc.subr[8] é a seguinte: `run_rc_command` transmite todos os seus argumentos, mas o primeiro um para o respectivo método na íntegra. O primeiro, omitido, argumento é o nome do próprio método: `start`,`stop`, etc. Ele será deslocado por `run_rc_command`, então o que é `$2` na linha de comando original será apresentado como `$1` ao método, e assim por diante. From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 10:40:38 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9687C57B9F0 for ; Sat, 20 Mar 2021 10:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2cjf3Ws5z3qXL; Sat, 20 Mar 2021 10:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6123A26800; Sat, 20 Mar 2021 10:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12KAeckI025775; Sat, 20 Mar 2021 10:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12KAecBp025774; Sat, 20 Mar 2021 10:40:38 GMT (envelope-from git) Date: Sat, 20 Mar 2021 10:40:38 GMT Message-Id: <202103201040.12KAecBp025774@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ryusuke SUZUKI Subject: git: ed65be4e6b - main - 53facdf95e -> 321dfc85ea MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ryusuke X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed65be4e6be9906927226f8dfbff2d84b1c40a1d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 10:40:38 -0000 The branch main has been updated by ryusuke: URL: https://cgit.FreeBSD.org/doc/commit/?id=ed65be4e6be9906927226f8dfbff2d84b1c40a1d commit ed65be4e6be9906927226f8dfbff2d84b1c40a1d Author: Ryusuke SUZUKI AuthorDate: 2021-03-20 10:40:08 +0000 Commit: Ryusuke SUZUKI CommitDate: 2021-03-20 10:40:08 +0000 53facdf95e -> 321dfc85ea --- website/content/ja/where.adoc | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/website/content/ja/where.adoc b/website/content/ja/where.adoc index 513807cfc3..b3fecc6036 100644 --- a/website/content/ja/where.adoc +++ b/website/content/ja/where.adoc @@ -123,6 +123,55 @@ a| |=== +[[helptest]] +== 新しいリリースのテストに参加する + +次期リリースのテストに興味をお持ちでしたら、 +link:../where/[FreeBSD ダウンロードページ] を確認してください。 + +== FreeBSD {rel130-current}-RELEASE +[.tblbasic] +[.tblDownload] +[width="100%",cols="25%,25%,25%,25%",options="header",] +|=== +|インストーライメージ |仮想マシンイメージ |SD カードイメージ |文書 +a| +* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel130-current}/[amd64] +* link:{url-rel}/i386/i386/ISO-IMAGES/{rel130-current}/[i386] +* link:{url-rel}/powerpc/powerpc/ISO-IMAGES/{rel130-current}/[powerpc] +* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel130-current}/[powerpc64] +* link:{url-rel}/powerpc/powerpc64le/ISO-IMAGES/{rel130-current}/[powerpc64le] +* link:{url-rel}/powerpc/powerpcspe/ISO-IMAGES/{rel130-current}/[powerpcspe] +* link:{url-rel}/arm/armv6/ISO-IMAGES/{rel130-current}/[armv6] +* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel130-current}/[armv7] +* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[aarch64] +* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/[riscv64] + +a| +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/amd64/Latest/[amd64] +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/i386/Latest/[i386] +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/aarch64/Latest/[aarch64] +* link:{url-rel}/VM-IMAGES/{rel130-current}-RC1/riscv64/Latest/[riscv64] + +a| +* aarch64 +* {blank} +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[PINE64] +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[PINE64-LTS] +** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[RPI3] +* armv6/armv7 +* {blank} +** link:{url-rel}/arm/armv7/ISO-IMAGES/{rel130-current}/[GENERICSD] +** link:{url-rel}/arm/armv6/ISO-IMAGES/{rel130-current}/[RPI-B] +* riscv64 +* {blank} +** link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel130-current}/[GENERICSD] + +a| +* {blank} + +|=== + [[download-snapshots]] == 開発スナップショット From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 16:10:18 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C408F5AD9A4 for ; Sat, 20 Mar 2021 16:10: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 4F2m2259MRz4hQl; Sat, 20 Mar 2021 16:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A430F26E9; Sat, 20 Mar 2021 16:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12KGAIFA070444; Sat, 20 Mar 2021 16:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12KGAI6i070432; Sat, 20 Mar 2021 16:10:18 GMT (envelope-from git) Date: Sat, 20 Mar 2021 16:10:18 GMT Message-Id: <202103201610.12KGAI6i070432@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 7efa934235 - main - Prune 13.0-RC2 CHECKSUM files MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7efa934235c249c45010a267f076d229cee7083a Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 16:10:18 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=7efa934235c249c45010a267f076d229cee7083a commit 7efa934235c249c45010a267f076d229cee7083a Author: Glen Barber AuthorDate: 2021-03-20 16:02:47 +0000 Commit: Glen Barber CommitDate: 2021-03-20 16:02:47 +0000 Prune 13.0-RC2 CHECKSUM files Sponsored by: Rubicon Communications, LLC ("Netgate") --- .../CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64-vm.asc | 23 ----------------- .../CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64.asc | 29 ---------------------- ...SUM.SHA256-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc | 20 --------------- ...SHA256-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc | 20 --------------- ...6-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc | 20 --------------- ...HA256-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc | 20 --------------- ...256-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc | 20 --------------- ...HA256-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc | 20 --------------- ...56-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc | 20 --------------- ...M.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc | 20 --------------- ...UM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc | 23 ----------------- ...CKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64.asc | 29 ---------------------- .../CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386-vm.asc | 23 ----------------- .../CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386.asc | 29 ---------------------- ...M.SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64.asc | 29 ---------------------- ...SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64le.asc | 29 ---------------------- ....SHA256-FreeBSD-13.0-RC2-powerpc-powerpcspe.asc | 29 ---------------------- .../CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc.asc | 29 ---------------------- ...56-FreeBSD-13.0-RC2-riscv-riscv64-GENERICSD.asc | 20 --------------- ...UM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64-vm.asc | 23 ----------------- ...CKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64.asc | 29 ---------------------- .../CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64-vm.asc | 23 ----------------- .../CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64.asc | 29 ---------------------- ...SUM.SHA512-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc | 20 --------------- ...SHA512-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc | 20 --------------- ...2-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc | 20 --------------- ...HA512-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc | 20 --------------- ...512-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc | 20 --------------- ...HA512-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc | 20 --------------- ...12-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc | 20 --------------- ...M.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc | 20 --------------- ...UM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc | 23 ----------------- ...CKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64.asc | 29 ---------------------- .../CHECKSUM.SHA512-FreeBSD-13.0-RC2-i386-vm.asc | 23 ----------------- .../CHECKSUM.SHA512-FreeBSD-13.0-RC2-i386.asc | 29 ---------------------- ...M.SHA512-FreeBSD-13.0-RC2-powerpc-powerpc64.asc | 29 ---------------------- ...SHA512-FreeBSD-13.0-RC2-powerpc-powerpc64le.asc | 29 ---------------------- ....SHA512-FreeBSD-13.0-RC2-powerpc-powerpcspe.asc | 29 ---------------------- .../CHECKSUM.SHA512-FreeBSD-13.0-RC2-powerpc.asc | 29 ---------------------- ...12-FreeBSD-13.0-RC2-riscv-riscv64-GENERICSD.asc | 20 --------------- ...UM.SHA512-FreeBSD-13.0-RC2-riscv-riscv64-vm.asc | 23 ----------------- ...CKSUM.SHA512-FreeBSD-13.0-RC2-riscv-riscv64.asc | 29 ---------------------- 42 files changed, 1008 deletions(-) diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64-vm.asc deleted file mode 100644 index 24848d9106..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64-vm.asc +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-amd64.qcow2.xz) = aa854ab8ec61514ab82973a703a91fe845daf7effff9596f588e26c5c4857248 -SHA256 (FreeBSD-13.0-RC2-amd64.raw.xz) = 45ca10786b5631b1b27252a0696ccca74b891834e7fcbb244c80627e5f44e8bc -SHA256 (FreeBSD-13.0-RC2-amd64.vhd.xz) = 2da3f3010bdc9c8f54fcfe506fb8ed8b27a569581a43f681280ef3a277313aa6 -SHA256 (FreeBSD-13.0-RC2-amd64.vmdk.xz) = 51e5c70801b9be8fe36683d65bbb33695005557b42938d489d0cd430689c75f9 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pPJAA/9Gw4JyWgGHqjUeivjOfhGB77CkX9wXxYsxqHRTRtjvEKxF1aEmDSRBRk1 -TNyMuNDO3SPsySEFGat6Q91Y9qQoiAYxGLodsRlJn5aaXgZ6mIlAfIcF40OjJ7HX -TqCmq++Ooqxi1JuevNNG403ksnOCCWea2ttiSNJS/orNXK7i2Uy2voKEx4V9qVgb -KsLymiscozSuLrEJ7QHM6tttlGzy0pBNx06b8mhJdVjFQQfYVzEu+b6Ia7KHzzs4 -QnGGcozd8UMqhREBM4kIKKqxPOp6VIfBXax/K2+vYOh692aNDxg8j+TJ7EheUJPu -LM738dPmF0qde+M0KfJtq3nMegiv8yv/PBIjctgsX21aiNHkC2hEC/QV7elO0K5v -2P0yXPzghJLDVAjTUICyfhrTNrRIetQbrnekiAx92r9ZYy2rLVSo3pSURRvePlGx -tidkcItINWDw03iwRFSJLvAxxATnkpurlsClMmt/yCEBhdr+rH7FxcpVrLkACEwx -2ANURl/6AXPTGbahzpkuQkv6SqP7qeT0QcZtOSKZfSV+bPtNTnD/A1x5yJyyHtac -K9Itcp+MfSd8BIRuBxAu1ePiaAnUW9h6Pg2zwx8cTdq0nJVDb0qVHY2qQ0p94GYF -AW73sH742Xu1/XG+1RDgM/KvF1JcA7OnQ0A9tUK6hvSYjK7GkeA= -=p6UC ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64.asc deleted file mode 100644 index 29737e5871..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-amd64.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-amd64-bootonly.iso) = 58e43e0b092a268edf8533c9e1cebc41b58e69c7058cf563618ac455052daffd -SHA256 (FreeBSD-13.0-RC2-amd64-bootonly.iso.xz) = 48a4ea3b60215fd095004832dff7f6195361be29014b6779b73803029da9ac98 -SHA256 (FreeBSD-13.0-RC2-amd64-disc1.iso) = ab244a85e7acbadd5ea609934809f549302e911a68d6abfb784e4b83a6905cef -SHA256 (FreeBSD-13.0-RC2-amd64-disc1.iso.xz) = 46ee6d455f60579e9ce3bfed19bc1abce6fb3ea4d1fbd9615e31a0f1ae7a6fd1 -SHA256 (FreeBSD-13.0-RC2-amd64-dvd1.iso) = 371c629b2e1ffda6be07788e102b47d59ad3bf463ccd5ced24009d323fda1380 -SHA256 (FreeBSD-13.0-RC2-amd64-dvd1.iso.xz) = d1c7beaaee2836ea88016af7db227f014cbdd07a311bae75da87ba013b0c71e9 -SHA256 (FreeBSD-13.0-RC2-amd64-memstick.img) = b3433a608ade02ba4e5f7e20bde351bf5d803272e86b0102e3859026c6df1a69 -SHA256 (FreeBSD-13.0-RC2-amd64-memstick.img.xz) = 9aad5873f1f4215570dab24abfca20d10f3bff91a48be76fb65768a738ee777e -SHA256 (FreeBSD-13.0-RC2-amd64-mini-memstick.img) = 4571db996294b101f20b7f5ed4c6adf32fd96a87023baffe866ebf8d8032ad67 -SHA256 (FreeBSD-13.0-RC2-amd64-mini-memstick.img.xz) = 3b8dd166da52e7d623d0109a240677173c580e17cb23d8e0c3458fb5d858e3ae ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pMX0g//TBcjBK1TV+IzdMXUNKLe0KlO0yL1LN74dUcnEbtgJSen+eibJlvrzuG5 -ZmhpZ9yB7vIYm0eXh9+NlZv1S04p/Oh1WinxyV3uSDjR2Cs3yOMgFdV4E3V2/AQR -jP/ePKh+CC+JJo8HGDXzDEvFNBUBzSHnakPYcheKX5phpHjnnjAXpXIUVSg1Z0IO -srb1kkQOy1iU07mRHco4/t+LQVCQdOUgvz5NoDqcZcD8XBQTJNU7Nxd0TklhucaL -+gKzg+0b4Sd+AzFIcKt2bMyMnutuwKsrYjMLZHQ1f2D8aCd7Hbf34KViHttZo2Tc -ufHIpbD7dDSwpnSeC6eeKO+GRoT8CmJM4G0gQbCpcERiibZIim1CFjGddTxfoeRa -3QfYhq3i+cszQjSbNg0M3dQSJ2DhyM8zwrNEg09ZZnROCjkW/B/zkHGNHsVnKStW -TJrkWpcTCffcisAjoq+ymCf5M2whgkyxTtIde+KoAwmKastXQOnpc7iXe6iypU7s -1k7JbwWNINX2M3zRwF8YVicddL48B8za9U8Wa545/ZCb3eytLWfwbyFqqN8YYhoo -qSU5z/glg1/Ja1T5XLan7394Mho+t50wfYjJ4yiwrWm/XP6eLbq++8SkStC04Zob -9sW/ivBucFVhr60gMCEQVPeAiNoqKPPqdvsoBUHGuiB5h0B81vs= -=LFkU ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc deleted file mode 100644 index 6c31970528..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm-armv6-RPI-B.img.xz) = 2fcb4b129c30b2b17701c8619838967a0c2ec53326c2a3509f551b89dcf59771 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pMM3g/9EC1dDw+H+sgEaPVlNmvcIBVQunLlVAXEGmaeAKLvKKuBS6apzigO4ie2 -5VicAhi/gKsFEyOstk4NVeRYjpK+McsNuFam9cszjpwLsU6yD6SFL8MxxEpj/QWU -KS/gyJj7vw/rOUwpyXhCKpS75mQdaDMD9EnxBkWb/pAZmtt2RfVQx1Ld5tvDOOet -QDzLzp4TQp5PAucZkr8KJEwKxR3Lx5QQ/NW8OzGUuLfPfsPGxcYTF3sQ0Sx7JWsJ -6Ang6FCRJtJbZFfnd/2srrC8HViQfH+D2qtXBY5OYur4StpLUvpv0kogyyPgZ2x+ -HTxS9QYnLQcqkZcH791LzQPYRRxqT68RYYcsqgUtAFaL85FgYZFdrPCOyXr99/VX -2kvxO9uparDKVw7RGtAsE+g00XO6BkMvJY46ZKTJCm5jEH6KwuLQKpKosVLNPnzZ -VuCrmhvSN8jc18JVRmCJignGpHhm7kuN16wlplIzMW1Yvu7BB59LwQlsF/FgKdLa -OMv/TQRgjmZchcsqy7Xcf0fTuxXyYDnOYkvnXUBBlcKuTFT3aQzAFFlaVH3D4I4Z -65twlclgrTaI5uA3UmeMCPChssjK+0h3LrzF0CrjlpchjMIksPi5bsVxic8bhwNi -boitUBdX8Dh+0t3ehEqNAnR3t3VC8XTw9NvZE4nWhh+JLMyVMoI= -=3MB0 ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc deleted file mode 100644 index 9468389d3a..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm-armv7-GENERICSD.img.xz) = 2d68bbae1e34a911a36f0a519aefce4d20b9fd85de6df33ff06dd1fbb8803ec5 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pMFnQ/6Atwrb08eKMpA4cuzYh4o23x8ioly+hbE9XA+C05agdFZDLd9Vrdbwf2J -Hn5Zs52FWGbiBa6odYojn9Up+Ve7YTetaaalOumU3xJ7b3k7FzSlynT+h2Q2Unfq -ztF/dAYLX9d0lSmz7jMdt0D2re7W7C01jnNIaB7dwIwKSbBh6owJqvdpGe9bKtJm -YUIlhY1GyTeQEvDHhd1rCSisGLUHWhOuCidyUlyT1REMmS9JUxS/Rr8ZMsHhxz1Q -isUp+/aO629+CJHHDZb4vmbM3ax4Ay3TyDtH2Xl8hPebihzPpFIf4a0o+DyPtC4s -yj/p4I5s8DtS+QLXw5czc2dGvot5ACI7CEkH+cK/ok45ZEq2MmwXUoQoPUrlvq7G -Z/Z3eq8IEZEcHNLCNK6kDxh8rRdyX1aeDovszIL3283+Ba40BdeueJtD/dA0IbrB -MUPdPEuIX4hN+6nrgPt35hj6h1YTp9IgAoS5y534v9oxPOqoK4GAcX7UidBsXdqa -v8bv1XpXkEYNgafjeRKru0KL3hq58+lWPSUkxW2voT6bejEhsggcJglc5WAoF90B -MLKlO0mUbEMuqwbycNM2Ta71sXsWkjn2oPW7VWBsbpSkOdZYQeCJohzLembowTbN -Hrd4UW/GT4ovR5w4kI9x//6z3KB9Zdt+og22IkWk3DdZ+etbr3o= -=JNGU ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc deleted file mode 100644 index 1bef79645e..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.img.xz) = 4ac9f161cb7bde4e8ef01d20c2ed7163da48927d6e85d3c8ad477370d16c4cd4 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pOlaw//Ru0iTMhy3xkwcQla8TZrNHWUJ74FsngN7yLXFMQLv9VnMfaDvEcDPoBv -Iqo8QIFYsGjkAPnEjajbIJQ4QIyLh60Xvzs8uHVxXw9IKSg2S3QFbteltTru7+U2 -5ewwDWyth2dd2atVZ/XizAbLIdxiKp6dTh7cdt5qm4i1iqNiuumA5lIoj4/532eT -TfcRc7NNC7CXSU0NDyS5/b7RhfNW9n65RiCuvFwKC3Z4DI0Mwy3zVzL8O5Ss6JvP -z2S6sm/Yeq67l4dEH+WVJrvzCdZ4eMuAt+iUqRQeaohhh2rO+sDpz0kpaE9vQw6F -ENI6a7GNUTXci8hBMw5npBJGpo7RjbRTtRYIWqtwFkoFpbTAya6zZCSuoIYBbOLc -y+SWCXod1QJE5AdonbRGF6ImqZf6sjMc/09Gz6+gTuHweKCWjF4Z0EuH0RH9Xxsh -xEVcJOVDsHAGypO69eTdC79sx8uJSgXuoSv8N/FpNyHL+ml7e1okeRbX0hn0UfMo -cSYQRcBR25RLOdq/CfTZEKz+MK5UUlD0kYgk7EeZOVoCVEhjj9patuf52bAHiFkL -eNxx8w4uAHi28NiziopviVHiJ+2D+yzxzH4Y+v9BX0wjCYeNcwilna0L4kLUAloo -GhIfOLhJ+a/quGbjciKvvK01yfsXKtdoq/wmtVOaTlCaeWiNINw= -=/H/N ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc deleted file mode 100644 index 2e3667aac3..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-PINE64.img.xz) = ac9a5340f208efdfba4ac02765326e4087537408c02b81a39b9ed8dd381e7f70 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pNcDg/9Hk+yK7GkH/47oupeCPOzQXSuLMTBXgcQMdAECaUdkP0Zu56geRlWDXLa -X2Yv4nWFb6pgdDFvtKHqmSRGvie3CAv6Fq3Z+m+X5W6YSktPQp72LURr0/G7uoeL -CE59fvhAaw2g5Wl1gHR8FmimdOnpTllRRty/M6E3lfPjZuth/BgTNDKwdKoITEh+ -TKL9mVsPKdTOJhN7tEdugUfZfFS2Aeuc+I/LzmSrXsygGz9S7IldtYtYY+K5/XaW -sTkUVVmCzwNjqbCsavJaj0p/pO0OgkZdn8xA8axgsWiwlzF8YzCNdGiVhCBzM8c4 -ene0uf1xxiwmDqQw/jbEnhdx0euUypxvUg4JysWO46BPWs9gGgFgtQFedvD3Ab7V -IOC69Iqvexvf7/242r/cZ8JB6wxNTmQXMvQ2TMvX+QnLfu4XT7nc27TtwdbJHL2e -grmsal2WT/i1u+6ULqzI/hprrjRiwU+yh81l5jnfTYMeAvNlMFNAFZOz2RFyborx -XGzdbv3BTVDkrjM/IGUDxpaQuGkGs4o9n6t5MhClxmFyykVyMnaXQF3zBBQNDs/x -3E+h3aXo78fwK4JTrQF/rI3AhwlBYcX+A37P1c5+Q8iFGt0Quj77MhDMHbcoSn5p -p4yKczAg/+c+mEBtfb8lD6hJIstTSMJRxdD29FymmiQY1ZhJlws= -=WVZS ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc deleted file mode 100644 index f35bdd38c4..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.img.xz) = acb6dc0784a635fc8c06f1b4e9a818c0036755ea77c8b99d1e42c0efe35e9667 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pP8ShAAgpseFcXoJG9K+isqnqZkVae3LKzWPWkpYO0mXqQ9ry/H/6H+K7PHffQh -IgL2rkFCeSbmL0yrd+v8yfqxeKYwjk1ZqJjs8+l9qCFeikBugahMG6Q9/80UK8ta -82NgExJmc0Y1mQwSbRpkoCUO+EvgJPRIm7Eyaff91JSM1+PHsn+UFvM/Y3PfAa2f -D3e5wxav1booz2MZaYLOslYwvsifq2AhT8YFveoOBNmXxZNE6OXuouuFm0XC9WFR -9MBaHNw47ZJb2FL6TWp2rOUtCDmDlbOD1fqca0qb5PSWt2y2f4CHYvK7DTjPXsq5 -7nVDZb3dvoH88vuiXMnYed5v/XRxKCQXor350tjKIzpXktUy1PItcOWstDht0Q64 -/9btt2wnSFm5ze264KI6uB7CHOnP2Ku21WSrzo4PU2PZrLeC3iXohbE9Kut2TMpT -cZAQkPy4UqqLSpG3YRjxAMFk0+XaFWnUA6cJ0KuMwMuej/f+UlGSOH/yOPxM9JjR -YzP3V7hCp4VKkKK3xT8xh/R9jV+Vm4SCwP+AH+tBEza0pc4+6uu4UZwCJuwwynov -KOE5tU+eMAB1S2sN6HNVSv0CGtbhjs4zpBtQW2eDnchhIig1jXRfa9Rk8eDp0lUn -1lIAzFWwgsINqbNq/vnh4MiNc1+8sQq1BrfMJFpdRnBm+JE3Va8= -=1HLN ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc deleted file mode 100644 index f641bb6447..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.img.xz) = 5ea9a59f1d4cfd62cb15a2a40dc2c77b88919e724aa5328e7fef639e713f7c7a ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pMCAQ/+P07iY6NpXFoc/e88L1aeCZ4W4fr3PbFsw1wWNX/JJNgTlRcAFEYbLP3L -Q0qVctGEa8L0gfz+ffAuY7O5sZyyuPdFqvOXRuWZnF0agc4X/7qivKISrypJJ612 -ePq4TT8DlPyeirjcCz0t4eaBMbuSF327mlPsvB34Bp/ZCgevWOCdn3AE9uTtndpZ -zO68evED32n3sq0hDMuDf6Wt6eiM0dnnYT2PBKWRX+qv2gVv69PZhfxv/pQI9pPe -My5iEKodlLXVxeqL8K2/f2BkCJ3dvV/l0dtATTl+hI+liKpREK3ZE6O9CjYzHmDO -MVSXgMyzQAglupsYzVf6w7o7dpwONTbZI+elQrVWGX8B29uwevQeA4okHl0uzjA9 -XgNdCi4UCPicYvXNafA7B0yZcWvfhIM1aVKNwfdhnkMZ2N+dEvQrstW3CRTKDGWq -yyJDXKRw778oglwSb1td6y61ugWpnG+ZGf7n6BdIfyulGxVfcvUkZg/VR5QXqUET -qDktt7YMuCnGE/pFEvhf5yu0FrT6+cRLhWJIz7wBgNsTFMSWiopVmBhqb4VWq3mH -ts6Sp2UnFockThfWmQn/KzeSATpSjDwa3vToQa9d5cPDxxU6uqBEqvQpgtQK4Bhv -VCyQGTbKwqKxLGcVwS4GD8lDJmcTF/Kh/jL07PcPihyNr5F3T50= -=ERex ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc deleted file mode 100644 index 53a566a07e..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.img.xz) = cee744f39642898f03ab9b137cfb6edda9f63424767ca10587799a1c8eedf5a7 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pP6Gw//TlZP4URNRLo2LA9MPInWfDCQk26oTW78c/gFQUJ+mKh3zKaTA6reOnri -xe46f5WiAWM0LcRInxmuVkScpq36bq78YMwPLZ+Lln+r8ds3J5MOFBbW3TIwedxz -T3gkoH6XzeK9mp7o5T0Ks3lioYLwyteUTX4FZ3pfKvbV5jtF5AD0J/16DrKqefxN -AoodL9qKVwPs8wjNM7JxxLPBQ8Q3p4H9tgDXVDJfcFx5WwfcW1Tp/OYvCf/A5u5/ -18pPTKDmV/3BEC5e1lMkXOaNOitpR4YLV76DYrYpEDgHeAxBAMWqGLn+V84n97kC -tC1uaHmkcs5b2fIbj4l+wiUGVs6+xNmqhG/JFeqOb13FKazdAF0zzgtaIDPHW6jJ -VKmtZVELEsoZD+Ilv2eJFtzm5wW5AaMmG8hbnqRnJn2HYH+Bb20668f5hnLR5fKk -cJqKkEN+dy0otiFTeeA92VvjZTAmwvDI4xdnTwm7mSh/0B5ftn8IY3k7VgiVx0yJ -SYpFKpe1XUeu3sfSrKYjyo30H/nJyWcV8+pu+XfltdvKBeQJ4EVTJaM3OI0gtIWL -1HfGdEIwiD9Ih/Er8ChEtjOc3l8Qo/yQ+O8OkA3w2GrngnJ6WHbirMU51SSgGQrx -Qe+Q3kL+DIB4F6No5Mwv337Drp47NXKr1RePUUPf4dbaqxRSQQw= -=+j4D ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc deleted file mode 100644 index 3b28de5e8e..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-RPI.img.xz) = e7832f2e66583357d4f89b89127acea4eb9767807c105b8acefa68fd45ff0d7e ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pPq3w//Tu9SOp54YrYQzBtYqhFdKGcvEQWbXzy02LUvPi0FO8B3v6YlIlWbyIfj -vVhenu5igcnTYQt0UmT6ajkla20YaPP+2eg6T2sQXCc5lbprUCAgrxRZTPR2iy6w -A6Lamd4SruG6FAcJjs51eBotf0sNDJDJXZ4IBVhstAtBHPeqQshmxw1ws6tp4NVa -q7ACKPJE8G7I14q3yHSxYY7eB64ueZBo8gAqac3lpTIHZKwnMqsqhmbbcsDGpKAM -drDTLrdtXj3u3ivW3VgyIqU4a0TWlnhC4qDgTqwdS/rpoSu87xz07bsStGhCUqqu -pSWFlcb7SWP4481QuhVnLynLckh3GAM4ttuJEsHGjCj2zdr9N0DkYrqdp3bt/zgl -v8ncjegTq2UEGSckl4HHjL1ofsa2tYl0XyUJMmuTHBDF0dRoSnpyJJPFiT4ZTLYV -NK6R5L1zfdbsF4spCriryqhOtoAolnqWsbKfVxGeH+q3Xg7IozAghGQLpZLzL9WW -8ARiTJ3y+qT1AAH70Dn0dCZ8MiRRORE6gM5Y9XyitKlHQbVl9hE32PGy1kTbe7rQ -bhJasJBXw3M8SG02GchjyJDBjIrx6KQO72LeHUzY9BAWcA71sQ4vz6PyekkD/k9n -Usw+Wx/ejcoKVRpouendkX7CP03vuP2Kj8FW8YHOlQMbysJ3yy0= -=urXm ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc deleted file mode 100644 index 1c69c19993..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.qcow2.xz) = 21a26d066a2673ffc3b1b29a3718bc4d47d82f56e6030dc607c2868cbdb24af1 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.raw.xz) = 891ed284dd66b382210925818f633b2f840d3f572d84a410a8961af829d63454 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.vhd.xz) = cca8b0b0736cc9e3af5364f9e9dad7b2756dcc7747283ef2f0a28d8bace66950 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.vmdk.xz) = 2781f5f0dea92964431d7af3cb74fef4837c5d3207aeca21296d9baf2b048cf2 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pOo6BAAoVJ0KcW3e/iTN0VfnQr/s0UHQ5lxYRd+o0eMPwhZJm3c7JTrexOj3Vbd -c6ERCq/RV84sEahlgDd25iBA6YgcJ2EcXaDBs5f0zGww7XktHK9KFhA8J9CrvTJS -d2TKS/7J1lVjlu4uJM8PcVBhtaSFKYtQWnGYo6Dx2MG2dbk2v8EjR+bEvQ7G4OMp -/wjyelD20Iy3qX1RxiVC5QDJh4OtoMwVqfWCqZ7BDJtPJ2o26a+O01l1xr52ffe2 -necrAXpvjmPeSNVlNZnhoP2p4sf5kHYzu2/PcVVGU/cTghfd91cv5uvTY+aRnHSa -c90iq073bRM1SUiYGquGNtsOjUzsH4lU4Dy9dbakJXnJ4NfMtV4Qe5LaldPWr1m/ -spxgl3mxiYzLB6wMv6X06awIdIFSu050id6PJUJNCqhXAwd5oeT1sCRqTKiluO5K -Hfr23mjKVtSJgdrTVufnuN1wPrOhsml7yTzpNpSv7EStg8YdCBSfQZNLLJzzit1R -hh8p3uH+t3Ye7XDdlzvrc4U0RZwHfm+o3Li4Pj9UoTwyyIgR9YDc0tQeipdT5xCg -WqMT/TU8vLheR7TTmDN7nahRV5PnOVpHEJA75XUKa5utDFdFfMABEaqbsHcCB6Xz -QmhLylCBJYJJ6sqsR3kkXF84ZfK1CS1G5iDLgMTkc7TMG/gvy1M= -=JAv2 ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64.asc deleted file mode 100644 index 98f72dd888..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-arm64-aarch64.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-bootonly.iso) = 7c6fefd776c87c416eaff9e5b3fd37109e139c093375041b1f85ac59c0bcb6c2 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-bootonly.iso.xz) = 31a9dc6858fbdb1905b4e964b5a09482d3466e95533d40d2d554ee825f95f22a -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-disc1.iso) = 6f448a1fd18ee42383eeb11302bd9186d2a831642c289fdd9da98ae46dfcedce -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-disc1.iso.xz) = d871e45a7e8a72cb38eb011eb121b13687b2381ca939534d6badf7e0176d4e12 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-dvd1.iso) = dc51f1c30acdfa621303c994a7c19c994e6478913e3bf603410baf6cdd47416a -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-dvd1.iso.xz) = a1ee44e3371599c97e8ea06a5a273f3bbe13525442e79db8f586dc6c01db1882 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-memstick.img) = a64cbe77c5df96b051f61da27b754ee39a3e529323bce0c56b3af7a8fcd59f5d -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-memstick.img.xz) = 09b133a2a059ef30f036f001d5147164cc0893ff2144af694fbafda504284129 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-mini-memstick.img) = 26eb7dd67106908ae50a7330fcd59aadd32d8f54499f47f00960006373e02f0b -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64-mini-memstick.img.xz) = 41a8b1d3693dfda4c6488f8a2fb2672b06dd5d1bf072508eb068fcda465ea51a ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pM6nQ//cfO1UKtkSq4iWc+PBUh2fsHGxCoLXXmGie+uyYbtbEbwmNniURNCpTH9 -mD8jKHyZz8n491v90eODizaAokcf9uCfLe0leS/4ZOHjnOx89ne5CtpQ00oIuVzY -pPn9HDKBwMxF+XD5oMYymjS6MURgyQ7kJWKbcHca3ajVPxSFIkyN1smbCPDWs/W3 -PvKd8oNZMd+hi0S31Bp6r9e5YJjXOGc4CifiZ3PHjHR+CZ7eOHo+JPMH4oofLuMC -0MaHVNsX0W3va0yleSu4uode7TlJlC95VcyhWpVW5YznAKuLiWOO7axO43OVroCp -KEEp4BFdY4SuPMS1KkwDeD093dD9+7ak1qY93liv+XY1HSmc65G93pEBmh/utvEq -pVetbho9FNQwf4c96cscEzhCXQgomKhg6dNFPm4a/xJT30uiPxYaxI0EcPBn0QbS -5ZgfiZKr8zR3VWZvG9X/ppnxREamng76P3yYh8EKGUClRsu4j3bn+ZI74o0eC4rn -z0kbzqLurz5iYaND/93tHaCKcphWjPr+fKZDdlTsVMIF9VgbxPzt/L7GVpsfLtF8 -sb9gzAh3U8LHOlUNuMtE3fDvCi1vLBvKk3cIeEe17XBD/UrYhvuYKuYcUGLnxUpX -iNEaT9meXlap+4PbyG5FPIGuXicB5RCnwcmuOTlLllvs4Q6vxXc= -=XtOE ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386-vm.asc deleted file mode 100644 index 5ac2ae82d1..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386-vm.asc +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-i386.qcow2.xz) = be1917ee2f52043938fe0c9b7d017a58bbdb8e76162b16a67fd6bcc6bab81225 -SHA256 (FreeBSD-13.0-RC2-i386.raw.xz) = 2b20462bd9cdf31a535696029f4afa2082fdd7ce2db7e577760be75e5444ce1a -SHA256 (FreeBSD-13.0-RC2-i386.vhd.xz) = 84f51f7835d2a647c8b02ac9b482f2f84bc0dfeea43498419e05490d638ce843 -SHA256 (FreeBSD-13.0-RC2-i386.vmdk.xz) = 303dcba1e14a96f7ac562290f6c4bca916c432d5f79893226b20efecdecf80f9 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pP34w//fmCy1gbcJ4QW+ZJ+hex0ZwxBe32Ionml6LKWKZX2GM8nrchBI+d2nrSa -bF5nCFk8/G9wQ1VDE47yhGsM026gv8ffNOeTisMsaFxvSvlhHNtupv2Nlza6ki1n -u5jn81pt0PTpdlm7E8sg9xW1GADR67QtuEIqgw5rGvrOCw2F9j8pQ4afoJEGPAZg -iFxcrWN+wRD7B4yOVP0y6H5ea5nXivMwkLoLrxT6E/AsThHF/bkYyUxopNLnpJi2 -TpOlPrhwA2BoL9nkHqx7dkbzuPdRuhkFTWYSyrPzKaOTs51DjsGixzdNINGDVabo -mCHoN5dWruq3DPJWpiAxXu/DXdDmXApJwZTelj7lYpX+o1r002yoiZOuyJ1w0tuP -NJbyq3c1IXtdKBq9jg99KH3ZvtFfaRQhxupo9oVnaMTy/Gi7+HqoeG1hXidA7+m9 -LfTEfv9vccoyiVhppAbYY5E45kTtzUS3sL0IaM1VaX6wyFcxuoUv5+NmRubBGqFC -G6oMwgdRSP+p7XzgG09CkhS0qZEV6IypAFlsUnE832Epwge691eoOyhamOIL+ndi -jmBLqjLFK4kHuKf63kcnwHH7/eBK55a6JJEe7tWYErG2rN1+hsUD473w81rCHx1Z -K7Zf6Ugz8qQMnl9T6NxdhEbUevvTe8V6Lh1vj6vXypFFPRLqo80= -=pm+e ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386.asc deleted file mode 100644 index b8e91dadb1..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-i386.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-i386-bootonly.iso) = e8bf5eba663773299e1c39ce1c8727638d8ef53b153956a433e7da2b2c1dfcfd -SHA256 (FreeBSD-13.0-RC2-i386-bootonly.iso.xz) = 756d1d9befc0a62bc77cae8695ae296f5945d6b151cff52e0ce8109dad475978 -SHA256 (FreeBSD-13.0-RC2-i386-disc1.iso) = e473a649f8d385078a7f8385092d09628b14f83586c6ab7e3d504a8e3ac1bda5 -SHA256 (FreeBSD-13.0-RC2-i386-disc1.iso.xz) = ba3dfd63f4a9a62077c849a0b6cd7b7c2516729a81c9e6fd3f75cead37a99ee0 -SHA256 (FreeBSD-13.0-RC2-i386-dvd1.iso) = be42a76332ef59654a0f76e32b04f1b5cd8a8e7fa033e003d7986cfad1951c50 -SHA256 (FreeBSD-13.0-RC2-i386-dvd1.iso.xz) = 158dfaa9f4406cf5c8ed432601cd2f9ca3c51b03eb1f8c158ff432dd34572328 -SHA256 (FreeBSD-13.0-RC2-i386-memstick.img) = 3ccab85ca211a8900c29a0fc662f45e9986d1b8a01154ec289671a3d1069acf8 -SHA256 (FreeBSD-13.0-RC2-i386-memstick.img.xz) = aa6bfacb77432b2c74528df15c188b8526fc13e7574853fd69074ed9b829f4df -SHA256 (FreeBSD-13.0-RC2-i386-mini-memstick.img) = 33174aa878182832f6aa544be93237e4a804bf793053e0bfa19496afb1e714e5 -SHA256 (FreeBSD-13.0-RC2-i386-mini-memstick.img.xz) = 09f9074c66be05dedc1fc9499b6a6d5da56435fba01861a5a18d59c26aa91880 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzGwACgkQAxRYpUeP -4pNaig/8CEy8S2tVI7pUAeVmnUO5V71jf6cqWV5COKHMYH5tSttYQX+SAt5rxTJB -8sMg9fAizSulYcH4s2e2yzwF6z/KohgrOyi/NnrfkywmPxC7sNN6ziHTrSUoFIDU -N1jlwzBE1SKuS9fCLUNyaieHYFjvKc+mWLOHMz5rLZuTbWXBEJIGdvcCToVKU9tN -frwmQwWzR68adOPrlevyEaAs8I2R++r9YXGG66u4b8XOc6NZsaRtwM+KDMH+a8Uk -DuCuTc+orqu+gcf15fHNZMybk9eoPd6UUk4WZyDWo0I/luM+3i4CYNCsIiE6cRlb -pJvrrd9c86V+OT7a/y2sOK4MQ+3D98COKcT7Ad+aIVn7bhCeX7o5FJKNcXEqZD5y -KAJWv2lgX3ceQRBfvGrOkyVjul9Ivyp9C/C5uZJ7GO/STVn4wY0ICDlABif6E6hf -7DGObhv8pyICAWUZNwOr7Y2gEEg8tPUJgsipEt3q2+HS317YJjJQwBxlDrR42WdY -T2k8CNcgJTVv9T/qXnkP7UvMr1KYq0Co54WqeUW0Io8nPI1YXP6eKQaYErV4qHp1 -eZx0Wd4F+hJxR/DYGpIpS/Z8aLZWN6laAOTtFEGam4NEqC4SPnYkYqtU7CWoGou2 -b7LLXIK7aTTAMX3jF6ZWtR5fypu17M8IcZJaFpL3ib1ngVxjt48= -=rUGd ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64.asc deleted file mode 100644 index 88ff40f764..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-bootonly.iso) = 0df9703ba834f543b4463a67f1f26f4581d04e6a4b6eccc1684e7e42f547b11c -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-bootonly.iso.xz) = 3b6e6cb6945ef8573341ce46cdcbe33e9e8c63e1d33c6f6cc1fad08ea456a458 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-disc1.iso) = 734b4fcb73ea1ec28543c323c1f7a5dc20aa2b1657628654600fbfcf0f8e04b3 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-disc1.iso.xz) = 1963eb9cc40cce1b6eb67b345c62212de7e1b7a4114dda77c97eadad31ddc906 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-dvd1.iso) = 1e3375fa76d2646cb0f54c906aabd86c092a917d37437e8e0056b30357d271da -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-dvd1.iso.xz) = fd0588dc4d90913a0562c49bae31b863ed0532e849dadd44095727790f746872 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-memstick.img) = c7857f21882b92c13dee8c4a64429b7535c79ee149eb7dda34607eda0844142c -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-memstick.img.xz) = 9855ccca699274f8c33073878d771ae54fc7931cb3a1eba1beb6a75d8cb7177e -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-mini-memstick.img) = e0e56da0ad6de77f7d8721deb98950e7ff4330a3b52a02ff072d029a96f3494c -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64-mini-memstick.img.xz) = 999edbd64584b4817f2d709c8186c0fbf9c853daa859ebd6c09034f67be6cdfe ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pOCgg/9EMbOOotRlP/aaigP29avzu9Sp6AY06WRpo3W/gd165wN611wLG0WdxXt -qFRtdhuW1MmlUsfP/KNkCyXl7MGMbqxXOVU3fVWdEnOHlCp+IhmYoRY26nOrOGEB -bUZHUjBaMCBsDikyFxYzJX1rrSpvUITwB2JicHuAkuo5XYejq/0MSUNihpgFBkmD -iDA9z77itiKDehDs4ib9F2Ngxa6hnZ3QyshbwpOlC/P+CRuWjQk53gW9k1PhENeS -sxZlF/RAmMpwo0wlGnaT546t+JZTtSu/UaI4e4R/Q5VrPm9AzCvDYGYa7PWAOVTd -Z8IqcTmzchUd5DK5Gi2qRzW7am03GOPXm0GDhem3y5spRxM8oZAtUEExi/hHCz2s -f2fD4wWcJVwuRG8Mt36NM/C9humHD4YVaBqRj+P0yNM2e2Bvr8cLU8o2eat958l/ -/Jb1bCt2VlyYpG4a5PZTikL2cksJiR7NkJNU4QURKWTphbCIDk7HsIRLDXaR1IwH -5oetY//roqW/d8van58eSmLEBAAlnArzlqShTJtKKwRQA/5DBIfFygTajizYd3T7 -HYDE5iOhBVbcmSje8Pwa0JJJs3tno/Sl+FSDPirHXonsT94R3IdSFnVSOsVHVc9m -jub83+u0TRJzd93aybp3/IQ+38aE9bzEp/5XDzVwfs7Nj5CB6gE= -=WSwl ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64le.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64le.asc deleted file mode 100644 index 7c7405230f..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpc64le.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-bootonly.iso) = 727433629962d3ce37a006bf17368aa9c3c34f10e8669869440410be6bc62be5 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-bootonly.iso.xz) = a4aa1ebb4418dc51fdeeee3f9a2bab02577b7022a5eab8338922286b7cb7ebe5 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-disc1.iso) = d78cdbd371494c5379582b8ce321a37bc9a984c9db4ecbf39de31d68ecfcd86f -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-disc1.iso.xz) = 7649cf94c43bff294d0efb8a9173f82a7a4bf5f1f0f4faeb8a0c9b80e7445bda -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-dvd1.iso) = 16e5ece2d2deef79213de2d8c0de264156e37a98ec54e711426a5d33bfb37b80 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-dvd1.iso.xz) = 4716d4d5055bde9dfaf9b6a0c3e3acde50e7845c81276ad87a5378492221c218 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-memstick.img) = 68d2beb5bd80c773fface906bba0c941b8e5984fb5146e16d605b5c227b9fbd8 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-memstick.img.xz) = 293b3d3dc97c0338bc37bd83149ca178b1126ab14d86ba68a5d41b51f04135dd -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-mini-memstick.img) = 0dec7fafe00977ba79e27448c59b4b6f6d150bd19ab3490f7e234d89de91cda4 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpc64le-mini-memstick.img.xz) = 3628eeda95e898965337acba9b046cc3b9cee752581653281d460e60e040de16 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pNmWA/8DJVaHYpbLNYopYdu6r/+0QfBVKrqenhLHiRta26E8OEAhOgaK1HctI1g -Su3QJ5wcIlHqzYNEA0QqLUsXNeilaQKckOcco0IAz7Un+BTp5/0NFvTebOZt7/+6 -4J5xihSz11tIp9jqLN/CBFPOna5g1t6LoDhRlHG2GeZZlfU47Z2BJe+yIS4C+2+1 -X/0XTU8zbtdHCo0vKbXQdZR9eUZa60NOQDZwkWUaT0USTa9BpbhB0ojkyohZJbYI -SREVDZVlnajF8PLDCZxqdMkUjyGeh/vQzBJNRQOG7n3Ic9VybZnJg8cVEODeYgX7 -FYsqSEDXLNR1LLKNo9QadjnHZ/yiVPVJ4GB2LQtxPsCqTAAcYwB4KaNNF3E/OnLu -5aHRMmTT1ThMD20IJZGWboYmjzlS5vSPj+lrCX+ud452oLH4wPplZBVjGLoCr60w -rkMzqV1moXVNJdbgBLArtql/WziFlPtcRQ0l2iAde4LPqAM+7E1WlaNB6H4vwRfO -1jM5b1Jccg7txtYgAsO9j+i2yyER79G89/0A3Ga1uYCtSfFWP3cwyZx9PWOOX1Uq -MGRrx7z4D4zJF6iyFptQyqZ6x5v3u1O/hYi99yDdQglW6yWbE8YMxxFsR0Man+x6 -FBVMwWoxxsON7fthUh9WOWXIis/2wpb9KJLBSH4zgziNTCrlZcc= -=XnU6 ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpcspe.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpcspe.asc deleted file mode 100644 index 38823d732c..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc-powerpcspe.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-bootonly.iso) = 3257c9b09dee563f21056cccb87ba2bd888ec4079440d903d48cecd196f16731 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-bootonly.iso.xz) = 146df7e141c3aee283cf22b774fe753ec9d36c60396c6c73ec8fe17d24bc3b30 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-disc1.iso) = c00a0be5943a2f49bcb1494d457240b13d78ac47f41a3dafb928fbade790bdd0 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-disc1.iso.xz) = f044544cdc8d1adac718b08b6d3915665b533850f8c1d0941568a9076817a126 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-dvd1.iso) = 445258ea6f5912e79ebbedcb0453b7d21b33adac81f72129e0889ef0cbfe3f50 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-dvd1.iso.xz) = 1379a9a668bdfc6e50a5bd2be28d69437d73a1c6a857a16ae5f1a80d8adf3ba8 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-memstick.img) = ca8c69f4c5db8e5337514058e73cfc21c4bee413a7bd707363b51a2d867451f8 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-memstick.img.xz) = 9a64d11dd09b86292bc0ec9cf9bf30e029e303be7eac763fbeb24bb2e2d4b920 -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-mini-memstick.img) = 25acf936313d4468464915be0bb9fc260cb2621ce1f5d4d7fdaf8c72ad6baf8b -SHA256 (FreeBSD-13.0-RC2-powerpc-powerpcspe-mini-memstick.img.xz) = 4e8bd1fd810faac7e1c7aebe0a020fb7cda337ce5a01b9a1f2be6ebf82040040 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pPFPRAAouYd6/4OMuV7o3NpB/p8qwPI4JTG5zNkKkKe4RyqgIah5VUUaB1jSVLA -KPIyRJfLqAxD1syaziLR8+tcdldr8xtTjroI07tR3on7yDWcIFkEMAv8jZS4LaOr -HKgy6BsTVtyJ9+ndO6YmlcbeLG5MO9f5BOKwtnJJjxM22bpmZM2DOGONeIZEeahg -bTSo8B2Iq9EthP29Y3QDM4xrDzs53EjFB/Aq3oKWbnGLZd/0CqlcSE/YeQDz2jqe -Dpq0uAaD925JJONoATCrAcu5bj5ZFspTOegDpgPhEeor1llSzUsqIP2Vljhgef0R -BXR6YQO22bVzfKKPA05BHzgScW3ve8xI9KjUBbsNBUPGFzU0BQ5wHONjpkEybvju -j4R+4QAX0xK+2wLD/20w7zaQMD8matm83/o5K/8bvNCDjbUfzLfX3ijKXXCv9G0n -5wrtI2RAAX2syy4gagASM5cPrPYpTyxgYpYRIPlXpvwctkdU9pkPGdHCUVjlQ9jx -GuTREFCVU9L9QcH+fTAFk5buZV8kQySaCCobTkVdQ1zUCS/BK6Edndfjixh07y7r -+sqLjxbUELIqFP05quKjKauEctZ/dRGws0am4o9+Cnw9JKUO8k3vkmJwDwoZukVO -csOe6R1yRg6r6RBANtO+iifqR8p6aEOeELnUb9LCfSj9+6zr8gI= -=+s9b ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc.asc deleted file mode 100644 index 09ce6636be..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-powerpc.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-powerpc-bootonly.iso) = 8573da6dfcc28ef51742f477b5a57a616f54d1e7e6dfb4e98bf01d3e5af63f91 -SHA256 (FreeBSD-13.0-RC2-powerpc-bootonly.iso.xz) = 92853fac30c594f87cbea4eccdfa28dbe9a5cb6d5202ebc45076626c9f978a34 -SHA256 (FreeBSD-13.0-RC2-powerpc-disc1.iso) = cbb6bcab279d0fb0118ff39e0cbfebb59cfe1e14d241a5e749266a14e444f447 -SHA256 (FreeBSD-13.0-RC2-powerpc-disc1.iso.xz) = 6981e01022ade54cafd9e7378fc36928a01d182b2e92d3ab175229bdbecd2e96 -SHA256 (FreeBSD-13.0-RC2-powerpc-dvd1.iso) = fc1d59afa1d6d006b22aeacdbd621d85295fc98152a8a898f9912fe5f4b05c7b -SHA256 (FreeBSD-13.0-RC2-powerpc-dvd1.iso.xz) = f6683b3730e6e7fcd33f98390daf09bbd90afd062817ea0a304e11022f53d352 -SHA256 (FreeBSD-13.0-RC2-powerpc-memstick.img) = 63907e8004e6fbcedb002be8797f5c87b014ca4f773b5f631fe9420055c59ef3 -SHA256 (FreeBSD-13.0-RC2-powerpc-memstick.img.xz) = c1bad1a63a015c66ae463008f36881c9015d6b04a1e9d13d5aa098b1cd7ed247 -SHA256 (FreeBSD-13.0-RC2-powerpc-mini-memstick.img) = bd705ed8b7f9cea0d6316b2c69200986ad084ea3923065c38586a2d2836882f6 -SHA256 (FreeBSD-13.0-RC2-powerpc-mini-memstick.img.xz) = a77f2d7a77c14aeb500f442e43138a707a379b9a4eafa4f67673463da3e7e71c ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pPaHRAAl6B3pAdPjqKhuLycqDpXOxsdWIpTA9T53rIe1gaU22qVfDQzwAaYH5Wz -xREElar3JEKQX8GyuFBaWZCroZ3OQFt83nFthfCsSm/FBScrqzpxbnEE+0NivWQH -LFc8YjmfTPakCvuHsvjTvDPFLipAbNT+c/WxCW+QD1M0X4l6ZSihOl49xNfN+S1f -zIBrwHjypAIZWct3iKu4kSA3v3jglbKnvUQJVkwTPsFYcI8f8UfSoN3pSqElwzmF -X4USaPlWYc0shXk5e1+H2qV4xb9b3TchKpPnWWmgBeh58j2+FAanmwZOvfe3GC/I -GkkIYkbyo3i0SegnCBeP2StTbkVERlEdvEt4t4yDicNm/as0aZ6Vw33hAjWdj+4n -NkKJ/inGsOBUVjhqe9mdSbvolzOurIEerjBkaiAYVo1E1a2G3K3FkmG45o2Xj8cQ -VPHaBBgYwbJ/pgro3x6eAOFVBOPgDJAcNgYKqH8GVol7XM9wwi7q9byIaiF5Bnil -nzpArzGnz2YRHak7GD3IJiyKfTLanl8GfH0Q163MVuPHO7GXcz6BFSt19NjIx231 -CFSnxlxN9KQtNac12oFgIYoOVK/DhygZ1CDxQhT629lV3Zvl1+9stKVFzfz5p+yl -gVa+JzFrYPHHiydjOSFQGJVrl3XTTKjTiJSb6c7BA03Mb90wRss= -=/Tbz ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64-GENERICSD.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64-GENERICSD.asc deleted file mode 100644 index eacecd8389..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64-GENERICSD.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-GENERICSD.img.xz) = b2d1c96de2df8d7a9e90ee98212b0792a006544c767c5f17a1ce317de7107bd0 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pNnDhAAoN14L6+rSPe5xZavQiVXwtyIrIW5zCslx2Mk7ckhCgTF+BREERcgnXk0 -dS6UejgJkfYXnx62i7BDea4O4mBjW5O6ZP4r6VEDzQrlFkWfAk5YMP4JkQQv4qM4 -OGY5BxxmN048YFUUib9BPRdElo3ngx8z+k8Eql6CSmL2U0nU7SrO4Qb5awm1JMaU -CqgRtyOSGIEY0NAjTh0qU/J9Kzy5xa5ni9wu6UKbU9nqHIlwkN9i4/HQc+rrT2dE -7PzZMTyiwVtR/mlWedxljnCp+i1MtpRGH/KYWUV/fxvM2KBoaAVQgyeegBAORbUn -lItX7XIKLdUYrIpMghMOSOkbdORPLYWWJWaqXbYwSq4hiu4zKoyPwHBg0BFArbsl -S2pB3Vy5T93TRIBRZWw4gWXB/HKu2ioVAIb5R5Js9KgoOnkrrDHvFQF9C9btXY3j -Hk1wYViKYHGhCoNW4/6OaD5Epo6F9ebZmDtaljL3I8tfswzOqA05QajfX8t0FQta -vHaP0+aToP1UD32yf1OZV8xs0wmRrnXRoYLx2xF9KGwTjB8aJ+7bRz4T0KNgpPv7 -4t00bMweyl2pe1EaDDO04iNmrxcnzW5AI+CZDJD82KI8ehM525dHUONI2hKfXmwJ -3M9uaAy1CqhvoCo8EKJwVyZ6ZqN1mxqW4D1k2UrxP3b+wFC89TY= -=YZAG ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64-vm.asc deleted file mode 100644 index 221c5888ef..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64-vm.asc +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.qcow2.xz) = 21a26d066a2673ffc3b1b29a3718bc4d47d82f56e6030dc607c2868cbdb24af1 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.raw.xz) = 891ed284dd66b382210925818f633b2f840d3f572d84a410a8961af829d63454 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.vhd.xz) = cca8b0b0736cc9e3af5364f9e9dad7b2756dcc7747283ef2f0a28d8bace66950 -SHA256 (FreeBSD-13.0-RC2-arm64-aarch64.vmdk.xz) = 2781f5f0dea92964431d7af3cb74fef4837c5d3207aeca21296d9baf2b048cf2 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pMWng/+PGTBkdPlwyRSUhb6w5E7+YPkIZVG3DPwxFdURtVKC7TDFgZ9y1tbJf7b -fSsWt/3lEvuV4KydeMV4f9jwlSE43y/z/93BHh8PwI4JSGSzH8Xsy8TXouZ2F52X -U7IhDcpcx0QTKS0D10XRWQ7DOcW+Gz/I7gOivAt4w8HuHGhCFcW5VfgerKp5mMt1 -KpqRz/Ay92bO3zfS+A6U2RgE7tqbYJp+yWgRHaquhZkw2SbDy0VCvWQWOZ8RSyaU -2S9y70VG11759T+3lfP24itVyJ3SkK7URuFiOEXISRrkWXSSQWhnU2uwUlVL5KVX -KErX6xGnzWS0WniTGqwtf9AmGtkwtFFAgnDNp8+iK3CrmQeubtGKuoRt14Lhf1vO -25V4zaJn4RF9wF1n1a+ToGJ7x/aXdnIE6ZFFL8JPNsnBtLnhu+SkOug+1yGgf8eC -wPKDiDVRcSgnJu0m8ra81oZp8c4ClKYv1a1lBtNeJE7z6wQMH/VXzVnuia/KxQWP -AVDcF6yN1sIeN4fslZBnb1Kr5iKwgbFGSeoM34K96XyjVrA+mwQQlwcTz0SC68kJ -R0UOwpnNoqPMRPpetvZjaIyC4X6jeY0rN02o1bgxplaEpKzzAsN1MIWCYTGTrq2C -Jf8FDRRWHWqemWQqQuNaHsuzCCUycieQ0cvKd7Z+7qdTnLz+4Ms= -=qFKB ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64.asc deleted file mode 100644 index ddec77a7fd..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2-riscv-riscv64.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-bootonly.iso) = 4293e27d8490015ac84f72f7ff76d555bbb4a743c1583dab1e757971866646bd -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-bootonly.iso.xz) = 8abcf9ed54d1e3e0411c6a77f13a2c9e1c1a4a25e5e174472290a82feeb464e3 -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-disc1.iso) = ef5990b171849675abc6251c41ae9915185d6a0750f8a619a4c6f7804066dbad -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-disc1.iso.xz) = 5295efb9854a292a838d286323452eb08548965773af5e25170f2208e4a99944 -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-dvd1.iso) = 460b99600f094e7163525d906669d63485be24010756ac87d73d43bc791f2b0e -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-dvd1.iso.xz) = 74eac73be6226da03b0bf93be7bdf088fbd9315af0d5d51a0bc62dbc487f221b -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-memstick.img) = fb2de2dde6f2bc845ab2ea9af032d7cfac9266d89845ea43effd586c700bd9ac -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-memstick.img.xz) = 9dccf3ebf5b003bcf2cdb83e311a64a494b2793cfedba30e6cd80f07b8a00eb3 -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-mini-memstick.img) = 15367e76249ee5ca71dfa8f80ed20d9f91cd56f24c0c7853fb531d1e217bf724 -SHA256 (FreeBSD-13.0-RC2-riscv-riscv64-mini-memstick.img.xz) = 71c9aecfeb3c9647a0710db3786130f7a14d73a62a6ea2951f3fc659b5a21f46 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pM3Ng/+I/S4opX2m7/aw/uDJ1oVA9Tc5n4rg5VJjhIKiw3iq3SJ/o6aKBQhenEy -+q5D8EEckXzy8qV9fN3oIcmBYLHrGZ+MCVmkoR1G9/kukSV3Kq1iMeHF3vrgxdIh -LsjVvLKa7F9n6UNrhymQLp1ZzAB9jwleEeVWSE/S4oFJ4qwzrIYpv+j1cNj5brMT -6FwaxQuElcdQ12ltMf1NnH0HdUwZArkski6m38ohbqQ3CsR2ZlWJrXVgqHyTR1nD -M3gBDljr+lj+grFN/GMk4ZcPAkplmppjk93r0WnAa7LKvxV/Js4RhxVAnhXgLt+z -GbumKi+MXpAk8qV1ugXiIPIu7IwHedm+wuEMvyjxM8GLIf+XmcrG0H3bcp0jbSIM -SI0rFFbS8PsNSv9fG3oWklAE/eYVB+9P0rmWzusGvblUoZi6rh6FB89lFvCySsTI -gq7MwtHQK/Clv8DkZcR3zmzf218dnL5p5KNRwDUHl+Y/v8HZ8AfEQ3k8hBkMsEN0 -hopj0abyOTKM1NOZm2utJu9XfcUmc2ZYLu0ju89/ly4WodKuZ6fcDEBcYJ+i7zmz -/SMcDiqoEN0RnYKBpJ3X4XOgxqcsQJJPEVDZE8/KUGB9TG70h3nO+zJCwS6br9Y6 -TXXHaj75aJGtvnKuhpPVIOwhsbnFv/f+9WimCBRpcqxPIRgO3ts= -=wXA7 ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64-vm.asc deleted file mode 100644 index 4ec036062d..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64-vm.asc +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-amd64.qcow2.xz) = eb8b3ba2178e167d4d52c7ff36e64bb2cd357470cfeda8b080ba70c6c040f30c97a11524293785f198d6cf53f9311fc1f054812087f630600bb76cc4501aebbb -SHA512 (FreeBSD-13.0-RC2-amd64.raw.xz) = 92f3277786446ac633caad0558e05217f92369d1a0a76d698adca1524672cbe57dadea2569c0a093b3d259c1dfc4337ebabb55fe6adcded615bb26812df9116a -SHA512 (FreeBSD-13.0-RC2-amd64.vhd.xz) = 2a0e943f3ba3ba24c8bf893f3999d6f967b955cdf12e156a40d2723c118053596a1dfb0a89b257c4b1f2f0b8bebbaec5618a5d81f958d9573dae683dde964ed3 -SHA512 (FreeBSD-13.0-RC2-amd64.vmdk.xz) = 8879a8b608cce9bf1a95110a1464d1acae9371cc9caabb3e2c13e8884ca9b84fb91d1cae121f53704c089f0922467c49ee9e21896a399ec172baf7abf7c73e6b ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pPirxAAlCiSV2dK3xV7dCk2O01ILbw8cRAUVUdFh7gh1VFvJUxIMG9yYLxoXAK+ -dI4ILb2twTiZHvCpJss473wwU/sNnW8icScCSl9RBoXLz4kD5dMd6jjFtIMK6Tk8 -1WJq6DTGZBN0Qu5BSHotltnSlOSYhVNuKyUio/33YdPt8SV+znowUER3ynnrXf3j -I6HRykmD1HR2xCFV6AhhLVPS8DDzMb+O7zQhymFH97dDkKxUHFSg23EupWvj2aR3 -aoTjMPueElYf4tffFQXTPvuxf/8ZJ9enNgDAB/oKOIGZJQDe+8eYTZpNOgKU+lC8 -YCdUx0d3uSN8U+PDKJyqVgr3+rwjqnDEw8byiS2M+ulgupfqofKb3fG3VNh+rbWG -/7WLg3LgRDAtkP4Tvj77mrRlX/1q2p/fncB9ja25XbWkdjOOTuUgjutefdTTcD9F -qOA6CouhtGsg/obd5mOmF04LsHQ/H1LSUT1vlAtHJ4af2I5ofqEPFY9dnnK9oMVh -3OGOcX8xNwA3KJgALa074KNWTU+PjZ+1gLxlREXXM9MGgdzJnPJNHDV4EQNjBoQ6 -fu8d+JIrcyRwttYvJQllwqpkgY4SUi6oxVdw+O80Duz8a2f/FdGDHDg17t3zvIkP -LyVZ6ozSRmBPCR8fb5Hg7bjY8J7uHvQkH3D4m0m7Vgq4nG8jLgE= -=J/js ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64.asc deleted file mode 100644 index b7ddf39ecc..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-amd64.asc +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-amd64-bootonly.iso) = 54a73543cafc861c90ff1a72aa6c921c307d2af76800079aa1191bad89339076a9680a430c939d0d4d052888bbedcabe7aa8f2bcdb5e228a4704460351513d56 -SHA512 (FreeBSD-13.0-RC2-amd64-bootonly.iso.xz) = 530811c49445a0985036863f88d03e4753cf6ebd19452f39d6230fbf582ff6ac4d5d90817cc5af22bf85dc85683302e12f154e6827f272e51e727773f7336f25 -SHA512 (FreeBSD-13.0-RC2-amd64-disc1.iso) = 7414ee64ba2fe3192cf4b4e9daa93925433bc04074e869d71696c086eb7d0691478ea359cf3471f7c626bf2834c10ed1910f0d5bc41a83b12fe128c13dd31bdc -SHA512 (FreeBSD-13.0-RC2-amd64-disc1.iso.xz) = 99a876e2b2c1d1c6752ceadafc70a6745ad8e9136526d23826ce5922b628ca76ba27159c74feea174b6cec2f5b06d48829f639967522eb6196725086f66b2f6d -SHA512 (FreeBSD-13.0-RC2-amd64-dvd1.iso) = 5cd73bccc7d653760bc816e3922d74b034c4652d58a94bb6bba2cf53c261ea19b5f54acf7023170c6af79b07d0fdc618b5529ecdbd86d047e3a56cabdf49176f -SHA512 (FreeBSD-13.0-RC2-amd64-dvd1.iso.xz) = 55026fe23d2ab135bbd88096cfde02310a3ec2ecebed0625b896924bca8c028bdd56d6d05178a613cf9e479ad36dcc29f3cbb988df65a63e43e2c16b822fc2d4 -SHA512 (FreeBSD-13.0-RC2-amd64-memstick.img) = 850c82bb99435e8467b8e54893b4e39ee3d304797e69b795938b3e00e2e59b8baedf65f86e40e14a6631d80bf669417169d14ddaf7ae0bed69a20a3cb3563bdf -SHA512 (FreeBSD-13.0-RC2-amd64-memstick.img.xz) = 6500796c500dbfac1290db846e1d8882091a23b055cb034bf85fbc329183c70539db5f2b525468e53d8f023bd4cbd70c866e73ae8e2ed2934df1327d29386e4b -SHA512 (FreeBSD-13.0-RC2-amd64-mini-memstick.img) = 1ad8816a50c5276dffa0be73d0fc753a5d72e4ef988daeeaefb47902a91e3dd672355ba2788bbb6559de4ab8201e9ef6c1af9001d2c04214e316082174270e21 -SHA512 (FreeBSD-13.0-RC2-amd64-mini-memstick.img.xz) = fe5f1fb95910f71fb638caa06dcaaf16d06ae99fe2f11738deba9dc3afb58edda0d1af8c89c503c11a2057a028ec200d2c2f7aa5d2f64f230bcdf751a2dccda3 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pNUtg/8ClIOtdx1DsFouNqpb6IOnlwvf/SlCvDmNsbUlcp2Tvf/Rl9WPNPNwYnC -42eZUzxcvCsmLfzB7+mAmC8gMetNKSaP4Q7Dw364fLH1eVb/k2ujo25B1KhWEzkn -GmRVjTKW3GJD6eqdkTWJsGlZdiuwJIigXzRITyjMqN4DUoltXDVDDMilEnm735n0 -L5xdk4DZ0DRShwncQaIv1VAkr0Kb1TZPKDaly+mKT2IG8k8Tkoks4klrdJKY4BJn -3lzXVF1RKTPDvrawAgQ7uyUlLQohOAqI6upLIynXyUwN4wtA2VoxzUkP6hX/GIoY -It6fgMdNFnkuKlubUm4RdB5MuuM5feA4RU7r9meNPkbueO4kLuTTF16aOs+zGh2M -OLdlMDqoBBtRBBS9GbMkyFz7JwlT8kS2W/3EBsYjivY3ILGouSM4ag88tHi3eX1i -3b+8YcRhT/BfF1uKCZ2e2rUPQA0uxBlIkMG6BvT/1HhyesA9sXfSosm4LgFnobQe -V/pKjUlinpZaLND9O2+NDVbUGFkX+YuL1A3P84UXgBf9LBGMQundULR0DNA3a5xn -8i0F1FyxsQnSzQDz8JiAt4dBNXUKUqbhT8WZdfYfGYtvQ11SamscugaVPsfm/wkk -JPCD5jgkXg13VaN3bDQQH6T/SQeDTfw51q1BFUubmcPS71tqVxk= -=DeMY ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc deleted file mode 100644 index 116b90bef3..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm-armv6-RPI-B.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm-armv6-RPI-B.img.xz) = fa0c63a19aef94fb8ded49ce1c0fd1c7f1148c47ae54bab91e67599dfa8d5982ee9b2e129a108b40cb0ff590ef263c1178e8421c90b7b998cc2daddaa3968bca ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pNs8A/9E9N+HgqqAB/FDrGY1/Wuob15P75lU9pNJHbPVu15eiipNagS1LmiQTTo -6DlUMBSp8n3K9LT0/preFkUhRvr3rKzw2hrfwhOibC3uwm2rliIANI7EJRFEHgZx -EVwj3U4+hjbyK/jXF0O3D2V7s7WILT0zsKD7GQSDb3A1GEY0JTeeksEZNuWL/BwF -wgXuJZhcE4ZNF2LSXtgHfpSORC8BGsA0lF8kQkuun4KNmo5lpCW3zNRsAACRLJV4 -vME7G9MzDJXCejReem+xzjEfqFjKGw9prCgLh/HRntsE9PcjwZhRZRJEqUdQs+it -YQ3knCCwrS3NkGoBqRUHc3v9WyjeZJmQVb9QbAMa+zHf8MiQ12u2e8MOHCskGJWp -6Q8HvmdiJZISpzxAaa1StaiHE/jFfe0CxN5Vq8mS1c6G/rh1J9Sf6CWVItnt9wlp -chbPtbx8N8mekwmwqL4LeYO8qei1KCvd2tLJAG4np26renTI+ef9g9oLEAJOS+hJ -UBdQ4q4R22B5iUCSmzsoL05L4Mohgr3RxppgUUCiiJWrjCRj89zynXQRkoZa2FeI -kZdlS8dRQ3lVjww3lfok9249W5umkUt4zF7/iuVMHW/0GTBi/p8Pq+RJfAKHCsr4 -Ksl+o1hZLcoHRzhsrMYit3vGgpoM8Qg4IXPDercawfw+dNv0htY= -=orRA ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc deleted file mode 100644 index 7156e50ee7..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm-armv7-GENERICSD.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm-armv7-GENERICSD.img.xz) = 01d65a3b02892a9f94733532556322600ce2b9320d0c4226df4dc4f225803a9675074c805be728e9b3a09d207e82f2065f86c9b14fabca18a55247ec830c715a ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pPXHw//U2lFDMibV7Q+JN/kyaAvQrXs5NQS1NXHzS8/Z0AaGAjCRUFpMVlIYm7l -5UW3RlxdUcva3V6sgzf6+nkvEy70nuo6amZO7A8VyoUpRzvbZRn3BlXJlOhLU4yH -uKsL4cv8PgNOUAvY5sbSELBg6UkIXpxXb9/0T3i33EvHpximkVbQYcJU6OnUA58w -qXHKI93LLWDGEH+KweBWkUCOlsNNQPJUBjilJXLZUssqayFmQtq1YSrDHpdmyYMS -g7t/kCQoZjr8CwuF+xb0bUlIjWxtwkuu1sUYBoRsmdTi1ffmhEsUeLPlmb9Njz1U -wTost+tF0GXe4OEMRONxakL9D/FKjgNOtsGyNfnp5JMG3BE8iwRJe4VMN1vWVt2m -LmV8KJ0o6/dSAIot53WS76CesaYUMhcjB40ps14jPxkoDfYA+D378fPksW21No4f -dAUrwg2w2tpYbk2ZRxeEBkJ69jRKjxE5zirucOWheV3I26oUiXBte2tZmBJGNLzz -WmwygHoqjPU3TldXQwnDXwdwquWv5KnEJZtfdi4RdmG8L2yGu8dCmf2n3LlyjH2q -TVGBAbRCdQ2189YWwK6umdNoFG1EANcYNgs71WNUjT6b3O3ebRzHD0Hb42TaKNcF -bOk/PlwdOL/+bFxB/qKsTOGQIFTLVemi4JmYopXimDnqpt5WDLU= -=PVW9 ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc deleted file mode 100644 index c612b847c0..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64-PINE64-LTS.img.xz) = bd2ba8b020b17f1935ed560f9020a3ba634e7822ef83c950934dd64eda9180aab6a9d42fe6782c09aa68bbb21aa9406a8b091271bc33ee2d4a5a95e942993ae7 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pPTwg/9G/a5SFPhkJ723q6oZZNBc3ZXO2cZ3+6/4o4E24acvQjJmesJ46aQiojJ -fahXVMgV8nqMacgJg7jv0JVr9M1MJZ9JLplv/BkgJTfFyRS5T8Q/lr1qW+bHN2TW -rymM1P5wi/pqxGgDKZXHk04TEYvpwnFuo3ZU27v51or93bAkwqtT/swd2mTyH8cJ -W/16HijAdxiXqNZJxPH2ka6Mo+U5G6dmwdpf2SvM/U85XwxRqFGkxbnPQoSxrFDf -gKnnhfyL4U0zrpLTrfXEBD3sjsST5AIEE4WL6WCaFPioORh+WJJ1HBzmYFxRzniW -QcvoeXWsQB1NZ8k3f1Y5Hr5fFe1Tp7lHzfgv5TlLW9GU+qOfbPpYkBO5SsvxusiU -zaOTfZVurkvkhcsgNuw/N4x+gGAGBvtdLaSTaxKZRZkv9w9H24UDiaq5/wQxmUWZ -xCzT6ZX6Dw7+dGu8b2UgQhXuAiiW3DuMle5HKkVjkzBWP0lLKR314ewa/NlgYN6O -9I+4pAWBGMIB8OMpZZCLsgi/f3pe/4zfs3PgCghMyVKKOhZkuPvH/LkS8Vyop9Fo -FcoMIu7raG/tX1gat6rhrS/h1XpwpX+uLmYsvklm7OeOWCzuwI2JE2tpvX+5nxWG -EVgxF7IzBNQj6f7ggds9mVr1GBw+ncoJ3XvlPzXaU0UMjhWMzTE= -=eoSK ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc deleted file mode 100644 index c7940c521d..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINE64.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64-PINE64.img.xz) = 773594a9806436038e95ebc0b71f3e022cf1201bd6700a3fcb5ee0fa498bab735b04900e9c166bbf80d8dcb2bd3098cb257e45ef789c4bb9d37610aa3749c305 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pOm/RAAgXgsc8LdOklzZG7H+Sf438Z5XaSFMfa2rqQDJ9lyCYGwi0jnRksDRLui -9p6dYLF9uoZ+R/pgmSCNgk64vIzTbyggt9bwZL9MZ94uH8BQHka3S7tWgQkPC0hO -twAF8MJuzd8YGenrYOpBwSfYpuJJOrXvi19QNbTrfIRUpTouWp1lWya593asObHn -3PpVnmcHGYObugTCkHXhCFdqVZb2dkZzzeLbKkG5jqDYnLuCh4VjXIFXMft2YnDR -/l49n1TgYmPecqty4yx8OUlPMO2ZxxW2+ZZBblVu/+4LIuUZ8xMhiSy7etdngnSD -eI7aP1vXEJ88PeKEL5XLzfnhFuPi5a0QfEgwYfoZ8SEShkyNolRvtRN3avctKaMA -duVM2CeUNjxW90uuNnYB/F9N4e8ydA/SM29ZoUIJ2A8orsDyJNZMnLCQZP3Hq3Ep -WvOiUZFhtqYcZ+s9Ju5KcTdfvJ67iS7GMS6nVd1I+iuIJQcxLeYLoGg3r50GE0ZP -I6PO1b+gNILGBvG1LIcoMU3VMeEOctkZ2LGpAn8VBsHtjnXlbTfKMxmsMOR47Ztd -wGBYYQJfF5lDHF/iHqEvoREYyQWhhZkA4aVkmJAwAeCKKC86RoXJ+L59cZk9k27c -1U10sxgahvB4NePQcelaz02LMyYl0p65Ewp9/mwClD+MYp9COBM= -=2o1k ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc deleted file mode 100644 index 1970b28851..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64-PINEBOOK.img.xz) = 40e71ac98457451664f75930f61ddaf1f2a990743410c0556c15b9493925da39c50a76a737b6083334fad5b432a241d7cfb7b2258a78c2577ea0aa86f23d9c4e ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pNA8Q//QdLxshZuRvQuKZO6nM/D8odym/Ta/mYS4+1LKusUyWz26MJ/3TiuXho0 -+WWBk5zQjqH7BILUTFGLQP+l6Vivav2uaKsPdDy00xJxmYJII/P0+0fQEDG38pas -CAebalARk2xVbKxkmRKZ8fHDHwv+CWPVzo7Uxg9mCP3BOhM1u1wXPnnTh/GzjZ// -FdOqosFqisi/a/afzxodgZbKXlg4tcNYzx1f80Q9dnQzMIYSU9fnLT5MPkBd78pK -MMJMiRRh8JhdBqAoG6iWMgwMZ6Kz1bBRG4nP8avuWABAIzt5971TfmRhZdLglyYw -D3+kd+rD+nP9JnPMpfmNNz3GkQHqSJCWDzbr2mItBtElaLDLJZfv2LTFMYFwxfwt -3nLSZTPV/R6PGqR0ZW3DSg/ZITMyQCGB8aqYN4cmcbIlYE8VJTYJUvrTgqJpsIcs -T/zNB4La7wc8uAAaEdLJ/fZfPKkwyDx9I2rD5eGf1lpEKTvOHrUagHcBc2vRpE9P -Pz5R7qvaSUZChRnm2PANA4AWfxMgmjrBOVFQBsbOnZNUKaCcocq2jp3XrjCZVyXs -ee9zGELVQ4M50fsaoWz0Z0p/RmNMBFCJG1DM2dshI0Xpgz70uKcixUTuay+HWTJ0 -WkPOwHOzRVxHxGfJs9ZGRizDUK9uqAT83Y78BqWKWRCyko502Ss= -=l5yx ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc deleted file mode 100644 index 73698b34a8..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64-ROCK64.img.xz) = b58e344d03e002cd9518b9e69b6721acba3aa16cf0d44bfc7183ac8e69ccebdcaed3fe99cd08ae1df819535abdce9d58673b707e3fb5355b1b117c950161b948 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pMNbw/6A/vQU7VQ1UVgIyDtWeJ21/S+LxOfd9VttBSoE4Vgb8ctd4rXbdwzCE7R -Wc8oIMBD/uMjDJUjZJSUzKG5L2n3yKZTvATnAZ+RiKQh2vEy0L3c8dEsdnmBcl9n -MTspXiqLhlsP7Wd1ueY/eJVuwH3rcX4/kUU2mrGB/mq2V0WSlL+vPlsOMYmvYrIM -6QZ9ZDK6rVtlv85jsLqwFW8GLvu7pglHTA4DH/CdkTQH7Rw9t0r3hFkzMDMtSrRj -JowajogZp68iswfmS3Wxa3NE8c/HRHZ4G5eQulfd0Yg4NVE325WXRpn9j7z5rmLs -BvG/oObzwE3FWs9a73PBQXyLx3f8U0E0LNZTD/q4hLAAnDRAo5cV+D3FSxXPaVUu -di5XMTidte90HFe0S+uuJPSmzcMdpayQILa3dJIY9Ox86d9C+B++Cqhv6KgxSHTS -4CCErH5V/0br2Md2xmrxybp1Ws2u/d2gaxsdTG0dMn92nXL2PfStVANuknRpNj81 -GSpVe66aJh5KI6TAJTyXv8s4BL1LnkxzOSksiZZa4DrI1Cx2rcISNz3FiYXt0zh2 -94TBkHB83Hfp3MZ8YN88xhhR429em2BsFK3m7dYv/pg1wLusxwwlnJl0sFIyg2Gm -VxCvVGQCsNMrq+SIsb1aXAZXyfpVU40rZDeFp5X55qfJard9j48= -=blCo ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc deleted file mode 100644 index f70da0b36b..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64-ROCKPRO64.img.xz) = 4c4aa8151ddc9a27758e37e86cfde0f833f787c63fe7b5154783b446278d029bb1e7d2740277cfdf8966c6c6ed7d6c0cb5f9b4a86060d2caec2785024807ac13 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pOg2A//VtjxdwMEAZHj5N/Sjb64VPMN1oHJ/uceTtTULlcmltZ7zwVHzJoAiyUL -5mdpeRz39IzYY4b0JIsfnkvRzjkOoV7QVlcj3GDRQOq5+f/DxRtFkDnWMT0HGTON -iVQAHZb4WIQqSGNBNWZ+Nwchc2r9CoRZ6jgVpXAcD/xkYQUDHe4AJ/Zmz9VFba9l -Spg+5YtzsB1Z5OvZeX3rGlPcnP+lUeeTz5yPy9nvJvacJ3oD0w780kWYRvMB4C9S -KjyTffP3QRL+zdu3JJSd3lrYQtIK7LkpUFgOp+XY0rOvD51C++9sSGYIIlSIPV17 -LvEzCXHvipSx8kPs95Iq38YcFiMKmMuE5DbWnoyR3BxyR2FUWtKh7qgPIIXWv807 -Z60QRa5JV+JXXwcqidJ0Z11VWCFVkBbsoxB/CxVJkkyLrUk842GHPhcJPKK1c/XC -AZUmJlrQaerwg9Ce2zqyBhNnsjXYkvuakcOIuf4p555gNaPj8dGBwmmYXwvzNcyZ -6ROe6G8N9C7xm2SWbPEAxMYS3BtMKvKKyyBRniBApSV1vJxVsWe1+XbDmDzUrkz6 -y+GKBYnCh8LwSQ1fDgm9K7B45yuxW8DYc+ZFXBisXRKZhszfg853I9CDZD3/YUM0 -PFSd5OGcuiygXtavn95WMY7OeK/FDgwW4OkqoLDvKsHKu2CaOEM= -=EuOo ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc deleted file mode 100644 index 043779e0df..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-RPI.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64-RPI.img.xz) = 0606410160b549030d4d76e087ea94d03627832bab41a14a9df3d2bf8498d4e55d26a544f7aa928bfa576ec2fa45e3430a62ee7495dfe8d71158187aa79f8088 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pOaEg/9E39Ef3hG2XFkLeCAUJXJ9Z2XauPVecSNGJDJrlmOQqkR6DHv8Q3wqgPt -KuRzIxp563bdjqCDyETDE2eWlgO/twUW6wauHDJhSGesvqW5Gtme3SadjmlK9dPI -lSaInmIOTXPOKYElFVzWTzIryx+lok0JWhHPyKDW+xtUbBvwXkCV//csRZgldTF/ -Yk27PZbxB0/XhLsSgOPyiXVMM7K0MNixJHf2zaScJMn/a1AJCWN0qdwIiuNaldDy -BIu3SFAkcYgSQ3dpAdYlbnx5dF576Uwl96EKZ17wqv1kIKRiyLDVxs4QitGOM5jj -ULcb63Xxn/DoiN0nCPjXzEX5Kv+5TUNgN6BFYNITimGeAbzaIkQbwcfNsb/qAxKz -k2FswonKOPlgp8UC2QOMYgfBirYONHfXya/R0YPQZOyfT5C8+ZvP5YbP2lS38FG4 -PRX2IJMcAH03p6620G3JCu8HUOkyPGFBnPjIeVpSewyX+Hw5wRLpuql5CUOJoVeJ -4MECa96RBDzXxchV3dUMQUdHCtwKhawGmnRKUOwYXz4bZY1nKK7jqv11IVvptM2e -7/ilXIE2RsjaQFEgGmLokB9j4qCqD9FAMlMtp2+0NchMY/SFQvqD9wrcKglJbcwx -2EQloKCNnnWyrA+eKs/LRZDGR8rQ/SBHpx33xplVisVYTBnnmQE= -=QTWr ------END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc deleted file mode 100644 index 0e980e33d1..0000000000 --- a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2-arm64-aarch64-vm.asc +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64.qcow2.xz) = 4c50efa22d57006178a513772d944e788a899316f7fa43ee221ab5ec06ea4e71a8101fc41fa6c2dd94a2eeaa1dc36ff35b176477330b1858e89405865204685f -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64.raw.xz) = 76383bac800d589f575d54872a746a858ffdc3bf35d0663c9faac0d1f341675e0c31877263c98177b9430aafabddb4d47e063a48b77bee2fb4565407404b6bc3 -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64.vhd.xz) = 61b0fa96f60b562bd99af1b9bbaf8a9b31400982001f139ae55eed806af2b75a8469d00cfba25ac16fcdcc4b1ad559a7061e78286a5df1264ce1964904e3d7b8 -SHA512 (FreeBSD-13.0-RC2-arm64-aarch64.vmdk.xz) = 5733b32e1d5eb4ec8ea976522cd41e2fce2ad5e1ea300f0c3ecd1a6247ca87f74c456f67f64edb90f6490a9cefbda70b67f6997f4a9a021b80d2b92a3f88e784 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBLzG0ACgkQAxRYpUeP -4pOYJw/+JvFHvj9oYHBwpoHsiSDFKQfNbp0rOH6zSjP5zu78T3R7VmHE1o30CFSQ -uKOMf45T+ziY8BceNreFY13v7p6fqbXPRqp2xouTwmLLiigtObmYEpJO1jg7Es1v -fe0hLoQSdSlG/LMM5urUNq1p6MvKkV5e1bwFG1FwnsLqLFkzSJbfwjuWF4dBM01I -n7GherFrl853LHEbjgMEN4et/KIxJ1mNDBTIr/9xKW2qE4bWPiQHPBymXqhF2Oqd -rErmd11LPRZ/MZcHhmTrYvU0RSgxRxn8FYVFdhelBDmtW93zAZVV2tR2AoJN+xpL -592rKOkfPN/6jORcioomfwNEy9RTIkm8PmWhY2XlMrje6315HlRdTQmNNtEzTDZ8 -vB+jTxS/O04Tr6GPgLApPpG6HD2eqaM+yvlFpsK/QFhkgccAM5oonPvIZ74wtRjA -Mm8eiJJYosDQ/WTOJtaHbcj6YI3DxFFzxWLvgsPjprPy7UA+Df91ycHScAJYWcO1 -+6TaCJha+l3mDALCtrHyavnkv70fEGdIGIzxOF03kXtRkykZYbNxYirKV6D7L6S2 -Lw7QPCamGeZCEAAkNB+tIkq5d0Z8SFogfx3UgJ2tRwQeiplghvgRFhDnhjQShbjM -PzJoNnlL6ux2jAmOyAOZz5SCSWJAMMIu++jcDx2dFLpqiM5/j+c= *** 331 LINES SKIPPED *** From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 16:10:20 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D3B35AD8F8 for ; Sat, 20 Mar 2021 16:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2m235g9gz4hN2; Sat, 20 Mar 2021 16:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B43ED28BC; Sat, 20 Mar 2021 16:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12KGAJMm070954; Sat, 20 Mar 2021 16:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12KGAJQ2070936; Sat, 20 Mar 2021 16:10:19 GMT (envelope-from git) Date: Sat, 20 Mar 2021 16:10:19 GMT Message-Id: <202103201610.12KGAJQ2070936@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 978568ade7 - main - Add 13.0-RC3 checksums MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 978568ade79e13317766b92678918b72b8bd8f2e Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 16:10:20 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=978568ade79e13317766b92678918b72b8bd8f2e commit 978568ade79e13317766b92678918b72b8bd8f2e Author: Glen Barber AuthorDate: 2021-03-20 16:03:44 +0000 Commit: Glen Barber CommitDate: 2021-03-20 16:03:44 +0000 Add 13.0-RC3 checksums Sponsored by: Rubicon Communications, LLC ("Netgate") --- .../CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64-vm.asc | 23 +++++++++++++++++ .../CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64.asc | 29 ++++++++++++++++++++++ ...SUM.SHA256-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc | 20 +++++++++++++++ ...SHA256-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc | 20 +++++++++++++++ ...6-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc | 20 +++++++++++++++ ...HA256-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc | 20 +++++++++++++++ ...256-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc | 20 +++++++++++++++ ...HA256-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc | 20 +++++++++++++++ ...56-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc | 20 +++++++++++++++ ...M.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc | 20 +++++++++++++++ ...UM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc | 23 +++++++++++++++++ ...CKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64.asc | 29 ++++++++++++++++++++++ .../CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386-vm.asc | 23 +++++++++++++++++ .../CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386.asc | 29 ++++++++++++++++++++++ ...M.SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64.asc | 29 ++++++++++++++++++++++ ...SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64le.asc | 29 ++++++++++++++++++++++ ....SHA256-FreeBSD-13.0-RC3-powerpc-powerpcspe.asc | 29 ++++++++++++++++++++++ .../CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc.asc | 29 ++++++++++++++++++++++ ...56-FreeBSD-13.0-RC3-riscv-riscv64-GENERICSD.asc | 20 +++++++++++++++ ...UM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64-vm.asc | 23 +++++++++++++++++ ...CKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64.asc | 29 ++++++++++++++++++++++ .../CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64-vm.asc | 23 +++++++++++++++++ .../CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64.asc | 29 ++++++++++++++++++++++ ...SUM.SHA512-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc | 20 +++++++++++++++ ...SHA512-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc | 20 +++++++++++++++ ...2-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc | 20 +++++++++++++++ ...HA512-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc | 20 +++++++++++++++ ...512-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc | 20 +++++++++++++++ ...HA512-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc | 20 +++++++++++++++ ...12-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc | 20 +++++++++++++++ ...M.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc | 20 +++++++++++++++ ...UM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc | 23 +++++++++++++++++ ...CKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64.asc | 29 ++++++++++++++++++++++ .../CHECKSUM.SHA512-FreeBSD-13.0-RC3-i386-vm.asc | 23 +++++++++++++++++ .../CHECKSUM.SHA512-FreeBSD-13.0-RC3-i386.asc | 29 ++++++++++++++++++++++ ...M.SHA512-FreeBSD-13.0-RC3-powerpc-powerpc64.asc | 29 ++++++++++++++++++++++ ...SHA512-FreeBSD-13.0-RC3-powerpc-powerpc64le.asc | 29 ++++++++++++++++++++++ ....SHA512-FreeBSD-13.0-RC3-powerpc-powerpcspe.asc | 29 ++++++++++++++++++++++ .../CHECKSUM.SHA512-FreeBSD-13.0-RC3-powerpc.asc | 29 ++++++++++++++++++++++ ...12-FreeBSD-13.0-RC3-riscv-riscv64-GENERICSD.asc | 20 +++++++++++++++ ...UM.SHA512-FreeBSD-13.0-RC3-riscv-riscv64-vm.asc | 23 +++++++++++++++++ ...CKSUM.SHA512-FreeBSD-13.0-RC3-riscv-riscv64.asc | 29 ++++++++++++++++++++++ 42 files changed, 1008 insertions(+) diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64-vm.asc new file mode 100644 index 0000000000..e43aa957ac --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64-vm.asc @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-amd64.qcow2.xz) = 1e393b2397cae0b4c942c49cb859f85869bbfb3f7e5a4d2d77e78932cc223278 +SHA256 (FreeBSD-13.0-RC3-amd64.raw.xz) = 1335f4d6674de43330c1a54d09efb3ac59219c8950d429a2a86b1e88d3816bfa +SHA256 (FreeBSD-13.0-RC3-amd64.vhd.xz) = 9bf03b7276892a3e015dd384bee9f9aa610a6018a8dd15cb5178399ac7d8f151 +SHA256 (FreeBSD-13.0-RC3-amd64.vmdk.xz) = 3bfee44fb4aca49f5b40ef678b60acfab14310cd30bfaeee8f39e0a14692339e +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHoACgkQAxRYpUeP +4pPC0hAAliwnEn7OcAsJxbPt6yNxsfMoN9HLbbj9OyVMeBFZPi5JshFqFxbcdzmL +87ABmJ00QZXDxSpHfrT9xMHj5Zf++KIDD7n3nObEAoCBlvn/Vsir03RBkiPK+KHS +Fej6lAEniS3t5KrG/KD9mi8446nfktsGP/wlLI/9YjbM01YcbnlzsvZRVpbfCQsz +MfjEGA1X5dsixNAGR2XOVyZRO0fDzmrFvlC2fzongn2adVyk60EacADnzZAWH5Ha +COV/fgq7lS2RkI0E14dB7J/UhL+YIRNBRcZNRjbVC2QPxOgW6LiaZknxWkYmB6S6 +Df1Spcgr6CSarO8kerCRlPg6kG9p3ES5c3D1a3vlXZv8CianFCsGBi541gRGcwVP +Eabyd1hZwzQqUF/M5L1KIL6OUpIaUgHgbq7rofIjdsBTdUU/0AsuU+JjuOwWNLa8 +snIuhj7vUn5o5ZIISwWF6byS/rT4LcaZVRfOcKRcp9Y5Q6+5rD6wwFvdY+P6TNzF +ZpNvAqLzqxmGoVXELcSAwI/VdLTnNZlB1XZQp63HIpwJsMhmWvOM78kN7MBzWA5I +4iYUKGqY/5FGej4ogr2umC3tFD03IM3W6+NHb/rY3CUSlRJYEg+S49Wrc9Sbl/St +AWhHt80a+OBaOKh+qVB4su2mo1rHM7UHcc3tKu8urF16QMFtzns= +=UMQY +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64.asc new file mode 100644 index 0000000000..3ad789e0a9 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-amd64.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-amd64-bootonly.iso) = 61f9ccff52e463ea498ab8e0151c094f2e5410ab78fd9b20cd82ae1aae14256f +SHA256 (FreeBSD-13.0-RC3-amd64-bootonly.iso.xz) = 452dc1b7a28b9c84b0777b6ba3069657ba3bbfb51c8fc7be52773e100a1ca2be +SHA256 (FreeBSD-13.0-RC3-amd64-disc1.iso) = 45d44170a3079b813d8e0033e1a99f10d0e8ed0ac349aeaf25193a33553c9601 +SHA256 (FreeBSD-13.0-RC3-amd64-disc1.iso.xz) = 36424f242f18db36883b7f532545a548e97b61f2107a9fe98e1562b63ac5570a +SHA256 (FreeBSD-13.0-RC3-amd64-dvd1.iso) = deb84cd7a5d9804bbabaa6cc8642ad02e537e9dc2eb3b9c801c52fb8b3d79d30 +SHA256 (FreeBSD-13.0-RC3-amd64-dvd1.iso.xz) = 4494197d4b746728b6407bda62b7c77af7798aa5562d50aee70ce6fd4f291426 +SHA256 (FreeBSD-13.0-RC3-amd64-memstick.img) = cc8162d5ebf79280e8fa41e1345ee985b86351aefdd77a90ad675eabab325c7c +SHA256 (FreeBSD-13.0-RC3-amd64-memstick.img.xz) = 865f3873f797aff92e6215ef28d9ae97bb69dfdf7acbeb17d70799ebcf982fd7 +SHA256 (FreeBSD-13.0-RC3-amd64-mini-memstick.img) = 0832bc13a555780772903073f1242471e25d3676d37a28ea16364a5d25b817b9 +SHA256 (FreeBSD-13.0-RC3-amd64-mini-memstick.img.xz) = d1c6e3d6a382d876981fb3f3f8c4929bfefab2290be279fef41a5a85314f95ab +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHkACgkQAxRYpUeP +4pNiRw//YX6q7qa6yf/K005wMX3E0UBFcW0PwqrINs1+hmNZ0xHh34Fo5Hp2/yp6 +rXWrlkr5icgsFxybN4unKAJgWCOJBB0juIEVJVC2oiCCqEbKkP3F8UmcJGhZ9Fun +ae8HO+ie+niqoe8gt81bEPuXPnoerIjKBYXXKjFiQzvomKW8TrwPIg6mh5XkJI9S +X9twGOiRiqi8id8F26+hCxKGTR1RoJVZtzHMj8Vg3YaRu2VAuASy/WMDOBrC85J0 +sLjo1ibccM+vbsK3xKQvFCXSGZMe6O9l6JCOXTTLGUpC/IIHfHd2mXeKBhCfkRwr +rxlAY4aMn6kvYK15nO5H/yD0zY+rHK9eCDWmfA4pMXF+jUllwAM2tYOQ77wBAfS1 +GmM/RYDoMrcag1Py+hKJFFYan005wOpcdZ2wwiOqkswElT0tWiKjNxElIHEVGk85 +IPjQTPyXOr1BlTm8kt8DcjnNGUxwIEraTxo0STN+yqxwCJEOhvIuymvSuwBAhdYk +/JZSrbtfzbXmS6w0PSXZVIMfKxNP9PzO3P/8j7tudfpjnSzUvYMN1a5KKm9sn74b +jHFaRilpWc2yfFMV14A8SZUMRXOQ4J9XwGAIDDMN8/8fUVuITcm8J+JgH7pwGdd1 +tRSWxk/RqPm2xe06Uo8PvohRrQ6pnEYazhn8SZEJtes298mzdRg= +=DtjM +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc new file mode 100644 index 0000000000..ecb3d6c865 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm-armv6-RPI-B.img.xz) = c9735ac85f6588a97e7be608aa8297ab6d3d81ce4e0986b7a8380c45b067f6f1 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHoACgkQAxRYpUeP +4pPY2BAAge4US8UUVeD10dtE4fQoh0eAx87RNLxcDuLUBYL9R8VUX8jNTAEYVUCy +MrNnxgNVI2rNxcsxwlYaCKAgYhg6V1epjE+8PUT7HqCpTIQ0FgYa8Gpr98u8hcQ5 +r99O5vkIXLEV94ii0koHtbjFlJ0K+PDs3Z9hwOlpD7IvpBYWKIAgxMzoTfanNPcH +zDtrBh6bUrGgh+zA2x1AuEgO0m8g7DZreCCl8fZ0uuArcjylAHbpA/JWaX+Yj9AY +U5RONFjHA0u7BX5rJiZB6zAzIWHRsJvsin9eg4sBrEq//1Iw0VBtPSEn026oPM2q +kzr+hgLFwarzfyGJ71XeAgdckKTBKdQpRYSeAD65YWVLA0rhVwqAdQJ0QJhI/MGX +CLQQhk/npa9PckqNw2YVuYbqpZjCYjo2tHyzSxXcNjNPcKxQ/UKXBH99eEY76JDg +TI7XMx1cwA0FENsm3pDZsiLszWXTLe/0xUyMAHs8mNxrKlwSDkX61gO7EnAxFOu1 +ExVxooodL+LN/apbFT438EXYYMiFhKloblcBGbIz4uUAqD5dV7riEYIg+cXL6KSs +BtmIMkExq9tiBV549ZmVfgLwe9RwPbjOLQnOCGthjxxpmYS8QPZO2wfdVOYl8ZMJ +GBPCInudEhgbwMwp81pMvZpSyIJOsD6KfQQUR3AbqisvqT4kPFw= +=3LIL +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc new file mode 100644 index 0000000000..3587667668 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm-armv7-GENERICSD.img.xz) = b8ae46bffdf781be6735c1e11ecbd9644d7ea02265e8cde0ea28abb6c5e28722 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHoACgkQAxRYpUeP +4pMZsQ/+Ii46Kfb5k7p0pVJOPQhsqlc3zK7CwYNOYMocqsjzdJApHVNVKrkDelgl +ECmtWWmP5xhgpzXLO8BXUpj6Qsfd8XXDz/OaA1Mv3Anyd9oXHJDssMNZSaby2Q7U +caCb+5DNB+Szn9O8gmKQsFOjfnL+S9e6QPWj9+4rlzDzZfJKPhr4vkvzq5Or44hh +OH0lTaxj03BpQimHnp3xJm45A2tYcUK6Wcx7v/gYQOPQtZWj+tW1fTLqSd251R8B +IGY1z5ll4S/M9uTmDy1Y9fSfnacEOfjsiVaR0MHK82jOllnYtPjQQ/Tg2e6/Csnx +29rSXXLLeWVtZfkMxR/UPPof6l1yjswC1Ca+7ucQoPEoKm4u+rFbZpzSNlpVrKZt +/UefK4CNZaQ9tGTMjbd/5Pz/Lrjc2hJ7weZkx6T4NG1uT6SzxT++fjo4HtXguzbG +URaYfsip4QnX77ma/d7ftg6MCAaeNlhjhC8PgYhtl72jFDHN415xfak0V1iELPOC +fjNOz9M5mjpAmr7C4YsFjDODqJOg2Tx9CZsOBM9+kaf9jZ9Hbv4f3cuiiRHRkpfK +8eIISFEVl529Qjf4W9iNXrMBG7WYfGjoXRh1AGBYrdEDTC8Mofnhht2/zj02AmRK +rLPs34H5gl/8cgu01o9nmpPWxPBXaWq2tZ+xvnXih9mYyYcNZTM= +=AmnJ +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc new file mode 100644 index 0000000000..47614e698a --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.img.xz) = 17fc09dfbdf36901bae32f8959373b9f77706f47420cfd1a2f51c6812f36800a +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHoACgkQAxRYpUeP +4pNidg/+OLrCv2THBv+zgeQEEu2nDOvpXvQ0dIhk69s/mVmGmIOaBxsrZSdkRjC3 +z9pexjSbuHss8CJ3AHNA3Wf3pwFxzeSm43YIaF4RecJR29dtK3mxUTcC2gyxMdkb +oD7MmjHzIOXgEcI6KL/QEkt6Vzj2fEM2zJ7icBLR1cxIjKpNdmM4bHLuttZKXQig +NetcFn1JbNANtylmfch5MH8KBtfwCDCotrBLbiMs7tUdhOdr8h7yisOcyQ5A9DH8 +Y8PIWovOVbm4IQRs8s0O8qRstwEBpG+yuY3EG45ZF56L5PDNiae3XqY7wMwTYGSw +O8+EIGQ2DgHCW5pmgBn7WCEONSeLw9YOIlNOqUN7tlC5i1VBRX0otQ5hmbIIqjpR +pIXnmNzSXEi3xaUMyqNb7ojdY7mJyJv2hWmcBNjVOmS/lNGB8WDlE3tsgJtn4R7I +uD4YaL23URUZF42dHhP207xybTD8wCMh+/f4T4OxZvZ9CrwIvjNG18bGvwb9H49z +D1ct25hlTaz2P99d6fujhMHlFCGkhSAJ/NqxjfOAwg0C/cbnO8Vr0etBkxs6+RMI +Puy7Da3JXa8XyEDKwqwwLHSegYLAUoct4jujlN6iFDYwLteMPiYEd4rtEWEHA8a3 +Tp9wIIEXwQ8Ctg959jH+0swBBPT48vYZ0XNidk0TkpluAh3kb8g= +=uqmR +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc new file mode 100644 index 0000000000..3b1fd8fd63 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-PINE64.img.xz) = 9f90f695921e922fb6f73a22c287dda9fa1e991fea8389a54633010b7a40b160 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHoACgkQAxRYpUeP +4pM1gw/9E84ybeFhRl8FZZcTFgxZfgn+wb3mVap0zpv5AcQ/3Xs9UqklE8W6FkaZ +fq1bNspPgtIcNftjPbc9dvL+aJ3uDTOFD0nD7b5kbeJjxL3MSbOfUHja6OrpmgH8 +vllzdgRKeHURAA+wGvGEdyCRodbEboZBkbFfHWX4TiwejG19tpZqF0BOynnIezb9 +NBboFj7Xh159om5Mt1d+qk1G73ySl6jeETbCFhSwTmnHM0n3EynJBuXPsfy0KqjW +U68vKneOEql6yh/9AbhETp5/Hfoh7m7yPjfRqSdAlcNu86ILmMJe5wc4m+iKmB3L +WlISnGr6i9+6u0YHIKicQhTCf1e7MABI6oQ0A5O4ZEJPma/dRG1uuYDQJdRr+JmJ +XwZ0n6tjSfrLQsz+2pXxvOLKgCbR7QPeqo0XyFEUa6GaXwE5uSgPecqIQkzkPOBN +CMPmcLFCgRuFnwma+gFbsKiXu1WvZS7dKtfYwexSZdZGRh+vwEkatVcw2X64U2KY +8Zh1FvzidshQsO7FCdjfMkvzvsYCyEyPzj/JHGK+kCrsi4gNXvwWkw2YTnT6fN5s +98YklF6u3WsDq4WkLmC7nJtVZsBB6Oj+6mBjNOQ4pQP3m6htpCIDj5okBhaukAf3 +fnVFKxuvlAOJrPXHiNrxBopnyx88QgKS3FlBbRgtLlb8VKN3caM= +=VQGs +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc new file mode 100644 index 0000000000..17c3979ac9 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.img.xz) = 580647b43fb156bbf791c7d7f1dc07759adb090f79f72b31ae0849ea83577e80 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pMIKw//Z8mYh+zmtR+7sMRmt7bqzBry8kifI86WevsMFR3Dqk/kypaVNtqbdWAG +VjJCBPodqtIJuGSAWgPp/apJ8oD1GyLMsZ4hcb4MwERzu+y23fZt0F94G+tdIvb/ +viDmj8fXfTq0tKe3PK2f/kxY9dvxRU38c7Q2t2EJKroifAJscdxHGhyyPxo9Y73Y +x9FeHKW5+bzn/ygr/cjGJMPVHz+MfmN+KmvOjm4ksfQwO9LjG2hYhtR+WJ9hM2tK +LaZNMz7uCjNEtQhYQRrU7qrUdUxdYRFu/+6I9KBbiEH7bNrSWhMSMo5jT+kYeG+F +IAl5xmh1+wwttMh4i4CRBr37gDS/KgNkoC8uUkM6XQ7txEUfbckRDV9H8vcePPn1 +8RMQv63mNtc3vtlDAdhJYe+SWtt5LD1QbgbsjMgnagMaUK+I+dHPE0kRZ/9FZv4G +oY9Xs8MSXxQY8JwHu0+eYdDA9jr5vUFGoXPsP6Qp4KeGWnHFC+AplEvuSZP/AFEb +DVcwor+jT+FS09i6qpYIel9k/DBNmloMqIB7EM+XoXR6fZpXHrvPh2pFXJMZNn51 +I5yQBB28BajBK+x37UrjEXEJjCyxjmr8uJyzAy7w+UBpvddIwZblfMkcKVlyNNNs +5MByRzSp9/7HzdUz163Sr2QracUi+64BN2EP2G43S29kAy8IQj4= +=8xD+ +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc new file mode 100644 index 0000000000..7a134cc57c --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.img.xz) = fdab2d985630f5a1c8cf7c32286cfe586dd8e9d88c66039946d492376f4cb7ef +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pPQ7A/9GnFDaU4ZEAZnN5rekRV8D7I8s8cNuqamb3jbfYmu+YFLLz/wU43nzM7M +OCCEe2NuxAO24Fp9migi/tEJEyO6eXyP92IpUEry04I9uuiu4vfJHQ3sdpH4ynkT +iqjKEHqVS5Z1uqcuXv9jVQ9J11XpJADdsdiLAaRPzeorK3cwenn2zDnbZw7HoKw4 +4tg7JiuwcAZpOPfu6bkz924NHN55h40nCUePunTcWin3wPma2UZtWbFFgQeBi0CY +1yrDsXfva/eGo8G9LsjxYYnNekUnxnJmreAL1n9LtcXILMWPH+VcxTc/7moPuU87 +wFnYye9sgpqhe6CyUII6F2KuLEn+/pauotC6EkG1dLwjw4l4jgU6ES627nnoL7BF +N7x761dc/xLpvrseehgMw9yE2dMKmIyh9SiT0Gd6eMfw/ASK1fFS0v1BEH7vbPVF +9IsuyKsEdXpTlEkyyhu2uyGfhvvOkt9VvatEN7jvSb94elJv+jG5I5kB/DArg4Hs +ty/TeLqSR0e1O+98AUxi71aR7CTZ0CKTMhSRpSiKDi58C8y0j6EWqMEFvvqrytF3 +G5I+WIODE928eGSWiwrTT99NCSYE70y2QbJJQgqIdKUXZr0612VEdFoQu/xsMyyL +vyYNo6y1DS6valyAbhlBfUiCLBrQDrRfqKSx1OajdB0C0qO5m/o= +=KaSQ +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc new file mode 100644 index 0000000000..418f486d4a --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.img.xz) = 2cc839203a3e4171c4ccde06c711288c89fdc906d60a87795b7f7916612985a4 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pPcWQ/+MR4HD8MNtx1Z0h+yxtS6UWE4TghHXCpbZUxKkAoBXaIOFKgHusTvSxEo +5Tg6owtkIcTnNCqrvNQBqQ9TAmLEbLMpNInQfhlGL3QN0SXTIQT+urY7ZAbY5lVY +YS/ASBGSxyf90VWrCT2JG44nRZCs1TEZHmeBCekNY+VS8bFLYnVWOohJyvBAQfqq +gSfon67xJWOyI/fcIcBUCPcCZItDm0OBcc9+D7eyOYLyO6PY+I/7B6Ud4G4VD04w +RaJt68tpX8iQThQKxQm3IZIv+UIFDTOsOiFh2LqDIEB+W5zEe7nc1ckpvM5XFX6f +3iSxpEeN8wNwwwjyrqePgSRNDWms/DQnnmxBOasd/HD540waIysqSnSPeU3OudOy +y3yVnxLVNGvzGEeFPSMq9YZRzL1fN5vu3/p7/pZss2XcEa/wrTDMCYFoWYHDzH+W +fwObkAX3KHZyvNR6LzWF5jBvYKvMBxQhhdPKAPPEcQrWecMBq0BoLeQ0JQd0ufnA +nHjtfWg9Cp9mmHS4Bgd2bsLHGrVT5wxPiYJQkSmPIEt3ijBRnqBjVxz5Jr3Epfvi +AXCzErJTB0P1vqEzvGQyAViUgl36q9zBRWM/u2Tr+gCfV4B+gYTcNExJ+Yx5tQgo +cz9DQb9R0a96+BngCUcIo6UIGPFpOZFGkGOWBDb9MrqarxD3bMU= +=n+XT +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc new file mode 100644 index 0000000000..ad931eb9c6 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-RPI.img.xz) = 75baf7655ae8690918b2813062e9a5b2ca60f9e19df3a874724110f0546bde2f +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pMZnhAApPFhirl2ebFw5EVh8ouDudJKAf073w5rgUr51B7AR/FB5I3nXaUfR2nW +ngWjylx38GvkU2tNO+XMs7r2xE5EGKfjsbZGTZObTs5sPRaoUsrJqnyND4u9t8wM +u0/ESIK7/j1aoI8JFWAKozfD6XpRyw3Khq5qNjmIgjp5Jq4+ni5wjj8Y9KnWi1Rd +Y44DK/0gJr8Vqm21HVB9YLxnZ8jcisTenINwGwVgNTGJHasvyPxSkKzyGIpZ4IRD +N+lxgo6X9Lrd0rB9nis8TohCdX3JFgPmx8d8B1bKFW+iZ8ktMjF/vnC/IbpvcHyX +z7vFFALtXywiQSwD3gDfzsW6AXZrKOtMkWpn4DK0rFw0jJ72BejgNo9LUhP3mk7I +/jXYNlF5YVxOFUNs3TT4VQYL92Hi/oTXNnL3SOCuJ0+wZfgpIZ3dx0BCh1p+17zs +V6qqNc6qbklfzEhnzWuF42zn/jkwHy+Ho5oOfz9Qq34um/Y0i7OPSDNrPfv1m+a4 +9vI1hc5+Jq03lBh3PUK2d6zTjvMFSchyFl4rLzk8SFGmr82uzAi7WI83fnBcMcGW +ixjkBZdAl5jEi2HhyZLHVaab7PNxSIEpKtOm3qnMaI9hFJpVw5gsQ2IQyfmMRgG3 +egRoUwX8sQyzzWxNRd/Tq5TMq7roebR8TjYo8LOpXYvg01ZDKjM= +=GiWt +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc new file mode 100644 index 0000000000..427cd571ac --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.qcow2.xz) = f0b064ee2f638dbb03bab5df0f13ddfb9755861e4c301667aff0606335337936 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.raw.xz) = ec3b751a4d994c1bd89dfabad03e3154be744a3d9667b65a09ffd9125451f285 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.vhd.xz) = 9ea7117736a7e9db12992984199b02aaa72013eea8ec2737058e37605a82c91f +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.vmdk.xz) = e5256d4dd05b22d61803bfe0580580e2c0a953731bed92f8930ec3e29f22c4a6 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pNpig/8DWHDxRnWxkdzfx42fP/+/8W3QqoWEIgggu8CiWrM2vUyGGR5piPNz1Gs +gBZ7T8E42Ys90BhxLf1PGXv75uLheY7z3E6urAiePw4E4OQWcm+xl2qtbPvbJ45k +5ulYRat/hNw5vxGIUV88TGT8lFdNfl2Bu5NWDtw//DH5qhFYfS0hUYViLjl/pn+a +3lWgiKwOIdxxyje3Jc0fla1wXm8nHPnoxmG7BJp1km2NQyI7ykDFVvpbuR/a9sKR +blpwVUN+nOp41LtgQ8lm6vFbUV77gyy2RhDRYaHYslP39TsR0hWWdWuYFBj7Gysj +KysPv1dJFePFSIZEcauZXdzzHGiXpzxVMDMzSG+z6kDJXgZc5tTaLUwN2td8NZHJ +vI+M7jEWr9UpgFk0UlxkZf2gb6Vd7jea/cRr5xU42kNXmjRB7rpRd9x6a7VVXQYF +SGwzdXOCpWhvbMi5kA7hdBLVRTEJeB/UeliFKEMwiCpJzYxfASW2aiTFFmt8cjEv +AC+W35VU9wHMdBn1bxOAt68Ngjhln5bNFXJg7XQESw5iydb3Xap8subpGdloMxDX +SdyPyx9nYF2Xxlnro+1T9DYgbMgoT37Cc41dfqtCygX/Enc0d8XrYIIlVoiHsza5 +E2yI5NJDVw9Te2kQxlBnxkDgCx8PG4hLJf1SXTkpZfE9Ol2t2tc= +=ymu9 +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64.asc new file mode 100644 index 0000000000..2cdd8dd1b0 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-arm64-aarch64.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-bootonly.iso) = ea6cc6df52a265c2ed50d48363f00ab06b63d352a06aab5d70ef169285f35a94 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-bootonly.iso.xz) = c89925ccd1df086a3124cd4c83fc2b76e549c5853e4d4a5c9b04470f4f0445a4 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-disc1.iso) = 36fc92bf421f55453917b7be92bb5e1676da828d7ebb1d3c1ffaa274e1b6e32b +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-disc1.iso.xz) = 9a4f0b05c6691996e3f907a03414ba8f5c8f384671ddfdca3c35595bb5d90dcb +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-dvd1.iso) = 5eadf34065e51108237a01912c352b545bc24069c66ed9d995a9fa91f4178de6 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-dvd1.iso.xz) = bfc2ffb62ded44a6e668ec2db672bb102c3424cb640076ab2fd8ece1d6f07130 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-memstick.img) = 67d832f15eac687f5dd9aa05f5c32a1571d16d401f054506dbb3f9a0e27462ac +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-memstick.img.xz) = 3b1ecefecd189c501924e52da83e54f794bb128afaf3d1f641788685bb03b848 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-mini-memstick.img) = 99ad8bec87c55e2fd7e950ba8e03e89b3017d34c22cc02a9ac3a99fef75f9ea4 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64-mini-memstick.img.xz) = 0e95974796aa45bc6d9bbee836a086a514e350b020172f567469a433b85994ca +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHoACgkQAxRYpUeP +4pOnUQ//b3QoD2biFmfkRqo6q5bePC1fW9D1eAIpr0Auq8J9tx7C2cV5xEp+QtJm +C7lPQq75/WCB3lGPPpFodz2X5ZKvqxlK2YX4GZdiyZlONxN0XTrBYgljo7XMI5pi +nFb8Opl/SLdIcyYfZATYl4Q3BSaUQ1BfTCS7ldUhiH5NEY3crhdNrcPS7vjDQPoa +wd5iI3BnSVXJHmQ8r1mhVB6goy3fSBaONHyIuZhG3ILEEv1DkyNX2nGwpqrlpZY8 +kRL06diwZEG5KluEwHsBMPaDoM9TS0X0qlSIvmig5PJaJ8hTNc2fdpIhfDt8hgLP +iVXgfKl3Lu/A9k6Rj64eraevWdnt2ffjThdIfmLtEobYGPkvLk+5aIt5YyIpmKzq +ER9PD8kUpCl8DopFNeFv1KQmpLuzRb9Xe40aI8ueiDvs6Rgnv7joxVlelHO17+j5 +zGwdkZ1x0yybxv77p7BKqc1WWLSXzVBeiDm8E2w4uZcrmQkkZkp/+FaPwaCTjxiX +DAFfzD924pghFBx9U8gBB8+l3U8/J7WDzkG/BQsSM3e/OU7U/gb8Xwu2hs3N0abU +Dl2I4/kQud8+UPmwwgEB73WQwJnrixYK50Vf/X92jABZhOUL/cK1BhuMn9CPRSfx +En3o6Na1df57Ip7VcVOXXf/wFlH29PyaXN9tn+18jc3mbOj9e7g= +=66M8 +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386-vm.asc new file mode 100644 index 0000000000..66197c6f17 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386-vm.asc @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-i386.qcow2.xz) = ef1d26dcdecb32cc23a616847b0f99eb4bd1784fc33d3bd5efea4556b161bb43 +SHA256 (FreeBSD-13.0-RC3-i386.raw.xz) = 405440c1ad1070749e2b77a4c2d2ef2d2aab4bf87c54d3296b1c722a06d2de4e +SHA256 (FreeBSD-13.0-RC3-i386.vhd.xz) = 287e0ea5f9597a15cf587020c22326932a2f1ddc0d81c3f101a64b5058985466 +SHA256 (FreeBSD-13.0-RC3-i386.vmdk.xz) = b2ecd761ceaaae62064fa03a10cf0a9487a1706eb946d9d1f27ff9f5b2ae7942 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pMNog/+Lfvurj4ZdtOZpv/8QDKUOL0CfcSOUY2SaHIv/0c7QD5NfKEc9PI/piwr +Aa/8+5aXhrNJq/J9D4oXvqQppgG+nz9UAFJ2I7HcpY7VdSKiX0eQZW6IOToOxaD9 +sk0Pj3pEUZRE2CvaerJ0oJcMcuVh1FZkqaIa++GtQgfGhajdKrJCNg9fRx67La4J +lClMa7SsbWczVbtZYyb0aRKxw7gx/cmcSiId6SsjixgvQIHDm1n27jNxJwGheVys +zzGxhDsOhi7zF5uZHEe8ESPNoz/sK4+95GYThubZGmV6HnJcSwoAOhRZAFvfaKS3 +QzBuunS9xkFheLCcghpkSJoAHtfIudYKhBC/xwIUt73WS/2WlXkbTjSUlBlOKp9V +0kJ3ssVYp3m2NnxTdr+RoV4ZuJQC1BKEJanBYwa1eyXWkmI/xI/Yoct2NcqlIgQw +RUnEDftVg+g6YH/6U5kAaalspUqTXVDIN6xrHD/wOrCkEVlON/vVk5/AN1m3nHMI +P+fl4X27ZJazslYv19bFNB3fzAwGGbyQ9jOnUxSU/rB9/1jxvNerNU6RmWCvlVJL +Ki8bSXRpll848NCgOu4B+afWjQyHplEczwtoXbLVK2Neq8wef0O8AYI9ltGJ6rLl +DgUS8PmlWWiN3vQPCtB6i777xKTSPZJ7eeyJdRLi3fEHNzmPh/I= +=Kd3K +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386.asc new file mode 100644 index 0000000000..7ab1321bd8 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-i386.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-i386-bootonly.iso) = ca224697c104eb1ab8819bb45ba1ef8af4815e4e04ce550ee83a21c1953d40b6 +SHA256 (FreeBSD-13.0-RC3-i386-bootonly.iso.xz) = 99d26efb2b6be602f9ea62d1efee784a34573a1701674fc1c7cb1275680e7664 +SHA256 (FreeBSD-13.0-RC3-i386-disc1.iso) = 0c4b1d061db20df8f615237054c83434ba9178e36419634a91b736fee5b6472e +SHA256 (FreeBSD-13.0-RC3-i386-disc1.iso.xz) = 54970c6f228d483ccba5a375ce2efc329894a1c06575c438190356270ab97293 +SHA256 (FreeBSD-13.0-RC3-i386-dvd1.iso) = 6c14c841fc824c4f8859d990f07f750f98516436d4091c3b85808fc0f10e3ea6 +SHA256 (FreeBSD-13.0-RC3-i386-dvd1.iso.xz) = 283ca6ec1a804397e3802f23df9134812ecaecbcf0a1941aae5cb2ca14b06ea1 +SHA256 (FreeBSD-13.0-RC3-i386-memstick.img) = dfb288c6125be214ca70414b0d4c19ca12b8356f99a7cde081bc5604f39ed3b4 +SHA256 (FreeBSD-13.0-RC3-i386-memstick.img.xz) = 2c727559a052c6627d0698193596b7e47c6d27d3091c8715e51bfaa22a3fc286 +SHA256 (FreeBSD-13.0-RC3-i386-mini-memstick.img) = 24c5e2e612c2b9c0626f623006bd49cf7b0eb53e0c7e792a12e33031223e218c +SHA256 (FreeBSD-13.0-RC3-i386-mini-memstick.img.xz) = c0d52746137c951b1ee20fb7a8463c9ceb0143e16812ddb2398224510435df87 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pOO4hAAoJgiEpMNZZf+JF22rX2tf5aklQUxarIazjREr0kVbg9ru13yz4lDvesk +4rxvZR6m8RfCY59XDCUm6YXkNs/zd5X6MTg+PtdAVIm9qX+3WQNSzSL4YVrAfl7f +lTWWV9h2nLnHoiWFmQvh5WUcljWVUj68mfNzidkbBxxefzrhNAVGORmgfCGM5ZfX +9h8DEk1ZgFVCX8Yhybf5p0cUgHSZ41akvsHxKVtnUGsZBM3lKqUiZlh1FUQPSmd4 +cNsURYXTWNexqQlq3ar5HBe3msOUn679La/pLyZwv9EzZ4LeUTD4N712MxQgvpis +GouKFzlq2D3ROsElwzbGCIrmzisyQD+gygxqxF5KoexmW36B362NWqCj7jisYwCO +Hcr0iaJKDWyAWx8vQU5ZYPn7XVz3V0j32Z0cFKXLdmtAmEtHkWq3WV0rHfaIrTeh +LXuD8Te0Z90DE8xtchx/6FkNV89/nprh7870PJrmm0hsME3BgeFcHjR0rjshJqTl +L2nqR29W3zM683JYHOysseHsnz3O9ZO7sxlzOEiXxrVNB/klWtWZRcN3e8x5TeUo +hBWIL9YWr0ZHAjI6Qbu7ja+oTgYxM1uRElJRsfFfdud8Dn/6bEGRE2n98D82feC/ +mRjl7pdeoL0qS2mRna78yLmtEWrARI82xRa/JTreVJSM49EaqBs= +=HIs7 +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64.asc new file mode 100644 index 0000000000..bec3608c90 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-bootonly.iso) = 9fe607162acf6f3155716ee517cffd2049900c736166858b7f5b0d8ba44c924e +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-bootonly.iso.xz) = 9b3d631f180cc0a1ac88161359c51ff52644a6964d7c6add707f55af1bf03ec8 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-disc1.iso) = dbc5ff4f6949051c5b32231d223a2e58c7ebde74736d21001bd73eef76c5d0f0 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-disc1.iso.xz) = 0b7ce4c0f018457ba296f09dbf24113f73fdf7a5dea7010e111dfb3a0c5c0bf1 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-dvd1.iso) = e89482b35fa7d8256e35891cf45d0e4afbace45078249033a95e26cbb025e3f2 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-dvd1.iso.xz) = d21437dfd71b7e2dc35271195828409185432937bff0f3591969c426c85897e7 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-memstick.img) = 42d54e6aad696e426ef40fe3089a30c7d890ff80829e02d7981810e717f7a93d +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-memstick.img.xz) = 404718b19b82553b9d8b315f4761e69759f30922fe8caffa2abd21e62616e690 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-mini-memstick.img) = 5dcdcdefdd9d6ad348269af00a0ef53fc7bf1f8eeb787aca2a22686ad984f029 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64-mini-memstick.img.xz) = dc3b9ffdb17035ea65b06426e36927701d5aa81f903521a58e93ad4447c2ed1a +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pMTDw/+L3PfVqQ8uhDxNSuzbNSVssxijli78/kA7olhbuZJ9bbYcX4vAWfOJ8fq +wZSzL8ZtDiKsUpY73f8eNeNVIiLQxZJq3oA7WYWW3GPqdGebL+dxXy/sESf74YvN +fOTjtxhp/bkihjwfqOXZe2ys7PONe+Dcxu4AMNJODZ/25Pzsf4Dd9tgTC1LG5W/r +drN7TbLJ/T8V90dQUlge6wKK9/6drD8DLFhCSs2BglkImfZbd3K5aCX+opfZa6sU +FZti6HvgoWd8TExEDcjPJ6XeF0zZj0In7HjlzD/I7lyHPiOrY4o/JC69b/cSmjGp +rrEkGx17Kop6uWTE63mm/TWS0JejBHP+bT3pju8SNYFHRU6QHOy9gvswp4O/Er8k +sZyIvlGaGqqag98h+x86ISUFDu5ZbiveaHNEjpPPfy1X8nXMaqU9gbL39Fr+JNw8 +x0mmW5SajjF98unC00z9dLtePvGGivQ+tp0kJaawpHVVPemBt8MacfLAGFqBBgqt +MKR55nIy0umMTK9tas1y2L1oS8wHgGLdARBfbBr/uf+JLvMLsDtEEF9JRaMK8KpX +HuOPg7vSaS28PbSIAVuxLoIwwg5cn/3Ku28MGowu7P/YdF2GsLrJ78P7T0j/Jr3A +hKSql3+L6mpRfAERUkTlgFZ4pX6fmUuhJxAU+HI/DG0Id5Wyq7c= +=120r +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64le.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64le.asc new file mode 100644 index 0000000000..c35c72b5f0 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpc64le.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-bootonly.iso) = 0e506b45827dbdf95b8a93bfb93897b90a829cd34467f79b937a839a3323c6a2 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-bootonly.iso.xz) = aea5f78ebc1c3fb893e1c14a0b7c52700304da5cdb5bd57f8e9707a833bac3c7 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-disc1.iso) = a87b529a6d4dd1901696976d2242ad9eade35cb9836ef3b23352b9b68a8dc408 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-disc1.iso.xz) = 2f6df29467a8323382d963e7589fd6374243c4dc16471e43870d71df4f1bf463 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-dvd1.iso) = e8cd5c1fdc88f03e57f9cf8fee673fa9180845b73ed52ef6546b0d323ab77515 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-dvd1.iso.xz) = c57bae422bc519cba108e712fab8f3cc3c6678d9689f4e8b015db6b9e9cfe2d0 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-memstick.img) = 9de982cecdecec99de537e924c0335dfcc0ae1f324d118df4105ed0b987a378e +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-memstick.img.xz) = 2d734610349d1f7003cd1091bee1d55f26d4415ef5e9e793fb7d10b70e6c23ea +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-mini-memstick.img) = f12c27b660938c5c7c3c4cb0ebefe5843b5061e7fe9f418009dc57c9e25c4436 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpc64le-mini-memstick.img.xz) = a0f207e9d6021303ce8059f9c328a185f4baef8513e01b0512c064169bae5967 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pPdLQ//bca0UumXtw2DxLsk4hjYxk//i0FwFcsBdxm3PG4j5OIzzjJiWkyywH+D +5kN1gEXd2Wv/pcmDBvgOoIzxvDM1ybDAq7NVIWqBJ0dLuEwl0b3seWGqpwhUMPZU +6S1vBWNAzjuc+o4sfrZrqcj9rAd6DWAIIa/jhOSJFBiqgj67GMhyTorw4+zBoSzx +fvuHGVq7J3a8aRLg5SofVsDp4b395VaukWmAeg+tfm34uCKwhWAI+ewOvZ9P2vQm +mOo/QbfxdqYOKf9EjyICyEUebw4D65JJA0KFhI5D22wLGIuen1jDIHm25RxgoigQ +OEzUNzHiXL1+r7YP5wwZ5dH/1y9qifr1G/SRl7XJAyhXY2FyUSVuHm3erJzF/vp+ +bDhV8praVFC8degCXb0hBEeRUD5UF9JCJfzm+7yaNE52U7EB2peu00RjI7u9A7xK +6nOzncJXSDHEJ+gQKoYaqFj3rDgJYZ1NXDpcrzZ53GPm5MmYkWSgLUglrdXwSm+j +zm1yIBmDVwDMRIv9M4M91EWJeK3VtH+vHCHu6uPBohk/Sn8Ff/gyNXFiF+xQDoz9 +e+xUCB1P/AYOwJBczm/BTomJAMO5aEvaS+2f9bYfUeWdbVmdUGF/6bXBhPlRe7di +yFt1KC3/S2/yGR0r32qQB+A1yvj9USV0RMJWe8iGhJe01uou2pA= +=MJnf +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpcspe.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpcspe.asc new file mode 100644 index 0000000000..7338a636ae --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc-powerpcspe.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-bootonly.iso) = 0f610c5a299f1a15f8543481595e276efa281135225c31663f6da36374a11ddc +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-bootonly.iso.xz) = accb9a7848ecee7f619ffc87ca82ac49b6662daccb5f314a22b55c5482cd73f6 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-disc1.iso) = 3675ab93e9048ec1e93f462eef1f7b146c00a5d03b2d308a5250e5a66a2ed7ed +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-disc1.iso.xz) = 5a85e594991c2abdfa47dc7c908de6e48518c333ff2f1d6c83b488aa31fb4b18 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-dvd1.iso) = 4a195bd5cbb0416cf2640675c753670311326992385ce84fbb19f587260d85ef +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-dvd1.iso.xz) = 8abeb2f0c66f94430a6e8dbe5980d09b01d8daa7a061ef88f57498fdade02f22 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-memstick.img) = 55e582e947c787c68e6b4de2b48ebc2156fc443366517f69233806648a9703c8 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-memstick.img.xz) = 1e99c45c862733843b0ca8f98fbc2119fee0f9fe4c0032096ddde3014143c76e +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-mini-memstick.img) = 45585d171c62a128dd1c035cde8d956a83541e984e2fe6c98f274c7c9a2dfe40 +SHA256 (FreeBSD-13.0-RC3-powerpc-powerpcspe-mini-memstick.img.xz) = 13923dfa411c15c70de2dbaf96f9bdb7411f375ce723b3d4883d36f9da3eb097 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pOZxRAAnBO3PiNRjnuW4dY2hgg56c6wATBkYzl8EFdpvIKZutQ9dAjkp4C/mfeO +aUiYcCrdUW3bJpSbARohwJfSouu4v2WQhrnXjXvXWEfq0/4CsPrEm0d6PBT3oCzN +RNxm6iHxuvS11FbHATjF4s6mgZanOZaxrQEOHZPenUKnwcoTUxDDHafEb4n+AqVN ++1zd9Z1m5d54kyKeoLNkO/s6woEoeknGOwFGO5M1d3uv7Fomqegb2qanhcN1Yhdp +Ddk0A8elTbYzKTa3OT5+vE/U+Hm+4hngdYOa4k57PWN1JZKTjPDhT7QO1KmwFDi3 +3tbdtUMpXZlDhtkllvnS6zCStSwYZXdgq875UrX++LJdcge8voudFh3ZJlRdqnOE +nAQNYqWuuwiX9ROCtBtGqCztbzawhxZ+sKvg2yfKck+PwPm6mMTrR6VU6noPPclr +KHYnO/JWVwbgAdZGJJIzZC1Z/aUM9OKPmp4PrKFfhpalrz9aiB42zgIrQdUiESL3 +0Z0f0WiqboC8nTFYdRUBYcyt3wKZtt7vQc3QI3Jll9SkZrzP1ZK7ioR7JDLXceTa +tWxZb+IGCa+APx62nyvpn1v3zDk242AiKhA1VEt3LgwTUpFF1fMCv5Qjb/p3Aac+ +Ka0a0yqUpbBxKxzV+6/xxyd1x+inaV11XRomnRGLbsBIcCT3Qmw= +=eJ5V +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc.asc new file mode 100644 index 0000000000..83fa57a65b --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-powerpc.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-powerpc-bootonly.iso) = 4066eaffd07f593ff8917a02ae7a2291fd830a43bad2491f9a4f0dfdcc22a3cc +SHA256 (FreeBSD-13.0-RC3-powerpc-bootonly.iso.xz) = fa2081156359d7a9f6c8459cdd1e525fda58a9d4a4a516fa7faf679679bbda39 +SHA256 (FreeBSD-13.0-RC3-powerpc-disc1.iso) = 8088574a0589d13221d461548f39a83e23041dc0f689ecc2a03478778e1de374 +SHA256 (FreeBSD-13.0-RC3-powerpc-disc1.iso.xz) = 2825be88eb4a9cffc0df728db3ee77bd7c73c6f581fc036049d738126636cea6 +SHA256 (FreeBSD-13.0-RC3-powerpc-dvd1.iso) = 13f7ffeac6c820572618b61c2d278b3237fb21e0c19d4fcd8dc9e96fc360c8c5 +SHA256 (FreeBSD-13.0-RC3-powerpc-dvd1.iso.xz) = dd3a91f2d6914e3d95d03f39babb5555675938a709b70fb22ea8038b6abb99f4 +SHA256 (FreeBSD-13.0-RC3-powerpc-memstick.img) = 828b06ce910823bd4e968f61da26d2169e70a987cb89a75f255678ff685daf80 +SHA256 (FreeBSD-13.0-RC3-powerpc-memstick.img.xz) = a662e3ca383b835cdf3f19904ac1b60ad9a39de2f5c9a613f83ab05af1d12e72 +SHA256 (FreeBSD-13.0-RC3-powerpc-mini-memstick.img) = 3c811f437b4a76d8cb33f7db1765490058a794725419e27291a929384620b44c +SHA256 (FreeBSD-13.0-RC3-powerpc-mini-memstick.img.xz) = 4b8318c51b07e19d30734681e6915093b1ca0cd8f3f8d447cc7ab9b56c7534b0 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pMWwBAAmjYZQWCO2W/JiQdrsvuHJv5koIdZnh0MMoF1DmhflFCbNaCHMBmad746 +hNDgIwZVnx2QmACEszNqTy3t93s5eAMTq9PQoLCfHoEb9Mab3wmJaWwnTzfX0w9p +QSNAC1YQ8Y3/+oF2Eq6R6do4mohjtdt8a1PqK+VSfwRGVeZQWoJUNlbkloyhQA9L +Df6q0ZCYxSrnDcWgTeRgkyyvBkg7h+HfMvyR+CgjD+F7SfZs3PBUs5yEDALSnBKB +oqSUVv5EtETCbLPbZDg4Ij5x6nJEQuInhysaABNwMviLg6XnXft8AbvHDP7HqZMN +PGJDAIh73686LdLHiZVf6j/M5dDsVF+QTKpjf1HGwLsB9CXwU9papDRo0fvPwZ9L +rHHaMoylBWJSqFoKu6GLjelx8yqP07ItZAsnZAkdDpv3qy/H7HBZJVx+2YYmygFW +y8qbafOC/MiSmtoaT2Fwm3y2ZRhMoXPlc6/Ltmd1+co2we21xDg/g2hoqVa6/p4o +aIKTrI2ZJTDquBWoKiihoBNoPM1+U926NbO4EaU3nK2a/SeKq0+AZMqcVxnRdEc1 +oYNWkHh4AoXivsMZTZ8kb3dbkDja5Y4iNUPZ7bt/E0qzYwXkZ9Ww7fvsuqqGxXRD +CJnocFzVvcw7VBjsCAuqMguqTB0K/4LIc17jO1eVQTyF6LAT3ec= +=AVau +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64-GENERICSD.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64-GENERICSD.asc new file mode 100644 index 0000000000..8dd0b30ec5 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64-GENERICSD.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-GENERICSD.img.xz) = 1e05ea2e8add4cce3331a8072e0e9a6b8c9f69e727f2641b05aad96109b44baf +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pOlcA//UB+6O5r0pXryohu9rqHISGIdVozM12Zuk6SYHnuPmO5tWAE2Oy9i687v +T7S6Lc92T/f5uI052lpTkUeOOio5oinwNZyHnh3+9i+k4x006F14vLmiSc1bHwrO +3P2VNm3EcXrpzzUTndCg6ofdvhWlF4QDt5ROiaq5aWZuS1E9fj3C4LHFphOr3clh +nYQ33Qfdfpetrh0gJ9Fn3nlkHWBxMkeJb4thmJ8GtmcIwVjwfrosA1GEj0MEurpr +7pPrRXy924Jw/S8UjQKnlucaZMw6p6soD2nxhz6iSYZIDmkSyj60IOT/NVquM+L2 +KKd2NAPbbIPogUeKcyc0GClrnWoPM3KCQGTmRX7FCNCcf+GY/CFWglu6hF2DL/UK +PsGUMwgZsoLfz8I81wj4toVxrUB3Bw8bLMqROO2JMcgyhaOx4KRxciksdGX5LDPt +oftBBx9Ne5q7/jLtrKSXOKIf9+ignmxVVhdyrIld4lzncBqK6bVnU6RX8ysKJORP +trFMOPN06vWp6AoGV6MaedvVJg4WliWs0QJ/mcb8u1KoZLmOFBQrEfJMM2k4rGqa +hSuiWODRXz67OXt/EXI360syh7InEN/ziRJkvXyHSahuPTGcktfJGLnBnjoCJWSG +DibFRN2P3GDII9H6+NN1wvdYBJz08lolPMb5+r4SMfcdLfDVISQ= +=d6NQ +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64-vm.asc new file mode 100644 index 0000000000..427cd571ac --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64-vm.asc @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.qcow2.xz) = f0b064ee2f638dbb03bab5df0f13ddfb9755861e4c301667aff0606335337936 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.raw.xz) = ec3b751a4d994c1bd89dfabad03e3154be744a3d9667b65a09ffd9125451f285 +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.vhd.xz) = 9ea7117736a7e9db12992984199b02aaa72013eea8ec2737058e37605a82c91f +SHA256 (FreeBSD-13.0-RC3-arm64-aarch64.vmdk.xz) = e5256d4dd05b22d61803bfe0580580e2c0a953731bed92f8930ec3e29f22c4a6 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pNpig/8DWHDxRnWxkdzfx42fP/+/8W3QqoWEIgggu8CiWrM2vUyGGR5piPNz1Gs +gBZ7T8E42Ys90BhxLf1PGXv75uLheY7z3E6urAiePw4E4OQWcm+xl2qtbPvbJ45k +5ulYRat/hNw5vxGIUV88TGT8lFdNfl2Bu5NWDtw//DH5qhFYfS0hUYViLjl/pn+a +3lWgiKwOIdxxyje3Jc0fla1wXm8nHPnoxmG7BJp1km2NQyI7ykDFVvpbuR/a9sKR +blpwVUN+nOp41LtgQ8lm6vFbUV77gyy2RhDRYaHYslP39TsR0hWWdWuYFBj7Gysj +KysPv1dJFePFSIZEcauZXdzzHGiXpzxVMDMzSG+z6kDJXgZc5tTaLUwN2td8NZHJ +vI+M7jEWr9UpgFk0UlxkZf2gb6Vd7jea/cRr5xU42kNXmjRB7rpRd9x6a7VVXQYF +SGwzdXOCpWhvbMi5kA7hdBLVRTEJeB/UeliFKEMwiCpJzYxfASW2aiTFFmt8cjEv +AC+W35VU9wHMdBn1bxOAt68Ngjhln5bNFXJg7XQESw5iydb3Xap8subpGdloMxDX +SdyPyx9nYF2Xxlnro+1T9DYgbMgoT37Cc41dfqtCygX/Enc0d8XrYIIlVoiHsza5 +E2yI5NJDVw9Te2kQxlBnxkDgCx8PG4hLJf1SXTkpZfE9Ol2t2tc= +=ymu9 +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64.asc new file mode 100644 index 0000000000..17a8eeee71 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3-riscv-riscv64.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-bootonly.iso) = 5809f78a48ac7d29d1547e95a6cd43bb58666c293dae273ead5f6f336f832f5e +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-bootonly.iso.xz) = 53f38657df7f4de4f1493d54ed31a4996bde294ade0d3346cfbd628a1db676d2 +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-disc1.iso) = ccb710957bd6b93e1adc4ab66fd3a130ed13c7ca09ba59361448a69012b1813f +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-disc1.iso.xz) = 755ab3fe1fa7ccd06f1fb0e753f82127f983f41c00fbd22f53979b3795d12ba5 +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-dvd1.iso) = b7b2836c3d6884ac7d32095724e33fec7584297537df69745a178f44b0097ceb +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-dvd1.iso.xz) = 964e21fa42e8a242edf5907116f0cdd0569edcabcbbdfc6253e70fcc6e121a2e +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-memstick.img) = 3f5ad3a0f2b251fd26884dbbb62bc235db0a168982a1afe9372eb465b8646dca +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-memstick.img.xz) = e4e5ee26ce083db674e036b55c0d9b2ad6bbcd159e64e81afc7021d7ddaf770a +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-mini-memstick.img) = 48bdd9f3afd074fc682e618d1cd42a3e2437a4484b6990bad0922a6a8e32e2e5 +SHA256 (FreeBSD-13.0-RC3-riscv-riscv64-mini-memstick.img.xz) = 8d5b8d052301cb897e82eaed1bd0fa51ae53a26003a20ddfc31da1459512ad41 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pNj3Q//TdxMgac9H7hLGq9/VIMJR8Ayw9A9nH9tKnvdf6fE8gQLnJJq2uBKObuR +HFZz8ID579Xqa/p4bo/8+beXzfzoqx/fIzrrIIBjgWQ93YtnWFhBKwavuH0iz0ka +ZGdy7SAUu3SRKpnnO1vDjYFbX2fGADFcveVxFVPb+n9e2yduRjmrh5/tCW3KFHzh +6jZ2SLSWmM9lfpglN7Ad2HHsNDBVGHN72UQcyHxdpXEfsJe+OsG0DDJnN/dh6eru +7IJeAVK8YEqmlZ0tclN8ch+bSgI2oi7cSBn0/l3eLbaxUvcmXiM/LWHY8qMAcPeS ++3yLk7LKnPjDJ5LYEGC73iMsT7M2I+T6S/3JDdUKatqRqiIXqKSH0qidIOp59ohs +EuQptVsl5VLNmjEwC+uJOM1PLXRIh52mTVe2xNWNs6la5NDDe/aPwW4IUDD48AJz +3ROoRTG5RWjUnokY0O0NhURf80NWisczAAKwzDTgEHNfw2ATslQbdLs2+y2kqNLn +c7ef+iAgpm5MUD4Iw1g5k1+tqzqifezVC5Ltbhsrpih3xI3baiO0gTMIAxjk7hBd +cp8VZs+R5/UqEq1woAtULEH94PpfZ8fCpSwy7Yyp/a3dK01EVq4tFfRC4FBqAy/+ +FxpO4t9qEFgn0weORG/8JQyCaiaSvzhfvl3c0O+x1mB2tnMA8Yc= +=Qakw +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64-vm.asc new file mode 100644 index 0000000000..ed0e60d346 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64-vm.asc @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-amd64.qcow2.xz) = 85341a74163a18034ed9982431d551d151312002b9d2c046fe787c1e084bd58a9748262636e8b537626483acd99c4c1c86ea7b77b9dae190919dcb0831709f42 +SHA512 (FreeBSD-13.0-RC3-amd64.raw.xz) = df35e633e1b3c431f16236b90048ff2b1edda544a51238cfdacd056f3cf739e7b25dddf31fb2cbc879646c8fcb8feb6e433ecd483ff71ab0294900f9eba127b7 +SHA512 (FreeBSD-13.0-RC3-amd64.vhd.xz) = f28716d6638240ffeabff00188449edc8a453041413fd6cc44146ccedbdf2e70d7fa6666eafbffd036c3a4c4c7223ab4e7bc994ec0bb8af1976d2fbabedd919f +SHA512 (FreeBSD-13.0-RC3-amd64.vmdk.xz) = 634d6becdfdfffd60ad94825e1ce64459ae3ee32873e25b97def0482d8e4617135a13e0011e1ae336e1f13793db2e2fb424a11ca3013836d81fb9ce245e34ac6 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pOBpg//a1LRKLnBIqPyQe7rADXkVsY7gI3q03orWwUOfBzQXi33AhIlsCkn1Mm1 +M0ei4WyYS3J5O1cQYaeDqCXupbTYYZjZVn3Smg+TJ226DOi0X1Fm/hnJPAUClLVg +u4DXQkIfzTIae3I0Aza4IyxM7LpdSukgvSp8PswnDPzzJFzavcV6xdKZdqDqvb8H +5Kw9gzHbegm0IjFxvv8xSd7GY/uJhFCHD0tqoJ4kbXklx4A5JK30G3mlTdrw7y9y +uGIUtaqnMkS1tWlcFtoEZ38exs5l4n0DuWyp5TDBECCUztea34t1sTEWErgIPzZq +IR0ApXbrRiXUiG6nEj7uH955mhE8C5sAtW67jIbAFOW1yQgcHEZCP3c8G6krGEyE +WZHexR1Ny/VNCwW8B++1z/L7t1c/S49pYk0y5T+uX7S1NkN7DZlgiHJcrBzK6jCM +dtIha4gCVmV2dS3sRtFVgycE3yyLmSyIlF0Lqdu8oOuoBqvfVoMsYAu/xwDQHGhS +W8iSZw0DTBJStIZwRXhJnytjpqs+E5xmbU6NBzHyT7DOrNpM5fULOxQzXOwQeOOT +Mj21X7mp2OnX0XenAlUGypQWIG9EgXllItH5PeNHkAF4pOXcYT9RY81Ga8iwT9BL +AeYwqowQ0SZ9w9smhyXW1ohJ+mzlqDlP5+hV1sGkWEQstsY5QJ4= +=rsVq +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64.asc new file mode 100644 index 0000000000..99c68db88d --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-amd64.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-amd64-bootonly.iso) = 1d8234d83825754fad4c05783196e9e2d4f447c10eeb17a6c548a7ab59b4107d8046d8df8880efc2197fadac4f2b13cd33ffdefb7e4366d8f7a2aa694d56f464 +SHA512 (FreeBSD-13.0-RC3-amd64-bootonly.iso.xz) = cae723447e08991ee202c5c43125c5d6430c274fcc55f9334ceabd17a1b5a8077cc2f38124136cfab8ea080b63f3cec08a0aa90263cc357cfad377ad7893e3bb +SHA512 (FreeBSD-13.0-RC3-amd64-disc1.iso) = 31b9d9e9488af2f370c9181ed47a23dabbc58853c070d60233db5823c0e80d39d104852e20399c4b755b38eb76cc34da909098a08b6e4f064b9f05077f7a2927 +SHA512 (FreeBSD-13.0-RC3-amd64-disc1.iso.xz) = ebe6ee173c283b0f684d1dc772191e6d80a793acde3c8d26f5efb4e9fa90c579d57f5bb6ba3451ce64ccf3f8a7e630f580b343e4e6b07535aab49d9868841cd4 +SHA512 (FreeBSD-13.0-RC3-amd64-dvd1.iso) = 5ac4c60e37506c5305bc29df7678a47dfc04150a8826d9389931c54a8f244740f06251edf63bdfc31f9dbcffcec7b2933c77777bed42024e05930145e590ca18 +SHA512 (FreeBSD-13.0-RC3-amd64-dvd1.iso.xz) = 542c4b322a51461bec85321babd2791a5c1cb038b7fcd25609040c7a19d449c4978f9e88bd362ba040d60a50db00b0f8cc4b9f5ba881a6502f0f23a6d2db4f8b +SHA512 (FreeBSD-13.0-RC3-amd64-memstick.img) = d7a7388a1d8398af245a5bf40a3e8fd2e137a0b6dcdec5d10f0f1bbf834fe2477ef1fc0ba80e7facacc7902bb6983c4fbd928539d6cabad0402d9d89735ac6be +SHA512 (FreeBSD-13.0-RC3-amd64-memstick.img.xz) = 564b51529bad0d17eac2ac07d538f20434575a6f9fced0313965f518c35cdbe0d771f1d8440c731de9e38d82b5561c15596243a2b431408391af6828e19909c4 +SHA512 (FreeBSD-13.0-RC3-amd64-mini-memstick.img) = 7cc0ea6ea104fdf9938300534757f261bc3992a17bb0de78e59cd6bf7c29de88155d7a2fe0919c3bcd7048d73e9a140dbd3caaae842211e840802a9fbd5c2411 +SHA512 (FreeBSD-13.0-RC3-amd64-mini-memstick.img.xz) = 3f6e0b98e969b5e18036ca905a9ad613aeaf804e07395dde9a17f5004bdf1acae35782dd0c1a794c546d7184681873d519eb962859b670b863ba565830d3c5c5 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHsACgkQAxRYpUeP +4pNXIBAAmNdX84LF+Rd5A5ggG3Z/Ku+gEsOtqjWwaGHOABU7o1i/uffvhebJY91t ++iPix3DQTboTeDm4LSTClCUWpaStbfDS3HPguZV6wwEsx/rb5QyKN695hz+qMf2O +HnhUBfkqqN1lKzzeWWIMfJP2Kas9FhgaZhAeiMq9qLh+kn67J6Ni/Ku7+ynRUj/j +xKnjpYMmAw3gsTu4ILTsOiq54h3cIE276Rw6fv9t1LKjl0vDfTqHUw8wtsKHy0KY +VrECPeAWa4RHlNsyJTy3GAXgwIcVmnuxBK45hObNIOFDrEa94yEJIjprDFhXw8i5 +Z2riPTQvlrM87HcK7KL18KGjCBClWkqGRPC8YZ/upvtfI2eYAP8IYM2MKAEXdRNd +diPbhaUmmGVk8CEwpu5MsRA9ilDT90U+UBOLpHPTkL6AKVJ10+CuskOdNyEMSC7g +9BxpJgiU4yjIeyqGNTAgFbZLmXREV2boALrcMxcz6JHlcQJ9rbdA0aij7G3AsoA6 +OR0wHyS+h4rayWM1h0K8R+TI3FSmRbmWFZ/BxuwA9AatSVHkPvHa89zd9TIftk7i +oxCEPXAtzPUQtzUYjJEXy8Ed0Bhq441oe3VLMo9xm5WFX4oA5EPcVoQm2KKvpjvR +r928f8oaw/ny05aHvXf/2M/ZifgJbxcF3APCRCkRATjgZadKf00= +=lEHl +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc new file mode 100644 index 0000000000..5766aae89e --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm-armv6-RPI-B.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm-armv6-RPI-B.img.xz) = 3c293abaadf4a6615dcd9be0baf444d32bcfc2e5ba3a13f88f311c8e865a4ec98d9e79999ddd7be721ed862c9c3c1f969763215b00001365582cdac6c2b0124f +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pNfmw//SPmox99t1ZCmw3gSCwBLO906QBxMZJPqpYv6TGj9g0yhsUH8AomvLBFx +UR975XXwAAWLtHmrNPfbjNtltAn5l2pA3BpN6ZX8ltrzjSJ8t5gLRQ7VPFfPMawU +1/X5DQ9Mnyu0M8Zra6wAhiZoNzVU9ciCRi1QuPJp21jXQw/3AcMCcZq998Ot+ig4 +Esh3dCMJ/28I78h+S/LyyXNVBcm2+DB/3VfFKuJeMO0TJWDEYnqm3rpMVP4Qxge6 +NAYDE/vKETOGJvGe9bUPWfoggq9XXyvEZhqH5Xcn54qU3V9PiItHfo7G0+cj//Ek +ZO1+imx+VOV+OtgIt4/24/ze2iTCQDu6UBIOwFnPE+Mi3YRI+P0wJudHiZftS8Wu +2H0hm+PJAU5KrK5cqRpdIR/4OrwXEMS9WIbCMsaFTa48HXugvdrimwHffcgE51X1 +uKYDSljoaY/fjC7UcT5JFyDE4ZeSPm2k2qvKQmS3/3RM+iLbBvYMBmT+VpFCttKh +86xG+0yHuGyX+fDtklEnBt+NvKfTTnSrwvjLs8RepLyCRn7v7WIn/PFL49W5rkxP +JFcnJKQaJeYlkj0uoYSArCFcRXngf/fGpRAoBsF3KKvVtU79LMNSvbqelAXR8OiV +8AWTiSoPz9pMXL2maV7MlRsrKhyQq9fwjiiL+nNf8OcLvOObaRw= +=dj7R +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc new file mode 100644 index 0000000000..d79952803d --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm-armv7-GENERICSD.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm-armv7-GENERICSD.img.xz) = 339ed5f99140b1a992e35d4098e722d60700573d118a310554590faf5fbe452fa13462f588c3d2cde60761afbcb8224f308890980f30e39edea05b7a25347b88 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pOYRQ/+M/qEfQMn4IW9rXHTweLR0mjYyhpvAfIO4KS8UC1MgJVVlFyrxJFCdh7y +zo5dGN6OZnXozzdBP3kqDFDhLud+y1HSN7q9CXzacGdFcQqfOjpJgNOHAJJhmTia ++ftqniWs1aBUJIum1gPi0+AMgqlIqnvlKsSAskxWXtFX8VIAXv5thtSw4btxmC0Y +tBtaw4kL4OET9sqhaZHCiudyokJPDnxGTACki905A8JkJIOri+GFqgWWrndrxPQR +Ju/29THx8TBJDeZbwXbJfHM72Q7fjLhs8txCqHzp8uEmVTeIPoUmcxqH6PARIQHQ +3gd7EKVxGquyxi8fIryYAuEMhBoRhyFz6i5er/2bjQzsL8hFeG9uhn8/qtaIxknB +Qovoj+795QJwcJ+VTtCKm3dMf36CvYZhEkaiU6rW0itiwAlzxi5wFDILB4Kl7e14 +dUeATF4IUOK0qXS4un2DCLhglxfVbPFoT9TISXZ2WEy1pL7CxxMhjp4ARTCmB/qy +XopA6p4dcr2+l/NaZ8EIrgPgc2x2gpBx3bS5TmWpbYODg8Bh3WXpB+5vGnbDbsXf +z+RJRTqhfXoIBn/qc0Wt/+7g0dk/hNWyHxDVvk78Udi0k4jVdJrqTokBt+6h4x85 +GRRoEMouyWZ3BFEP/SL4Cy3vNBWdIBNNfdmJuPyUUUXtC8njfs8= +=j1Et +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc new file mode 100644 index 0000000000..ed10b7d978 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64-PINE64-LTS.img.xz) = dbd28b0cabaf969c13da611ee11960ef5cb49383bdeda5b5187235eb1b261e03b67cc565692c3c553ed60ddbf1f43f0f641837bf97c880adeda548fa5f80a0ad +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pMShw/+NcPeQOr133cvpXRXi+CFEGQF444/OG0y7CO7AlRWX8BcQlJ1t+CO+aUf +7eZD241lSPeQEycecuzm5962gyFdxxNGp6lxXoXrnqC4QtE/PI36sZLnjWQ7Vo8d +wA9xB9ysyuephnf5R2mFm2DNka8MDx9ggawBsRWY5aHYr2tnkVuiORznlm19BP5m +62AdA/oXUMyjdMgK8rPISBM6fgSUd40M0A0bWnKn4BSnAA/tnygi0/DE0Y3XXYmT +JPPN2g5PhOx8ZY0UUGHEroew+l+Kdelf3fa+BpDXSS/jPTa1dtabJe6uMda4uzu0 +9PMqDx9b1UCoklv5BKyWRCb8WGipWQZ/yt1rGasJQswa5u5SFLDew3/5IDsST3XU +463YkcK74hIQz+il1HVEqBPivX6lB20NCFVmclPvHJeY+joS+p5Biky9Jbm8LZGF +qpfVU0zYJ1tUL4+fDP1YDAFhyWo5Dfo3dla6ZSld1BPnouArPBx7VMq/gb7UyH6J +ubDTo2IxcXpmgThfdXhWTxqVH6dELbxrPU7TtITGoeheBqY/ElbHyzw2P0JLJNZn +e8/M8x+naVrCLVLAeCS/OvSF1pGxXKKcEBgz5OaKWzfhIjQtjbDLhZEv56VPEAjE +JAH2avIGEsKBpzkHpJSJFL3czkziWlH1DDVgWYyJ3uA3SyJNICw= +=I+JQ +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc new file mode 100644 index 0000000000..63b77895e4 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINE64.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64-PINE64.img.xz) = 362c58670c598ebefcd64fbdca4e8af9490e6244db4dd0f22fac6c2a3b3131be9e451b36fcb70a1544c22df240a2f721cd77cdd99f1c323ad672d0bb95952e4c +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pO79g//cEGh/wzFQUz5M3u2HCTkOUeXstbvN7tDb3mgiiTlDfoJGiPcqtWbkaY4 +zHdsdEmdvs1rEBJhpiayIqSV++xzc2Q6ynjN+SS5MYpnSi2eA/fOnKLqilCzcitu +YSZD9G0Qa4oV7kqRtJTYVBd4ydOpkrV+0vMIMJYtvxoW38r7AFA1mJCqIJxTVScp +DFznDG5Xno4EENK3r38K0DCMkKa5w2gbLWbZTMvV9PWofalzGzyAKyfxHRqpuZzB +0o+GWDe9KABFSLoXTIv83TB0i4ZW3SOksD1oxkIZPvQ+IyP+8BkJoKH0YxlLjgQC +1lbs7FwYjbReE6NsbwkocG/LMLecS/1mC+z5LETKidFZnw0m3ehuHenu0cyeKQhw +iXH7vOCto53JuDvCGidk/CbHz6RuzXMNCVVg6LbZkk5ckfu8atwBnFpYZIqrjwIf +OVhJ+1pkJuIdNH3eWqHcVEppTdFcEV4UKR3Q5BDZcgbGcy1pnOFtNmob+eXnb/H8 +eu5Yk4ojMf2hOljUTOltsaF1KIkwmdD+l3Gdt9UP2zC9fdiLyeIoKf+FIYIgLDTE +89PDencswMSLjGLBNwyApzuZ4JzsHugclGixDUG4SH/fLsGgVyAKHpIhwyHQDs88 +pdX8/xf3FUf+Q1SyDtu09s+2wcp+2J+e5SixcoiNuuYoNM/8HDw= +=hcPv +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc new file mode 100644 index 0000000000..e0bbada241 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64-PINEBOOK.img.xz) = f5121e29d5f31edcb81edc2598786c9791d87038f8e189dcdbed2cc3286b2c0c8d2fd5305300a868556f2b8b579ed2bd5a6c8b71ae6f2ea0ae79032dc4ed14ca +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pN5fxAAjfDNCRCOzO/GJ4Q4jEt5CTgYa9O4ld4Ku4X/T9scTSBGLVK8iDhHw0SM +Gaq2o8QCKlyCOA++A8pCpOQs1fKQVHLMgxrgtMYYIymDV/IA20JTVlZEI6bBRa0j +rS3YgqBENzrL39jALoEq/YjmGc3gBh9T1efcVyYLlWFmS3YO7IHVOLbsssozbYvE +EX55ToAB0ue7tKz+PlUNRZelEl/2cM63wPBdU3vfS8w5cqSnGm5rapAu5jYnlp0O ++6U6HIx8j+CbEiOSP5DnalUB9kJ3rrwZOngYpb9Sap3LSKnqN0y/0iC2SHaFbN6E +XcJLXM7BC5mcr6C/PiC+GaNkNW8lT79ZDCt2l1WiG3EqCKe4R8zI1ve2vX/HLbuk +jrRdKuyqj7NV/RSY0EyS4Jsk7tSx4jxtvmQCxistmwTY4JJsGSgmPPeXpIVIRDWk +c+xRnkIo37MuOV9nn3NQ3d69eame4P++fzSB8PPjYoiCh3jCQYcyDUswFi1Nly8M +v9332D1MqzzzKPU5geZRQ3H4AQqnYBeWbf4rr1TJxBn8o7m9WQYq8ph5jq6Wt+uR +k/mATWjiTqMZ2sCJ9TbBulI63EjF/OgFxfBlL1WA0ODkqg5vw0ZAppvWBaPyxgp+ +tMN1487PH2SPK+PojWwo2onobd6+HRvUZW0WGSeZwSmgz0z1MsE= +=jLsl +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc new file mode 100644 index 0000000000..007f60fcb7 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64-ROCK64.img.xz) = 88fac80fd941a073c39aa0f19c166954aff0e9344ae675d2c6d68a476a7795ac9d2c757d1afb95817816f0a71e4cb57fb51024f942092c49e247b6ecf87d0057 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pOuRQ//UYL9b8zVl3DMlC14EdQm0c1aZNL4+1Lk6ygsB4ucebaT+iZnZR9qCBzR +vrWhesYwh/BfL+kmOLIyMCYqJXqoapIpXCFbwbR0iOaoqtUV88DE+ksW/gi9j+sv +CQUuBkPtSIIgnZ5mtWfWJxl4hK4XgKimpsdxUm3AqcRxbMQijRmmEtnnk6FNZmLm +te8IbaYeLF8WmoqLxY3bl5qcq8SQgD7PkyTXy2xW0FOinYf9g0vkTmb3+M41Av5L +V6SnqVwMDoDtIRiEkuPOCitXKU3DaaqA9qbBFMrCrps1WxVXtYy0OgVURsJU2BFv +PisaiIUw8WolzToFCsSnBam0O93zVyHF+G8+QLt766nNkc9aOJvTVpDwCb+b5fo+ +itsHLcTmSUgPEUP/wCCf9pySomnfAhHk5O6zwWtZVtjJhh/liytNjN3YJWpqfGRG +OmuLRgs4PBCpJTB8XkuU3STIKvR/qKKCFi9FTNqg9b8n2RiH8R8X4ACsWV6cdVye +jtmAMSFQn5mCwR5o0dGlRRoYjJv6zXjQC2TLWtpxWB9JOLf6QRrzezD6j1Fc9Vwn +tLCM7zAtWSrOJo3NfdKyG0sli1Y3S+bkVYPe7R9g45o6cRnOI0R+ZLFIksqVp1mo +8v0aiBskWpfxA95Bkf3CqTu2YyNr+JbTZm0bDCnu6G3kEbOfHZk= +=En1r +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc new file mode 100644 index 0000000000..37cf6a6673 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64-ROCKPRO64.img.xz) = c789f1cbe903afc21564ab31f4bdaf041abc30765d5040ca587cf2388b2843dd34ff3c97ed94c26dac85a4a9cdc68ceca75ca12a7d9551a862788e63b682ea43 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pO/QhAAlvI9846JrMJdBPQyWwNjf1r3UkvKlyMMPtHI+H+62doazDMVy5XC+mBH +ZCbUSRwTSjXjEGY3oDuogR1wKeNo/VO9CPy0C+03llJ8aW7q8Kww/el+cVehGncY ++WFTTwongNkj39rJIHKjnUxB7RJ2hXQlgCOynaoZ1IG8dZCTZ+tqEci0EZiJHDFY +C7TYBP399vj4Jaiz1MWZ4QJyGwISLIlQ15Kfv8AyqCmk6dMK7Z3bHc9Hg9B0Aoe3 +F5J2QommGV7cp/z8Im1fM2plilZNwi3jDpobAM4CDQAHcx7J9T0GnKLuCqqz0rM4 +7vOTrjujPlpfDohLZHLT6t522DdR4uXBn6rZXD5yW46QuxyrUM1YpghQtCUUiwdd +NICILruXmYdFh5/uOfGbs68O0TJ1xfv/c+1NDlbh08lAKxgPHZyMiBZAwa0Cbjlq +ighgg8ue9F4TBZZJxtUqWiziSd+OKifat2hGjIAErtITo/L4zzDPxccpRnjUJu3d +yHmCiBUt6tLRiErdG2mF7cJ5+AQIxIJnXRzlawaIAEap9+YG5Uc7l1lHg6xm3YxN +ZqltFB+7Tw8s3gBBGdHbAlokBrDrgELOb+bIYFNsDepJen8xX39zU58mF5BMhrMW +7QZLf8kBLFWaS9Sr0LVyzRaBXQKOPHNeWpgVI3G8Vh9E+1+1I8c= +=bCzu +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc new file mode 100644 index 0000000000..11ca7ec1c7 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-RPI.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64-RPI.img.xz) = 22f6cacbc25ca0861aa434337afda85fdcc1e2ab707298b5058a4d57345b7f17808663b863aef263f3a5fc22fabb95442a39e9605fbd2a348a46179cf08175f7 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pOcRxAAkGKRZ5btCi3TV1fHAHzB8fhN/2M9I+cNTfiVtSdpKwLoSzD5iYUmbvdE +vFyeGs2CgEf4MBy3OWRH2RocpYZ+ZF6a2j2IzntBjtlLRmSB9QH1EYsxiMVsVURG +0HW1Gtuj6vp4VU94qFS2IJJo39f4PM+gEHa85ukT2sJZNERaH1zn3HU0vq7+1btM +U4jy4ZWfF+shZNciPzuR9h7bVBI5MyjC6ewZ5L2fvK1N5v4Swvpe01Ms1B1HbA8T +b2rrTYOh5OnAh5dJCSw4F5uYZskqVQkI7Tk8MaB/QRm7205fJclUwfdO9N8Sagdb +8R093fa4yOcQs9joEA9G4b5cEchVQ7SyYDIJPXjjj7Lq/o+QHcDprvBrpixi1lRN +S0qNQBodjJTcE9gmJGAm6A79PJviC6nQ9F6JqRAe8o13ibKxzZT7Cu3f5gqxizAH +Ztc/s1vCyO9K1lWMHODAxa+jKxgaXeXNUFxKrhQuTzvNFSopzIzU61GATldvF2cg +AUs3kCckvTigBIInW0Chvwl4gEODLUqRlG3rnCmuH00c13zX0znQhbUpB8ISiw9P +Y9DByW772ICRQI9hd2qtkP8qJh/rvMX6XvWua+v9EMHJJcILv4DoG++cXPPWBnpQ +unEcFzfMWSAUlIzFPq535YYSaV9pA6ssp7EeutYyTY+giZz28pw= +=1y4k +-----END PGP SIGNATURE----- diff --git a/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc new file mode 100644 index 0000000000..c3f91dbcd8 --- /dev/null +++ b/website/content/en/releases/13.0R/checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3-arm64-aarch64-vm.asc @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64.qcow2.xz) = a8a4a557b121869bf73d096230b6659709d6f53b4762d30ee7f60245d341550d9e44c9049b93ec3a284a5b9aed07ad23b3922274dfcefdef8947271172cf2821 +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64.raw.xz) = 5c285e4f677609cc6abd17bf748135f1d8ffeb1cdd4381de210e9c5d0c81ebc6a9c691ae888a3735c1fcf0e735f893b45ee152c13df8003f7c4711b14822fa8c +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64.vhd.xz) = 342d5219dfe82b53a1bea1635c3a0c11ee84e37eebf948a75c6a43d9c26fa5ad5bed07bef42f8dbfe043832358d86df104526fb48317c97a487b445cdd6c30ca +SHA512 (FreeBSD-13.0-RC3-arm64-aarch64.vmdk.xz) = 6a794f981f4d4076ec05c9dd8a853f28726003e452ed1f7dc341d1aba462e1b0f23767387331714fb80e567e80fc167accd401c36a588aa08ac8d5885dde331a +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmBVCHwACgkQAxRYpUeP +4pPdyw//TUXdcKIQiYMFXvtV4TBBHTYg7MVo5fISW8H3LsvGzF3uRB5P+QuaaiSv +YSu+CpPBpudmZ6tO0hfWW0ZpdZZqqzDozhKHLunaHYbL7Gn3kqfrokeL9Zg6pneV +ZCnUg8MbGja+TTUBWQAr1cZGoqrbfT1KdeO+zcyK9NQ2aD/qGO4WpD3MUqvdGY4w +BzS+uRAtjsj24bUqMkJ27KxX0AL/Ah1BKpeshed+/KlwgKK8WjA7m62d2bbTl4uO +CkWBhyvPxQ8PwRbOw+YaGUy8iDKnQr88woLajcGJnMbF018Ix2ov5Rdl/JP1XENc +bs268azb+22/ObrIeVW6enxuFYb58Xr/4BkPcP8m0G/o+RUMVqOtbnbsd/YarxbY +7J/aF3ZcZN0ieENUMGWo4maTgLiOHw5+S0ZAhdvswGFdiJzRsfe8UF9oVKVdIZsV +FO5oy2w6pqwvkZ3gPeTIgMlmDx5wNX7cZ+0ylGyU0NN9z0RZfm3ZHEvYrMJFuElF +3tp9nvkSU6MhnEh2zGr787J/MgQk8J5YX+Q6c4iUF12cFyS5pareFcVqOcMfNGTe +0RtfbE/wiBUz88iw9RNElQCN0bjt9aKlvvXnsxSr/hDNx52RP4Hp8JYijVc1F1tB +mDZgfiEZdM/at2lBmyyCUkH6gkr8bodoKQotQX9J74KHo/CWJao= *** 331 LINES SKIPPED *** From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 16:10:21 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22A2F5AD948 for ; Sat, 20 Mar 2021 16:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2m250Nmnz4hYd; Sat, 20 Mar 2021 16:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D84C524E9; Sat, 20 Mar 2021 16:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12KGAKhw071437; Sat, 20 Mar 2021 16:10:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12KGAK6L071430; Sat, 20 Mar 2021 16:10:20 GMT (envelope-from git) Date: Sat, 20 Mar 2021 16:10:20 GMT Message-Id: <202103201610.12KGAK6L071430@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 39e11667fe - main - RC2 -> RC3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39e11667fea7dc9fec6c1df80ca96e3694c7beb0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 16:10:21 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=39e11667fea7dc9fec6c1df80ca96e3694c7beb0 commit 39e11667fea7dc9fec6c1df80ca96e3694c7beb0 Author: Glen Barber AuthorDate: 2021-03-20 16:09:49 +0000 Commit: Glen Barber CommitDate: 2021-03-20 16:09:49 +0000 RC2 -> RC3 Sponsored by: Rubicon Communications, LLC ("Netgate") --- website/content/en/releases/13.0R/signatures.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/content/en/releases/13.0R/signatures.adoc b/website/content/en/releases/13.0R/signatures.adoc index a90289dbed..8637d3a8e6 100644 --- a/website/content/en/releases/13.0R/signatures.adoc +++ b/website/content/en/releases/13.0R/signatures.adoc @@ -4,11 +4,11 @@ sidenav: download --- :localRel: 13.0 -:localBranchName: "RC2" +:localBranchName: "RC3" :localBranchStable: "stable/13" :localBranchReleng: "releng/13.0" -:localRelSha256: ../checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC2 -:localRelSha512: ../checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC2 +:localRelSha256: ../checksums/CHECKSUM.SHA256-FreeBSD-13.0-RC3 +:localRelSha512: ../checksums/CHECKSUM.SHA512-FreeBSD-13.0-RC3 = FreeBSD {localRel} Release Checksum Signatures From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 16:10:22 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65CE45ADB26 for ; Sat, 20 Mar 2021 16:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2m261MGLz4hlm; Sat, 20 Mar 2021 16:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 15E7A2A8F; Sat, 20 Mar 2021 16:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12KGALU5071819; Sat, 20 Mar 2021 16:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12KGALcB071818; Sat, 20 Mar 2021 16:10:21 GMT (envelope-from git) Date: Sat, 20 Mar 2021 16:10:21 GMT Message-Id: <202103201610.12KGALcB071818@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: 98b9c01a12 - main - Announce 13.0-RC3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98b9c01a12515cbc9b1eb4bf86ddf89f5b2f1b0c Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 16:10:22 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=98b9c01a12515cbc9b1eb4bf86ddf89f5b2f1b0c commit 98b9c01a12515cbc9b1eb4bf86ddf89f5b2f1b0c Author: Glen Barber AuthorDate: 2021-03-20 16:10:08 +0000 Commit: Glen Barber CommitDate: 2021-03-20 16:10:08 +0000 Announce 13.0-RC3 Sponsored by: Rubicon Communications, LLC ("Netgate") --- website/data/en/news/news.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml index 5299e15ce9..aab365b0f6 100644 --- a/website/data/en/news/news.toml +++ b/website/data/en/news/news.toml @@ -1,6 +1,11 @@ # Sort news by year, month and day # $FreeBSD$ +[[news]] +date = "2021-03-20" +title = "FreeBSD 13.0-RC3 Available" +description = "The third RC build for the FreeBSD 13.0 release cycle is now available. ISO images for the amd64, arm64, armv6, armv7, i386, powerpc, powerpc64, powerpcspe, powerpc64le, and riscv64 architectures are available on most of our FreeBSD mirror sites." + [[news]] date = "2021-03-15" description = "New committer: Ka Ho Ng (src)" From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 18:03:24 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B76535B0989 for ; Sat, 20 Mar 2021 18:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2pXX4dFcz4q7L; Sat, 20 Mar 2021 18:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 91C6B415B; Sat, 20 Mar 2021 18:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12KI3OCj030900; Sat, 20 Mar 2021 18:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12KI3OYA030899; Sat, 20 Mar 2021 18:03:24 GMT (envelope-from git) Date: Sat, 20 Mar 2021 18:03:24 GMT Message-Id: <202103201803.12KI3OYA030899@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: e16d21085b - main - Fix typos, style and images paths MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e16d21085bebdaf6f91c49e14cff9cb960a13315 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 18:03:24 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=e16d21085bebdaf6f91c49e14cff9cb960a13315 commit e16d21085bebdaf6f91c49e14cff9cb960a13315 Author: Sergio Carlavilla Delgado AuthorDate: 2021-03-20 17:58:59 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-03-20 18:03:12 +0000 Fix typos, style and images paths Global review of styles, typos and images paths in gjournal-desktop, releng, vinum and vm-design --- .../content/en/articles/contributing/_index.adoc | 277 ++++++-- .../content/en/articles/contributors/_index.adoc | 18 +- documentation/content/en/articles/cups/_index.adoc | 50 +- .../content/en/articles/explaining-bsd/_index.adoc | 98 ++- .../en/articles/filtering-bridges/_index.adoc | 110 ++- .../content/en/articles/fonts/_index.adoc | 143 ++-- .../en/articles/freebsd-questions/_index.adoc | 66 +- .../content/en/articles/freebsd-releng/_index.adoc | 123 +++- .../en/articles/freebsd-update-server/_index.adoc | 55 +- .../content/en/articles/geom-class/_index.adoc | 125 +++- .../en/articles/gjournal-desktop/_index.adoc | 152 +++-- documentation/content/en/articles/hubs/_index.adoc | 152 ++++- .../content/en/articles/ipsec-must/_index.adoc | 37 +- .../content/en/articles/ldap-auth/_index.adoc | 231 +++++-- .../content/en/articles/leap-seconds/_index.adoc | 30 +- .../en/articles/linux-emulation/_index.adoc | 743 +++++++++++++++++---- .../content/en/articles/linux-users/_index.adoc | 87 ++- .../en/articles/mailing-list-faq/_index.adoc | 69 +- .../content/en/articles/nanobsd/_index.adoc | 91 ++- .../content/en/articles/new-users/_index.adoc | 189 ++++-- documentation/content/en/articles/pam/_index.adoc | 204 ++++-- .../content/en/articles/pgpkeys/_index.adoc | 3 +- .../en/articles/port-mentor-guidelines/_index.adoc | 48 +- .../content/en/articles/pr-guidelines/_index.adoc | 70 +- .../en/articles/problem-reports/_index.adoc | 96 ++- .../content/en/articles/rc-scripting/_index.adoc | 399 ++++++++--- .../content/en/articles/releng/_index.adoc | 176 +++-- .../content/en/articles/remote-install/_index.adoc | 110 ++- .../content/en/articles/serial-uart/_index.adoc | 321 ++++++--- .../content/en/articles/solid-state/_index.adoc | 107 ++- .../content/en/articles/vinum/_index.adoc | 243 +++++-- .../content/en/articles/vm-design/_index.adoc | 338 ++++++++-- 32 files changed, 3732 insertions(+), 1229 deletions(-) diff --git a/documentation/content/en/articles/contributing/_index.adoc b/documentation/content/en/articles/contributing/_index.adoc index 11a6054351..16d4c1cf1a 100644 --- a/documentation/content/en/articles/contributing/_index.adoc +++ b/documentation/content/en/articles/contributing/_index.adoc @@ -30,15 +30,24 @@ This article describes the different ways in which an individual or organization toc::[] -So you want to contribute to FreeBSD? That is great! FreeBSD _relies_ on the contributions of its user base to survive. Your contributions are not only appreciated, they are vital to FreeBSD's continued growth. +So you want to contribute to FreeBSD? That is great! FreeBSD _relies_ on the contributions of its user base to survive. +Your contributions are not only appreciated, they are vital to FreeBSD's continued growth. -A large and growing number of international contributors, of greatly varying ages and areas of technical expertise, develop FreeBSD. There is always more work to be done than there are people available to do it, and more help is always appreciated. +A large and growing number of international contributors, of greatly varying ages and areas of technical expertise, develop FreeBSD. +There is always more work to be done than there are people available to do it, and more help is always appreciated. -As a volunteer, what you do is limited only by what you want to do. However, we do ask that you are aware of what other members of the FreeBSD community will expect of you. You may want to take this into account before deciding to volunteer. +As a volunteer, what you do is limited only by what you want to do. +However, we do ask that you are aware of what other members of the FreeBSD community will expect of you. +You may want to take this into account before deciding to volunteer. -The FreeBSD project is responsible for an entire operating system environment, rather than just a kernel or a few scattered utilities. As such, our [.filename]#TODO# lists span a very wide range of tasks: from documentation, beta testing and presentation, to the system installer and highly specialized types of kernel development. People of any skill level, in almost any area, can almost certainly help the project. +The FreeBSD project is responsible for an entire operating system environment, rather than just a kernel or a few scattered utilities. +As such, our [.filename]#TODO# lists span a very wide range of tasks: from documentation, beta testing and presentation, to the system installer and highly specialized types of kernel development. +People of any skill level, in almost any area, can almost certainly help the project. -Commercial entities engaged in FreeBSD-related enterprises are also encouraged to contact us. Do you need a special extension to make your product work? You will find us receptive to your requests, given that they are not too outlandish. Are you working on a value-added product? Please let us know! We may be able to work cooperatively on some aspect of it. The free software world is challenging many existing assumptions about how software is developed, sold, and maintained, and we urge you to at least give it a second look. +Commercial entities engaged in FreeBSD-related enterprises are also encouraged to contact us. +Do you need a special extension to make your product work? You will find us receptive to your requests, given that they are not too outlandish. +Are you working on a value-added product? Please let us know! We may be able to work cooperatively on some aspect of it. +The free software world is challenging many existing assumptions about how software is developed, sold, and maintained, and we urge you to at least give it a second look. [[contrib-what]] == What Is Needed @@ -48,7 +57,9 @@ The following list of tasks and sub-projects represents something of an amalgam [[non-programmer-tasks]] === Ongoing Non-Programmer Tasks -Many people who are involved in FreeBSD are not programmers. The Project includes documentation writers, Web designers, and support people. All that these people need to contribute is an investment of time and a willingness to learn. +Many people who are involved in FreeBSD are not programmers. +The Project includes documentation writers, Web designers, and support people. +All that these people need to contribute is an investment of time and a willingness to learn. . Read through the FAQ and Handbook periodically. If anything is poorly explained, ambiguous, out of date or incorrect, let us know. Even better, send us a fix (Docbook is not difficult to learn, but there is no objection to ASCII submissions). . Help translate FreeBSD documentation into your native language. If documentation already exists for your language, you can help translate additional documents or verify that the translations are up-to-date and correct. First take a look at the link:{fdp-primer}#translations[Translations FAQ] in the FreeBSD Documentation Project Primer. You are not committing yourself to translating every single FreeBSD document by doing this - as a volunteer, you can do as much or as little translation as you desire. Once someone begins translating, others almost always join the effort. If you only have the time or energy to translate one part of the documentation, please translate the installation instructions. @@ -57,7 +68,8 @@ Many people who are involved in FreeBSD are not programmers. The Project include [[ongoing-programmer-tasks]] === Ongoing Programmer Tasks -Most of the tasks listed here may require a considerable investment of time, an in-depth knowledge of the FreeBSD kernel, or both. However, there are also many useful tasks which are suitable for "weekend hackers". +Most of the tasks listed here may require a considerable investment of time, an in-depth knowledge of the FreeBSD kernel, or both. +However, there are also many useful tasks which are suitable for "weekend hackers". . If you run FreeBSD-CURRENT and have a good Internet connection, there is a machine `current.FreeBSD.org` which builds a full release once a day-every now and again, try to install the latest release from it and report any failures in the process. . Read the {freebsd-bugs}. There may be a problem you can comment constructively on or with patches you can test. Or you could even try to fix one of the problems yourself. @@ -72,15 +84,24 @@ Most of the tasks listed here may require a considerable investment of time, an === Work through the PR Database -The https://bugs.FreeBSD.org/search/[FreeBSD PR list] shows all the current active problem reports and requests for enhancement that have been submitted by FreeBSD users. The PR database includes both programmer and non-programmer tasks. Look through the open PRs, and see if anything there takes your interest. Some of these might be very simple tasks that just need an extra pair of eyes to look over them and confirm that the fix in the PR is a good one. Others might be much more complex, or might not even have a fix included at all. +The https://bugs.FreeBSD.org/search/[FreeBSD PR list] shows all the current active problem reports and requests for enhancement that have been submitted by FreeBSD users. +The PR database includes both programmer and non-programmer tasks. +Look through the open PRs, and see if anything there takes your interest. +Some of these might be very simple tasks that just need an extra pair of eyes to look over them and confirm that the fix in the PR is a good one. +Others might be much more complex, or might not even have a fix included at all. -Start with the PRs that have not been assigned to anyone else. If a PR is assigned to someone else, but it looks like something you can handle, email the person it is assigned to and ask if you can work on it-they might already have a patch ready to be tested, or further ideas that you can discuss with them. +Start with the PRs that have not been assigned to anyone else. +If a PR is assigned to someone else, but it looks like something you can handle, email the person it is assigned to and ask if you can work on it-they might already have a patch ready to be tested, or further ideas that you can discuss with them. === Ongoing Ports Tasks -The Ports Collection is a perpetual work in progress. We want to provide our users with an easy to use, up to date, high quality repository of third party software. We need people to donate some of their time and effort to help us achieve this goal. +The Ports Collection is a perpetual work in progress. +We want to provide our users with an easy to use, up to date, high quality repository of third party software. +We need people to donate some of their time and effort to help us achieve this goal. -Anyone can get involved, and there are lots of different ways to do so. Contributing to ports is an excellent way to help "give back" something to the project. Whether you are looking for an ongoing role, or a fun challenge for a rainy day, we would love to have your help! +Anyone can get involved, and there are lots of different ways to do so. +Contributing to ports is an excellent way to help "give back" something to the project. +Whether you are looking for an ongoing role, or a fun challenge for a rainy day, we would love to have your help! There are a number of easy ways you can contribute to keeping the ports tree up to date and in good working order: @@ -91,7 +112,8 @@ There are a number of easy ways you can contribute to keeping the ports tree up === Pick one of the items from the Ideas page -The https://wiki.freebsd.org/IdeasPage[FreeBSD list of projects and ideas for volunteers] is also available for people willing to contribute to the FreeBSD project. The list is being regularly updated and contains items for both programmers and non-programmers with information about each project. +The https://wiki.freebsd.org/IdeasPage[FreeBSD list of projects and ideas for volunteers] is also available for people willing to contribute to the FreeBSD project. +The list is being regularly updated and contains items for both programmers and non-programmers with information about each project. [[contrib-how]] == How to Contribute @@ -101,25 +123,39 @@ Contributions to the system generally fall into one or more of the following 5 c [[contrib-general]] === Bug Reports and General Commentary -An idea or suggestion of _general_ technical interest should be mailed to the {freebsd-hackers}. Likewise, people with an interest in such things (and a tolerance for a _high_ volume of mail!) may subscribe to the {freebsd-hackers}. See link:{handbook}#eresources-mail[The FreeBSD Handbook] for more information about this and other mailing lists. +An idea or suggestion of _general_ technical interest should be mailed to the {freebsd-hackers}. +Likewise, people with an interest in such things (and a tolerance for a _high_ volume of mail!) may subscribe to the {freebsd-hackers}. +See link:{handbook}#eresources-mail[The FreeBSD Handbook] for more information about this and other mailing lists. -If you find a bug or are submitting a specific change, please report it using the https://bugs.FreeBSD.org/submit/[bug submission form]. Try to fill-in each field of the bug report. Unless they exceed 65KB, include any patches directly in the report. If the patch is suitable to be applied to the source tree put `[PATCH]` in the synopsis of the report. When including patches, _do not_ use cut-and-paste because cut-and-paste turns tabs into spaces and makes them unusable. When patches are a lot larger than 20KB, consider compressing them (eg. with man:gzip[1] or man:bzip2[1]) prior to uploading them. +If you find a bug or are submitting a specific change, please report it using the https://bugs.FreeBSD.org/submit/[bug submission form]. +Try to fill-in each field of the bug report. +Unless they exceed 65KB, include any patches directly in the report. +If the patch is suitable to be applied to the source tree put `[PATCH]` in the synopsis of the report. +When including patches, _do not_ use cut-and-paste because cut-and-paste turns tabs into spaces and makes them unusable. +When patches are a lot larger than 20KB, consider compressing them (eg. with man:gzip[1] or man:bzip2[1]) prior to uploading them. -After filing a report, you should receive confirmation along with a tracking number. Keep this tracking number so that you can update us with details about the problem. +After filing a report, you should receive confirmation along with a tracking number. +Keep this tracking number so that you can update us with details about the problem. See also link:{problem-reports}[this article] on how to write good problem reports. === Changes to the Documentation -Changes to the documentation are overseen by the {freebsd-doc}. Please look at the link:{fdp-primer}[FreeBSD Documentation Project Primer] for complete instructions. Send submissions and changes (even small ones are welcome!) using the same method as any other bug report. +Changes to the documentation are overseen by the {freebsd-doc}. +Please look at the link:{fdp-primer}[FreeBSD Documentation Project Primer] for complete instructions. +Send submissions and changes (even small ones are welcome!) using the same method as any other bug report. === Changes to Existing Source Code -An addition or change to the existing source code is a somewhat trickier affair and depends a lot on how far out of date you are with the current state of FreeBSD development. There is a special on-going release of FreeBSD known as "FreeBSD-CURRENT" which is made available in a variety of ways for the convenience of developers working actively on the system. See link:{handbook}#current-stable[The FreeBSD Handbook] for more information about getting and using FreeBSD-CURRENT. +An addition or change to the existing source code is a somewhat trickier affair and depends a lot on how far out of date you are with the current state of FreeBSD development. +There is a special on-going release of FreeBSD known as "FreeBSD-CURRENT" which is made available in a variety of ways for the convenience of developers working actively on the system. +See link:{handbook}#current-stable[The FreeBSD Handbook] for more information about getting and using FreeBSD-CURRENT. -Working from older sources unfortunately means that your changes may sometimes be too obsolete or too divergent for easy re-integration into FreeBSD. Chances of this can be minimized somewhat by subscribing to the {freebsd-announce} and the {freebsd-current} lists, where discussions on the current state of the system take place. +Working from older sources unfortunately means that your changes may sometimes be too obsolete or too divergent for easy re-integration into FreeBSD. +Chances of this can be minimized somewhat by subscribing to the {freebsd-announce} and the {freebsd-current} lists, where discussions on the current state of the system take place. -Assuming that you can manage to secure fairly up-to-date sources to base your changes on, the next step is to produce a set of diffs to send to the FreeBSD maintainers. This is done with the man:diff[1] command. +Assuming that you can manage to secure fairly up-to-date sources to base your changes on, the next step is to produce a set of diffs to send to the FreeBSD maintainers. +This is done with the man:diff[1] command. The preferred man:diff[1] format for submitting patches is the unified output format generated by `diff -u`. @@ -139,19 +175,29 @@ would generate a set of unified diffs for the given source file or directory hie See man:diff[1] for more information. -Once you have a set of diffs (which you may test with the man:patch[1] command), you should submit them for inclusion with FreeBSD as a bug report. _Do not_ just send the diffs to the {freebsd-hackers} or they will get lost! We greatly appreciate your submission (this is a volunteer project!); because we are busy, we may not be able to address it immediately, but it will remain in the PR database until we do. Indicate your submission by including `[PATCH]` in the synopsis of the report. +Once you have a set of diffs (which you may test with the man:patch[1] command), you should submit them for inclusion with FreeBSD as a bug report. +_Do not_ just send the diffs to the {freebsd-hackers} or they will get lost! We greatly appreciate your submission (this is a volunteer project!); because we are busy, we may not be able to address it immediately, but it will remain in the PR database until we do. +Indicate your submission by including `[PATCH]` in the synopsis of the report. -If you feel it appropriate (e.g. you have added, deleted, or renamed files), bundle your changes into a `tar` file. Archives created with man:shar[1] are also welcome. +If you feel it appropriate (e.g. you have added, deleted, or renamed files), bundle your changes into a `tar` file. +Archives created with man:shar[1] are also welcome. -If your change is of a potentially sensitive nature, such as if you are unsure of copyright issues governing its further distribution then you should send it to {core-email} directly rather than submitting as a bug report. The {core-email} reaches a much smaller group of people who do much of the day-to-day work on FreeBSD. Note that this group is also _very busy_ and so you should only send mail to them where it is truly necessary. +If your change is of a potentially sensitive nature, such as if you are unsure of copyright issues governing its further distribution then you should send it to {core-email} directly rather than submitting as a bug report. +The {core-email} reaches a much smaller group of people who do much of the day-to-day work on FreeBSD. +Note that this group is also _very busy_ and so you should only send mail to them where it is truly necessary. -Please refer to man:intro[9] and man:style[9] for some information on coding style. We would appreciate it if you were at least aware of this information before submitting code. +Please refer to man:intro[9] and man:style[9] for some information on coding style. +We would appreciate it if you were at least aware of this information before submitting code. === New Code or Major Value-Added Packages -In the case of a significant contribution of a large body work, or the addition of an important new feature to FreeBSD, it becomes almost always necessary to either send changes as tar files or upload them to a web or FTP site for other people to access. If you do not have access to a web or FTP site, ask on an appropriate FreeBSD mailing list for someone to host the changes for you. +In the case of a significant contribution of a large body work, or the addition of an important new feature to FreeBSD, it becomes almost always necessary to either send changes as tar files or upload them to a web or FTP site for other people to access. +If you do not have access to a web or FTP site, ask on an appropriate FreeBSD mailing list for someone to host the changes for you. -When working with large amounts of code, the touchy subject of copyrights also invariably comes up. FreeBSD prefers free software licenses such as BSD or ISC. Copyleft licenses such as GPLv2 are sometimes permitted. The complete listing can be found on the link:https://www.FreeBSD.org/internal/software-license/[core team licensing policy] page. +When working with large amounts of code, the touchy subject of copyrights also invariably comes up. +FreeBSD prefers free software licenses such as BSD or ISC. +Copyleft licenses such as GPLv2 are sometimes permitted. +The complete listing can be found on the link:https://www.FreeBSD.org/internal/software-license/[core team licensing policy] page. === Money or Hardware @@ -160,7 +206,9 @@ We are always very happy to accept donations to further the cause of the FreeBSD [[donations]] ==== Donating Funds -The https://www.freebsdfoundation.org[FreeBSD Foundation] is a non-profit, tax-exempt foundation established to further the goals of the FreeBSD Project. As a 501(c)3 entity, the Foundation is generally exempt from US federal income tax as well as Colorado State income tax. Donations to a tax-exempt entity are often deductible from taxable federal income. +The https://www.freebsdfoundation.org[FreeBSD Foundation] is a non-profit, tax-exempt foundation established to further the goals of the FreeBSD Project. +As a 501(c)3 entity, the Foundation is generally exempt from US federal income tax as well as Colorado State income tax. +Donations to a tax-exempt entity are often deductible from taxable federal income. Donations may be sent in check form to: @@ -175,11 +223,13 @@ USA The FreeBSD Foundation is also able to accept https://www.freebsdfoundation.org/donate/[online donations] through various payment options. -More information about the FreeBSD Foundation can be found in https://people.FreeBSD.org/~jdp/foundation/announcement.html[The FreeBSD Foundation -- an Introduction]. To contact the Foundation by email, write to mailto:info@FreeBSDFoundation.org[info@FreeBSDFoundation.org]. +More information about the FreeBSD Foundation can be found in https://people.FreeBSD.org/~jdp/foundation/announcement.html[The FreeBSD Foundation -- an Introduction]. +To contact the Foundation by email, write to mailto:info@FreeBSDFoundation.org[info@FreeBSDFoundation.org]. ==== Donating Hardware -The FreeBSD Project happily accepts donations of hardware that it can find good use for. If you are interested in donating hardware, please contact the link:https://www.FreeBSD.org/donations/[Donations Liaison Office]. +The FreeBSD Project happily accepts donations of hardware that it can find good use for. +If you are interested in donating hardware, please contact the link:https://www.FreeBSD.org/donations/[Donations Liaison Office]. [[ports-contributing]] == Contributing to ports @@ -189,21 +239,36 @@ The FreeBSD Project happily accepts donations of hardware that it can find good ==== Choosing an unmaintained port -Taking over maintainership of ports that are unmaintained is a great way to get involved. Unmaintained ports are only updated and fixed when somebody volunteers to work on them. There are a large number of unmaintained ports. It is a good idea to start with adopting a port that you use regularly. +Taking over maintainership of ports that are unmaintained is a great way to get involved. +Unmaintained ports are only updated and fixed when somebody volunteers to work on them. +There are a large number of unmaintained ports. +It is a good idea to start with adopting a port that you use regularly. -Unmaintained ports have their `MAINTAINER` set to `ports@FreeBSD.org`. A list of unmaintained ports and their current errors and problem reports can be seen at the http://portsmon.FreeBSD.org/portsconcordanceformaintainer.py?maintainer=ports%40FreeBSD.org[FreeBSD Ports Monitoring System]. +Unmaintained ports have their `MAINTAINER` set to `ports@FreeBSD.org`. +A list of unmaintained ports and their current errors and problem reports can be seen at the http://portsmon.FreeBSD.org/portsconcordanceformaintainer.py?maintainer=ports%40FreeBSD.org[FreeBSD Ports Monitoring System]. -Some ports affect a large number of others due to dependencies and slave port relationships. Generally, we want people to have some experience before they maintain such ports. +Some ports affect a large number of others due to dependencies and slave port relationships. +Generally, we want people to have some experience before they maintain such ports. -You can find out whether or not a port has dependencies or slave ports by looking at a master index of ports called [.filename]#INDEX#. (The name of the file varies by release of FreeBSD; for instance, [.filename]#INDEX-8#.) Some ports have conditional dependencies that are not included in a default [.filename]#INDEX# build. We expect you to be able to recognize such ports by looking through other ports' [.filename]#Makefile#'s. +You can find out whether or not a port has dependencies or slave ports by looking at a master index of ports called [.filename]#INDEX#. +(The name of the file varies by release of FreeBSD; for instance, [.filename]#INDEX-8#.) Some ports have conditional dependencies that are not included in a default [.filename]#INDEX# build. +We expect you to be able to recognize such ports by looking through other ports' [.filename]#Makefile#'s. ==== How to adopt the port -First make sure you understand your <>. Also read the link:{porters-handbook}[Porter's Handbook]. _Please do not commit yourself to more than you feel you can comfortably handle._ +First make sure you understand your <>. +Also read the link:{porters-handbook}[Porter's Handbook]. +_Please do not commit yourself to more than you feel you can comfortably handle._ -You may request maintainership of any unmaintained port as soon as you wish. Simply set `MAINTAINER` to your own email address and send a PR (Problem Report) with the change. If the port has build errors or needs updating, you may wish to include any other changes in the same PR. This will help because many committers are less willing to assign maintainership to someone who does not have a known track record with FreeBSD. Submitting PRs that fix build errors or update ports are the best ways to establish one. +You may request maintainership of any unmaintained port as soon as you wish. +Simply set `MAINTAINER` to your own email address and send a PR (Problem Report) with the change. +If the port has build errors or needs updating, you may wish to include any other changes in the same PR. +This will help because many committers are less willing to assign maintainership to someone who does not have a known track record with FreeBSD. +Submitting PRs that fix build errors or update ports are the best ways to establish one. -File your PR with category `ports` and class `change-request`. A committer will examine your PR, commit the changes, and finally close the PR. Sometimes this process can take a little while (committers are volunteers, too :). +File your PR with category `ports` and class `change-request`. +A committer will examine your PR, commit the changes, and finally close the PR. +Sometimes this process can take a little while (committers are volunteers, too :). [[maintain-port]] === The challenge for port maintainers @@ -213,9 +278,12 @@ This section will give you an idea of why ports need to be maintained and outlin [[why-maintenance]] ==== Why ports require maintenance -Creating a port is a once-off task. Ensuring that a port is up to date and continues to build and run requires an ongoing maintenance effort. Maintainers are the people who dedicate some of their time to meeting these goals. +Creating a port is a once-off task. +Ensuring that a port is up to date and continues to build and run requires an ongoing maintenance effort. +Maintainers are the people who dedicate some of their time to meeting these goals. -The foremost reason ports need maintenance is to bring the latest and greatest in third party software to the FreeBSD community. An additional challenge is to keep individual ports working within the Ports Collection framework as it evolves. +The foremost reason ports need maintenance is to bring the latest and greatest in third party software to the FreeBSD community. +An additional challenge is to keep individual ports working within the Ports Collection framework as it evolves. As a maintainer, you will need to manage the following challenges: @@ -239,18 +307,24 @@ As a maintainer, you will need to manage the following challenges: This section outlines the process to follow to keep your ports up to date. -This is an overview. More information about upgrading a port is available in the link:{porters-handbook}[Porter's Handbook]. +This is an overview. +More information about upgrading a port is available in the link:{porters-handbook}[Porter's Handbook]. [.procedure] ==== . Watch for updates + -Monitor the upstream vendor for new versions, updates and security fixes for the software. Announcement mailing lists or news web pages are useful for doing this. Sometimes users will contact you and ask when your port will be updated. If you are busy with other things or for any reason just cannot update it at the moment, ask if they will help you by submitting an update. +Monitor the upstream vendor for new versions, updates and security fixes for the software. +Announcement mailing lists or news web pages are useful for doing this. +Sometimes users will contact you and ask when your port will be updated. +If you are busy with other things or for any reason just cannot update it at the moment, ask if they will help you by submitting an update. + -You may also receive automated email from the `FreeBSD Ports Version Check` informing you that a newer version of your port's distfile is available. More information about that system (including how to stop future emails) will be provided in the message. +You may also receive automated email from the `FreeBSD Ports Version Check` informing you that a newer version of your port's distfile is available. +More information about that system (including how to stop future emails) will be provided in the message. . Incorporate changes + -When they become available, incorporate the changes into the port. You need to be able to generate a patch between the original port and your updated port. +When they become available, incorporate the changes into the port. +You need to be able to generate a patch between the original port and your updated port. . Review and test + Thoroughly review and test your changes: @@ -263,34 +337,44 @@ Thoroughly review and test your changes: . Submit changes + -Send your update by submitting a PR with an explanation of the changes and a patch containing the differences between the original port and the updated one. Please refer to link:{problem-reports}[Writing FreeBSD Problem Reports] for information on how to write a really good PR. +Send your update by submitting a PR with an explanation of the changes and a patch containing the differences between the original port and the updated one. +Please refer to link:{problem-reports}[Writing FreeBSD Problem Reports] for information on how to write a really good PR. + [NOTE] ====== -Please do not submit a man:shar[1] archive of the entire port; instead, use man:diff[1] `-ruN`. In this way, committers can much more easily see exactly what changes are being made. The Porter's Handbook section on link:{porters-handbook}#port-upgrading[Upgrading] has more information. +Please do not submit a man:shar[1] archive of the entire port; instead, use man:diff[1] `-ruN`. +In this way, committers can much more easily see exactly what changes are being made. +The Porter's Handbook section on link:{porters-handbook}#port-upgrading[Upgrading] has more information. ====== . Wait + -At some stage a committer will deal with your PR. It may take minutes, or it may take weeks - so please be patient. +At some stage a committer will deal with your PR. +It may take minutes, or it may take weeks - so please be patient. . Give feedback + -If a committer finds a problem with your changes, they will most likely refer it back to you. A prompt response will help get your PR committed faster, and is better for maintaining a thread of conversation when trying to resolve any problems. +If a committer finds a problem with your changes, they will most likely refer it back to you. +A prompt response will help get your PR committed faster, and is better for maintaining a thread of conversation when trying to resolve any problems. . And Finally + -Your changes will be committed and your port will have been updated. The PR will then be closed by the committer. That's it! +Your changes will be committed and your port will have been updated. +The PR will then be closed by the committer. That's it! ==== ===== Ensure your ports continue to build correctly This section is about discovering and fixing problems that stop your ports from building correctly. -FreeBSD only guarantees that the Ports Collection works on the `-STABLE` branches. In theory, you should be able to get by with running the latest release of each stable branch (since the ABIs are not supposed to change) but if you can run the branch, that is even better. +FreeBSD only guarantees that the Ports Collection works on the `-STABLE` branches. +In theory, you should be able to get by with running the latest release of each stable branch (since the ABIs are not supposed to change) but if you can run the branch, that is even better. -Since the majority of FreeBSD installations run on PC-compatible machines (what is termed the `i386` architecture), we expect you to keep the port working on that architecture. We prefer that ports also work on the `amd64` architecture running native. It is completely fair to ask for help if you do not have one of these machines. +Since the majority of FreeBSD installations run on PC-compatible machines (what is termed the `i386` architecture), we expect you to keep the port working on that architecture. +We prefer that ports also work on the `amd64` architecture running native. +It is completely fair to ask for help if you do not have one of these machines. [NOTE] ==== -The usual failure modes for non-`x86` machines are that the original programmers assumed that, for instance, pointers are `int`-s, or that a relatively lax older gcc compiler was being used. More and more, application authors are reworking their code to remove these assumptions - but if the author is not actively maintaining their code, you may need to do this yourself. +The usual failure modes for non-`x86` machines are that the original programmers assumed that, for instance, pointers are `int`-s, or that a relatively lax older gcc compiler was being used. +More and more, application authors are reworking their code to remove these assumptions - but if the author is not actively maintaining their code, you may need to do this yourself. ==== These are the tasks you need to perform to ensure your port is able to be built: @@ -302,7 +386,9 @@ These are the tasks you need to perform to ensure your port is able to be built: Check your mail for mail from `pkg-fallout@FreeBSD.org` and the http://portscout.FreeBSD.org[distfiles scanner] to see if any of the port which are failing to build are out of date. . Collect information + -Once you are aware of a problem, collect information to help you fix it. Build errors reported by `pkg-fallout` are accompanied by logs which will show you where the build failed. If the failure was reported to you by a user, ask them to send you information which may help in diagnosing the problem, such as: +Once you are aware of a problem, collect information to help you fix it. +Build errors reported by `pkg-fallout` are accompanied by logs which will show you where the build failed. +If the failure was reported to you by a user, ask them to send you information which may help in diagnosing the problem, such as: ** Build logs ** The commands and options used to build the port (including options set in [.filename]#/etc/make.conf#) @@ -313,20 +399,25 @@ Once you are aware of a problem, collect information to help you fix it. Build e . Investigate and find a solution + -Unfortunately there is no straightforward process to follow to do this. Remember, though: if you are stuck, ask for help! The {freebsd-ports} is a good place to start, and the upstream developers are often very helpful. +Unfortunately there is no straightforward process to follow to do this. +Remember, though: if you are stuck, ask for help! The {freebsd-ports} is a good place to start, and the upstream developers are often very helpful. . Submit changes + Just as with updating a port, you should now incorporate changes, review and test, submit your changes in a PR, and provide feedback if required. . Send patches to upstream authors + -In some cases, you will have to make patches to the port to make it run on FreeBSD. Some (but not all) upstream authors will accept such patches back into their code for the next release. If so, this may even help their users on other BSD-based systems as well and perhaps save duplicated effort. Please consider sending any applicable patches to the authors as a courtesy. +In some cases, you will have to make patches to the port to make it run on FreeBSD. +Some (but not all) upstream authors will accept such patches back into their code for the next release. +If so, this may even help their users on other BSD-based systems as well and perhaps save duplicated effort. +Please consider sending any applicable patches to the authors as a courtesy. ==== ===== Investigate bug reports and PRs related to your port This section is about discovering and fixing bugs. -FreeBSD-specific bugs are generally caused by assumptions about the build and runtime environments that do not apply to FreeBSD. You are less likely to encounter a problem of this type, but it can be more subtle and difficult to diagnose. +FreeBSD-specific bugs are generally caused by assumptions about the build and runtime environments that do not apply to FreeBSD. +You are less likely to encounter a problem of this type, but it can be more subtle and difficult to diagnose. These are the tasks you need to perform to ensure your port continues to work as intended: @@ -334,16 +425,19 @@ These are the tasks you need to perform to ensure your port continues to work as ==== . Respond to bug reports + -Bugs may be reported to you through email via the https://bugs.FreeBSD.org/search/[Problem Report database]. Bugs may also be reported directly to you by users. +Bugs may be reported to you through email via the https://bugs.FreeBSD.org/search/[Problem Report database]. +Bugs may also be reported directly to you by users. + -You should respond to PRs and other reports within 14 days, but please try not to take that long. Try to respond as soon as possible, even if it is just to say you need some more time before you can work on the PR. +You should respond to PRs and other reports within 14 days, but please try not to take that long. +Try to respond as soon as possible, even if it is just to say you need some more time before you can work on the PR. + If you have not responded after 14 days, any committer may commit from a PR that you have not responded to via a `maintainer-timeout`. . Collect information + If the person reporting the bug has not also provided a fix, you need to collect the information that will allow you to generate one. + -If the bug is reproducible, you can collect most of the required information yourself. If not, ask the person who reported the bug to collect the information for you, such as: +If the bug is reproducible, you can collect most of the required information yourself. +If not, ask the person who reported the bug to collect the information for you, such as: ** A detailed description of their actions, expected program behavior and actual behavior ** Copies of input data used to trigger the bug @@ -353,28 +447,43 @@ If the bug is reproducible, you can collect most of the required information you . Eliminate incorrect reports + -Some bug reports may be incorrect. For example, the user may have simply misused the program; or their installed packages may be out of date and require updating. Sometimes a reported bug is not specific to FreeBSD. In this case report the bug to the upstream developers. If the bug is within your capabilities to fix, you can also patch the port so that the fix is applied before the next upstream release. +Some bug reports may be incorrect. +For example, the user may have simply misused the program; or their installed packages may be out of date and require updating. +Sometimes a reported bug is not specific to FreeBSD. +In this case report the bug to the upstream developers. +If the bug is within your capabilities to fix, you can also patch the port so that the fix is applied before the next upstream release. . Find a solution + -As with build errors, you will need to sort out a fix to the problem. Again, remember to ask if you are stuck! +As with build errors, you will need to sort out a fix to the problem. +Again, remember to ask if you are stuck! . Submit or approve changes + -Just as with updating a port, you should now incorporate changes, review and test, and submit your changes in a PR (or send a follow-up if a PR already exists for the problem). If another user has submitted changes in the PR, you can also send a follow-up saying whether or not you approve the changes. +Just as with updating a port, you should now incorporate changes, review and test, and submit your changes in a PR (or send a follow-up if a PR already exists for the problem). +If another user has submitted changes in the PR, you can also send a follow-up saying whether or not you approve the changes. ==== ===== Providing support -Part of being a maintainer is providing support - not for the software in general - but for the port and any FreeBSD-specific quirks and problems. Users may contact you with questions, suggestions, problems and patches. Most of the time their correspondence will be specific to FreeBSD. +Part of being a maintainer is providing support - not for the software in general - but for the port and any FreeBSD-specific quirks and problems. +Users may contact you with questions, suggestions, problems and patches. +Most of the time their correspondence will be specific to FreeBSD. -Occasionally you may have to invoke your skills in diplomacy, and kindly point users seeking general support to the appropriate resources. Less frequently you will encounter a person asking why the `RPMS` are not up to date or how can they get the software to run under Foo Linux. Take the opportunity to tell them that your port is up to date (if it is, of course!), and suggest that they try FreeBSD. +Occasionally you may have to invoke your skills in diplomacy, and kindly point users seeking general support to the appropriate resources. +Less frequently you will encounter a person asking why the `RPMS` are not up to date or how can they get the software to run under Foo Linux. +Take the opportunity to tell them that your port is up to date (if it is, of course!), and suggest that they try FreeBSD. -Sometimes users and developers will decide that you are a busy person whose time is valuable and do some of the work for you. For example, they might: +Sometimes users and developers will decide that you are a busy person whose time is valuable and do some of the work for you. +For example, they might: * submit a PR or send you patches to update your port, * investigate and perhaps provide a fix to a PR, or * otherwise submit changes to your port. -In these cases your main obligation is to respond in a timely manner. Again, the timeout for non-responsive maintainers is 14 days. After this period changes may be committed unapproved. They have taken the trouble to do this for you; so please try to at least respond promptly. Then review, approve, modify or discuss their changes with them as soon as possible. +In these cases your main obligation is to respond in a timely manner. +Again, the timeout for non-responsive maintainers is 14 days. +After this period changes may be committed unapproved. +They have taken the trouble to do this for you; so please try to at least respond promptly. +Then review, approve, modify or discuss their changes with them as soon as possible. If you can make them feel that their contribution is appreciated (and it should be) you will have a better chance persuading them to do more things for you in the future :-). @@ -383,37 +492,57 @@ If you can make them feel that their contribution is appreciated (and it should There are two really good places to find a port that needs some attention. -You can use the https://bugs.freebsd.org/search[web interface] to the Problem Report database to search through and view unresolved PRs. The majority of ports PRs are updates, but with a little searching and skimming over synopses you should be able to find something interesting to work on (the `sw-bug` class is a good place to start). +You can use the https://bugs.freebsd.org/search[web interface] to the Problem Report database to search through and view unresolved PRs. +The majority of ports PRs are updates, but with a little searching and skimming over synopses you should be able to find something interesting to work on (the `sw-bug` class is a good place to start). -The other place is the http://portsmon.FreeBSD.org/[FreeBSD Ports Monitoring System]. In particular look for unmaintained ports with build errors and ports that are marked `BROKEN`. It is OK to send changes for a maintained port as well, but remember to ask the maintainer in case they are already working on the problem. +The other place is the http://portsmon.FreeBSD.org/[FreeBSD Ports Monitoring System]. +In particular look for unmaintained ports with build errors and ports that are marked `BROKEN`. +It is OK to send changes for a maintained port as well, but remember to ask the maintainer in case they are already working on the problem. -Once you have found a bug or problem, collect information, investigate and fix! If there is an existing PR, follow up to that. Otherwise create a new PR. Your changes will be reviewed and, if everything checks out, committed. +Once you have found a bug or problem, collect information, investigate and fix! If there is an existing PR, follow up to that. +Otherwise create a new PR. +Your changes will be reviewed and, if everything checks out, committed. [[mortal-coil]] === When to call it quits -As your interests and commitments change, you may find that you no longer have time to continue some (or all) of your ports contributions. That is fine! Please let us know if you are no longer using a port or have otherwise lost time or interest in being a maintainer. In this way we can go ahead and allow other people to try to work on existing problems with the port without waiting for your response. Remember, FreeBSD is a volunteer project, so if maintaining a port is no fun any more, it is probably time to let someone else do it! +As your interests and commitments change, you may find that you no longer have time to continue some (or all) of your ports contributions. +That is fine! Please let us know if you are no longer using a port or have otherwise lost time or interest in being a maintainer. +In this way we can go ahead and allow other people to try to work on existing problems with the port without waiting for your response. +Remember, FreeBSD is a volunteer project, so if maintaining a port is no fun any more, it is probably time to let someone else do it! -In any case, the Ports Management Team (`portmgr`) reserves the right to reset your maintainership if you have not actively maintained your port in some time. (Currently, this is set to 3 months.) By this, we mean that there are unresolved problems or pending updates that have not been worked on during that time. +In any case, the Ports Management Team (`portmgr`) reserves the right to reset your maintainership if you have not actively maintained your port in some time. +(Currently, this is set to 3 months.) +By this, we mean that there are unresolved problems or pending updates that have not been worked on during that time. [[resources]] === Resources for ports maintainers and contributors The link:{porters-handbook}[Porter's Handbook] is your hitchhiker's guide to the ports system. Keep it handy! -link:{problem-reports}[Writing FreeBSD Problem Reports] describes how to best formulate and submit a PR. In 2005 more than eleven thousand ports PRs were submitted! Following this article will greatly assist us in reducing the time needed to handle your PRs. +link:{problem-reports}[Writing FreeBSD Problem Reports] describes how to best formulate and submit a PR. +In 2005 more than eleven thousand ports PRs were submitted! Following this article will greatly assist us in reducing the time needed to handle your PRs. The https://bugs.freebsd.org/bugzilla/query.cgi[Problem Report database]. -The http://portsmon.FreeBSD.org/[FreeBSD Ports Monitoring System] can show you cross-referenced information about ports such as build errors and problem reports. If you are a maintainer you can use it to check on the build status of your ports. As a contributor you can use it to find broken and unmaintained ports that need to be fixed. +The http://portsmon.FreeBSD.org/[FreeBSD Ports Monitoring System] can show you cross-referenced information about ports such as build errors and problem reports. +If you are a maintainer you can use it to check on the build status of your ports. +As a contributor you can use it to find broken and unmaintained ports that need to be fixed. -The http://portscout.FreeBSD.org[FreeBSD Ports distfile scanner] can show you ports for which the distfiles are not fetchable. You can check on your own ports or use it to find ports that need their `MASTER_SITES` updated. +The http://portscout.FreeBSD.org[FreeBSD Ports distfile scanner] can show you ports for which the distfiles are not fetchable. +You can check on your own ports or use it to find ports that need their `MASTER_SITES` updated. -package:ports-mgmt/poudriere[] is the most thorough way to test a port through the entire cycle of installation, packaging, and deinstallation. Documentation is located at the https://github.com/freebsd/poudriere[poudriere github repository] +package:ports-mgmt/poudriere[] is the most thorough way to test a port through the entire cycle of installation, packaging, and deinstallation. +Documentation is located at the https://github.com/freebsd/poudriere[poudriere github repository] -man:portlint[1] is an application which can be used to verify that your port conforms to many important stylistic and functional guidelines. portlint is a simple heuristic application, so you should use it __only as a guide__. If portlint suggests changes which seem unreasonable, consult the link:{porters-handbook}[Porter's Handbook] or ask for advice. +man:portlint[1] is an application which can be used to verify that your port conforms to many important stylistic and functional guidelines. +portlint is a simple heuristic application, so you should use it __only as a guide__. +If portlint suggests changes which seem unreasonable, consult the link:{porters-handbook}[Porter's Handbook] or ask for advice. -The {freebsd-ports} is for general ports-related discussion. It is a good place to ask for help. You can https://lists.freebsd.org/mailman/listinfo[subscribe, or read and search the list archives]. Reading the archives of the {freebsd-ports-bugs} and the {svn-ports-head} may also be of interest. +The {freebsd-ports} is for general ports-related discussion. +It is a good place to ask for help. +You can https://lists.freebsd.org/mailman/listinfo[subscribe, or read and search the list archives]. +Reading the archives of the {freebsd-ports-bugs} and the {svn-ports-head} may also be of interest. [[ideas-contributing]] == Getting Started in Other Areas diff --git a/documentation/content/en/articles/contributors/_index.adoc b/documentation/content/en/articles/contributors/_index.adoc index 39a95f542e..1919f846c6 100644 --- a/documentation/content/en/articles/contributors/_index.adoc +++ b/documentation/content/en/articles/contributors/_index.adoc @@ -96,7 +96,8 @@ The following individuals and businesses have generously contributed hardware fo [[staff-committers]] == The FreeBSD Developers -These are the people who have commit privileges and do the engineering work on the FreeBSD source tree. All core team members are also developers. +These are the people who have commit privileges and do the engineering work on the FreeBSD source tree. +All core team members are also developers. (in alphabetical order by last name): @@ -105,7 +106,8 @@ include::content/en/articles/contributors/contrib-committers.adoc[] [[contrib-corealumni]] == Core Team Alumni -The following people were members of the FreeBSD core team during the periods indicated. We thank them for their past efforts in the service of the FreeBSD project. +The following people were members of the FreeBSD core team during the periods indicated. +We thank them for their past efforts in the service of the FreeBSD project. _In rough reverse chronological order:_ @@ -114,7 +116,8 @@ include::content/en/articles/contributors/contrib-corealumni.adoc[] [[contrib-develalumni]] == Development Team Alumni -The following people were members of the FreeBSD development team during the periods indicated. We thank them for their past efforts in the service of the FreeBSD project. +The following people were members of the FreeBSD development team during the periods indicated. +We thank them for their past efforts in the service of the FreeBSD project. _In rough reverse chronological order:_ @@ -123,7 +126,8 @@ include::content/en/articles/contributors/contrib-develalumni.adoc[] [[contrib-portmgralumni]] == Ports Management Team Alumni -The following people were members of the FreeBSD portmgr team during the periods indicated. We thank them for their past efforts in the service of the FreeBSD project. +The following people were members of the FreeBSD portmgr team during the periods indicated. +We thank them for their past efforts in the service of the FreeBSD project. _In rough reverse chronological order:_ @@ -132,7 +136,8 @@ include::content/en/articles/contributors/contrib-portmgralumni.adoc[] [[contrib-develinmemoriam]] == Development Team: In Memoriam -During the many years that the FreeBSD Project has been in existence, sadly, some of our developers have passed away. Here are some remembrances. +During the many years that the FreeBSD Project has been in existence, sadly, some of our developers have passed away. +Here are some remembrances. _In rough reverse chronological order of their passing:_ @@ -141,7 +146,8 @@ include::content/en/articles/contributors/contrib-develinmemoriam.adoc[] [[contrib-derived]] == Derived Software Contributors -This software was originally derived from William F. Jolitz's 386BSD release 0.1, though almost none of the original 386BSD specific code remains. This software has been essentially re-implemented from the 4.4BSD-Lite release provided by the Computer Science Research Group (CSRG) at the University of California, Berkeley and associated academic contributors. +This software was originally derived from William F. Jolitz's 386BSD release 0.1, though almost none of the original 386BSD specific code remains. +This software has been essentially re-implemented from the 4.4BSD-Lite release provided by the Computer Science Research Group (CSRG) at the University of California, Berkeley and associated academic contributors. There are also portions of NetBSD and OpenBSD that have been integrated into FreeBSD as well, and we would therefore like to thank all the contributors to NetBSD and OpenBSD for their work. diff --git a/documentation/content/en/articles/cups/_index.adoc b/documentation/content/en/articles/cups/_index.adoc index c617d871ce..008369f0ad 100644 --- a/documentation/content/en/articles/cups/_index.adoc +++ b/documentation/content/en/articles/cups/_index.adoc @@ -29,9 +29,13 @@ toc::[] [[printing-cups]] == An Introduction to the Common Unix Printing System (CUPS) -CUPS, the Common UNIX Printing System, provides a portable printing layer for UNIX(R)-based operating systems. It has been developed by Easy Software Products to promote a standard printing solution for all UNIX(R) vendors and users. +CUPS, the Common UNIX Printing System, provides a portable printing layer for UNIX(R)-based operating systems. +It has been developed by Easy Software Products to promote a standard printing solution for all UNIX(R) vendors and users. -CUPS uses the Internet Printing Protocol (IPP) as the basis for managing print jobs and queues. The Line Printer Daemon (LPD), Server Message Block (SMB), and AppSocket (aka JetDirect) protocols are also supported with reduced functionality. CUPS adds network printer browsing and PostScript Printer Description (PPD) based printing options to support real-world printing under UNIX(R). As a result, CUPS is ideally-suited for sharing and accessing printers in mixed environments of FreeBSD, Linux(R), Mac OS(R) X, or Windows(R). +CUPS uses the Internet Printing Protocol (IPP) as the basis for managing print jobs and queues. +The Line Printer Daemon (LPD), Server Message Block (SMB), and AppSocket (aka JetDirect) protocols are also supported with reduced functionality. +CUPS adds network printer browsing and PostScript Printer Description (PPD) based printing options to support real-world printing under UNIX(R). +As a result, CUPS is ideally-suited for sharing and accessing printers in mixed environments of FreeBSD, Linux(R), Mac OS(R) X, or Windows(R). The main site for CUPS is http://www.cups.org/[http://www.cups.org/]. @@ -45,12 +49,14 @@ To install CUPS using a precompiled binary, issue the following command from a r # pkg install cups .... -Other optional, but recommended, packages are package:print/gutenprint[] and package:print/hplip[], both of which add drivers and utilities for a variety of printers. Once installed, the CUPS configuration files can be found in the directory [.filename]#/usr/local/etc/cups#. +Other optional, but recommended, packages are package:print/gutenprint[] and package:print/hplip[], both of which add drivers and utilities for a variety of printers. +Once installed, the CUPS configuration files can be found in the directory [.filename]#/usr/local/etc/cups#. [[printing-cups-configuring-server]] == Configuring the CUPS Print Server -After installation, a few files must be edited in order to configure the CUPS server. First, create or modify, as the case may be, the file [.filename]#/etc/devfs.rules# and add the following information to set the proper permissions on all potential printer devices and to associate printers with the `cups` user group: +After installation, a few files must be edited in order to configure the CUPS server. +First, create or modify, as the case may be, the file [.filename]#/etc/devfs.rules# and add the following information to set the proper permissions on all potential printer devices and to associate printers with the `cups` user group: [.programlisting] .... @@ -63,7 +69,8 @@ add path 'usb/X.Y.Z' mode 0660 group cups [NOTE] ==== -Note that _X_, _Y_, and _Z_ should be replaced with the target USB device listed in the [.filename]#/dev/usb# directory that corresponds to the printer. To find the correct device, examine the output of man:dmesg[8], where [.filename]#ugenX.Y# lists the printer device, which is a symbolic link to a USB device in [.filename]#/dev/usb#. +Note that _X_, _Y_, and _Z_ should be replaced with the target USB device listed in the [.filename]#/dev/usb# directory that corresponds to the printer. +To find the correct device, examine the output of man:dmesg[8], where [.filename]#ugenX.Y# lists the printer device, which is a symbolic link to a USB device in [.filename]#/dev/usb#. ==== Next, add two lines to [.filename]#/etc/rc.conf# as follows: @@ -94,21 +101,31 @@ Once these changes have been made, the man:devfs[8] and CUPS systems must both b [[printing-cups-configuring-printers]] == Configuring Printers on the CUPS Print Server -After the CUPS system has been installed and configured, the administrator can begin configuring the local printers attached to the CUPS print server. This part of the process is very similar, if not identical, to configuring CUPS printers on other UNIX(R)-based operating systems, such as a Linux(R) distribution. +After the CUPS system has been installed and configured, the administrator can begin configuring the local printers attached to the CUPS print server. +This part of the process is very similar, if not identical, to configuring CUPS printers on other UNIX(R)-based operating systems, such as a Linux(R) distribution. -The primary means for managing and administering the CUPS server is through the web-based interface, which can be found by launching a web browser and entering http://localhost:631[http://localhost:631] in the browser's URL bar. If the CUPS server is on another machine on the network, substitute the server's local IP address for `localhost`. The CUPS web interface is fairly self-explanatory, as there are sections for managing printers and print jobs, authorizing users, and more. Additionally, on the right-hand side of the Administration screen are several check-boxes allowing easy access to commonly-changed settings, such as whether to share published printers connected to the system, whether to allow remote administration of the CUPS server, and whether to allow users additional access and privileges to the printers and print jobs. +The primary means for managing and administering the CUPS server is through the web-based interface, which can be found by launching a web browser and entering http://localhost:631[http://localhost:631] in the browser's URL bar. +If the CUPS server is on another machine on the network, substitute the server's local IP address for `localhost`. +The CUPS web interface is fairly self-explanatory, as there are sections for managing printers and print jobs, authorizing users, and more. +Additionally, on the right-hand side of the Administration screen are several check-boxes allowing easy access to commonly-changed settings, such as whether to share published printers connected to the system, whether to allow remote administration of the CUPS server, and whether to allow users additional access and privileges to the printers and print jobs. -Adding a printer is generally as easy as clicking "Add Printer" at the Administration screen of the CUPS web interface, or clicking one of the "New Printers Found" buttons also at the Administration screen. When presented with the "Device" drop-down box, simply select the desired locally-attached printer, and then continue through the process. If one has added the package:print/gutenprint-cups[] or package:print/hplip[] ports or packages as referenced above, then additional print drivers will be available in the subsequent screens that might provide more stability or features. +Adding a printer is generally as easy as clicking "Add Printer" at the Administration screen of the CUPS web interface, or clicking one of the "New Printers Found" buttons also at the Administration screen. +When presented with the "Device" drop-down box, simply select the desired locally-attached printer, and then continue through the process. +If one has added the package:print/gutenprint-cups[] or package:print/hplip[] ports or packages as referenced above, then additional print drivers will be available in the subsequent screens that might provide more stability or features. [[printing-cups-clients]] == Configuring CUPS Clients -Once the CUPS server has been configured and printers have been added and published to the network, the next step is to configure the clients, or the machines that are going to access the CUPS server. If one has a single desktop machine that is acting as both server and client, then much of this information may not be needed. +Once the CUPS server has been configured and printers have been added and published to the network, the next step is to configure the clients, or the machines that are going to access the CUPS server. +If one has a single desktop machine that is acting as both server and client, then much of this information may not be needed. [[printing-cups-clients-unix]] === UNIX(R) Clients -CUPS will also need to be installed on your UNIX(R) clients. Once CUPS is installed on the clients, then CUPS printers that are shared across the network are often automatically discovered by the printer managers for various desktop environments such as GNOME or KDE. Alternatively, one can access the local CUPS interface on the client machine at http://localhost:631[http://localhost:631] and click on "Add Printer" in the Administration section. When presented with the "Device" drop-down box, simply select the networked CUPS printer, if it was automatically discovered, or select `ipp` or `http` and enter the IPP or HTTP URI of the networked CUPS printer, usually in one of the two following syntaxes: +CUPS will also need to be installed on your UNIX(R) clients. +Once CUPS is installed on the clients, then CUPS printers that are shared across the network are often automatically discovered by the printer managers for various desktop environments such as GNOME or KDE. +Alternatively, one can access the local CUPS interface on the client machine at http://localhost:631[http://localhost:631] and click on "Add Printer" in the Administration section. +When presented with the "Device" drop-down box, simply select the networked CUPS printer, if it was automatically discovered, or select `ipp` or `http` and enter the IPP or HTTP URI of the networked CUPS printer, usually in one of the two following syntaxes: [.programlisting] .... @@ -132,7 +149,10 @@ In this case, _server-ip_ would be replaced by the local IP address of the CUPS [[printing-cups-clients-windows]] === Windows(R) Clients -Versions of Windows(R) prior to XP did not have the capability to natively network with IPP-based printers. However, Windows(R) XP and later versions do have this capability. Therefore, to add a CUPS printer in these versions of Windows(R) is quite easy. Generally, the Windows(R) administrator will run the Windows(R) `Add Printer` wizard, select `Network Printer` and then enter the URI in the following syntax: +Versions of Windows(R) prior to XP did not have the capability to natively network with IPP-based printers. +However, Windows(R) XP and later versions do have this capability. +Therefore, to add a CUPS printer in these versions of Windows(R) is quite easy. +Generally, the Windows(R) administrator will run the Windows(R) `Add Printer` wizard, select `Network Printer` and then enter the URI in the following syntax: [.programlisting] .... @@ -144,7 +164,13 @@ If one has an older version of Windows(R) without native IPP printing support, t [[printing-cups-troubleshooting]] == CUPS Troubleshooting -Difficulties with CUPS often lies in permissions. First, double check the man:devfs[8] permissions as outlined above. Next, check the actual permissions of the devices created in the file system. It is also helpful to make sure your user is a member of the `cups` group. If the permissions check boxes in the Administration section of the CUPS web interface do not seem to be working, another fix might be to manually backup the main CUPS configuration file located at [.filename]#/usr/local/etc/cups/cupsd.conf# and edit the various configuration options and try different combinations of configuration options. One sample [.filename]#/usr/local/etc/cups/cupsd.conf# to test is listed below. Please note that this sample [.filename]#cupsd.conf# sacrifices security for easier configuration; once the administrator successfully connects to the CUPS server and configures the clients, it is advisable to revisit this configuration file and begin locking down access. +Difficulties with CUPS often lies in permissions. +First, double check the man:devfs[8] permissions as outlined above. +Next, check the actual permissions of the devices created in the file system. +It is also helpful to make sure your user is a member of the `cups` group. +If the permissions check boxes in the Administration section of the CUPS web interface do not seem to be working, another fix might be to manually backup the main CUPS configuration file located at [.filename]#/usr/local/etc/cups/cupsd.conf# and edit the various configuration options and try different combinations of configuration options. +One sample [.filename]#/usr/local/etc/cups/cupsd.conf# to test is listed below. +Please note that this sample [.filename]#cupsd.conf# sacrifices security for easier configuration; once the administrator successfully connects to the CUPS server and configures the clients, it is advisable to revisit this configuration file and begin locking down access. [.programlisting] .... diff --git a/documentation/content/en/articles/explaining-bsd/_index.adoc b/documentation/content/en/articles/explaining-bsd/_index.adoc index 1f76b113e1..ce636eb968 100644 --- a/documentation/content/en/articles/explaining-bsd/_index.adoc +++ b/documentation/content/en/articles/explaining-bsd/_index.adoc @@ -33,7 +33,11 @@ toc::[] [[what-is-bsd]] == What is BSD? -BSD stands for "Berkeley Software Distribution". It is the name of distributions of source code from the University of California, Berkeley, which were originally extensions to AT&T's Research UNIX(R) operating system. Several open source operating system projects are based on a release of this source code known as 4.4BSD-Lite. In addition, they comprise a number of packages from other Open Source projects, including notably the GNU project. The overall operating system comprises: +BSD stands for "Berkeley Software Distribution". +It is the name of distributions of source code from the University of California, Berkeley, which were originally extensions to AT&T's Research UNIX(R) operating system. +Several open source operating system projects are based on a release of this source code known as 4.4BSD-Lite. +In addition, they comprise a number of packages from other Open Source projects, including notably the GNU project. +The overall operating system comprises: * The BSD kernel, which handles process scheduling, memory management, symmetric multi-processing (SMP), device drivers, etc. * The C library, the base API for the system. @@ -44,23 +48,44 @@ __The BSD C library is based on code from Berkeley, not the GNU project.__ __Some of the utilities are derived from the GNU project, others are not.__ * The X Window system, which handles graphical display. + -The X Window system used in most versions of BSD is maintained by the http://www.X.org/[X.Org project]. FreeBSD allows the user to choose from a variety of desktop environments, such as Gnome, KDE, or Xfce; and lightweight window managers like Openbox, Fluxbox, or Awesome. +The X Window system used in most versions of BSD is maintained by the http://www.X.org/[X.Org project]. +FreeBSD allows the user to choose from a variety of desktop environments, such as Gnome, KDE, or Xfce; and lightweight window managers like Openbox, Fluxbox, or Awesome. * Many other programs and utilities. [[what-a-real-unix]] == What, a real UNIX(R)? -The BSD operating systems are not clones, but open source derivatives of AT&T's Research UNIX(R) operating system, which is also the ancestor of the modern UNIX(R) System V. This may surprise you. How could that happen when AT&T has never released its code as open source? +The BSD operating systems are not clones, but open source derivatives of AT&T's Research UNIX(R) operating system, which is also the ancestor of the modern UNIX(R) System V. +This may surprise you. +How could that happen when AT&T has never released its code as open source? It is true that AT&T UNIX(R) is not open source, and in a copyright sense BSD is very definitely _not_ UNIX(R), but on the other hand, AT&T has imported sources from other projects, noticeably the Computer Sciences Research Group (CSRG) of the University of California in Berkeley, CA. Starting in 1976, the CSRG started releasing tapes of their software, calling them _Berkeley Software Distribution_ or __BSD__. -Initial BSD releases consisted mainly of user programs, but that changed dramatically when the CSRG landed a contract with the Defense Advanced Research Projects Agency (DARPA) to upgrade the communications protocols on their network, ARPANET. The new protocols were known as the __Internet Protocols__, later _TCP/IP_ after the most important protocols. The first widely distributed implementation was part of 4.2BSD, in 1982. - -In the course of the 1980s, a number of new workstation companies sprang up. Many preferred to license UNIX(R) rather than developing operating systems for themselves. In particular, Sun Microsystems licensed UNIX(R) and implemented a version of 4.2BSD, which they called SunOS(TM). When AT&T themselves were allowed to sell UNIX(R) commercially, they started with a somewhat bare-bones implementation called System III, to be quickly followed by System V. The System V code base did not include networking, so all implementations included additional software from the BSD, including the TCP/IP software, but also utilities such as the _csh_ shell and the _vi_ editor. Collectively, these enhancements were known as the __Berkeley Extensions__. - -The BSD tapes contained AT&T source code and thus required a UNIX(R) source license. By 1990, the CSRG's funding was running out, and it faced closure. Some members of the group decided to release the BSD code, which was Open Source, without the AT&T proprietary code. This finally happened with the __Networking Tape 2__, usually known as __Net/2__. Net/2 was not a complete operating system: about 20% of the kernel code was missing. One of the CSRG members, William F. Jolitz, wrote the remaining code and released it in early 1992 as __386BSD__. At the same time, another group of ex-CSRG members formed a commercial company called http://www.bsdi.com/[Berkeley Software Design Inc.] and released a beta version of an operating system called http://www.bsdi.com/[BSD/386], which was based on the same sources. The name of the operating system was later changed to BSD/OS. - -386BSD never became a stable operating system. Instead, two other projects split off from it in 1993: http://www.NetBSD.org/[NetBSD] and link:https://www.FreeBSD.org/[FreeBSD]. The two projects originally diverged due to differences in patience waiting for improvements to 386BSD: the NetBSD people started early in the year, and the first version of FreeBSD was not ready until the end of the year. In the meantime, the code base had diverged sufficiently to make it difficult to merge. In addition, the projects had different aims, as we will see below. In 1996, http://www.OpenBSD.org/[OpenBSD] split off from NetBSD, and in 2003, http://www.dragonflybsd.org/[DragonFlyBSD] split off from FreeBSD. +Initial BSD releases consisted mainly of user programs, but that changed dramatically when the CSRG landed a contract with the Defense Advanced Research Projects Agency (DARPA) to upgrade the communications protocols on their network, ARPANET. +The new protocols were known as the __Internet Protocols__, later _TCP/IP_ after the most important protocols. +The first widely distributed implementation was part of 4.2BSD, in 1982. + +In the course of the 1980s, a number of new workstation companies sprang up. +Many preferred to license UNIX(R) rather than developing operating systems for themselves. +In particular, Sun Microsystems licensed UNIX(R) and implemented a version of 4.2BSD, which they called SunOS(TM). +When AT&T themselves were allowed to sell UNIX(R) commercially, they started with a somewhat bare-bones implementation called System III, to be quickly followed by System V. +The System V code base did not include networking, so all implementations included additional software from the BSD, including the TCP/IP software, but also utilities such as the _csh_ shell and the _vi_ editor. +Collectively, these enhancements were known as the __Berkeley Extensions__. + +The BSD tapes contained AT&T source code and thus required a UNIX(R) source license. +By 1990, the CSRG's funding was running out, and it faced closure. +Some members of the group decided to release the BSD code, which was Open Source, without the AT&T proprietary code. +This finally happened with the __Networking Tape 2__, usually known as __Net/2__. +Net/2 was not a complete operating system: about 20% of the kernel code was missing. +One of the CSRG members, William F. Jolitz, wrote the remaining code and released it in early 1992 as __386BSD__. +At the same time, another group of ex-CSRG members formed a commercial company called http://www.bsdi.com/[Berkeley Software Design Inc.] and released a beta version of an operating system called http://www.bsdi.com/[BSD/386], which was based on the same sources. +The name of the operating system was later changed to BSD/OS. + +386BSD never became a stable operating system. +Instead, two other projects split off from it in 1993: http://www.NetBSD.org/[NetBSD] and link:https://www.FreeBSD.org/[FreeBSD]. +The two projects originally diverged due to differences in patience waiting for improvements to 386BSD: the NetBSD people started early in the year, and the first version of FreeBSD was not ready until the end of the year. +In the meantime, the code base had diverged sufficiently to make it difficult to merge. +In addition, the projects had different aims, as we will see below. In 1996, http://www.OpenBSD.org/[OpenBSD] split off from NetBSD, and in 2003, http://www.dragonflybsd.org/[DragonFlyBSD] split off from FreeBSD. [[why-is-bsd-not-better-known]] == Why is BSD not better known? @@ -71,27 +96,42 @@ For a number of reasons, BSD is relatively unknown: . Much of Linux's popularity is due to factors external to the Linux projects, such as the press, and to companies formed to provide Linux services. Until recently, the open source BSDs had no such proponents. . In 1992, AT&T sued http://www.bsdi.com/[BSDI], the vendor of BSD/386, alleging that the product contained AT&T-copyrighted code. The case was settled out of court in 1994, but the spectre of the litigation continues to haunt people. In March 2000 an article published on the web claimed that the court case had been "recently settled". + -One detail that the lawsuit did clarify is the naming: in the 1980s, BSD was known as "BSD UNIX(R)". With the elimination of the last vestige of AT&T code from BSD, it also lost the right to the name UNIX(R). Thus you will see references in book titles to "the 4.3BSD UNIX(R) operating system" and "the 4.4BSD operating system". +One detail that the lawsuit did clarify is the naming: in the 1980s, BSD was known as "BSD UNIX(R)". +With the elimination of the last vestige of AT&T code from BSD, it also lost the right to the name UNIX(R). +Thus you will see references in book titles to "the 4.3BSD UNIX(R) operating system" and "the 4.4BSD operating system". [[comparing-bsd-and-linux]] == Comparing BSD and Linux -So what is really the difference between, say, Debian Linux and FreeBSD? For the average user, the difference is surprisingly small: Both are UNIX(R) like operating systems. Both are developed by non-commercial projects (this does not apply to many other Linux distributions, of course). In the following section, we will look at BSD and compare it to Linux. The description applies most closely to FreeBSD, which accounts for an estimated 80% of the BSD installations, but the differences from NetBSD, OpenBSD and DragonFlyBSD are small. +So what is really the difference between, say, Debian Linux and FreeBSD? For the average user, the difference is surprisingly small: Both are UNIX(R) like operating systems. +Both are developed by non-commercial projects (this does not apply to many other Linux distributions, of course). +In the following section, we will look at BSD and compare it to Linux. +The description applies most closely to FreeBSD, which accounts for an estimated 80% of the BSD installations, but the differences from NetBSD, OpenBSD and DragonFlyBSD are small. === Who owns BSD? -No one person or corporation owns BSD. It is created and distributed by a community of highly technical and committed contributors all over the world. Some of the components of BSD are Open Source projects in their own right and managed by different project maintainers. +No one person or corporation owns BSD. +It is created and distributed by a community of highly technical and committed contributors all over the world. +Some of the components of BSD are Open Source projects in their own right and managed by different project maintainers. === How is BSD developed and updated? -The BSD kernels are developed and updated following the Open Source development model. Each project maintains a publicly accessible _source tree_ which contains all source files for the project, including documentation and other incidental files. Users can obtain a complete copy of any version. +The BSD kernels are developed and updated following the Open Source development model. +Each project maintains a publicly accessible _source tree_ which contains all source files for the project, including documentation and other incidental files. +Users can obtain a complete copy of any version. -A large number of developers worldwide contribute to improvements to BSD. They are divided into three kinds: +A large number of developers worldwide contribute to improvements to BSD. +They are divided into three kinds: * _Contributors_ write code or documentation. They are not permitted to commit (add code) directly to the source tree. In order for their code to be included in the system, it must be reviewed and checked in by a registered developer, known as a __committer__. * _Committers_ are developers with write access to the source tree. In order to become a committer, an individual must show ability in the area in which they are active. + -It is at the individual committer's discretion whether they should obtain authority before committing changes to the source tree. In general, an experienced committer may make changes which are obviously correct without obtaining consensus. For example, a documentation project committer may correct typographical or grammatical errors without review. On the other hand, developers making far-reaching or complicated changes are expected to submit their changes for review before committing them. In extreme cases, a core team member with a function such as Principal Architect may order that changes be removed from the tree, a process known as _backing out_. All committers receive mail describing each individual commit, so it is not possible to commit secretly. +It is at the individual committer's discretion whether they should obtain authority before committing changes to the source tree. +In general, an experienced committer may make changes which are obviously correct without obtaining consensus. +For example, a documentation project committer may correct typographical or grammatical errors without review. +On the other hand, developers making far-reaching or complicated changes are expected to submit their changes for review before committing them +In extreme cases, a core team member with a function such as Principal Architect may order that changes be removed from the tree, a process known as _backing out_. +All committers receive mail describing each individual commit, so it is not possible to commit secretly. * The _Core team_. FreeBSD and NetBSD each have a core team which manages the project. The core teams developed in the course of the projects, and their role is not always well-defined. It is not necessary to be a developer in order to be a core team member, though it is normal. The rules for the core team vary from one project to the other, but in general they have more say in the direction of the project than non-core team members have. This arrangement differs from Linux in a number of ways: @@ -103,13 +143,20 @@ This arrangement differs from Linux in a number of ways: === BSD releases -FreeBSD, NetBSD and OpenBSD provide the system in three different "releases". As with Linux, releases are assigned a number such as 1.4.1 or 3.5. In addition, the version number has a suffix indicating its purpose: +FreeBSD, NetBSD and OpenBSD provide the system in three different "releases". +As with Linux, releases are assigned a number such as 1.4.1 or 3.5. +In addition, the version number has a suffix indicating its purpose: . The development version of the system is called _CURRENT_. FreeBSD assigns a number to CURRENT, for example FreeBSD 5.0-CURRENT. NetBSD uses a slightly different naming scheme and appends a single-letter suffix which indicates changes in the internal interfaces, for example NetBSD 1.4.3G. OpenBSD does not assign a number ("OpenBSD-current"). All new development on the system goes into this branch. . At regular intervals, between two and four times a year, the projects bring out a _RELEASE_ version of the system, which is available on CD-ROM and for free download from FTP sites, for example OpenBSD 2.6-RELEASE or NetBSD 1.4-RELEASE. The RELEASE version is intended for end users and is the normal version of the system. NetBSD also provides _patch releases_ with a third digit, for example NetBSD 1.4.2. . As bugs are found in a RELEASE version, they are fixed, and the fixes are added to the SVN tree. In FreeBSD, the resultant version is called the _STABLE_ version, while in NetBSD and OpenBSD it continues to be called the RELEASE version. Smaller new features can also be added to this branch after a period of test in the CURRENT branch. Security and other important bug fixes are also applied to all supported RELEASE versions. -_By contrast, Linux maintains two separate code trees: the stable version and the development version. Stable versions have an even minor version number, such as 2.0, 2.2 or 2.4. Development versions have an odd minor version number, such as 2.1, 2.3 or 2.5. In each case, the number is followed by a further number designating the exact release. In addition, each vendor adds their own userland programs and utilities, so the name of the distribution is also important. Each distribution vendor also assigns version numbers to the distribution, so a complete description might be something like "TurboLinux 6.0 with kernel 2.2.14"_ +_By contrast, Linux maintains two separate code trees: the stable version and the development version. +Stable versions have an even minor version number, such as 2.0, 2.2 or 2.4. +Development versions have an odd minor version number, such as 2.1, 2.3 or 2.5. +In each case, the number is followed by a further number designating the exact release. +In addition, each vendor adds their own userland programs and utilities, so the name of the distribution is also important. +Each distribution vendor also assigns version numbers to the distribution, so a complete description might be something like "TurboLinux 6.0 with kernel 2.2.14"_ === What versions of BSD are available? @@ -129,19 +176,26 @@ There are also two additional BSD UNIX(R) operating systems which are not open s === How does the BSD license differ from the GNU Public license? -Linux is available under the http://www.fsf.org/copyleft/gpl.html[GNU General Public License] (GPL), which is designed to eliminate closed source software. In particular, any derivative work of a product released under the GPL must also be supplied with source code if requested. By contrast, the http://www.opensource.org/licenses/bsd-license.html[BSD license] is less restrictive: binary-only distributions are allowed. This is particularly attractive for embedded applications. +Linux is available under the http://www.fsf.org/copyleft/gpl.html[GNU General Public License] (GPL), which is designed to eliminate closed source software. +In particular, any derivative work of a product released under the GPL must also be supplied with source code if requested. +By contrast, the http://www.opensource.org/licenses/bsd-license.html[BSD license] is less restrictive: binary-only distributions are allowed. +This is particularly attractive for embedded applications. === What else should I know? -Since fewer applications are available for BSD than Linux, the BSD developers created a Linux compatibility package, which allows Linux programs to run under BSD. The package includes both kernel modifications, in order to correctly perform Linux system calls, and Linux compatibility files such as the C library. There is no noticeable difference in execution speed between a Linux application running on a Linux machine and a Linux application running on a BSD machine of the same speed. +Since fewer applications are available for BSD than Linux, the BSD developers created a Linux compatibility package, which allows Linux programs to run under BSD. +The package includes both kernel modifications, in order to correctly perform Linux system calls, and Linux compatibility files such as the C library. +There is no noticeable difference in execution speed between a Linux application running on a Linux machine and a Linux application running on a BSD machine of the same speed. -The "all from one supplier" nature of BSD means that upgrades are much easier to handle than is frequently the case with Linux. BSD handles library version upgrades by providing compatibility modules for earlier library versions, so it is possible to run binaries which are several years old with no problems. +The "all from one supplier" nature of BSD means that upgrades are much easier to handle than is frequently the case with Linux. +BSD handles library version upgrades by providing compatibility modules for earlier library versions, so it is possible to run binaries which are several years old with no problems. === Which should I use, BSD or Linux? What does this all mean in practice? Who should use BSD, who should use Linux? -This is a very difficult question to answer. Here are some guidelines: +This is a very difficult question to answer. +Here are some guidelines: * "If it ain't broke, don't fix it": If you already use an open source operating system, and you are happy with it, there is probably no good reason to change. * BSD systems, in particular FreeBSD, can have notably higher performance than Linux. But this is not across the board. In many cases, there is little or no difference in performance. In some cases, Linux may perform better than FreeBSD. diff --git a/documentation/content/en/articles/filtering-bridges/_index.adoc b/documentation/content/en/articles/filtering-bridges/_index.adoc index a98bc5e6f1..d880fb95f6 100644 --- a/documentation/content/en/articles/filtering-bridges/_index.adoc +++ b/documentation/content/en/articles/filtering-bridges/_index.adoc @@ -22,9 +22,12 @@ include::shared/en/urls.adoc[] [.abstract-title] Abstract -Often it is useful to divide one physical network (like an Ethernet) into two separate segments without having to create subnets, and use a router to link them together. The device that connects the two networks in this way is called a bridge. A FreeBSD system with two network interfaces is enough in order to act as a bridge. +Often it is useful to divide one physical network (like an Ethernet) into two separate segments without having to create subnets, and use a router to link them together. +The device that connects the two networks in this way is called a bridge. +A FreeBSD system with two network interfaces is enough in order to act as a bridge. -A bridge works by scanning the addresses of MAC level (Ethernet addresses) of the devices connected to each of its network interfaces and then forwarding the traffic between the two networks only if the source and the destination are on different segments. Under many points of view a bridge is similar to an Ethernet switch with only two ports. +A bridge works by scanning the addresses of MAC level (Ethernet addresses) of the devices connected to each of its network interfaces and then forwarding the traffic between the two networks only if the source and the destination are on different segments. +Under many points of view a bridge is similar to an Ethernet switch with only two ports. ''' @@ -33,26 +36,35 @@ toc::[] [[filtering-bridges-why]] == Why use a filtering bridge? -More and more frequently, thanks to the lowering costs of broad band Internet connections (xDSL) and also because of the reduction of available IPv4 addresses, many companies are connected to the Internet 24 hours on 24 and with few (sometimes not even a power of 2) IP addresses. In these situations it is often desirable to have a firewall that filters incoming and outgoing traffic from and towards Internet, but a packet filtering solution based on router may not be applicable, either due to subnetting issues, the router is owned by the connectivity supplier (ISP), or because it does not support such functionalities. In these scenarios the use of a filtering bridge is highly advised. +More and more frequently, thanks to the lowering costs of broad band Internet connections (xDSL) and also because of the reduction of available IPv4 addresses, many companies are connected to the Internet 24 hours on 24 and with few (sometimes not even a power of 2) IP addresses. +In these situations it is often desirable to have a firewall that filters incoming and outgoing traffic from and towards Internet, but a packet filtering solution based on router may not be applicable, either due to subnetting issues, the router is owned by the connectivity supplier (ISP), or because it does not support such functionalities. +In these scenarios the use of a filtering bridge is highly advised. A bridge-based firewall can be configured and inserted between the xDSL router and your Ethernet hub/switch without any IP numbering issues. [[filtering-bridges-how]] == How to Install -Adding bridge functionalities to a FreeBSD system is not difficult. Since 4.5 release it is possible to load such functionalities as modules instead of having to rebuild the kernel, simplifying the procedure a great deal. In the following subsections I will explain both installation ways. +Adding bridge functionalities to a FreeBSD system is not difficult. +Since 4.5 release it is possible to load such functionalities as modules instead of having to rebuild the kernel, simplifying the procedure a great deal. +In the following subsections I will explain both installation ways. [IMPORTANT] ==== -_Do not_ follow both instructions: a procedure _excludes_ the other one. Select the best choice according to your needs and abilities. +_Do not_ follow both instructions: a procedure _excludes_ the other one. +Select the best choice according to your needs and abilities. ==== -Before going on, be sure to have at least two Ethernet cards that support the promiscuous mode for both reception and transmission, since they must be able to send Ethernet packets with any address, not just their own. Moreover, to have a good throughput, the cards should be PCI bus mastering cards. The best choices are still the Intel EtherExpress(TM) Pro, followed by the 3Com(R) 3c9xx series. To simplify the firewall configuration it may be useful to have two cards of different manufacturers (using different drivers) in order to distinguish clearly which interface is connected to the router and which to the inner network. +Before going on, be sure to have at least two Ethernet cards that support the promiscuous mode for both reception and transmission, since they must be able to send Ethernet packets with any address, not just their own. +Moreover, to have a good throughput, the cards should be PCI bus mastering cards. +The best choices are still the Intel EtherExpress(TM) Pro, followed by the 3Com(R) 3c9xx series. +To simplify the firewall configuration it may be useful to have two cards of different manufacturers (using different drivers) in order to distinguish clearly which interface is connected to the router and which to the inner network. [[filtering-bridges-kernel]] === Kernel Configuration -So you have decided to use the older but well tested installation method. To begin, you have to add the following rows to your kernel configuration file: +So you have decided to use the older but well tested installation method. +To begin, you have to add the following rows to your kernel configuration file: [.programlisting] .... @@ -63,7 +75,8 @@ options IPFIREWALL_VERBOSE *** 8945 LINES SKIPPED *** From owner-dev-commits-doc-all@freebsd.org Sat Mar 20 18:36:22 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9418E5B1554 for ; Sat, 20 Mar 2021 18:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F2qGZ3qdtz4rYR; Sat, 20 Mar 2021 18:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 765304A2E; Sat, 20 Mar 2021 18:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12KIaM8s073050; Sat, 20 Mar 2021 18:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12KIaMH0073049; Sat, 20 Mar 2021 18:36:22 GMT (envelope-from git) Date: Sat, 20 Mar 2021 18:36:22 GMT Message-Id: <202103201836.12KIaMH0073049@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 72a86c01df - main - Upgrade committers-guide and freebsd-releng with the new doc tech. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72a86c01dfbce05e33204e59716ad6f64bd5880d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 18:36:22 -0000 The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=72a86c01dfbce05e33204e59716ad6f64bd5880d commit 72a86c01dfbce05e33204e59716ad6f64bd5880d Author: Sergio Carlavilla Delgado AuthorDate: 2021-03-20 18:34:29 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2021-03-20 18:34:29 +0000 Upgrade committers-guide and freebsd-releng with the new doc tech. Upgrade committers-guide and freebsd-releng to show the new documentation tech - Hugo/AsciiDoctor --- .../en/articles/committers-guide/_index.adoc | 2 +- .../content/en/articles/freebsd-releng/_index.adoc | 67 ++++++++-------------- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 3f39b45571..e9ea2cb9c3 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -4558,7 +4558,7 @@ In particular, we recommend that you read: + [NOTE] ==== -Get your mentor to add you to the "Additional Contributors" ([.filename]#doc/en_US.ISO8859-1/articles/contributors/contrib.additional.xml#), if you are not already listed there. +Get your mentor to add you to the "Additional Contributors" ([.filename]#~/documentation/content/en/articles/contributors/contrib-additional.adoc#), if you are not already listed there. ==== * <> * <> diff --git a/documentation/content/en/articles/freebsd-releng/_index.adoc b/documentation/content/en/articles/freebsd-releng/_index.adoc index 48124f6881..65410cf4a0 100644 --- a/documentation/content/en/articles/freebsd-releng/_index.adoc +++ b/documentation/content/en/articles/freebsd-releng/_index.adoc @@ -207,26 +207,19 @@ The same applies to work-in-progress extensions. For example, in-progress work for a new device driver that is otherwise isolated from the rest of the tree may be granted an extension. A new scheduler, however, may not be feasible, especially if such dramatic changes do not exist in another branch. -The schedule is also added to the Project website, in the `doc/` repository, in [.filename]#head/en_US.ISO8859-1/htdocs/releases/{branchRevision}R/schedule.xml#. This file is continuously updated as the release cycle progresses. +The schedule is also added to the Project website, in the `doc/` repository, in [.filename]#~/website/content/en/releases/{branchRevision}R/schedule.adoc#. This file is continuously updated as the release cycle progresses. [NOTE] ==== -In most cases, the [.filename]#schedule.xml# can be copied from a prior release and updated accordingly. +In most cases, the [.filename]#schedule.adoc# can be copied from a prior release and updated accordingly. ==== -In addition to adding [.filename]#schedule.xml# to the website, [.filename]#head/shared/xml/navibar.ent# and [.filename]#head/shared/xml/release.ent# are also updated to add the link to the schedule to various subpages, as well as enabling the link to the schedule on the Project website index page. +In addition to adding [.filename]#schedule.adoc# to the website, [.filename]#~/shared/releases.adoc# is also updated to add the link to the schedule to various subpages, as well as enabling the link to the schedule on the Project website index page. -The schedule is also linked from [.filename]#head/en_US.ISO8859-1/htdocs/releng/index.xml#. +The schedule is also linked from [.filename]#~/website/content/en/releng/_index.adoc#. Approximately one month prior to the scheduled "code slush", the {teamRe} sends a reminder email to the FreeBSD Developers. -Once the first builds of the release cycle are available, update the `beta.local.where` entity in [.filename]#head/en_US.ISO8859-1/htdocs/releases/{branchRevision}R/schedule.xml#. replacing `IGNORE` with `INCLUDE`. - -[NOTE] -==== -If two parallel release cycles are happening at once, the `beta2.local.where` entity may be used instead. -==== - [[releng-terms]] == Release Engineering Terminology @@ -284,17 +277,12 @@ When the release cycle schedule is available, these files need to be updated to | File to Edit | What to Change -|[.filename]#share/xml/release.ent# -|Change `beta.upcoming` from `IGNORE` to `INCLUDE` - -|[.filename]#share/xml/release.ent# -|Change `% beta.upcoming` from `IGNORE` to `INCLUDE` +|[.filename]#~/shared/releases.adoc# +|Change `beta-upcoming` from `IGNORE` to `INCLUDE` -|[.filename]#share/xml/release.ent# -|Change `beta.testing` from `IGNORE` to `INCLUDE` +|[.filename]#~/shared/releases.adoc# +|Change `beta-testing` from `IGNORE` to `INCLUDE` -|[.filename]#share/xml/release.ent# -|Change `% beta.testing` from `IGNORE` to `INCLUDE` |=== [[releng-website-beta-rc]] @@ -308,19 +296,16 @@ When transitioning from `PRERELEASE` to `BETA`, these files need to be updated t | File to Edit | What to Change -|[.filename]#en_US.ISO8859-1/htdocs/releases/12.0R/schedule.xml# -|Change `% beta.local.where` `IGNORE` to `INCLUDE` +|[.filename]#share/releases.adoc# +|Update `betarel-vers` to `BETA__1__` -|[.filename]#share/xml/release.ent# -|Update `% betarel.vers` to `BETA__1__` - -|[.filename]#share/xml/news.xml# +|[.filename]#~/website/data/en/news.toml# |Add an entry announcing the `BETA` -|[.filename]#en_US.ISO8859-1/htdocs/security/advisory-template.txt# +|[.filename]#~/website/static/security/advisory-template.txt# |Add the new `BETA`, `RC`, or final `RELEASE` to the template -|[.filename]#en_US.ISO8859-1/htdocs/security/errata-template.txt# +|[.filename]#~/website/static/security/errata-template.txt# |Add the new `BETA`, `RC`, or final `RELEASE` to the template |=== @@ -500,8 +485,6 @@ These files are all relative to the top-most level of the stable branch: |Add a new `.ds` entry for the FreeBSD version, and update `doc-default-operating-system` (FreeBSD 11.x and earlier only) |=== -In the `doc` repository, also update [.filename]#head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.hardware#, switching the value of `_BRANCH` to `BETA__X__`, `RC__X__`, or `RELEASE`, respectively. - [[releng-stable-builds-beta]] === FreeBSD `BETA` Builds @@ -575,7 +558,7 @@ The order of commits and what to change are: % svn commit {branchStablex} .... -Now that two new `__FreeBSD_version` values exist, also update [.filename]#head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml# in the Documentation Project repository. +Now that two new `__FreeBSD_version` values exist, also update [.filename]#~/documentation/content/en/books/porters-handbook/versions/chapter.adoc# in the Documentation Project repository. After the first `RC` build has completed and tested, the {branchStable} branch can be "thawed" by removing (or commenting) the ^/{branchStablex} entry in [.filename]#svnadmin/conf/approvers#. @@ -853,27 +836,27 @@ When a release reaches End-of-Life, references to that release should be removed | What to Change -|[.filename]#head/en_US.ISO8859-1/htdocs/index.xsl# -|Remove `&u.relXXX.announce;` and `&u.relXXX.current;` references. +|[.filename]#~/website/themes/beastie/layouts/index.html# +|Remove `u-relXXX-announce` and `u-relXXX-announce` references. -|[.filename]#head/en_US.ISO8859-1/htdocs/releases/index.xml# -|Move the &u.relXXX.*; macros from the supported release list to the Legacy Releases list. +|[.filename]#~/website/content/en/releases/_index.adoc# +|Move the `u-relXXX-*` variables from the supported release list to the Legacy Releases list. -|[.filename]#head/en_US.ISO8859-1/htdocs/releng/index.xml# +|[.filename]#~/website/content/en/releng/_index.adoc# |Update the appropriate releng branch to refelect the branch is no longer supported. -|[.filename]#head/en_US.ISO8859-1/htdocs/security/security.xml# +|[.filename]#~/website/content/en/security/_index.adoc# |Remove the branch from the supported branch list. -|[.filename]#head/en_US.ISO8859-1/htdocs/where.xml# +|[.filename]#~/website/content/en/where.adoc# |Remove the URLs for the release. -|[.filename]#head/share/xml/navibar.ent# -|Remove `&u.relXXX.announce;` and `&u.relXXX.current;` references. +|[.filename]#~/website/themes/beastie/layouts/partials/sidenav.html# +|Remove `u-relXXX-announce` and `u-relXXX-announce` references. -|[.filename]#head/en_US.ISO8859-1/htdocs/security/advisory-template.txt# +|[.filename]#~/website/static/security/advisory-template.txt# |Remove references to the release and releng branch. -|[.filename]#head/en_US.ISO8859-1/htdocs/security/errata-template.txt# +|[.filename]#~/website/static/security/errata-template.txt# |Remove references to the release and releng branch. |===