Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wikisrc/users/wiz/scm-migration.mdwn	10 Jun 2023 10:39:26 -0000	1.25
+++ wikisrc/users/wiz/scm-migration.mdwn	10 Jun 2023 10:54:52 -0000	1.26
@@ -21,9 +21,11 @@
 
 - releng some scripts need to be adapted
   - localsrc/releng/autobuild - martin@ is working on it
+  - releng needs to migrate to using hg
 
-- DONE anita test bed
-  - anita was not affected, but the underlying bracket tool needed changes for hg support
+- anita test bed
+  - DONE anita was not affected, but the underlying bracket tool needed changes for hg support
+  - test bed needs to migrate to using hg
 
 - Daily/weekly jobs:
   - daily publishing jobs for tarballs

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/users/wiz/scm-migration.mdwn	9 Jun 2023 08:30:07 -0000	1.24
+++ wikisrc/users/wiz/scm-migration.mdwn	10 Jun 2023 10:39:26 -0000	1.25
@@ -22,8 +22,8 @@
 - releng some scripts need to be adapted
   - localsrc/releng/autobuild - martin@ is working on it
 
-- anita test bed
-  - anita not affected, but the underlying bracket tool needs changes for hg support (patch exists, ask wiz@/gson@)
+- DONE anita test bed
+  - anita was not affected, but the underlying bracket tool needed changes for hg support
 
 - Daily/weekly jobs:
   - daily publishing jobs for tarballs

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/users/wiz/scm-migration.mdwn	7 Jun 2023 10:34:42 -0000	1.23
+++ wikisrc/users/wiz/scm-migration.mdwn	9 Jun 2023 08:30:07 -0000	1.24
@@ -16,7 +16,7 @@
 - DONE public access:
   - hg:
     - [[public|https://anonhg.netbsd.org/]]
-    - [[for developers|ssh://hgmaster.netbsd.org/]]
+    - [[for developers|ssh://hg.netbsd.org/]]
   - [[read-only git|https://github.com/netbsd/]]
 
 - releng some scripts need to be adapted
@@ -53,16 +53,16 @@
 - DONE do we need new hardware for the server(s)?
   - no; use cvs and anoncvs machines
 
-- rename 'hgmaster' host to 'hg'
+- DONE rename 'hgmaster' host to 'hg'
 
 - turn on hg as main repository
   - switch them one by one?
     - public repositories
       - othersrc (conversion exists, ask wiz@ for access)
       - htdocs (needs a conversion first)
-      - pkgsrc - [[public|https://anonhg.netbsd.org/pkgsrc/]] & [[internal|ssh://hgmaster.netbsd.org/pkgsrc]]
-      - src - [[public|https://anonhg.netbsd.org/src/]] & [[internal|ssh://hgmaster.netbsd.org/src]]
-      - xsrc - [[public|https://anonhg.netbsd.org/xsrc/]] & [[internal|ssh://hgmaster.netbsd.org/xsrc]]
+      - pkgsrc - [[public|https://anonhg.netbsd.org/pkgsrc/]] & [[internal|ssh://hg.netbsd.org/pkgsrc]]
+      - src - [[public|https://anonhg.netbsd.org/src/]] & [[internal|ssh://hg.netbsd.org/src]]
+      - xsrc - [[public|https://anonhg.netbsd.org/xsrc/]] & [[internal|ssh://hg.netbsd.org/xsrc]]
     - internal repositories
       - htutils (needs a conversion first)
       - localsrc (needs a conversion first; update localsrc/releng/autobuild/autobuild.txt)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wikisrc/users/wiz/scm-migration.mdwn	4 Jun 2023 12:14:04 -0000	1.22
+++ wikisrc/users/wiz/scm-migration.mdwn	7 Jun 2023 10:34:42 -0000	1.23
@@ -23,7 +23,7 @@
   - localsrc/releng/autobuild - martin@ is working on it
 
 - anita test bed
-  - anita not affected, but the underlying bracket tool needs changes for hg support (wiz@/gson@ have started working on this)
+  - anita not affected, but the underlying bracket tool needs changes for hg support (patch exists, ask wiz@/gson@)
 
 - Daily/weekly jobs:
   - daily publishing jobs for tarballs
@@ -58,7 +58,7 @@
 - turn on hg as main repository
   - switch them one by one?
     - public repositories
-      - othersrc (needs a conversion first)
+      - othersrc (conversion exists, ask wiz@ for access)
       - htdocs (needs a conversion first)
       - pkgsrc - [[public|https://anonhg.netbsd.org/pkgsrc/]] & [[internal|ssh://hgmaster.netbsd.org/pkgsrc]]
       - src - [[public|https://anonhg.netbsd.org/src/]] & [[internal|ssh://hgmaster.netbsd.org/src]]
@@ -72,3 +72,5 @@
 - turn off CVS/anoncvs server :-)
 
 - close tech-repository mailing list
+
+- (optional) discuss if hg should be included in the base system

Members: 
	kerberos.mdwn:1.4->1.5 
	kerberos/password.mdwn:1.10->1.11 
	kerberos/system.mdwn:1.16->1.17 
	kerberos/web_browser.mdwn:1.14->1.15 

Index: wikisrc/kerberos.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/kerberos.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/kerberos.mdwn	18 Mar 2012 17:24:50 -0000	1.4
+++ wikisrc/kerberos.mdwn	6 Jun 2023 01:08:51 -0000	1.5
@@ -1,3 +1,5 @@
+*These pages on The NetBSD Foundation's internal Kerberos deployment are being migrated to <https://www.NetBSD.org/developers/kerberos.html>.*
+
 ## NETBSD.ORG Kerberos
 
 * [[password]]
Index: wikisrc/kerberos/password.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/kerberos/password.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/kerberos/password.mdwn	27 Oct 2021 06:31:37 -0000	1.10
+++ wikisrc/kerberos/password.mdwn	6 Jun 2023 01:08:51 -0000	1.11
@@ -1,3 +1,5 @@
+*These pages on The NetBSD Foundation's internal Kerberos deployment are being migrated to <https://www.NetBSD.org/developers/kerberos.html>.*
+
 ### What TNF uses this password for
 
 Anything not requiring the maximum level of trust. For example:
Index: wikisrc/kerberos/system.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/kerberos/system.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/kerberos/system.mdwn	5 Jun 2023 23:53:22 -0000	1.16
+++ wikisrc/kerberos/system.mdwn	6 Jun 2023 01:08:51 -0000	1.17
@@ -1,5 +1,7 @@
 [[!tag kerberos howto]]
 
+*These pages on The NetBSD Foundation's internal Kerberos deployment are being migrated to <https://www.NetBSD.org/developers/kerberos.html>.*
+
 ## Why enable Kerberos on your system?
 
 Convenience and security. With
Index: wikisrc/kerberos/web_browser.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/kerberos/web_browser.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/kerberos/web_browser.mdwn	2 Sep 2019 21:37:56 -0000	1.14
+++ wikisrc/kerberos/web_browser.mdwn	6 Jun 2023 01:08:51 -0000	1.15
@@ -1,3 +1,5 @@
+*These pages on The NetBSD Foundation's internal Kerberos deployment are being migrated to <https://www.NetBSD.org/developers/kerberos.html>.*
+
 First, Kerberize your [[system]]. Then:
 
 ## Firefox

Index: wikisrc/kerberos/system.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/kerberos/system.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/kerberos/system.mdwn	5 Jun 2023 23:50:44 -0000	1.15
+++ wikisrc/kerberos/system.mdwn	5 Jun 2023 23:53:22 -0000	1.16
@@ -12,8 +12,8 @@
 
 Create a file ~/.krb5/config with the following contents:
 
-   [libdefaults]
-           name_canon_rules = as-is:match_domain=netbsd.org
+    [libdefaults]
+            name_canon_rules = as-is:match_domain=netbsd.org
 
 NetBSD will now autodiscover and uses the NETBSD.ORG KDC as defined
 in DNS. To use Kerberized TNF services, log in with your Kerberos

Setting as-is:match_domain=netbsd.org:

1. plugs the CNAME-chasing vulnerability
   (https://github.com/heimdal/heimdal/issues/1130); and

2. is necessary for wiki.n.o which has a CNAME to www46.n.o but uses
   service principal HTTP/wiki.netbsd.org@NETBSD.ORG, so it simply
   doesn't work with CNAME-chasing.

However, this limits the canonicalization rule to netbsd.org in case
the user relies on kerberized services in other Kerberos realms that
foolishly rely on the CNAME-chasing vulnerability.

Members: 
	kerberos/system.mdwn:1.14->1.15 

Index: wikisrc/kerberos/system.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/kerberos/system.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/kerberos/system.mdwn	29 Oct 2015 16:10:38 -0000	1.14
+++ wikisrc/kerberos/system.mdwn	5 Jun 2023 23:50:44 -0000	1.15
@@ -10,15 +10,10 @@
 
 ## NetBSD
 
-NetBSD needs to be configured to prevent Kerberos from being used
-to log into _your_ system, and then to enable Kerberos.
+Create a file ~/.krb5/config with the following contents:
 
-7. Either disable Kerberos auth for `sshd`, `login`, etc. in
-`/etc/pam.d`, or tell your relevant services not to use PAM.
-
-   /!\ Disabling KerberosAuthentication in `/etc/ssh/sshd_config` does **NOT** prevent `sshd` from invoking `pam_krb5.so` and prompting for a Kerberos password -- oops. Since you probably do not have a host key in the realm NETBSD.ORG you have little to fear from ssh's KerberosAuthentication method -- nothing can get tickets to use your machine, because there is no host instance for your machine shared between the NetBSD kerberos server and your local keytab. So, the bottom line: turn off UsePAM for `sshd` or adjust your PAM configuration; don't worry about KerberosAuthentication or GSSAPIAuthentication in `sshd` itself.
-
-7. Create `/etc/krb5.conf` containing only the line `[libdefaults]`.
+   [libdefaults]
+           name_canon_rules = as-is:match_domain=netbsd.org
 
 NetBSD will now autodiscover and uses the NETBSD.ORG KDC as defined
 in DNS. To use Kerberized TNF services, log in with your Kerberos

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wikisrc/users/wiz/scm-migration.mdwn	4 Jun 2023 11:57:33 -0000	1.21
+++ wikisrc/users/wiz/scm-migration.mdwn	4 Jun 2023 12:14:04 -0000	1.22
@@ -35,7 +35,13 @@
   - what else?
 
 - htutils:
-  - various scripts using CVS
+  - changes/cvschanges2html
+  - changes/pkg-changes2rss
+  - scripts/mirrorcheck (perhaps obsolete)
+  - scripts/pkgdoget
+  - scripts/update.changes
+  - scripts/update.http
+  - scripts/update.releng
 
 - developer activity script for admins/membership-exec needs to be adapted or rewritten
 

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/users/wiz/scm-migration.mdwn	2 Jun 2023 05:05:03 -0000	1.20
+++ wikisrc/users/wiz/scm-migration.mdwn	4 Jun 2023 11:57:33 -0000	1.21
@@ -34,6 +34,11 @@
   - backups of the repo(s)
   - what else?
 
+- htutils:
+  - various scripts using CVS
+
+- developer activity script for admins/membership-exec needs to be adapted or rewritten
+
 - RCS Ids
   - for src: set `-D_SOURCE_REVISION=\"$(hg log -r . -T {node})"` (computed once) instead of the RCS Ids so that "ident /netbsd" stays useful.
     - joerg@ has a WIP patch

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wikisrc/users/wiz/scm-migration.mdwn	31 May 2023 21:16:49 -0000	1.19
+++ wikisrc/users/wiz/scm-migration.mdwn	2 Jun 2023 05:05:03 -0000	1.20
@@ -7,7 +7,7 @@
 - conversion:
   - basically done, possibly one 'final' cleaned-up conversion
     - currently waiting for [[auditlog merge|https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/235]]
-    - authormap is work in progress, should be finalized by June 1 (localsrc/cvs_server/migration/authormap)
+    - DONE authormap is finalized
   - github mirror
     - after final conversion happens, either force-push or make a new repository and deprecate the old one
 
@@ -42,7 +42,7 @@
 - DONE do we need new hardware for the server(s)?
   - no; use cvs and anoncvs machines
 
-- rename 'hgmaster' host name
+- rename 'hgmaster' host to 'hg'
 
 - turn on hg as main repository
   - switch them one by one?

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wikisrc/users/wiz/scm-migration.mdwn	24 May 2023 20:24:28 -0000	1.18
+++ wikisrc/users/wiz/scm-migration.mdwn	31 May 2023 21:16:49 -0000	1.19
@@ -23,7 +23,7 @@
   - localsrc/releng/autobuild - martin@ is working on it
 
 - anita test bed
-  - anita not affected, but the underlying bracket tool needs changes for hg support
+  - anita not affected, but the underlying bracket tool needs changes for hg support (wiz@/gson@ have started working on this)
 
 - Daily/weekly jobs:
   - daily publishing jobs for tarballs
@@ -54,7 +54,7 @@
       - xsrc - [[public|https://anonhg.netbsd.org/xsrc/]] & [[internal|ssh://hgmaster.netbsd.org/xsrc]]
     - internal repositories
       - htutils (needs a conversion first)
-      - localsrc (needs a conversion first)
+      - localsrc (needs a conversion first; update localsrc/releng/autobuild/autobuild.txt)
       - wikisrc (needs a conversion first)
       - pkgsrc-wiki (conversion exists, ask wiz@ for access)
 

--- wikisrc/blog/archives.mdwn	2023-05-31 15:32:31.030933245 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,2 +0,0 @@
-Browse through blog archives by year:
-[[!map pages="./archives/* and !./archives/*/*"]]

--- wikisrc/blog.mdwn	2023-05-31 15:32:31.391164464 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,22 +0,0 @@
-[[!template id=note text="""
-[[!calendar pages="internal(blog/*)"]]
-[[blog/Archives]]
-"""]]
-
-This page is a blog mirror of sorts. It pulls in articles from
-blog's feed and publishes them here (with a feed, too).
-
-<!--
-[[!aggregate
-name="NetBSD Blog"
-dir="blog"
-url="http://blog.netbsd.org/"
-feedurl="http://blog.netbsd.org/tnf/feed/entries/atom"
-tag="blog"
-]]
--->
-
-[[!inline
-pages="internal(./blog/*) and !internal(./blog/archives) and !internal(./blog/archives/*) and ! internal(./blog/archives/*/*)"
-description="NetBSD Blog"
-]]
--- wikisrc/archives/2023.mdwn	2023-05-31 15:32:31.422457775 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2023 pages="internal(blog/*)"]]
--- wikisrc/archives/2023/01.mdwn	2023-05-31 15:32:31.456974217 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=01 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(01) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/02.mdwn	2023-05-31 15:32:31.489042306 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=02 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(02) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/03.mdwn	2023-05-31 15:32:31.520476551 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=03 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(03) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/04.mdwn	2023-05-31 15:32:31.559313053 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=04 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(04) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/05.mdwn	2023-05-31 15:32:31.591821284 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=05 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(05) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/06.mdwn	2023-05-31 15:32:31.622948903 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=06 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(06) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/07.mdwn	2023-05-31 15:32:31.655695739 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=07 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(07) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/08.mdwn	2023-05-31 15:32:31.684041586 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=08 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(08) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/09.mdwn	2023-05-31 15:32:31.723857434 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=09 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(09) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/10.mdwn	2023-05-31 15:32:31.759272468 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=10 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(10) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/11.mdwn	2023-05-31 15:32:31.797887733 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=11 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(11) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2023/12.mdwn	2023-05-31 15:32:31.841201177 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=12 year=2023 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(12) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/blog/archives/2012.mdwn	2023-05-31 15:32:31.872499228 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
--- wikisrc/blog/archives/2013.mdwn	2023-05-31 15:32:31.901561127 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2013 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2014.mdwn	2023-05-31 15:32:31.932367784 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2014 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2015.mdwn	2023-05-31 15:32:31.960838987 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2015 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2016.mdwn	2023-05-31 15:32:31.991711162 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2016 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2017.mdwn	2023-05-31 15:32:32.037646404 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2017 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2018.mdwn	2023-05-31 15:32:32.065685296 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2018 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2019.mdwn	2023-05-31 15:32:32.106000907 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2019 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2020.mdwn	2023-05-31 15:32:32.136061326 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2020 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2021.mdwn	2023-05-31 15:32:32.168410667 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2021 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2022.mdwn	2023-05-31 15:32:32.207807354 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2022 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2023.mdwn	2023-05-31 15:32:32.240092313 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2023 pages="internal(blog/*)"]]
--- wikisrc/blog/archives/2012/01.mdwn	2023-05-31 15:32:32.270019490 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=01 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(01) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/blog/archives/2012/02.mdwn	2023-05-31 15:32:32.299634245 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=02 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(02) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/blog/archives/2012/03.mdwn	2023-05-31 15:32:32.332771466 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=03 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(03) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/blog/archives/2012/04.mdwn	2023-05-31 15:32:32.362956517 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@

(Diff truncated)

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023.mdwn	2023-05-31 15:32:37.403743294 +0000
@@ -0,0 +1 @@
+[[!calendar type=year year=2023 pages="internal(blog/*)"]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/01.mdwn	2023-05-31 15:32:37.436897422 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/02.mdwn	2023-05-31 15:32:37.470113809 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/03.mdwn	2023-05-31 15:32:37.501929152 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/04.mdwn	2023-05-31 15:32:37.532994508 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/05.mdwn	2023-05-31 15:32:37.563552611 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/06.mdwn	2023-05-31 15:32:37.605644615 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/07.mdwn	2023-05-31 15:32:37.639058516 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/08.mdwn	2023-05-31 15:32:37.683380795 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/09.mdwn	2023-05-31 15:32:37.720448466 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/10.mdwn	2023-05-31 15:32:37.755173647 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/11.mdwn	2023-05-31 15:32:37.787277767 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/archives/2023/12.mdwn	2023-05-31 15:32:37.812860840 +0000
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2023 pages="internal(blog/*)"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2023) and internal(blog/*)" show=0 feeds=no reverse=yes]]

Index: wikisrc/blog.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Attic/blog.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/blog.mdwn	30 May 2023 15:43:49 -0000	1.6
+++ wikisrc/blog.mdwn	30 May 2023 16:01:16 -0000	1.7
@@ -17,6 +17,6 @@
 -->
 
 [[!inline
-pages="internal(./blog/*)"
+pages="internal(./blog/*) and !internal(./blog/archives) and !internal(./blog/archives/*) and ! internal(./blog/archives/*/*)"
 description="NetBSD Blog"
 ]]

Index: wikisrc/blog.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Attic/blog.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/blog.mdwn	5 Feb 2012 02:14:15 -0000	1.5
+++ wikisrc/blog.mdwn	30 May 2023 15:43:49 -0000	1.6
@@ -1,6 +1,6 @@
 [[!template id=note text="""
 [[!calendar pages="internal(blog/*)"]]
-[[Archives]]
+[[blog/Archives]]
 """]]
 
 This page is a blog mirror of sorts. It pulls in articles from

--- wikisrc/archives.mdwn	2023-05-31 15:32:38.823189676 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,2 +0,0 @@
-Browse through blog archives by year:
-[[!map pages="./archives/* and !./archives/*/*"]]
--- wikisrc/archives/2012.mdwn	2023-05-31 15:32:38.852916131 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
--- wikisrc/archives/2013.mdwn	2023-05-31 15:32:38.881730186 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2013 pages="internal(blog/*)"]]
--- wikisrc/archives/2014.mdwn	2023-05-31 15:32:38.918905399 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2014 pages="internal(blog/*)"]]
--- wikisrc/archives/2015.mdwn	2023-05-31 15:32:38.949215049 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2015 pages="internal(blog/*)"]]
--- wikisrc/archives/2016.mdwn	2023-05-31 15:32:38.981063483 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2016 pages="internal(blog/*)"]]
--- wikisrc/archives/2017.mdwn	2023-05-31 15:32:39.011281759 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2017 pages="internal(blog/*)"]]
--- wikisrc/archives/2018.mdwn	2023-05-31 15:32:39.041267919 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2018 pages="internal(blog/*)"]]
--- wikisrc/archives/2019.mdwn	2023-05-31 15:32:39.073503877 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2019 pages="internal(blog/*)"]]
--- wikisrc/archives/2020.mdwn	2023-05-31 15:32:39.112939131 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2020 pages="internal(blog/*)"]]
--- wikisrc/archives/2021.mdwn	2023-05-31 15:32:39.149885174 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2021 pages="internal(blog/*)"]]
--- wikisrc/archives/2022.mdwn	2023-05-31 15:32:39.179900507 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2022 pages="internal(blog/*)"]]
--- wikisrc/archives/2023.mdwn	2023-05-31 15:32:39.212435341 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-[[!calendar type=year year=2023 pages="internal(blog/*)"]]
--- wikisrc/archives/2012/01.mdwn	2023-05-31 15:32:39.243742281 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=01 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(01) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/02.mdwn	2023-05-31 15:32:39.274443200 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=02 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(02) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/03.mdwn	2023-05-31 15:32:39.305431823 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=03 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(03) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/04.mdwn	2023-05-31 15:32:39.336649486 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=04 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(04) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/05.mdwn	2023-05-31 15:32:39.363456929 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=05 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(05) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/06.mdwn	2023-05-31 15:32:39.408826582 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=06 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(06) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/07.mdwn	2023-05-31 15:32:39.447196640 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=07 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(07) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/08.mdwn	2023-05-31 15:32:39.479497480 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=08 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(08) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/09.mdwn	2023-05-31 15:32:39.512225989 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=09 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(09) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/10.mdwn	2023-05-31 15:32:39.548921673 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=10 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(10) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/11.mdwn	2023-05-31 15:32:39.580033043 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=11 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(11) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2012/12.mdwn	2023-05-31 15:32:39.619341549 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=12 year=2012 pages="internal(blog/*) and !internal(blog/archives/*)"]]
-"""]]
-
-[[!inline pages="creation_month(12) and creation_year(2012) and internal(blog/*) and !internal(blog/archives/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2013/01.mdwn	2023-05-31 15:32:39.651270608 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=01 year=2013 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(01) and creation_year(2013) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2013/02.mdwn	2023-05-31 15:32:39.683310736 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=02 year=2013 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(02) and creation_year(2013) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2013/03.mdwn	2023-05-31 15:32:39.715898179 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=03 year=2013 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(03) and creation_year(2013) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2013/04.mdwn	2023-05-31 15:32:39.746112040 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=04 year=2013 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(04) and creation_year(2013) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2013/05.mdwn	2023-05-31 15:32:39.780424234 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=05 year=2013 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(05) and creation_year(2013) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2013/06.mdwn	2023-05-31 15:32:39.809585479 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@
-[[!sidebar content="""
-[[!calendar type=month month=06 year=2013 pages="internal(blog/*)"]]
-"""]]
-
-[[!inline pages="creation_month(06) and creation_year(2013) and internal(blog/*)" show=0 feeds=no reverse=yes]]
--- wikisrc/archives/2013/07.mdwn	2023-05-31 15:32:39.841033131 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,5 +0,0 @@

(Diff truncated)

--- wikisrc/wiki/non-developer.mdwn	2023-05-31 15:32:49.673181736 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,36 +0,0 @@
-### Getting access
-
-We want your help! Send your [[ikiwiki/OpenID]] of choice to
-"www@NetBSD.org" (and Cc: "schmonz@NetBSD.org"). We'll get you set up with
-basic write privileges.
-
-### What am I allowed to do?
-
-Every page on this wiki consists of two sections. The latter (called
-"Discussion") is entirely at your disposal. Write an entire howto,
-critique or tweak someone else's, or provide corrections or suggestions
-about the page. NetBSD developers can edit both sections. If your
-changes are good, they'll be incorporated into the main body of the
-page -- or, if you wrote a document from scratch, into a page of
-its own.
-
-### Why not full write privileges?
-
-Until now, NetBSD project resources have been writable exclusively
-by developers. In a way, that's exactly what being a developer
-means.  It's fundamental to our project infrastructure, and it's
-fundamental to why you're able to trust the software we publish.
-This wiki is the first exception to the rule. No way around it, we
-have to be careful.
-
-At the same time, it's a wiki, and this is NetBSD -- we want to be
-as inclusive as we responsibly can. Anyone with an OpenID can play.
-Instead of a simplistic comment system, you get full control over
-Discussions, each of which _is_ a wiki page. When you make an edit,
-your change is committed to "wikisrc". A commit message goes out
-to "www-changes@NetBSD.org", attributed to you, the same as it would for a
-developer.
-
-As a starting point, we feel pretty good about this. We hope you
-do too, and we hope you feel welcome to contribute. Because you
-are.

Index: wikisrc/users/schmonz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz.mdwn,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wikisrc/users/schmonz.mdwn	2 Nov 2021 13:56:52 -0000	1.44
+++ wikisrc/users/schmonz.mdwn	30 May 2023 15:22:10 -0000	1.45
@@ -6,41 +6,12 @@
 If you've got an idea about how it ought to, edit the [[wiki/todo]] list!
 Here's what's been [[wiki/todo/done]] so far.
 
-<!--
-[[!aggregate
-name="schmonz.com (pkgsrc)"
-dir="schmonz.com.pkgsrc"
-url="https://schmonz.com/tag/pkgsrc/"
-feedurl="https://schmonz.com/tag/pkgsrc/index.rss"
-tag="schmonz pkgsrc"
-]]
-
-[[!aggregate
-name="schmonz.com (qmail)"
-dir="schmonz.com.qmail"
-url="https://schmonz.com/tag/qmail/"
-feedurl="https://schmonz.com/tag/qmail/index.rss"
-tag="schmonz qmail"
-]]
--->
-
-## pkgsrc talks
-
-([[quick notes from pkgsrcCon 2014|pkgsrccon2014]])
-
-[[!inline
-pages="internal(schmonz.com.pkgsrc/*)"
-archive=yes
-feeds=no
-limit=0
-]]
-
 ## qmail-run from pkgsrc
 
 Start with my
-[overview of qmail patches and packages](https://schmonz.com/qmail/),
+[overview of qmail patches and packages](https://schmonz.com/software/),
 particularly
-[qmail-run](https://schmonz.com/qmail/pkgsrc-qmail-run/).
+[qmail-run](https://schmonz.com/software/pkgsrc-qmail-run/).
 
 ## schmonz.com blog posts
 

--- wikisrc/wiki/graphic_chart.mdwn	2023-05-31 15:32:50.333964694 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,108 +0,0 @@
-[[!toc ]]
-
-# Introduction
-
-The purpose of the following document is to propose a graphic chart regarding the NetBSD htdocs site, including this wiki, and give some examples so they can be reused quickly anywhere else.
-
-***
-
-# On textual conventions
-
-Remember that this is a [[!wikipedia wiki]]; its base syntax, [[!wikipedia Markdown]], is more limited than the one you have when writing down man pages using packages like [[!template id=man name=mdoc section=7]], where data types (variables, pathnames, flags, functions, return values, ...) have each their associated types, or document markup language like [[!wikipedia LaTeX]]. 
-
-This does not mean that we should not care about conventions, though. For convenience, prefer using the ones that are chosen by the HTML output of the .
-
-## Quoting
-
-When quoting text from an outside source, use double quotes "...", and explicitly indicate its reference.
-
-When you want to quote specific character(s), use single quotes. For example: all sentences end with a '.'.
-
-## Files and directories
-
-Files and directories (and in a wider sense, *paths*) should be *emphasized*, e.g. *fstab* and *rc.conf* are found under */etc/*.
-
-## Commands, options names and flags
-
-When a command, or an executable, are referenced, they should be **strongly emphasized**; same goes for their optional flags and arguments, e.g. **ls** can be used to list the content of a directory, and, together with its **-a** flag, will output entries that start with a dot.
-
-## Functions, or specific part of code
-
-Functions reference should be *simply emphasized*. It is preferable to give the associated file explicitly, to avoid confusions; in that case, use a colon `:' to separate file name from function name. Same goes when you want to pinpoint to specific zone in source files, like lines.
-
-For example, the *src/bin/print.c:printlong* function is responsible for printing the long output from [[!template id=man name=ls section=1]].
-
-# On the usage of links
-
-You can find multiple types of links within the wiki:
-
-1. links to other pages of this [[wiki|sitemap]]:
-    2. [[Epson]]
-    2. [[wiki/graphic_chart]] (this page)
-1. explicit URLs:
-    2. with a label: 
-    2. or without: 
-1. last but not least, various services regarding NetBSD:
-    2. problem reports: [[!template id=pr number=1]]
-    2. man pages: [[!template id=man name=intro section=1]], [[!template id=man name=hier section=7]]
-    2. pkgsrc packages: [[!template id=pkg category=www name=apache]], [[!template id=pkg category=security name=netpgp]]
-
-Always prefer using [[templates]] rather than hard-coding paths for external URLs. This helps both maintainability and readability.
-
-# Specific layouts
-
-The wiki support different commands, [[shortcuts]] and [[templates]] that can help controlling the layout.
-
-## Code
-
-TBC 
-
-## Terminal/console-like output
-
-If you want to write series of commands, eventually with their output, you can use the [[programlisting_template|templates/programlisting]].
-
-[[!template id=programlisting text="""
-$ uname
-NetBSD
-$ cat /etc/fstab
-# See /usr/share/examples/fstab/ for more examples.
-/dev/wd0a	/	  ffs      rw,log	1 1
-/dev/wd0b	none	  swap	   sw		0 0
-kernfs		/kern	  kernfs   rw
-ptyfs		/dev/pts  ptyfs    rw
-procfs		/proc	  procfs   rw
-/dev/cd0a	/cdrom    cd9660   ro,noauto
-"""]]
-
-## File content
-
-If you want to display the content of a file, and make a proper distinction with terminal output, use the [[filecontent_template|templates/filecontent]].
-
-[[!template id=filecontent name="/etc/fstab" text="""
-# See /usr/share/examples/fstab/ for more examples.
-/dev/wd0a	/	  ffs      rw,log	1 1
-/dev/wd0b	none	  swap	   sw		0 0
-kernfs		/kern	  kernfs   rw
-ptyfs		/dev/pts  ptyfs    rw
-procfs		/proc	  procfs   rw
-/dev/cd0a	/cdrom    cd9660   ro,noauto
-"""]]
-
-## Warnings and notes
-
-### Warnings
-
-TBC Provide a "warning" template, with a nice-looking icon and appropriate framing (light red fieldset, for example). Investigate Tango icons. Needs some CSS tweaking.
-
-### Notes
-
-TBC Provide a "note" template, similar to the "warning" one (yellow-greyish maybe).
-
-***
-
-# References
-
-Last, some references:
-
-* TBD
-* TBD
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/wiki/netbsd_specific.mdwn	2023-05-31 15:32:50.366345862 +0000
@@ -0,0 +1,102 @@
+[[!toc ]]
+
+# On textual conventions
+
+Remember that this is a [[!wikipedia wiki]]; its base syntax, [[!wikipedia Markdown]], is more limited than the one you have when writing down man pages using packages like [[!template id=man name=mdoc section=7]], where data types (variables, pathnames, flags, functions, return values, ...) have each their associated types, or document markup language like [[!wikipedia LaTeX]]. 
+
+This does not mean that we should not care about conventions, though. For convenience, prefer using the ones that are chosen by the HTML output of the .
+
+## Quoting
+
+When quoting text from an outside source, use double quotes "...", and explicitly indicate its reference.
+
+When you want to quote specific character(s), use single quotes. For example: all sentences end with a '.'.
+
+## Files and directories
+
+Files and directories (and in a wider sense, *paths*) should be *emphasized*, e.g. *fstab* and *rc.conf* are found under */etc/*.
+
+## Commands, options names and flags
+
+When a command, or an executable, are referenced, they should be **strongly emphasized**; same goes for their optional flags and arguments, e.g. **ls** can be used to list the content of a directory, and, together with its **-a** flag, will output entries that start with a dot.
+
+## Functions, or specific part of code
+
+Functions reference should be *simply emphasized*. It is preferable to give the associated file explicitly, to avoid confusions; in that case, use a colon `:' to separate file name from function name. Same goes when you want to pinpoint to specific zone in source files, like lines.
+
+For example, the *src/bin/print.c:printlong* function is responsible for printing the long output from [[!template id=man name=ls section=1]].
+
+# On the usage of links
+
+You can find multiple types of links within the wiki:
+
+1. links to other pages of this [[wiki|sitemap]]:
+    2. [[Epson]]
+    2. [[wiki/start]]
+1. explicit URLs:
+    2. with a label: 
+    2. or without: 
+1. last but not least, various services regarding NetBSD:
+    2. problem reports: [[!template id=pr number=1]]
+    2. man pages: [[!template id=man name=intro section=1]], [[!template id=man name=hier section=7]]
+    2. pkgsrc packages: [[!template id=pkg category=www name=apache]], [[!template id=pkg category=security name=netpgp]]
+
+Always prefer using [[templates]] rather than hard-coding paths for external URLs. This helps both maintainability and readability.
+
+# Specific layouts
+
+The wiki support different commands, [[shortcuts]] and [[templates]] that can help controlling the layout.
+
+## Code
+
+TBC 
+
+## Terminal/console-like output
+
+If you want to write series of commands, eventually with their output, you can use the [[programlisting_template|templates/programlisting]].
+
+[[!template id=programlisting text="""
+$ uname
+NetBSD
+$ cat /etc/fstab
+# See /usr/share/examples/fstab/ for more examples.
+/dev/wd0a	/	  ffs      rw,log	1 1
+/dev/wd0b	none	  swap	   sw		0 0
+kernfs		/kern	  kernfs   rw
+ptyfs		/dev/pts  ptyfs    rw
+procfs		/proc	  procfs   rw
+/dev/cd0a	/cdrom    cd9660   ro,noauto
+"""]]
+
+## File content
+
+If you want to display the content of a file, and make a proper distinction with terminal output, use the [[filecontent_template|templates/filecontent]].
+
+[[!template id=filecontent name="/etc/fstab" text="""
+# See /usr/share/examples/fstab/ for more examples.
+/dev/wd0a	/	  ffs      rw,log	1 1
+/dev/wd0b	none	  swap	   sw		0 0
+kernfs		/kern	  kernfs   rw
+ptyfs		/dev/pts  ptyfs    rw
+procfs		/proc	  procfs   rw
+/dev/cd0a	/cdrom    cd9660   ro,noauto
+"""]]
+
+## Warnings and notes
+

(Diff truncated)

--- wikisrc/wiki/marketing.mdwn	2023-05-31 15:32:50.757956420 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,14 +0,0 @@
-[[!template id=note text="""
-* To mark an item completed, edit it and add a link to [[wiki/todo/done]].
-* To see tasks already completed, follow that link.
-* Another reason tasks might not appear in this list is if they're marked for [[wiki/todo/later]].
-"""]]
-
-[[!inline
-pages="./marketing/* and !*/Discussion"
-actions=yes
-archive=yes
-rootpage="Marketing"
-postformtext="Add a new marketing item entitled:"
-show=0
-]]
--- wikisrc/wiki/marketing/promotion.mdwn	2023-05-31 15:32:50.788335541 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,6 +0,0 @@
-NetBSD needs to be more organized on marketing front this wiki should be used to store all info
-about marketing and NetBSD.
-
-Help can be sought from www or more specifically either [[haad]] or [[sarah]] and marketing (at)
-netbsd (dot) org. 
-

Index: wikisrc/root_on_zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/root_on_zfs.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/root_on_zfs.mdwn	30 May 2023 15:05:35 -0000	1.1
+++ wikisrc/root_on_zfs.mdwn	30 May 2023 15:06:31 -0000	1.2
@@ -1,4 +1,4 @@
-# Root On ZFS
+[[!meta title="Root On ZFS"]]
 
 NetBSD-9 gained much improved ZFS support.
 However, one feature it's still missing is the ability to have your system

--- wikisrc/root__95__on__95__zfs.mdwn	2023-05-31 15:32:51.474561629 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,74 +0,0 @@
-# Root On ZFS
-
-NetBSD-9 gained much improved ZFS support.
-However, one feature it's still missing is the ability to have your system
-root on ZFS.
-For that, we need to teach our boot loader about ZFS,xi
-but until then we can work around this limitation by using a FFS boot
-partition and a ZFS root ramdisk.
-You'll also need to use NetBSD-9.99.48 or newer.
-
-The idea is simple - the boot loader loads the NetBSD kernel and the
-required modules *(solaris and zfs)* from FFS and the ZFS root ramdisk.
-The ramdisk then imports the ZFS root pool called `rpool`,
-mounts `rpool/ROOT` to `/altroot` and finally instructs the kernel to
-chroot to it.
-Because the initial root is on a ramdisk,
-we can then load the boot partition from inside the ZFS chroot to maintain it;
-for example to update the kernel and modules.
-
-## Assumptions
-
-The ramdisk does make some assumptions as there is no way to pass variables
-from boot.cfg:
-
-  *  The kernel has matching modules installed in the same partition; you only need `solaris` and `zfs`.
-  *  The ZFS root pool is called `rpool` and the root filesystem is called `ROOT`.
-
-Once inside the chroot the kernel will load modules from the ZFS filesystem
-because there is a symlink to it from the ramdisk.
-The same is true for any firmware needed after boot.
-
-## Generic setup
-
-Until the NetBSD installer can be updated, here are the manual steps from fresh:
-
-  *  Build the ramdisk (`cd src/distrib/amd64/ramdisks/ramdisk-zfsroot; nbmake-amd64`)
-  *  Boot the NetBSD installer
-  *  Create a small (I used 2G) FFS partition and a normal swap partition
-  *  Create a partition for ZFS
-  *  Finish the NetBSD installation - install the etc, base and maybe rescue sets
-  *  Reboot into your minimal NetBSD install
-
-## ZFS Setup
-
-So far, so good. Now we need to make the needed adjustments to change root:
-
-  *  Create a ZFS pool called `rpool` on your ZFS partition
-  *  Create a ZFS filesystem called `ROOT` in `rpool`
-  *  Set the mountpoint of `rpool/ROOT` to legacy so that the mount command can deal with it
-  *  Create any other ZFS filesystems you want to - if you create `/usr` or `/var` or anything in these they **must** to be legacy mount points as well
-  *  `zfs umount rpool/ROOT`
-  *  Add `rpool/ROOT /altroot zfs rw` to /etc/fstab
-  *  `mount /altroot`
-  *  Extract the sets you need to `/altroot`. At a minimum you will need etc and base.
-  *  `cd /altroot/dev; ./MAKEDEV all`
-  *  `cd /altroot; mkdir kern proc`
-  *  Copy `/etc/wscons.conf`, `/etc/fstab` and any other config files sysinst might have created to `/etc/rc.conf` to `/altroot/etc`
-  *  Set `zfs=YES` in `/altroot/etc/rc.conf`
-  *  Remove `rpool/ROOT` from `/altroot/etc/fstab`
-  *  Add `name=boot /altroot ffs rw,noauto` to `/altroot/etc/fstab` along with any ZFS filesytems you created in '/usr' and '/var'
-  *  Add the filesystems as well to `critical_filesystems_local` in `/altroot/etc/rc.conf` - such as `critical_filesystems_local="/usr /var /var/log"`
-  *  Copy the `ramdisk-zfsroot.fs` to `/`
-  *  Edit `/boot.cfg` and add `menu=Boot ZFS Root:load solaris;load zfs;fs /ramdisk-zfsroot.fs;boot`
-
-And done!
-You can now reboot and enjoy your root on ZFS and all the benefits it brings.
-When updating the kernel, remember to `mount /altroot` and update it there as
-well as the modules.
-
-## Future work
-
-All these steps could be done in the installer.
-This is probably an easier task than adding ZFS support to the bootloader.
-But don't let that stop you if you are stuck for something to do!
--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/root_on_zfs.mdwn	2023-05-31 15:32:51.510567642 +0000
@@ -0,0 +1,74 @@
+# Root On ZFS
+
+NetBSD-9 gained much improved ZFS support.
+However, one feature it's still missing is the ability to have your system
+root on ZFS.
+For that, we need to teach our boot loader about ZFS,xi
+but until then we can work around this limitation by using a FFS boot
+partition and a ZFS root ramdisk.
+You'll also need to use NetBSD-9.99.48 or newer.
+
+The idea is simple - the boot loader loads the NetBSD kernel and the
+required modules *(solaris and zfs)* from FFS and the ZFS root ramdisk.
+The ramdisk then imports the ZFS root pool called `rpool`,
+mounts `rpool/ROOT` to `/altroot` and finally instructs the kernel to
+chroot to it.
+Because the initial root is on a ramdisk,
+we can then load the boot partition from inside the ZFS chroot to maintain it;
+for example to update the kernel and modules.
+
+## Assumptions
+
+The ramdisk does make some assumptions as there is no way to pass variables
+from boot.cfg:
+
+  *  The kernel has matching modules installed in the same partition; you only need `solaris` and `zfs`.
+  *  The ZFS root pool is called `rpool` and the root filesystem is called `ROOT`.
+
+Once inside the chroot the kernel will load modules from the ZFS filesystem
+because there is a symlink to it from the ramdisk.
+The same is true for any firmware needed after boot.
+
+## Generic setup
+
+Until the NetBSD installer can be updated, here are the manual steps from fresh:
+
+  *  Build the ramdisk (`cd src/distrib/amd64/ramdisks/ramdisk-zfsroot; nbmake-amd64`)
+  *  Boot the NetBSD installer
+  *  Create a small (I used 2G) FFS partition and a normal swap partition
+  *  Create a partition for ZFS
+  *  Finish the NetBSD installation - install the etc, base and maybe rescue sets
+  *  Reboot into your minimal NetBSD install
+
+## ZFS Setup
+
+So far, so good. Now we need to make the needed adjustments to change root:
+
+  *  Create a ZFS pool called `rpool` on your ZFS partition
+  *  Create a ZFS filesystem called `ROOT` in `rpool`
+  *  Set the mountpoint of `rpool/ROOT` to legacy so that the mount command can deal with it
+  *  Create any other ZFS filesystems you want to - if you create `/usr` or `/var` or anything in these they **must** to be legacy mount points as well
+  *  `zfs umount rpool/ROOT`
+  *  Add `rpool/ROOT /altroot zfs rw` to /etc/fstab
+  *  `mount /altroot`
+  *  Extract the sets you need to `/altroot`. At a minimum you will need etc and base.
+  *  `cd /altroot/dev; ./MAKEDEV all`
+  *  `cd /altroot; mkdir kern proc`
+  *  Copy `/etc/wscons.conf`, `/etc/fstab` and any other config files sysinst might have created to `/etc/rc.conf` to `/altroot/etc`
+  *  Set `zfs=YES` in `/altroot/etc/rc.conf`
+  *  Remove `rpool/ROOT` from `/altroot/etc/fstab`
+  *  Add `name=boot /altroot ffs rw,noauto` to `/altroot/etc/fstab` along with any ZFS filesytems you created in '/usr' and '/var'
+  *  Add the filesystems as well to `critical_filesystems_local` in `/altroot/etc/rc.conf` - such as `critical_filesystems_local="/usr /var /var/log"`
+  *  Copy the `ramdisk-zfsroot.fs` to `/`
+  *  Edit `/boot.cfg` and add `menu=Boot ZFS Root:load solaris;load zfs;fs /ramdisk-zfsroot.fs;boot`
+
+And done!
+You can now reboot and enjoy your root on ZFS and all the benefits it brings.
+When updating the kernel, remember to `mount /altroot` and update it there as
+well as the modules.
+
+## Future work
+
+All these steps could be done in the installer.
+This is probably an easier task than adding ZFS support to the bootloader.
+But don't let that stop you if you are stuck for something to do!

Index: wikisrc/zfs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/zfs.mdwn,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wikisrc/zfs.mdwn	25 Mar 2021 22:59:39 -0000	1.42
+++ wikisrc/zfs.mdwn	30 May 2023 15:04:20 -0000	1.43
@@ -43,7 +43,7 @@
 
 NetBSD-current (as of 2021-03) has similar ZFS code to 9.
 
-There is initial support for [[ZFS root|wiki/RootOnZFS]], via booting
+There is initial support for [[ZFS root|Root_on_zfs]], via booting
 from ffs and pivoting.
 
 ## NetBSD/xen special issues

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/root__95__on__95__zfs.mdwn	2023-05-31 15:32:52.194164167 +0000
@@ -0,0 +1,74 @@
+# Root On ZFS
+
+NetBSD-9 gained much improved ZFS support.
+However, one feature it's still missing is the ability to have your system
+root on ZFS.
+For that, we need to teach our boot loader about ZFS,xi
+but until then we can work around this limitation by using a FFS boot
+partition and a ZFS root ramdisk.
+You'll also need to use NetBSD-9.99.48 or newer.
+
+The idea is simple - the boot loader loads the NetBSD kernel and the
+required modules *(solaris and zfs)* from FFS and the ZFS root ramdisk.
+The ramdisk then imports the ZFS root pool called `rpool`,
+mounts `rpool/ROOT` to `/altroot` and finally instructs the kernel to
+chroot to it.
+Because the initial root is on a ramdisk,
+we can then load the boot partition from inside the ZFS chroot to maintain it;
+for example to update the kernel and modules.
+
+## Assumptions
+
+The ramdisk does make some assumptions as there is no way to pass variables
+from boot.cfg:
+
+  *  The kernel has matching modules installed in the same partition; you only need `solaris` and `zfs`.
+  *  The ZFS root pool is called `rpool` and the root filesystem is called `ROOT`.
+
+Once inside the chroot the kernel will load modules from the ZFS filesystem
+because there is a symlink to it from the ramdisk.
+The same is true for any firmware needed after boot.
+
+## Generic setup
+
+Until the NetBSD installer can be updated, here are the manual steps from fresh:
+
+  *  Build the ramdisk (`cd src/distrib/amd64/ramdisks/ramdisk-zfsroot; nbmake-amd64`)
+  *  Boot the NetBSD installer
+  *  Create a small (I used 2G) FFS partition and a normal swap partition
+  *  Create a partition for ZFS
+  *  Finish the NetBSD installation - install the etc, base and maybe rescue sets
+  *  Reboot into your minimal NetBSD install
+
+## ZFS Setup
+
+So far, so good. Now we need to make the needed adjustments to change root:
+
+  *  Create a ZFS pool called `rpool` on your ZFS partition
+  *  Create a ZFS filesystem called `ROOT` in `rpool`
+  *  Set the mountpoint of `rpool/ROOT` to legacy so that the mount command can deal with it
+  *  Create any other ZFS filesystems you want to - if you create `/usr` or `/var` or anything in these they **must** to be legacy mount points as well
+  *  `zfs umount rpool/ROOT`
+  *  Add `rpool/ROOT /altroot zfs rw` to /etc/fstab
+  *  `mount /altroot`
+  *  Extract the sets you need to `/altroot`. At a minimum you will need etc and base.
+  *  `cd /altroot/dev; ./MAKEDEV all`
+  *  `cd /altroot; mkdir kern proc`
+  *  Copy `/etc/wscons.conf`, `/etc/fstab` and any other config files sysinst might have created to `/etc/rc.conf` to `/altroot/etc`
+  *  Set `zfs=YES` in `/altroot/etc/rc.conf`
+  *  Remove `rpool/ROOT` from `/altroot/etc/fstab`
+  *  Add `name=boot /altroot ffs rw,noauto` to `/altroot/etc/fstab` along with any ZFS filesytems you created in '/usr' and '/var'
+  *  Add the filesystems as well to `critical_filesystems_local` in `/altroot/etc/rc.conf` - such as `critical_filesystems_local="/usr /var /var/log"`
+  *  Copy the `ramdisk-zfsroot.fs` to `/`
+  *  Edit `/boot.cfg` and add `menu=Boot ZFS Root:load solaris;load zfs;fs /ramdisk-zfsroot.fs;boot`
+
+And done!
+You can now reboot and enjoy your root on ZFS and all the benefits it brings.
+When updating the kernel, remember to `mount /altroot` and update it there as
+well as the modules.
+
+## Future work
+
+All these steps could be done in the installer.
+This is probably an easier task than adding ZFS support to the bootloader.
+But don't let that stop you if you are stuck for something to do!
--- wikisrc/wiki/RootOnZFS.mdwn	2023-05-31 15:32:52.227615200 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,74 +0,0 @@
-# Root On ZFS
-
-NetBSD-9 gained much improved ZFS support.
-However, one feature it's still missing is the ability to have your system
-root on ZFS.
-For that, we need to teach our boot loader about ZFS,xi
-but until then we can work around this limitation by using a FFS boot
-partition and a ZFS root ramdisk.
-You'll also need to use NetBSD-9.99.48 or newer.
-
-The idea is simple - the boot loader loads the NetBSD kernel and the
-required modules *(solaris and zfs)* from FFS and the ZFS root ramdisk.
-The ramdisk then imports the ZFS root pool called `rpool`,
-mounts `rpool/ROOT` to `/altroot` and finally instructs the kernel to
-chroot to it.
-Because the initial root is on a ramdisk,
-we can then load the boot partition from inside the ZFS chroot to maintain it;
-for example to update the kernel and modules.
-
-## Assumptions
-
-The ramdisk does make some assumptions as there is no way to pass variables
-from boot.cfg:
-
-  *  The kernel has matching modules installed in the same partition; you only need `solaris` and `zfs`.
-  *  The ZFS root pool is called `rpool` and the root filesystem is called `ROOT`.
-
-Once inside the chroot the kernel will load modules from the ZFS filesystem
-because there is a symlink to it from the ramdisk.
-The same is true for any firmware needed after boot.
-
-## Generic setup
-
-Until the NetBSD installer can be updated, here are the manual steps from fresh:
-
-  *  Build the ramdisk (`cd src/distrib/amd64/ramdisks/ramdisk-zfsroot; nbmake-amd64`)
-  *  Boot the NetBSD installer
-  *  Create a small (I used 2G) FFS partition and a normal swap partition
-  *  Create a partition for ZFS
-  *  Finish the NetBSD installation - install the etc, base and maybe rescue sets
-  *  Reboot into your minimal NetBSD install
-
-## ZFS Setup
-
-So far, so good. Now we need to make the needed adjustments to change root:
-
-  *  Create a ZFS pool called `rpool` on your ZFS partition
-  *  Create a ZFS filesystem called `ROOT` in `rpool`
-  *  Set the mountpoint of `rpool/ROOT` to legacy so that the mount command can deal with it
-  *  Create any other ZFS filesystems you want to - if you create `/usr` or `/var` or anything in these they **must** to be legacy mount points as well
-  *  `zfs umount rpool/ROOT`
-  *  Add `rpool/ROOT /altroot zfs rw` to /etc/fstab
-  *  `mount /altroot`
-  *  Extract the sets you need to `/altroot`. At a minimum you will need etc and base.
-  *  `cd /altroot/dev; ./MAKEDEV all`
-  *  `cd /altroot; mkdir kern proc`
-  *  Copy `/etc/wscons.conf`, `/etc/fstab` and any other config files sysinst might have created to `/etc/rc.conf` to `/altroot/etc`
-  *  Set `zfs=YES` in `/altroot/etc/rc.conf`
-  *  Remove `rpool/ROOT` from `/altroot/etc/fstab`
-  *  Add `name=boot /altroot ffs rw,noauto` to `/altroot/etc/fstab` along with any ZFS filesytems you created in '/usr' and '/var'
-  *  Add the filesystems as well to `critical_filesystems_local` in `/altroot/etc/rc.conf` - such as `critical_filesystems_local="/usr /var /var/log"`
-  *  Copy the `ramdisk-zfsroot.fs` to `/`
-  *  Edit `/boot.cfg` and add `menu=Boot ZFS Root:load solaris;load zfs;fs /ramdisk-zfsroot.fs;boot`
-
-And done!
-You can now reboot and enjoy your root on ZFS and all the benefits it brings.
-When updating the kernel, remember to `mount /altroot` and update it there as
-well as the modules.
-
-## Future work
-
-All these steps could be done in the installer.
-This is probably an easier task than adding ZFS support to the bootloader.
-But don't let that stop you if you are stuck for something to do!

Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- wikisrc/index.mdwn	30 May 2023 14:44:07 -0000	1.75
+++ wikisrc/index.mdwn	30 May 2023 14:46:20 -0000	1.76
@@ -3,13 +3,6 @@
 * [[Laptops]]
 * [[Donations]]
 
-[[!template id=note text="""
-**Meta-wiki**
-
-* [[How to edit|wiki/start]]
-* [[Sitemap|wiki/sitemap]]
-"""]]
-
 ## Software
 * [[Tutorials]]
 * [[Features]]
@@ -27,3 +20,7 @@
 
 ## Get involved
 * [[Projects]]
+
+## Meta-wiki
+* [[How to edit|wiki/start]]
+* [[Sitemap|wiki/sitemap]]

Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- wikisrc/index.mdwn	30 May 2023 14:42:38 -0000	1.74
+++ wikisrc/index.mdwn	30 May 2023 14:44:07 -0000	1.75
@@ -1,3 +1,8 @@
+## Hardware
+* [[Ports]]
+* [[Laptops]]
+* [[Donations]]
+
 [[!template id=note text="""
 **Meta-wiki**
 
@@ -5,11 +10,6 @@
 * [[Sitemap|wiki/sitemap]]
 """]]
 
-## Hardware
-* [[Ports]]
-* [[Laptops]]
-* [[Donations]]
-
 ## Software
 * [[Tutorials]]
 * [[Features]]

Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- wikisrc/index.mdwn	30 May 2023 14:39:59 -0000	1.73
+++ wikisrc/index.mdwn	30 May 2023 14:42:38 -0000	1.74
@@ -1,7 +1,8 @@
 [[!template id=note text="""
-### Meta-wiki
-* (?) [[How to edit|wiki/start]]
-* {i} [[Sitemap|wiki/sitemap]]
+**Meta-wiki**
+
+* [[How to edit|wiki/start]]
+* [[Sitemap|wiki/sitemap]]
 """]]
 
 ## Hardware

Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- wikisrc/index.mdwn	30 May 2023 14:37:36 -0000	1.72
+++ wikisrc/index.mdwn	30 May 2023 14:39:59 -0000	1.73
@@ -1,6 +1,8 @@
-## Meta-wiki
+[[!template id=note text="""
+### Meta-wiki
 * (?) [[How to edit|wiki/start]]
 * {i} [[Sitemap|wiki/sitemap]]
+"""]]
 
 ## Hardware
 * [[Ports]]

Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- wikisrc/index.mdwn	30 May 2023 13:59:43 -0000	1.71
+++ wikisrc/index.mdwn	30 May 2023 14:37:36 -0000	1.72
@@ -1,30 +1,26 @@
-[[!template id=note text="""
-#### (?) [[How to edit|wiki/start]]
-#### {*} [[Wiki news|wiki/news]]
-#### {i} [[Sitemap|wiki/sitemap]]
-"""]]
+## Meta-wiki
+* (?) [[How to edit|wiki/start]]
+* {i} [[Sitemap|wiki/sitemap]]
+
+## Hardware
+* [[Ports]]
+* [[Laptops]]
+* [[Donations]]
+
+## Software
+* [[Tutorials]]
+* [[Features]]
+* [[Languages]]
+* [[Security]]
+* [[GitHub]]
+* [[Amazon EC2]]
+* [[pkgsrc]]
+* [[releng]]
+
+## People
+* [[Events]]
+* [[Summits]]
+* [[Users]]
 
-The NetBSD wiki is a place where NetBSD developers can write or host less formal content, experiment with converting the existing website into a new CMS, and get content published immediately about anything they happen to be doing.
-
-See the [[Sitemap|wiki/sitemap]] for the complete contents, or use some of the top level topics below.
-
-Send patches/improvements/suggestions/critiques to [www@NetBSD.org](mailto:www@NetBSD.org), or to any NetBSD developer you happen to find.
-
-
-## Contents
-
-* [[Events]] -- NetBSD related events are listed here
-* [[Summits]] -- Stories from past NetBSD Developer summits
-* [[Tutorials]] -- Guides & Docs (some from the former user-wiki)
-* [[Features]] -- Features of the NetBSD Operating System
-* [[Projects]] -- The big list of work. Get hacking!
-* [[pkgsrc]] -- pkgsrc docs - The NetBSD package manager
-* [[releng]] -- Release engineering
-* [[Security]] -- Security features and hardening
-* [[Users]] -- Developer sandbox pages
-* [[GitHub]] -- NetBSD on GitHub
-* [[Amazon EC2]] -- NetBSD on amazon's EC2
-* [[Laptops]] -- Information about laptop hardware support
-* [[Ports]] -- NetBSD on your hardware
-* [[Languages]] -- Programming languages on your NetBSD
-* [[Donations]] -- Hardware offered and requested by developers
+## Get involved
+* [[Projects]]
--- wikisrc/wiki/news.mdwn	2023-05-31 15:32:54.012147355 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,7 +0,0 @@
-[[!inline
-pages="./news/* and !*/Discussion"
-rootpage="news"
-postformtext="Add a new wiki-related news item entitled:"
-show=0
-
-]]
--- wikisrc/wiki/news/new_mini-blog_for_major_wiki_updates.mdwn	2023-05-31 15:32:54.042158123 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,6 +0,0 @@
-This is a mini-blog for wiki-related news. When features or other
-significant additions are made to the wiki configuration, they'll
-be announced here.
-
-As with any blog, to be notified of new postings, subscribe with
-your preferred feed reader.
--- wikisrc/wiki/news/no_longer_pre-release__44___but....mdwn	2023-05-31 15:32:54.070922678 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,3 +0,0 @@
-You may have noticed that the NetBSD wiki is no longer marked as "pre-release", this comes, however, with a warning.
-
-There are still unresolved issues, mostly of a technical nature.  If you run into issues, please contact www@netbsd.org.
--- wikisrc/wiki/news/wiki_edits_go_to_www-changes__64__.mdwn	2023-05-31 15:32:54.108161059 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1 +0,0 @@
-As with `htdocs` commits, wiki edits are now being sent to the ` www-changes@` mailing list.

Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- wikisrc/index.mdwn	18 Jan 2023 19:18:37 -0000	1.70
+++ wikisrc/index.mdwn	30 May 2023 13:59:43 -0000	1.71
@@ -13,18 +13,18 @@
 
 ## Contents
 
-* [[Events|events]] -- NetBSD related events are listed here
+* [[Events]] -- NetBSD related events are listed here
 * [[Summits]] -- Stories from past NetBSD Developer summits
 * [[Tutorials]] -- Guides & Docs (some from the former user-wiki)
 * [[Features]] -- Features of the NetBSD Operating System
 * [[Projects]] -- The big list of work. Get hacking!
 * [[pkgsrc]] -- pkgsrc docs - The NetBSD package manager
 * [[releng]] -- Release engineering
-* [[Security|security]] -- Security features and hardening
+* [[Security]] -- Security features and hardening
 * [[Users]] -- Developer sandbox pages
-* [[GitHub|github]] -- NetBSD on GitHub
-* [[Amazon EC2|amazon_ec2]] -- NetBSD on amazon's EC2
-* [[Laptops|laptops]] -- Information about laptop hardware support
+* [[GitHub]] -- NetBSD on GitHub
+* [[Amazon EC2]] -- NetBSD on amazon's EC2
+* [[Laptops]] -- Information about laptop hardware support
 * [[Ports]] -- NetBSD on your hardware
 * [[Languages]] -- Programming languages on your NetBSD
-* [[Donations|donations]] -- Hardware offered and requested by developers
+* [[Donations]] -- Hardware offered and requested by developers

Members: 
	ports/qemu_riscv.mdwn:1.3->1.4 

Index: wikisrc/ports/qemu_riscv.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/qemu_riscv.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/ports/qemu_riscv.mdwn	13 May 2023 07:40:43 -0000	1.3
+++ wikisrc/ports/qemu_riscv.mdwn	27 May 2023 19:07:38 -0000	1.4
@@ -33,8 +33,11 @@
           -M virt \
           -m 4g \
           -kernel netbsd-GENERIC64 \
-          -drive if=none,file=riscv64.img,id=hd0 -device virtio-blk-device,drive=hd0 \
-          -netdev type=user,id=net0 -device virtio-net-device,netdev=net0,mac=00:11:22:33:44:55 \
+          -drive if=none,file=riscv64.img,id=hd0,format=raw \
+          -device virtio-blk-device,drive=hd0 \
+          -device virtio-rng-device \
+          -netdev type=user,id=net0 \
+          -device virtio-net-device,netdev=net0,mac=00:11:22:33:44:55 \
           -append "root=dk1" \
           -nographic
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- wikisrc/users/jun.mdwn	25 May 2023 08:06:28 -0000	1.120
+++ wikisrc/users/jun.mdwn	26 May 2023 09:46:11 -0000	1.121
@@ -19,6 +19,7 @@
 - [[https://event.ospn.jp/osc2023-online-do/]]
 - [[https://event.ospn.jp/osc2023-online-do/session/908792]]
 - Youtube video [[https://www.youtube.com/c/OSPNjp]] ROOM D: Watch via Youtube Live
+- Join meeting via ZOOM [[https://ospn.connpass.com/event/281181/]]
 - Tour Guide [[]]
 - togetter [[]]
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- wikisrc/users/jun.mdwn	24 May 2023 03:45:36 -0000	1.119
+++ wikisrc/users/jun.mdwn	25 May 2023 08:06:28 -0000	1.120
@@ -17,7 +17,7 @@
 ## Open Source Conference 2023 Online/Hokkaido NetBSD BoF
 - 2023 Jun.17 Sat 15:00-15:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-do/]]
-- [[https://event.ospn.jp/osc2023-online-do/]] Session: TBD
+- [[https://event.ospn.jp/osc2023-online-do/session/908792]]
 - Youtube video [[https://www.youtube.com/c/OSPNjp]] ROOM D: Watch via Youtube Live
 - Tour Guide [[]]
 - togetter [[]]

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/users/wiz/scm-migration.mdwn	24 May 2023 20:22:13 -0000	1.17
+++ wikisrc/users/wiz/scm-migration.mdwn	24 May 2023 20:24:28 -0000	1.18
@@ -13,7 +13,7 @@
 
 - [[documentation for developers|https://www.netbsd.org/developers/mercurial/]]
 
-- [X] public access:
+- DONE public access:
   - hg:
     - [[public|https://anonhg.netbsd.org/]]
     - [[for developers|ssh://hgmaster.netbsd.org/]]
@@ -37,10 +37,10 @@
 - RCS Ids
   - for src: set `-D_SOURCE_REVISION=\"$(hg log -r . -T {node})"` (computed once) instead of the RCS Ids so that "ident /netbsd" stays useful.
     - joerg@ has a WIP patch
-  - [x] `USE_PKG_ADMIN_DIGEST` has been set to `yes`
+  - DONE for pkgsrc: `USE_PKG_ADMIN_DIGEST` has been set to `yes`
 
-- do we need new hardware for the server(s)?
-  - [X] no; use cvs and anoncvs machines
+- DONE do we need new hardware for the server(s)?
+  - no; use cvs and anoncvs machines
 
 - rename 'hgmaster' host name
 

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/users/wiz/scm-migration.mdwn	20 May 2023 05:05:52 -0000	1.16
+++ wikisrc/users/wiz/scm-migration.mdwn	24 May 2023 20:22:13 -0000	1.17
@@ -13,7 +13,7 @@
 
 - [[documentation for developers|https://www.netbsd.org/developers/mercurial/]]
 
-- public access:
+- [X] public access:
   - hg:
     - [[public|https://anonhg.netbsd.org/]]
     - [[for developers|ssh://hgmaster.netbsd.org/]]
@@ -23,29 +23,27 @@
   - localsrc/releng/autobuild - martin@ is working on it
 
 - anita test bed
+  - anita not affected, but the underlying bracket tool needs changes for hg support
 
-- Daily/weekly jobs I can think of:
+- Daily/weekly jobs:
   - daily publishing jobs for tarballs
-  - updated extracted sources? ftp.netbsd.org?
+  - updated extracted sources? ftp.NetBSD.org?
   - autogenerated CHANGES HTML pages for src & pkgsrc(?)
   - all the pkgsrc automation (requires an unpacked updated tree of the right branch, doesn't care how it came into being)
   - when we migrate htdocs and htutils, update of the web pages
   - backups of the repo(s)
-  - I guess lots more
+  - what else?
 
 - RCS Ids
   - for src: set `-D_SOURCE_REVISION=\"$(hg log -r . -T {node})"` (computed once) instead of the RCS Ids so that "ident /netbsd" stays useful.
     - joerg@ has a WIP patch
-  - set `USE_PKG_ADMIN_DIGEST` to `yes` for pkgsrc so that bulk builds know when to re-build packages
+  - [x] `USE_PKG_ADMIN_DIGEST` has been set to `yes`
 
 - do we need new hardware for the server(s)?
-  - currently hgmaster and anonhg are VMs on a TNF host, are they fast
-    enough as is? "new servers" inplies "a place to put them" and
-    "someone to put them there" and both are hard to supply from another
-    continent. The reasonable thing to do would be to transform cvs and
-    anoncvs into the new *master and anon* (btw, given the avoidance of
-    "master" due to a lack of trades association, remember to rename
-    that to something inoffensive)
+  - [X] no; use cvs and anoncvs machines
+
+- rename 'hgmaster' host name
+
 - turn on hg as main repository
   - switch them one by one?
     - public repositories
@@ -61,4 +59,5 @@
       - pkgsrc-wiki (conversion exists, ask wiz@ for access)
 
 - turn off CVS/anoncvs server :-)
+
 - close tech-repository mailing list

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- wikisrc/users/jun.mdwn	22 May 2023 01:33:10 -0000	1.118
+++ wikisrc/users/jun.mdwn	24 May 2023 03:45:36 -0000	1.119
@@ -54,7 +54,7 @@
 - [[https://event.ospn.jp/osc2023-online-nagoya/]]
 - [[https://event.ospn.jp/osc2023-online-nagoya/session/852896]] 
 - [[https://ospn.connpass.com/event/278665/]] Join via ZOOM 
-- Youtube video [[https://www.youtube.com/c/OSPNjp]] ROOM E: Watch via Youtube Live
+- Youtube video [[https://youtu.be/aqE2wy9l6Ps]] OpenBSD7.3/LUNA88K by aoyama@openbsd
 - Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023nagoya.pdf]]
 - togetter [[https://togetter.com/li/2142714]]
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- wikisrc/users/jun.mdwn	19 May 2023 04:19:48 -0000	1.117
+++ wikisrc/users/jun.mdwn	22 May 2023 01:33:10 -0000	1.118
@@ -4,29 +4,21 @@
 
 # 2023
 
-## Open Source Conference 2023 Online/Nagoya NetBSD BoF
-- 2023 May.20 Sat 13:00-13:45 JST (UTC+9) 
-- [[https://event.ospn.jp/osc2023-online-nagoya/]]
-- [[https://event.ospn.jp/osc2023-online-nagoya/session/852896]] 
-- [[https://ospn.connpass.com/event/278665/]] Join via ZOOM 
-- Youtube video [[https://www.youtube.com/c/OSPNjp]] ROOM E: Watch via Youtube Live
-- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023nagoya.pdf]]
-- togetter [[https://togetter.com/li/2142714]]
-
 ## Open Source Conference 2023 Nagoya NetBSD Booth
 - 2023 May.28 Sun 11:00-16:00 JST (UTC+9)
 - Nagoya Trade & Industry Center [[https://www.nipc.or.jp/fukiage/sub/visitor-access.html#around]]
 - with [[http://nagoya.bug.gr.jp/]]
 - [[https://event.ospn.jp/osc2023-nagoya/]]
 - [[https://ospn.connpass.com/event/278668/]] Join offline event
-- Tour Guide [[]]
-- togetter [[]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023nagoya.pdf]]
+- togetter [[https://togetter.com/li/2142714]]
+
 
 ## Open Source Conference 2023 Online/Hokkaido NetBSD BoF
-- 2023 Jun.17 Sat XX:00-XX:45 JST (UTC+9) 
+- 2023 Jun.17 Sat 15:00-15:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-do/]]
 - [[https://event.ospn.jp/osc2023-online-do/]] Session: TBD
-- Youtube video [[]]
+- Youtube video [[https://www.youtube.com/c/OSPNjp]] ROOM D: Watch via Youtube Live
 - Tour Guide [[]]
 - togetter [[]]
 
@@ -57,6 +49,15 @@
 
 # Past Events in 2023
 
+## Open Source Conference 2023 Online/Nagoya NetBSD BoF
+- 2023 May.20 Sat 13:00-13:45 JST (UTC+9) 
+- [[https://event.ospn.jp/osc2023-online-nagoya/]]
+- [[https://event.ospn.jp/osc2023-online-nagoya/session/852896]] 
+- [[https://ospn.connpass.com/event/278665/]] Join via ZOOM 
+- Youtube video [[https://www.youtube.com/c/OSPNjp]] ROOM E: Watch via Youtube Live
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023nagoya.pdf]]
+- togetter [[https://togetter.com/li/2142714]]
+
 ## Open Source Conference 2023 Tokyo/Spring NetBSD Booth
 - 2023 Apr.1 Sat 10:00-16:00 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-spring/]]

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/users/wiz/scm-migration.mdwn	18 May 2023 09:20:05 -0000	1.15
+++ wikisrc/users/wiz/scm-migration.mdwn	20 May 2023 05:05:52 -0000	1.16
@@ -7,6 +7,9 @@
 - conversion:
   - basically done, possibly one 'final' cleaned-up conversion
     - currently waiting for [[auditlog merge|https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/235]]
+    - authormap is work in progress, should be finalized by June 1 (localsrc/cvs_server/migration/authormap)
+  - github mirror
+    - after final conversion happens, either force-push or make a new repository and deprecate the old one
 
 - [[documentation for developers|https://www.netbsd.org/developers/mercurial/]]
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- wikisrc/users/jun.mdwn	22 Apr 2023 06:44:27 -0000	1.116
+++ wikisrc/users/jun.mdwn	19 May 2023 04:19:48 -0000	1.117
@@ -9,9 +9,9 @@
 - [[https://event.ospn.jp/osc2023-online-nagoya/]]
 - [[https://event.ospn.jp/osc2023-online-nagoya/session/852896]] 
 - [[https://ospn.connpass.com/event/278665/]] Join via ZOOM 
-- Youtube video [[https://www.youtube.com/c/OSPNjp]] Watch via Youtube Live
-- Tour Guide [[]]
-- togetter [[]]
+- Youtube video [[https://www.youtube.com/c/OSPNjp]] ROOM E: Watch via Youtube Live
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023nagoya.pdf]]
+- togetter [[https://togetter.com/li/2142714]]
 
 ## Open Source Conference 2023 Nagoya NetBSD Booth
 - 2023 May.28 Sun 11:00-16:00 JST (UTC+9)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/users/wiz/scm-migration.mdwn	17 May 2023 19:12:20 -0000	1.14
+++ wikisrc/users/wiz/scm-migration.mdwn	18 May 2023 09:20:05 -0000	1.15
@@ -17,9 +17,7 @@
   - [[read-only git|https://github.com/netbsd/]]
 
 - releng some scripts need to be adapted
-  - in particular getting the latest (branch) checkout. I heard a
-    partial git version by maya exists and martin@ has it; hg needs
-    to be done.
+  - localsrc/releng/autobuild - martin@ is working on it
 
 - anita test bed
 
@@ -33,11 +31,9 @@
   - I guess lots more
 
 - RCS Ids
-  - for src: set
-      -D_SOURCE_REVISION=\"$(hg log -r . -T {node})"
-    (computed once) instead of the RCS Ids so that "ident /netbsd" stays useful.
-    -- WIP patch exists (joerg@)
-  - set USE_PKG_ADMIN_DIGEST to yes for pkgsrc so that bulk builds know when to re-build packages
+  - for src: set `-D_SOURCE_REVISION=\"$(hg log -r . -T {node})"` (computed once) instead of the RCS Ids so that "ident /netbsd" stays useful.
+    - joerg@ has a WIP patch
+  - set `USE_PKG_ADMIN_DIGEST` to `yes` for pkgsrc so that bulk builds know when to re-build packages
 
 - do we need new hardware for the server(s)?
   - currently hgmaster and anonhg are VMs on a TNF host, are they fast

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/users/wiz/scm-migration.mdwn	17 May 2023 12:52:51 -0000	1.13
+++ wikisrc/users/wiz/scm-migration.mdwn	17 May 2023 19:12:20 -0000	1.14
@@ -36,6 +36,7 @@
   - for src: set
       -D_SOURCE_REVISION=\"$(hg log -r . -T {node})"
     (computed once) instead of the RCS Ids so that "ident /netbsd" stays useful.
+    -- WIP patch exists (joerg@)
   - set USE_PKG_ADMIN_DIGEST to yes for pkgsrc so that bulk builds know when to re-build packages
 
 - do we need new hardware for the server(s)?

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/wiz/scm-migration.mdwn	17 May 2023 12:50:30 -0000	1.12
+++ wikisrc/users/wiz/scm-migration.mdwn	17 May 2023 12:52:51 -0000	1.13
@@ -51,9 +51,9 @@
     - public repositories
       - othersrc (needs a conversion first)
       - htdocs (needs a conversion first)
-      - pkgsrc - [[public|https://anonhg.netbsd.org/pkgsrc/]] & [[internal|https://hgmaster.netbsd.org/pkgsrc]]
-      - src - [[public|https://anonhg.netbsd.org/src/]] & [[internal|https://hgmaster.netbsd.org/src]]
-      - xsrc - [[public|https://anonhg.netbsd.org/xsrc/]] & [[internal|https://hgmaster.netbsd.org/xsrc]]
+      - pkgsrc - [[public|https://anonhg.netbsd.org/pkgsrc/]] & [[internal|ssh://hgmaster.netbsd.org/pkgsrc]]
+      - src - [[public|https://anonhg.netbsd.org/src/]] & [[internal|ssh://hgmaster.netbsd.org/src]]
+      - xsrc - [[public|https://anonhg.netbsd.org/xsrc/]] & [[internal|ssh://hgmaster.netbsd.org/xsrc]]
     - internal repositories
       - htutils (needs a conversion first)
       - localsrc (needs a conversion first)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/users/wiz/scm-migration.mdwn	16 May 2023 09:31:50 -0000	1.11
+++ wikisrc/users/wiz/scm-migration.mdwn	17 May 2023 12:50:30 -0000	1.12
@@ -33,8 +33,10 @@
   - I guess lots more
 
 - RCS Ids
-  - what do we replace RCS Ids with for the kernel (ident /netbsd)?
-  - what do we replace RCS Ids with for pkgsrc (rebuild package or not)?
+  - for src: set
+      -D_SOURCE_REVISION=\"$(hg log -r . -T {node})"
+    (computed once) instead of the RCS Ids so that "ident /netbsd" stays useful.
+  - set USE_PKG_ADMIN_DIGEST to yes for pkgsrc so that bulk builds know when to re-build packages
 
 - do we need new hardware for the server(s)?
   - currently hgmaster and anonhg are VMs on a TNF host, are they fast

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/users/wiz/scm-migration.mdwn	4 May 2023 13:51:07 -0000	1.10
+++ wikisrc/users/wiz/scm-migration.mdwn	16 May 2023 09:31:50 -0000	1.11
@@ -59,3 +59,4 @@
       - pkgsrc-wiki (conversion exists, ask wiz@ for access)
 
 - turn off CVS/anoncvs server :-)
+- close tech-repository mailing list

Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- wikisrc/releng.mdwn	4 Jan 2023 17:19:13 -0000	1.51
+++ wikisrc/releng.mdwn	15 May 2023 20:46:10 -0000	1.52
@@ -9,6 +9,7 @@
 The next major release will be NetBSD 10.0 (no date for release set)
 
 * [[Pre release task list for NetBSD 10.0|netbsd-10]]
+* [Current pull-up queue for the netbsd-10 branch](http://releng.netbsd.org/cgi-bin/req-10.cgi)
 
 ## Active Major Releases
 

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- wikisrc/releng/netbsd-10.mdwn	13 May 2023 14:53:06 -0000	1.88
+++ wikisrc/releng/netbsd-10.mdwn	14 May 2023 09:24:57 -0000	1.89
@@ -129,11 +129,11 @@
   <tbody>
     <tr>
         <td><a href="//www.netbsd.org/~martin/aarch64-atf-netbsd10/">aarch64</a>, real hardware</td>
-        <td>2023-05-01</td><td>3</td><td> </td>
+        <td>2023-05-13</td><td>3</td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/sparc64-atf-netbsd10/">sparc64</a>, real hardware</td>
-        <td>2023-04-30</td><td>4</td><td> </td>
+        <td>2023-05-13</td><td>4</td><td> </td>
     </tr>
     <tr>
         <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/netbsd-10/">xen</a></td>
@@ -141,7 +141,7 @@
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/evbarm-atf-netbsd10/">evbarm</a>, real hardware</td>
-        <td>2023-04-30</td><td>64</td><td></td>
+        <td>2023-05-13</td><td>63</td><td></td>
     </tr>
   </tbody>
 </table>

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- wikisrc/releng/netbsd-10.mdwn	13 May 2023 14:46:00 -0000	1.87
+++ wikisrc/releng/netbsd-10.mdwn	13 May 2023 14:53:06 -0000	1.88
@@ -18,9 +18,7 @@
   the kernel and should be investigated and fixed.**
 * [[!template id=pr number=55272]]: userland watchdog processes may be outstalled (regression since -9)
 * [[!template id=pr number=55466]]: rump_server processes busy looping can stall a machine (regression since -9)
-* ~~topdown uvm mmap assertion failure (PR upcoming) - PMAP_PREFER can cause KASSERT failure~~ (might be a gcc bug, only reproducable on sh3)
 * ~~[[!template id=pr number=56329]]: nvme(4) takes long time to umount~~ analyzed: the number of dirty vnodes has been bumped, no real performance regression
-* handling of randomness and seed file need to be decided (more below, waiting for randot)
 *  ~~autoconfig API changes need to be backed out or made type-safe see this [backout request](https://mail-index.netbsd.org/tech-kern/2021/05/11/msg027374.html)~~
 * [[!template id=pr number=56653]]: kernel crash in ipv6 fragment reassembly
 * ~~[[!template id=pr number=56713]]: kqueue/kevent does not work with null mounts~~
@@ -130,16 +128,20 @@
   </thead>
   <tbody>
     <tr>
-        <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/netbsd-10/">xen</a></td>
-        <td>2022-12-31</td> <td>2</td><td></td>
+        <td><a href="//www.netbsd.org/~martin/aarch64-atf-netbsd10/">aarch64</a>, real hardware</td>
+        <td>2023-05-01</td><td>3</td><td> </td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/sparc64-atf-netbsd10/">sparc64</a>, real hardware</td>
-        <td>2022-12-28</td><td>3</td><td> </td>
+        <td>2023-04-30</td><td>4</td><td> </td>
+    </tr>
+    <tr>
+        <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/netbsd-10/">xen</a></td>
+        <td>2023-05-07</td> <td>5</td><td></td>
     </tr>
     <tr>
         <td><a href="//www.netbsd.org/~martin/evbarm-atf-netbsd10/">evbarm</a>, real hardware</td>
-        <td>2022-12-29</td><td>64</td><td></td>
+        <td>2023-04-30</td><td>64</td><td></td>
     </tr>
   </tbody>
 </table>

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- wikisrc/releng/netbsd-10.mdwn	13 May 2023 10:11:46 -0000	1.86
+++ wikisrc/releng/netbsd-10.mdwn	13 May 2023 14:46:00 -0000	1.87
@@ -28,7 +28,7 @@
 * [[!template id=pr number=57127]]: ptyfs fails
 
 ## Open issues with new DRM/KMS
-* [[!template id=pr number=53126]]: uefi boot breaks graphics
+* ~~[[!template id=pr number=53126]]: uefi boot breaks graphics~~
 * [[!template id=pr number=56566]]: amdgpu/drm: X screen corruption, resets and errors
 * [[!template id=pr number=56648]]: i915drmkms fails to detect output
 * [[!template id=pr number=56672]]: i915drmkms hangs on boot
@@ -55,7 +55,7 @@
 * ~~[[!template id=pr number=55997]]: lang/perl5 fails to build on NetBSD-current under COMPAT_NETBSD32~~ (Perl bug)
 * ~~[[!template id=pr number=56073]]: reading from /dev/pad panics the kernel with an assertion failure~~
 * ~~[[!template id=pr number=56113]]: short reads on AF_UNIX/SOCK_STREAM sockets return early, breaks jackd~~ (maybe a jack bug, fixed in newer jack...)
-* [[!template id=pr number=56117]]: New test failures on amd64 since switch to gcc10
+* ~~[[!template id=pr number=56117]]: New test failures on amd64 since switch to gcc10~~
 * ~~[[!template id=pr number=56291]]: XEN3_DOM0 nvme abysmal performance~~
 * ~~[[!template id=pr number=56404]]: ACPI poweroff fails~~
 * ~~[[!template id=pr number=56414]]: cmake hang on kqueue~~
@@ -78,7 +78,7 @@
 * ~~[[!template id=pr number=55042]]: kernel panics when ZFS filesystem is exported with NFS~~
 * ~~[[!template id=pr number=55458]]: entropy: WrAnRdNcING no nstropy in  eed~~
 * [[!template id=pr number=55510]]: pg_jobc going negative and crashing the kernel
-* [[!template id=pr number=55533]]: mmap(2) fails when called with a non-zero hint
+* ~~[[!template id=pr number=55533]]: mmap(2) fails when called with a non-zero hint~~
 * [[!template id=pr number=55892]]: npf cannot handle large tables
 * [[!template id=pr number=55941]]: NetBSD 9+ /boot does not work
 * [[!template id=pr number=56330]]: amd64 gdb issues

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- wikisrc/releng/netbsd-10.mdwn	31 Jan 2023 11:13:05 -0000	1.85
+++ wikisrc/releng/netbsd-10.mdwn	13 May 2023 10:11:46 -0000	1.86
@@ -1,5 +1,17 @@
 [[!meta title="NetBSD 10.0 pre release tasklist"]]
 
+## Hard Release Blockers
+
+Currently we consider the magnitude of DRM/KMS bugs (see below) as a blocker.
+Maybe not all of them will be fixed before the release, but the new user impact with the current state
+is just too bad.
+
+The *randot* issue (below) is a hard blocker.
+
+We will pull up OpenSSL 3.x as soon as that has proven to work in -current,
+and may also import an update to libfido, as NetBSD 10.0 will be the first release
+that can make use of WebAuthN/Fido keys out of the box.
+
 ## Showstopper bugs and PRs
 
 * **Any issues found by [syzbot](https://syzkaller.appspot.com/netbsd) may potentially crash
@@ -30,6 +42,7 @@
 * [[!template id=pr number=57143]]: Screen rotation causes loss of acceleration on i915
 * [[!template id=pr number=57182]]: nouveau doesn't switches LVDS on
 * [[!template id=pr number=57207]]: Unable to get display from a NetBSD system through a DP 1.4 KVM switch
+* ~~[[!template id=pr number=57402]]: null pointer dereference in i915_gem_busy_ioctl~~ (needs pullup)
 
 ## Regressions since netbsd-9
 

Members: 
	ports/qemu_riscv.mdwn:1.2->1.3 

Index: wikisrc/ports/qemu_riscv.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/qemu_riscv.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/ports/qemu_riscv.mdwn	13 May 2023 07:05:12 -0000	1.2
+++ wikisrc/ports/qemu_riscv.mdwn	13 May 2023 07:40:43 -0000	1.3
@@ -7,9 +7,9 @@
 # Requirements
 * qemu 6.2.0 (tested) or higher
 * disk image
-  * [NetBSD current riscv64.img.gz](https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/202305121450Z/riscv-riscv64/binary/gzimg/riscv64.img.gz)
+  * [NetBSD current riscv64.img.gz](https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/riscv-riscv64/binary/gzimg/riscv64.img.gz)
 * kernel image
-  * [NetBSD current kernel](https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/202305121450Z/riscv-riscv64/binary/kernel/netbsd-GENERIC64.gz)
+  * [NetBSD current kernel](https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/riscv-riscv64/binary/kernel/netbsd-GENERIC64.gz)
 
 
 # Installing QEMU on NetBSD
@@ -24,7 +24,7 @@
 The disk image (riscv64.img.gz) must first be uncompressed. The *qemu-img* tool can then resize the image to the desired size. On first boot, NetBSD will grow the root file-system to match the size of the disk.
 
     $ gunzip netbsd-GENERIC64.gz 
-    $ gunzip risccv64.img.gz
+    $ gunzip riscv64.img.gz
     $ qemu-img resize riscv64.img 20g
 
 # Booting the system (riscv64)
@@ -32,7 +32,7 @@
     $ qemu-system-riscv64 \
           -M virt \
           -m 4g \
-          -kernel netbsd \
+          -kernel netbsd-GENERIC64 \
           -drive if=none,file=riscv64.img,id=hd0 -device virtio-blk-device,drive=hd0 \
           -netdev type=user,id=net0 -device virtio-net-device,netdev=net0,mac=00:11:22:33:44:55 \
           -append "root=dk1" \

Index: wikisrc/ports/qemu_riscv.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/qemu_riscv.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/ports/qemu_riscv.mdwn	13 May 2023 06:37:54 -0000	1.1
+++ wikisrc/ports/qemu_riscv.mdwn	13 May 2023 07:05:12 -0000	1.2
@@ -35,5 +35,6 @@
           -kernel netbsd \
           -drive if=none,file=riscv64.img,id=hd0 -device virtio-blk-device,drive=hd0 \
           -netdev type=user,id=net0 -device virtio-net-device,netdev=net0,mac=00:11:22:33:44:55 \
+          -append "root=dk1" \
           -nographic
 

Index: wikisrc/ports/riscv.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/riscv.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/riscv.mdwn	15 Feb 2020 08:00:06 -0000	1.5
+++ wikisrc/ports/riscv.mdwn	13 May 2023 06:39:36 -0000	1.6
@@ -5,6 +5,25 @@
 about="""
 NetBSD/riscv is a nascent port of NetBSD to RISC-V. Interested individuals can
 subscribe to the port-riscv mailing list.
+
+NetBSD/riscv64 now works under qemu.
+
+[[!toc levels=3]]
+"""
+supported_hardware="""
+
+### CPU types
+
+CPU variants supported
+
+- RV64/SV39
+
+### Board specific information
+
+Most RISC-V boards require a board-specific U-Boot image. A list of supported boards will appear here.
+
+### QEMU
+See the [[NetBSD/riscv under QEMU|qemu_riscv]] page for instructions on how to get started with QEMU.
 """
 
 ]]

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/ports/qemu_riscv.mdwn	2023-05-31 15:33:02.485822144 +0000
@@ -0,0 +1,39 @@
+[[!meta title="NetBSD/riscv under QEMU"]]
+
+This page attempts to document running NetBSD/riscv under the
+[QEMU](http://www.qemu.org/) open source processor emulator.
+This can be extremely useful for development and testing.
+
+# Requirements
+* qemu 6.2.0 (tested) or higher
+* disk image
+  * [NetBSD current riscv64.img.gz](https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/202305121450Z/riscv-riscv64/binary/gzimg/riscv64.img.gz)
+* kernel image
+  * [NetBSD current kernel](https://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/202305121450Z/riscv-riscv64/binary/kernel/netbsd-GENERIC64.gz)
+
+
+# Installing QEMU on NetBSD
+You can install latest qemu with the following commands.
+It is assumed that your pkgsrc tree is in /usr/pkgsrc directory.
+
+    # cd /usr/pkgsrc/emulators/qemu
+    # make install
+
+# Preparing the disk image and kernel
+
+The disk image (riscv64.img.gz) must first be uncompressed. The *qemu-img* tool can then resize the image to the desired size. On first boot, NetBSD will grow the root file-system to match the size of the disk.
+
+    $ gunzip netbsd-GENERIC64.gz 
+    $ gunzip risccv64.img.gz
+    $ qemu-img resize riscv64.img 20g
+
+# Booting the system (riscv64)
+
+    $ qemu-system-riscv64 \
+          -M virt \
+          -m 4g \
+          -kernel netbsd \
+          -drive if=none,file=riscv64.img,id=hd0 -device virtio-blk-device,drive=hd0 \
+          -netdev type=user,id=net0 -device virtio-net-device,netdev=net0,mac=00:11:22:33:44:55 \
+          -nographic
+

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/projects/project/pkgsrc_empty_env.mdwn	2023-05-31 15:33:02.835286507 +0000
@@ -0,0 +1,28 @@
+[[!template id=project
+
+title="Isolate builds from user environment"
+
+contact="""
+[tech-pkg](mailto:tech-pkg@NetBSD.org)
+"""
+
+mentors="""
+[Amitai Schleier](mailto:schmonz@NetBSD.org)
+"""
+
+category="pkgsrc"
+difficulty="easy"
+duration="1 month"
+
+description="""
+`bsd.pkg.mk` says: `# To sanitize the environment, set PKGSRC_SETENV=${SETENV} -i.`
+
+We'd like this to become the default. Steps:
+
+1. Do bulk builds with the existing defaults on a few platforms (e.g., NetBSD, macOS, Illumos, Linux)
+2. Rerun the bulk builds from scratch, this time with `PKGSRC_SETENV=${SETENV} -i` 
+3. Compare before and after to see which package builds break
+4. Fix them
+5. Flip the switch to sanitize the environment by default
+"""
+]]

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/users/wiz/scm-migration.mdwn	3 May 2023 21:09:00 -0000	1.9
+++ wikisrc/users/wiz/scm-migration.mdwn	4 May 2023 13:51:07 -0000	1.10
@@ -13,7 +13,7 @@
 - public access:
   - hg:
     - [[public|https://anonhg.netbsd.org/]]
-    - [[for developers|ssh://hgmaster.netbsd.org/repo/*]]
+    - [[for developers|ssh://hgmaster.netbsd.org/]]
   - [[read-only git|https://github.com/netbsd/]]
 
 - releng some scripts need to be adapted
@@ -49,9 +49,9 @@
     - public repositories
       - othersrc (needs a conversion first)
       - htdocs (needs a conversion first)
-      - pkgsrc - https://anonhg.netbsd.org/pkgsrc/
-      - src - https://anonhg.netbsd.org/src/
-      - xsrc - https://anonhg.netbsd.org/xsrc/
+      - pkgsrc - [[public|https://anonhg.netbsd.org/pkgsrc/]] & [[internal|https://hgmaster.netbsd.org/pkgsrc]]
+      - src - [[public|https://anonhg.netbsd.org/src/]] & [[internal|https://hgmaster.netbsd.org/src]]
+      - xsrc - [[public|https://anonhg.netbsd.org/xsrc/]] & [[internal|https://hgmaster.netbsd.org/xsrc]]
     - internal repositories
       - htutils (needs a conversion first)
       - localsrc (needs a conversion first)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/users/wiz/scm-migration.mdwn	3 May 2023 20:50:27 -0000	1.8
+++ wikisrc/users/wiz/scm-migration.mdwn	3 May 2023 21:09:00 -0000	1.9
@@ -32,6 +32,10 @@
   - backups of the repo(s)
   - I guess lots more
 
+- RCS Ids
+  - what do we replace RCS Ids with for the kernel (ident /netbsd)?
+  - what do we replace RCS Ids with for pkgsrc (rebuild package or not)?
+
 - do we need new hardware for the server(s)?
   - currently hgmaster and anonhg are VMs on a TNF host, are they fast
     enough as is? "new servers" inplies "a place to put them" and

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 18:54:59 -0000	1.7
+++ wikisrc/users/wiz/scm-migration.mdwn	3 May 2023 20:50:27 -0000	1.8
@@ -28,7 +28,7 @@
   - updated extracted sources? ftp.netbsd.org?
   - autogenerated CHANGES HTML pages for src & pkgsrc(?)
   - all the pkgsrc automation (requires an unpacked updated tree of the right branch, doesn't care how it came into being)
-  - if we migrate htdocs and htutils (there are currently no conversions I'm aware of), update of the web pages
+  - when we migrate htdocs and htutils, update of the web pages
   - backups of the repo(s)
   - I guess lots more
 
@@ -45,12 +45,13 @@
     - public repositories
       - othersrc (needs a conversion first)
       - htdocs (needs a conversion first)
-      - pkgsrc
-      - src
-      - xsrc
+      - pkgsrc - https://anonhg.netbsd.org/pkgsrc/
+      - src - https://anonhg.netbsd.org/src/
+      - xsrc - https://anonhg.netbsd.org/xsrc/
     - internal repositories
       - htutils (needs a conversion first)
       - localsrc (needs a conversion first)
-      - wikisrc [needs a conversion first)
+      - wikisrc (needs a conversion first)
+      - pkgsrc-wiki (conversion exists, ask wiz@ for access)
 
 - turn off CVS/anoncvs server :-)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 18:52:43 -0000	1.6
+++ wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 18:54:59 -0000	1.7
@@ -42,12 +42,15 @@
     that to something inoffensive)
 - turn on hg as main repository
   - switch them one by one?
-    - othersrc (needs a conversion first?)
-    - localsrc (needs a conversion first? remember it's not public)
-    - htdocs (needs a conversion first?)
-    - htutils (needs a conversion first? remember it's not public)
-    - pkgsrc
-    - src
-    - xsrc
+    - public repositories
+      - othersrc (needs a conversion first)
+      - htdocs (needs a conversion first)
+      - pkgsrc
+      - src
+      - xsrc
+    - internal repositories
+      - htutils (needs a conversion first)
+      - localsrc (needs a conversion first)
+      - wikisrc [needs a conversion first)
 
 - turn off CVS/anoncvs server :-)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 18:48:50 -0000	1.5
+++ wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 18:52:43 -0000	1.6
@@ -6,16 +6,15 @@
 
 - conversion:
   - basically done, possibly one 'final' cleaned-up conversion
-    - currently waiting for https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/235
+    - currently waiting for [[auditlog merge|https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/235]]
 
-- documentation for developers
-  - see: https://www.netbsd.org/developers/mercurial/
+- [[documentation for developers|https://www.netbsd.org/developers/mercurial/]]
 
 - public access:
   - hg:
-    - public: https://anonhg.netbsd.org/
-    - for developers: ssh://hgmaster.netbsd.org/repo/*
-  - read-only git: https://github.com/netbsd/
+    - [[public|https://anonhg.netbsd.org/]]
+    - [[for developers|ssh://hgmaster.netbsd.org/repo/*]]
+  - [[read-only git|https://github.com/netbsd/]]
 
 - releng some scripts need to be adapted
   - in particular getting the latest (branch) checkout. I heard a

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 17:46:48 -0000	1.4
+++ wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 18:48:50 -0000	1.5
@@ -6,6 +6,7 @@
 
 - conversion:
   - basically done, possibly one 'final' cleaned-up conversion
+    - currently waiting for https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/235
 
 - documentation for developers
   - see: https://www.netbsd.org/developers/mercurial/

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/wiz/scm-migration.mdwn	23 Apr 2023 06:49:19 -0000	1.3
+++ wikisrc/users/wiz/scm-migration.mdwn	29 Apr 2023 17:46:48 -0000	1.4
@@ -1,5 +1,4 @@
-I would really like to finish the migration away from CVS (hg/git
-still to be decided).
+I would really like to finish the migration away from CVS to hg.
 
 This is a list of items that need to be done for this to happen.
 
@@ -9,20 +8,18 @@
   - basically done, possibly one 'final' cleaned-up conversion
 
 - documentation for developers
-  - hg: available: https://www.netbsd.org/developers/mercurial/ (already documents pull-ups)
-  - git: branch handling/pull-up handling needs to be documented, but there is enough git documentation in the world
+  - see: https://www.netbsd.org/developers/mercurial/
 
 - public access:
-  - hg: https://anonhg.netbsd.org/
-    for developers: ssh://hgmaster.netbsd.org/repo/*
-  - git: https://github.com/netbsd/
-    github shouldn't host our official version; does a self-hosted
-    version of this already exist?
+  - hg:
+    - public: https://anonhg.netbsd.org/
+    - for developers: ssh://hgmaster.netbsd.org/repo/*
+  - read-only git: https://github.com/netbsd/
 
 - releng some scripts need to be adapted
   - in particular getting the latest (branch) checkout. I heard a
-    partial git version by maya exists and martin@ has it; hg would
-    need to be done.
+    partial git version by maya exists and martin@ has it; hg needs
+    to be done.
 
 - anita test bed
 
@@ -36,8 +33,14 @@
   - I guess lots more
 
 - do we need new hardware for the server(s)?
-  currently hgmaster and anonhg are VMs on a TNF host, are they fast enough as is? "new servers" inplies "a place to put them" and "someone to put them there" and both are hard to supply from another continent. The reasonable thing to do would be to transform cvs and anoncvs into the new *master and anon* (btw, given the avoidance of "master" due to a lack of trades association, remember to rename that to something inoffensive)
-- turn on hg/git as main repository
+  - currently hgmaster and anonhg are VMs on a TNF host, are they fast
+    enough as is? "new servers" inplies "a place to put them" and
+    "someone to put them there" and both are hard to supply from another
+    continent. The reasonable thing to do would be to transform cvs and
+    anoncvs into the new *master and anon* (btw, given the avoidance of
+    "master" due to a lack of trades association, remember to rename
+    that to something inoffensive)
+- turn on hg as main repository
   - switch them one by one?
     - othersrc (needs a conversion first?)
     - localsrc (needs a conversion first? remember it's not public)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/wiz/scm-migration.mdwn	22 Apr 2023 12:37:45 -0000	1.2
+++ wikisrc/users/wiz/scm-migration.mdwn	23 Apr 2023 06:49:19 -0000	1.3
@@ -6,7 +6,7 @@
 There are at least the following topics:
 
 - conversion:
-  - basically one, possibly one 'final' cleaned-up conversion
+  - basically done, possibly one 'final' cleaned-up conversion
 
 - documentation for developers
   - hg: available: https://www.netbsd.org/developers/mercurial/ (already documents pull-ups)

Index: wikisrc/users/wiz/scm-migration.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/scm-migration.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/wiz/scm-migration.mdwn	21 Apr 2023 17:41:02 -0000	1.1
+++ wikisrc/users/wiz/scm-migration.mdwn	22 Apr 2023 12:37:45 -0000	1.2
@@ -30,16 +30,21 @@
   - daily publishing jobs for tarballs
   - updated extracted sources? ftp.netbsd.org?
   - autogenerated CHANGES HTML pages for src & pkgsrc(?)
+  - all the pkgsrc automation (requires an unpacked updated tree of the right branch, doesn't care how it came into being)
+  - if we migrate htdocs and htutils (there are currently no conversions I'm aware of), update of the web pages
+  - backups of the repo(s)
   - I guess lots more
 
 - do we need new hardware for the server(s)?
-
+  currently hgmaster and anonhg are VMs on a TNF host, are they fast enough as is? "new servers" inplies "a place to put them" and "someone to put them there" and both are hard to supply from another continent. The reasonable thing to do would be to transform cvs and anoncvs into the new *master and anon* (btw, given the avoidance of "master" due to a lack of trades association, remember to rename that to something inoffensive)
 - turn on hg/git as main repository
   - switch them one by one?
-    - othersrc
-    - localsrc
-    - htdocs
+    - othersrc (needs a conversion first?)
+    - localsrc (needs a conversion first? remember it's not public)
+    - htdocs (needs a conversion first?)
+    - htutils (needs a conversion first? remember it's not public)
     - pkgsrc
     - src
+    - xsrc
 
 - turn off CVS/anoncvs server :-)

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- wikisrc/users/jun.mdwn	10 Apr 2023 04:14:24 -0000	1.115
+++ wikisrc/users/jun.mdwn	22 Apr 2023 06:44:27 -0000	1.116
@@ -5,10 +5,11 @@
 # 2023
 
 ## Open Source Conference 2023 Online/Nagoya NetBSD BoF
-- 2023 May.20 Sat XX:00-XX:45 JST (UTC+9) 
+- 2023 May.20 Sat 13:00-13:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-nagoya/]]
-- [[https://event.ospn.jp/osc2023-online-nagoya/]] session URL:TBD
-- Youtube video [[https://www.youtube.com/c/OSPNjp]]
+- [[https://event.ospn.jp/osc2023-online-nagoya/session/852896]] 
+- [[https://ospn.connpass.com/event/278665/]] Join via ZOOM 
+- Youtube video [[https://www.youtube.com/c/OSPNjp]] Watch via Youtube Live
 - Tour Guide [[]]
 - togetter [[]]
 
@@ -17,6 +18,7 @@
 - Nagoya Trade & Industry Center [[https://www.nipc.or.jp/fukiage/sub/visitor-access.html#around]]
 - with [[http://nagoya.bug.gr.jp/]]
 - [[https://event.ospn.jp/osc2023-nagoya/]]
+- [[https://ospn.connpass.com/event/278668/]] Join offline event
 - Tour Guide [[]]
 - togetter [[]]
 
@@ -36,6 +38,22 @@
 - Tour Guide [[]]
 - togetter [[]]
 
+## Open Source Conference 2023 Kyoto NetBSD Booth
+- 2023 Jul.22 Sat 11:00-16:00 JST (UTC+9) 
+- Kyoto Research Park [[https://www.krp.co.jp/access/map.html]]
+- [[https://event.ospn.jp/osc2023-kyoto/]]
+- Tour Guide [[]]
+- togetter [[]]
+
+
+## Open Source Conference 2023 Online/Kyoto NetBSD BoF
+- 2023 Jul.29 Sat XX:00-XX:45 JST (UTC+9) 
+- [[https://event.ospn.jp/osc2023-online-kyoto/]]
+- [[https://event.ospn.jp/osc2023-online-kyoto/]] Session: TBD
+- Youtube video [[]]
+- Tour Guide [[]]
+- togetter [[]]
+
 
 # Past Events in 2023
 

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/users/wiz/scm-migration.mdwn	2023-05-31 15:33:06.694056113 +0000
@@ -0,0 +1,45 @@
+I would really like to finish the migration away from CVS (hg/git
+still to be decided).
+
+This is a list of items that need to be done for this to happen.
+
+There are at least the following topics:
+
+- conversion:
+  - basically one, possibly one 'final' cleaned-up conversion
+
+- documentation for developers
+  - hg: available: https://www.netbsd.org/developers/mercurial/ (already documents pull-ups)
+  - git: branch handling/pull-up handling needs to be documented, but there is enough git documentation in the world
+
+- public access:
+  - hg: https://anonhg.netbsd.org/
+    for developers: ssh://hgmaster.netbsd.org/repo/*
+  - git: https://github.com/netbsd/
+    github shouldn't host our official version; does a self-hosted
+    version of this already exist?
+
+- releng some scripts need to be adapted
+  - in particular getting the latest (branch) checkout. I heard a
+    partial git version by maya exists and martin@ has it; hg would
+    need to be done.
+
+- anita test bed
+
+- Daily/weekly jobs I can think of:
+  - daily publishing jobs for tarballs
+  - updated extracted sources? ftp.netbsd.org?
+  - autogenerated CHANGES HTML pages for src & pkgsrc(?)
+  - I guess lots more
+
+- do we need new hardware for the server(s)?
+
+- turn on hg/git as main repository
+  - switch them one by one?
+    - othersrc
+    - localsrc
+    - htdocs
+    - pkgsrc
+    - src
+
+- turn off CVS/anoncvs server :-)

--- wikisrc/users/wiz/freeze-rules.mdwn	2023-05-31 15:33:07.045170270 +0000
+++ /dev/null	2023-05-31 15:32:00.271659344 +0000
@@ -1,15 +0,0 @@
-# pkgsrc freeze rules
-
-* No changes to mk/ or pkgtools/pkg_install and other bootstrap
-packages without PMC approval
-* Non-leaf package changes that affect more than 50 packages require PMC
-approval too. If you are not sure how many are affected, run
-finddepends(1) from pkgtools/revbump or ask.
-* Other non-leaf package changes require pre-commit review by another pkgsrc
-developers; look for reviewers on IRC or on packages@.
-Mention this with "ok wiz@" or similar in the commit message.
-* For leaf packages use your own judgement. In case of doubt, you can
-always ask on packages@.
-
-See also the [Quarterly Branching Plan](https://pkgsrc.org/quarterly/) and
-[is-a-freeze-on](https://pkgsrc.org/is-a-freeze-on/).

Index: wikisrc/users/spz/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/spz/sandbox.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/users/spz/sandbox.mdwn	3 Nov 2021 08:22:53 -0000	1.20
+++ wikisrc/users/spz/sandbox.mdwn	18 Apr 2023 12:28:48 -0000	1.21
@@ -1 +1 @@
-blah
+lalala

Members: 
	ports/evbarm.mdwn:1.108->1.109 

Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- wikisrc/ports/evbarm.mdwn	8 Nov 2022 22:35:55 -0000	1.108
+++ wikisrc/ports/evbarm.mdwn	12 Apr 2023 19:08:04 -0000	1.109
@@ -57,7 +57,7 @@
  - [[BeagleBone, BeagleBone Black, and PocketBeagle|BeagleBone]]
  - [[NVIDIA Tegra|Tegra]]
  - [[ODROID C1 and C1+|ODROID-C1]]
- - [[Raspberry Pi 1, 2, 3|Raspberry Pi]]
+ - [[Raspberry Pi family|Raspberry Pi]]
  - [[RockChip SoCs|RockChip]]
  - [[Terasic DE0 Nano-SoC|Cyclone5]]
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- wikisrc/users/jun.mdwn	14 Mar 2023 02:30:59 -0000	1.114
+++ wikisrc/users/jun.mdwn	10 Apr 2023 04:14:24 -0000	1.115
@@ -4,20 +4,53 @@
 
 # 2023
 
+## Open Source Conference 2023 Online/Nagoya NetBSD BoF
+- 2023 May.20 Sat XX:00-XX:45 JST (UTC+9) 
+- [[https://event.ospn.jp/osc2023-online-nagoya/]]
+- [[https://event.ospn.jp/osc2023-online-nagoya/]] session URL:TBD
+- Youtube video [[https://www.youtube.com/c/OSPNjp]]
+- Tour Guide [[]]
+- togetter [[]]
+
+## Open Source Conference 2023 Nagoya NetBSD Booth
+- 2023 May.28 Sun 11:00-16:00 JST (UTC+9)
+- Nagoya Trade & Industry Center [[https://www.nipc.or.jp/fukiage/sub/visitor-access.html#around]]
+- with [[http://nagoya.bug.gr.jp/]]
+- [[https://event.ospn.jp/osc2023-nagoya/]]
+- Tour Guide [[]]
+- togetter [[]]
+
+## Open Source Conference 2023 Online/Hokkaido NetBSD BoF
+- 2023 Jun.17 Sat XX:00-XX:45 JST (UTC+9) 
+- [[https://event.ospn.jp/osc2023-online-do/]]
+- [[https://event.ospn.jp/osc2023-online-do/]] Session: TBD
+- Youtube video [[]]
+- Tour Guide [[]]
+- togetter [[]]
+
+## Open Source Conference 2023 Hokkaido NetBSD Booth
+- 2023 Jun.24 Sat 11:00-16:00 JST (UTC+9) 
+- Sapporo Business Innovation Center [[https://www.sapporosansin.jp/access/]]
+- with [[https://www.no.bug.gr.jp/]]
+- [[https://event.ospn.jp/osc2023-do/]]
+- Tour Guide [[]]
+- togetter [[]]
+
+
+# Past Events in 2023
+
 ## Open Source Conference 2023 Tokyo/Spring NetBSD Booth
 - 2023 Apr.1 Sat 10:00-16:00 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-spring/]]
-- Tour Guide [[]]
-- togetter [[]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023tokyospring.pdf]]
+- togetter [[https://togetter.com/li/2112458]]
 
 ## AsiaBSDCon2023
 - 2023 Mar.30 to Apr.2 
 - Tokyo University of Science, Tokyo, Japan
-- CallForPapers: [[https://2023.asiabsdcon.org/cfp.html.en]]
 - Sponsorship Application Guidelines: [[https://2023.asiabsdcon.org/sponsorship.pdf]] 
-- making plans for NetBSD Booth.
-
-# Past Events in 2023
+- NetBSD Booth.
+- togetter [[https://togetter.com/li/2112458]]
 
 ## Open Source Conference 2023 Online/Spring NetBSD BoF
 - 2023 Mar.11 Sat 15:00-15:45 JST (UTC+9) 

Index: wikisrc/projects/project/clang-format.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/clang-format.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/clang-format.mdwn	1 Mar 2022 10:38:49 -0000	1.2
+++ wikisrc/projects/project/clang-format.mdwn	15 Mar 2023 10:28:21 -0000	1.3
@@ -6,9 +6,6 @@
 [tech-toolchain](mailto:tech-toolchain@NetBSD.org)
 """
 
-mentors="""
-[Kamil Rytarowski](mailto:kamil@NetBSD.org)
-"""
 
 category="analyzers"
 difficulty="medium"

Members: 
	summits/AsiaBSDCon_2020_NetBSD_BoF.mdwn:1.5->1.6 
	summits/eurobsdcon_2017.mdwn:1.27->1.28 
	summits/eurobsdcon_2018.mdwn:1.14->1.15 
	users/schmonz/pkgsrccon2014.mdwn:1.16->1.17 
	users/wiz/authorslist.mdwn:1.152->1.153 

Index: wikisrc/summits/AsiaBSDCon_2020_NetBSD_BoF.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/AsiaBSDCon_2020_NetBSD_BoF.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/summits/AsiaBSDCon_2020_NetBSD_BoF.mdwn	2 Mar 2020 05:07:45 -0000	1.5
+++ wikisrc/summits/AsiaBSDCon_2020_NetBSD_BoF.mdwn	14 Mar 2023 23:00:55 -0000	1.6
@@ -48,7 +48,6 @@
 First Last | `login@` | join dinner? | comment(s)
 Name Surname | `login@` | join |
 Jun Ebihara | `jun@` | join |
-Sevan Janiyan | `sevan@` | join |
 Ryo ONODERA | `ryoon@` | join |
 """]]
 
@@ -58,7 +57,7 @@
 Speaker  |Title
 `login@` |_Very Interesting Thing_
 `jun@` | Raspberry Pi and pinebook status update  [AsiaBSDCon2020 NetBSD travellers guide](http://www.re.soum.co.jp/~jun/AsiaBSDCon2020.pdf)
-`sevan@` | Something about getting pkgsrc through the door at $CORP
+[anonymous] | Something about getting pkgsrc through the door at $CORP
 """]]
 
 ## Discussions
Index: wikisrc/summits/eurobsdcon_2017.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2017.mdwn,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wikisrc/summits/eurobsdcon_2017.mdwn	21 Sep 2017 13:34:57 -0000	1.27
+++ wikisrc/summits/eurobsdcon_2017.mdwn	14 Mar 2023 23:00:55 -0000	1.28
@@ -22,7 +22,6 @@
 Pierre Pronchery | `khorben@` | 
 Valery Ushakov | `uwe@` |
 Martin Husemann | `martin@` |
-Sevan Janiyan | `sevan@` |
 Benny Siegert | `bsiegert@` |
 Bernd Ernesti | `veego@` |
  | |
Index: wikisrc/summits/eurobsdcon_2018.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2018.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/summits/eurobsdcon_2018.mdwn	20 Sep 2018 13:01:30 -0000	1.14
+++ wikisrc/summits/eurobsdcon_2018.mdwn	14 Mar 2023 23:00:55 -0000	1.15
@@ -16,7 +16,6 @@
 Jörg Sonnenberger | `joerg@` |
 Pierre Pronchery | `khorben@` |
 Kamil Rytarowski | `kamil@` |
-Sevan Janiyan | `sevan@` |
 Yang Zheng | `@` |
 Siddharth Muralee | `@` |
 Stephen Borrill | `sborrill@` |
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	28 Jun 2014 19:55:39 -0000	1.16
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	14 Mar 2023 23:00:55 -0000	1.17
@@ -28,7 +28,6 @@
 * `justin`
 * `jaapb`
 * `alnsn`
-* Sevan
 * `bsiegert`
 * `mlelstv`
 * `tron`
@@ -113,7 +112,7 @@
 * syscall emulation
 * (I'm still prepping a talk)
 
-### Sevan Janiyan: Mac OS X `powerpc`
+### [anonymous]: Mac OS X `powerpc`
 
 * GCC>4.4 doesn't build with XCode
 * he's managed to get up to 4.7 now
@@ -158,7 +157,6 @@
 * `justin`
 * `jaapb`
 * `alnsn`
-* Sevan
 * `bsiegert` and wife and cute kid
 * `mlelstv`
 * `tron`
Index: wikisrc/users/wiz/authorslist.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/wiz/authorslist.mdwn,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- wikisrc/users/wiz/authorslist.mdwn	16 Sep 2015 23:24:35 -0000	1.152
+++ wikisrc/users/wiz/authorslist.mdwn	14 Mar 2023 23:00:55 -0000	1.153
@@ -417,7 +417,6 @@
 - unex_linija = Unex <unex_linija@users.sourceforge.net>
 - ura = URA Hiroshi <ura@users.sourceforge.net>
 - uwe = Valery Ushakov <uwe@NetBSD.org>
-- venture37 = Sevan Janiyan <venture37@geeklan.co.uk>
 - virtus = Douwe Kiela <virtus@users.sourceforge.net>
 - vstakhov = Vsevolod Stakhov <vstakhov@users.sourceforge.net>
 - wa1ter = walt <wa1ter@users.sourceforge.net>

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- wikisrc/users/jun.mdwn	6 Mar 2023 01:52:22 -0000	1.113
+++ wikisrc/users/jun.mdwn	14 Mar 2023 02:30:59 -0000	1.114
@@ -4,15 +4,6 @@
 
 # 2023
 
-## Open Source Conference 2023 Online/Spring NetBSD BoF
-- 2023 Mar.11 Sat 15:00-15:45 JST (UTC+9) 
-- [[https://event.ospn.jp/osc2023-online-spring/]]
-- [[https://event.ospn.jp/osc2023-online-spring/session/764152]]
-- Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
-- Join meeting with ZOOM via connpass [[https://ospn.connpass.com/event/267866/]]
-- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023tokyospring.pdf]]
-- togetter [[https://togetter.com/li/2094211]]
-
 ## Open Source Conference 2023 Tokyo/Spring NetBSD Booth
 - 2023 Apr.1 Sat 10:00-16:00 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-spring/]]
@@ -28,6 +19,14 @@
 
 # Past Events in 2023
 
+## Open Source Conference 2023 Online/Spring NetBSD BoF
+- 2023 Mar.11 Sat 15:00-15:45 JST (UTC+9) 
+- [[https://event.ospn.jp/osc2023-online-spring/]]
+- [[https://event.ospn.jp/osc2023-online-spring/session/764152]]
+- Youtube video archive [[https://youtu.be/WHZ8Tn9LiB4]] 
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023tokyospring.pdf]]
+- togetter [[https://togetter.com/li/2094211]]
+
 ## Open Source Conference 2023 Online/Osaka NetBSD BoF
 - 2023 Jan.28 Sat 14:00-14:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-osaka/]]

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- wikisrc/users/jun.mdwn	13 Feb 2023 05:27:20 -0000	1.112
+++ wikisrc/users/jun.mdwn	6 Mar 2023 01:52:22 -0000	1.113
@@ -10,8 +10,8 @@
 - [[https://event.ospn.jp/osc2023-online-spring/session/764152]]
 - Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 - Join meeting with ZOOM via connpass [[https://ospn.connpass.com/event/267866/]]
-- Tour Guide [[]]
-- togetter [[]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023tokyospring.pdf]]
+- togetter [[https://togetter.com/li/2094211]]
 
 ## Open Source Conference 2023 Tokyo/Spring NetBSD Booth
 - 2023 Apr.1 Sat 10:00-16:00 JST (UTC+9) 

Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	4 Jan 2015 04:10:11 -0000	1.11
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Feb 2023 21:03:38 -0000	1.12
@@ -1,9 +1,5 @@
 [[!meta title="pkgsrc on Mac OS X 10.4 (Tiger) powerpc"]]
 
-[Sevan Janiyan](https://www.twitter.com/sevanjaniyan) and others are finding and fixing pkgsrc problems on
-Darwin/powerpc 8.11 (Mac OS X 10.4, a.k.a. "Tiger"), then [building
-binary packages](https://www.geeklan.co.uk/?p=1579).
-
 ## Nice to have
 Not specific to tiger, but better integration with OS X as a whole
 

Index: wikisrc/pkgsrc/macos_porting_notes.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macos_porting_notes.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/pkgsrc/macos_porting_notes.mdwn	8 Apr 2022 01:07:45 -0000	1.2
+++ wikisrc/pkgsrc/macos_porting_notes.mdwn	17 Feb 2023 20:34:08 -0000	1.3
@@ -201,14 +201,5 @@
 version.  Targeting older versions makes a build run on more systems,
 and targeting newer versions makes the build closer to what would be
 obtained from bootstrapping on a newer version and thus avoids some
-issues.   This section has pointers to active bulk builds.
+issues.
 
-## 10.4, --abi=32 powerpc, gcc
-
-Sevan Janiyan <Sevan@NetBSD.org> provides a bulk build for the -current branch
-(--abi=32, OS X 10.4/PowerPC, gcc 4.0.1 from Xcode 2.5, X11_TYPE=modular):
-
-- <https://www.geeklan.co.uk/?p=1579>
-- US repo: <http://sevan.mit.edu/packages>
-- Euro mirror: <http://pkgsrc.geeklan.co.uk/packages/current/Darwin-8>
-- See <https://mail-index.netbsd.org/pkgsrc-bulk/2015/11/07/msg012171.html>

Index: wikisrc/projects/gsoc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/gsoc.mdwn,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wikisrc/projects/gsoc.mdwn	12 Mar 2022 18:34:29 -0000	1.27
+++ wikisrc/projects/gsoc.mdwn	16 Feb 2023 10:22:02 -0000	1.28
@@ -16,7 +16,8 @@
 2018,
 2019,
 [2020](https://blog.netbsd.org/tnf/entry/google_summer_of_code_2020),
-2021
+2021,
+2022
 )
 
 This page contains a list of concrete suggestions for projects we would

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- wikisrc/users/jun.mdwn	1 Feb 2023 05:51:04 -0000	1.111
+++ wikisrc/users/jun.mdwn	13 Feb 2023 05:27:20 -0000	1.112
@@ -5,7 +5,7 @@
 # 2023
 
 ## Open Source Conference 2023 Online/Spring NetBSD BoF
-- 2023 Mar.11 Sat XX:00-XX:45 JST (UTC+9) 
+- 2023 Mar.11 Sat 15:00-15:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-spring/]]
 - [[https://event.ospn.jp/osc2023-online-spring/session/764152]]
 - Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- wikisrc/users/jun.mdwn	27 Jan 2023 02:04:17 -0000	1.110
+++ wikisrc/users/jun.mdwn	1 Feb 2023 05:51:04 -0000	1.111
@@ -3,21 +3,13 @@
 [[jun/2020]]-[[jun/2021]]-[[jun/2022]]
 
 # 2023
-## Open Source Conference 2023 Online/Osaka NetBSD BoF
-- 2023 Jan.28 Sat 14:00-14:45 JST (UTC+9) 
-- [[https://event.ospn.jp/osc2023-online-osaka/]]
-- [[https://event.ospn.jp/osc2023-online-osaka/session/737009]]
-- Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
-- Join meeting with ZOOM via connpass [[https://ospn.connpass.com/event/264321/]]
-- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023osaka.pdf]]
-- togetter [[https://togetter.com/li/2060234]]
 
 ## Open Source Conference 2023 Online/Spring NetBSD BoF
 - 2023 Mar.11 Sat XX:00-XX:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-spring/]]
 - [[https://event.ospn.jp/osc2023-online-spring/session/764152]]
 - Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
-- Join meeting with ZOOM via connpass [[]]
+- Join meeting with ZOOM via connpass [[https://ospn.connpass.com/event/267866/]]
 - Tour Guide [[]]
 - togetter [[]]
 
@@ -36,6 +28,14 @@
 
 # Past Events in 2023
 
+## Open Source Conference 2023 Online/Osaka NetBSD BoF
+- 2023 Jan.28 Sat 14:00-14:45 JST (UTC+9) 
+- [[https://event.ospn.jp/osc2023-online-osaka/]]
+- [[https://event.ospn.jp/osc2023-online-osaka/session/737009]]
+- Youtube video archive [[https://youtu.be/5VRQ97MyWUA]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023osaka.pdf]]
+- togetter [[https://togetter.com/li/2060234]]
+
 # Current my job mission
 - SOUM Corporation [[http://www.soum.co.jp]],TOKYO
 - Support Open Science Framework in Japan

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- wikisrc/releng/netbsd-10.mdwn	11 Jan 2023 16:41:07 -0000	1.84
+++ wikisrc/releng/netbsd-10.mdwn	31 Jan 2023 11:13:05 -0000	1.85
@@ -29,6 +29,7 @@
 * [[!template id=pr number=57142]]: firefox-107.0.1 crashes on startup sometimes crashing 10.0_BETA along with it
 * [[!template id=pr number=57143]]: Screen rotation causes loss of acceleration on i915
 * [[!template id=pr number=57182]]: nouveau doesn't switches LVDS on
+* [[!template id=pr number=57207]]: Unable to get display from a NetBSD system through a DP 1.4 KVM switch
 
 ## Regressions since netbsd-9
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- wikisrc/users/jun.mdwn	10 Jan 2023 01:29:17 -0000	1.109
+++ wikisrc/users/jun.mdwn	27 Jan 2023 02:04:17 -0000	1.110
@@ -9,8 +9,8 @@
 - [[https://event.ospn.jp/osc2023-online-osaka/session/737009]]
 - Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 - Join meeting with ZOOM via connpass [[https://ospn.connpass.com/event/264321/]]
-- Tour Guide [[]]
-- togetter [[]]
+- Tour Guide [[https://cdn.netbsd.org/pub/NetBSD/misc/jun/OSC/OSC2023osaka.pdf]]
+- togetter [[https://togetter.com/li/2060234]]
 
 ## Open Source Conference 2023 Online/Spring NetBSD BoF
 - 2023 Mar.11 Sat XX:00-XX:45 JST (UTC+9) 

Index: wikisrc/donations.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/donations.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/donations.mdwn	18 Jan 2023 20:49:44 -0000	1.4
+++ wikisrc/donations.mdwn	18 Jan 2023 21:02:24 -0000	1.5
@@ -7,11 +7,18 @@
 hardware when appropriate, especially when it can help improve hardware support
 for NetBSD!
 
+Direct financial contributions to the NetBSD Foundation can be made at
+<https://netbsd.org/donations/>. The NetBSD Foundation's policy can be found at
+<https://netbsd.org/foundation/policies/20030715-donations.txt>.
+
+This information was previously gathered at
+<https://www.netbsd.org/contrib/hardware.html>.
+
 ## Donation requests
 
 ## Donation offers
 
 Equipment | Location | Shipping | Contact
 ----------|----------|----------|--------
-Mac PowerPC G5 | London, UK | Can be delivered within the UK; possibly to continental Europe | Chris Pinnock <cjep@n.o>
+Mac PowerPC G5 | London, UK | Can be delivered within the UK; possibly to continental Europe | Chris Pinnock (<cjep@n.o>)
 

Index: wikisrc/donations.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/donations.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/donations.mdwn	18 Jan 2023 20:47:19 -0000	1.3
+++ wikisrc/donations.mdwn	18 Jan 2023 20:49:44 -0000	1.4
@@ -13,5 +13,5 @@
 
 Equipment | Location | Shipping | Contact
 ----------|----------|----------|--------
-Mac PowerPC G5 | London, UK | Can be delivered within the UK; possibly to continental Europe | Chris Pinnock <cjep@>
+Mac PowerPC G5 | London, UK | Can be delivered within the UK; possibly to continental Europe | Chris Pinnock <cjep@n.o>
 

Index: wikisrc/donations.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/donations.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/donations.mdwn	18 Jan 2023 20:45:47 -0000	1.2
+++ wikisrc/donations.mdwn	18 Jan 2023 20:47:19 -0000	1.3
@@ -11,7 +11,6 @@
 
 ## Donation offers
 
---------
 Equipment | Location | Shipping | Contact
 ----------|----------|----------|--------
 Mac PowerPC G5 | London, UK | Can be delivered within the UK; possibly to continental Europe | Chris Pinnock <cjep@>

Index: wikisrc/donations.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/donations.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/donations.mdwn	18 Jan 2023 19:18:37 -0000	1.1
+++ wikisrc/donations.mdwn	18 Jan 2023 20:45:47 -0000	1.2
@@ -11,3 +11,8 @@
 
 ## Donation offers
 
+--------
+Equipment | Location | Shipping | Contact
+----------|----------|----------|--------
+Mac PowerPC G5 | London, UK | Can be delivered within the UK; possibly to continental Europe | Chris Pinnock <cjep@>
+

Index: wikisrc/projects/project/pkgsrc-pbulk-web.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/pkgsrc-pbulk-web.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/pkgsrc-pbulk-web.mdwn	18 Jan 2023 20:32:24 -0000	1.1
+++ wikisrc/projects/project/pkgsrc-pbulk-web.mdwn	18 Jan 2023 20:35:30 -0000	1.2
@@ -46,6 +46,10 @@
 review of the reports, resulting in an rsync from a local staging
 directory to ftp.netbsd.org.
 - It should be usable "over a morning coffee".
+- For bonus points, it should be easily installable from pkgsrc,
+  ideally with an RC script.
+- For bonus points, integrate well with the NetBSD base system
+tools (e.g. bozohttpd).
 """
 ]]
 [[!tag gsoc350h]]

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/projects/project/pkgsrc-pbulk-web.mdwn	2023-05-31 15:33:14.010503954 +0000
@@ -0,0 +1,51 @@
+[[!template id=project
+
+title="Web interface for pbulk"
+
+contact="""
+[tech-pkg](mailto:tech-pkg@NetBSD.org)
+"""
+
+category="pkgsrc"
+difficulty="medium"
+
+description="""
+To create large sets of binary packages, pkgsrc uses the pbulk tool.
+
+pbulk is designed to build packages in bulk in a chroot sandbox (which
+may be based on an older NetBSD release, a 32-bit release on a 64-bit
+machine, or similar).
+
+However, managing multiple pbulk installations on a single machine
+can quickly become unwieldy.
+
+It would be nice to have a web frontend for managing pbulk, restarting
+builds, creating new build sandboxes based on different NetBSD versions
+and package sets, etc.
+
+For an example of a typical high-performance pbulk setup used
+on "large" hardware, see
+[Nia's pbulk scripts](https://github.com/alarixnia/bulkbuild-scripts).
+Notably, these include chroot management and can be used to build
+packages for multiple NetBSD (and pkgsrc) versions simultaneously 
+by using different "base directories".
+
+- A management tool should support parallel pbulk across many chroots,
+but should also easily allow simultaneous builds for different NetBSD
+versions on the same machine.
+- It should be possible to schedule builds for later, somewhat
+like Jenkins.
+- There should be some kind of access management system.
+- pbulk creates status directories, it would be useful to present as
+much data from them as possible, as well as information on system
+resource usage (e.g. to find any stuck processes and monitor
+hardware health).
+- It should be possible for users to "kick" the builds (to quickly
+restart them, kill "stuck" processes, and so on).
+- It should be possible to schedule builds for upload after manual
+review of the reports, resulting in an rsync from a local staging
+directory to ftp.netbsd.org.
+- It should be usable "over a morning coffee".
+"""
+]]
+[[!tag gsoc350h]]

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/donations.mdwn	2023-05-31 15:33:14.344411592 +0000
@@ -0,0 +1,13 @@
+[[!meta title="Donations"]]
+
+# Donations
+
+This page is meant to gather offers and requests for hardware donations to the
+project. Developers are encouraged to avoid electronic waste and exchange
+hardware when appropriate, especially when it can help improve hardware support
+for NetBSD!
+
+## Donation requests
+
+## Donation offers
+
Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- wikisrc/index.mdwn	6 Apr 2022 14:54:16 -0000	1.69
+++ wikisrc/index.mdwn	18 Jan 2023 19:18:37 -0000	1.70
@@ -27,3 +27,4 @@
 * [[Laptops|laptops]] -- Information about laptop hardware support
 * [[Ports]] -- NetBSD on your hardware
 * [[Languages]] -- Programming languages on your NetBSD
+* [[Donations|donations]] -- Hardware offered and requested by developers

Index: wikisrc/projects/project/Add_UEFI_boot_options.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/Add_UEFI_boot_options.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/Add_UEFI_boot_options.mdwn	12 Jan 2023 15:41:17 -0000	1.2
+++ wikisrc/projects/project/Add_UEFI_boot_options.mdwn	12 Jan 2023 15:42:55 -0000	1.3
@@ -6,7 +6,7 @@
 [tech-install](mailto:tech-install@NetBSD.org)
 """
 
-category="ueserland"
+category="userland"
 difficulty="medium"
 
 description="""

Index: wikisrc/projects/project/Add_UEFI_boot_options.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/Add_UEFI_boot_options.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/Add_UEFI_boot_options.mdwn	12 Jan 2023 15:36:32 -0000	1.1
+++ wikisrc/projects/project/Add_UEFI_boot_options.mdwn	12 Jan 2023 15:41:17 -0000	1.2
@@ -6,7 +6,7 @@
 [tech-install](mailto:tech-install@NetBSD.org)
 """
 
-category="installation"
+category="ueserland"
 difficulty="medium"
 
 description="""
@@ -27,7 +27,7 @@
 sub directory on the ESP for the NetBSD bootloader and the variables setup
 might happen elsewhere.
 
-Currently the kernel interface to acces the SetVariable() and other EFI runtime
+Currently the kernel interface to access the SetVariable() and other EFI runtime
 callbacks exists, but there is no userland tool to operate it.
 
 It is not clear what the EFI path set in the variable should be, and mapping

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/projects/project/Add_UEFI_boot_options.mdwn	2023-05-31 15:33:15.427841950 +0000
@@ -0,0 +1,40 @@
+[[!template id=project
+
+title="Add UEFI boot options"
+
+contact="""
+[tech-install](mailto:tech-install@NetBSD.org)
+"""
+
+category="installation"
+difficulty="medium"
+
+description="""
+Currently NetBSD can be booted via UEFI firmware, but only offers the
+default boot loader setup so multi-boot environments are hard to
+create. This also causes cryptic displays in the firmware boot order
+menu or boot select menu, like "UEFI OS", instead of "NetBSD 10.0".
+
+The UEFI spec offers support to configure load options, which include
+a path to the bootloader and a description of the operating system, see
+[the UEFI spec](https://uefi.org/specs/UEFI/2.10/03_Boot_Manager.html).
+This project is to implement setting up proper load option variables
+at least on x86 machines booting via UEFI.
+
+Part of the project is to find the best place to set this options up.
+Some integrations with sysinst might be needed, maybe sysinst is the right place
+to set this variables. If not, sysinst may simply be changed to use a different
+sub directory on the ESP for the NetBSD bootloader and the variables setup
+might happen elsewhere.
+
+Currently the kernel interface to acces the SetVariable() and other EFI runtime
+callbacks exists, but there is no userland tool to operate it.
+
+It is not clear what the EFI path set in the variable should be, and mapping
+NetBSD disks/partitions to EFI path notation is not trivial.
+"""
+]]
+
+[[!tag gsoc]]
+[[!tag gsoc350h]]
+

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- wikisrc/releng/netbsd-10.mdwn	5 Jan 2023 10:49:22 -0000	1.83
+++ wikisrc/releng/netbsd-10.mdwn	11 Jan 2023 16:41:07 -0000	1.84
@@ -28,6 +28,7 @@
 * [[!template id=pr number=57059]]: amdgpu graphics ring test failing
 * [[!template id=pr number=57142]]: firefox-107.0.1 crashes on startup sometimes crashing 10.0_BETA along with it
 * [[!template id=pr number=57143]]: Screen rotation causes loss of acceleration on i915
+* [[!template id=pr number=57182]]: nouveau doesn't switches LVDS on
 
 ## Regressions since netbsd-9
 

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- wikisrc/users/jun.mdwn	10 Jan 2023 01:17:41 -0000	1.108
+++ wikisrc/users/jun.mdwn	10 Jan 2023 01:29:17 -0000	1.109
@@ -15,12 +15,18 @@
 ## Open Source Conference 2023 Online/Spring NetBSD BoF
 - 2023 Mar.11 Sat XX:00-XX:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-spring/]]
-- [[https://event.ospn.jp/osc2023-online-spring/session/76415]]
+- [[https://event.ospn.jp/osc2023-online-spring/session/764152]]
 - Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 - Join meeting with ZOOM via connpass [[]]
 - Tour Guide [[]]
 - togetter [[]]
 
+## Open Source Conference 2023 Tokyo/Spring NetBSD Booth
+- 2023 Apr.1 Sat 10:00-16:00 JST (UTC+9) 
+- [[https://event.ospn.jp/osc2023-spring/]]
+- Tour Guide [[]]
+- togetter [[]]
+
 ## AsiaBSDCon2023
 - 2023 Mar.30 to Apr.2 
 - Tokyo University of Science, Tokyo, Japan

Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- wikisrc/users/jun.mdwn	25 Dec 2022 23:52:21 -0000	1.107
+++ wikisrc/users/jun.mdwn	10 Jan 2023 01:17:41 -0000	1.108
@@ -15,7 +15,7 @@
 ## Open Source Conference 2023 Online/Spring NetBSD BoF
 - 2023 Mar.11 Sat XX:00-XX:45 JST (UTC+9) 
 - [[https://event.ospn.jp/osc2023-online-spring/]]
-- [[]]
+- [[https://event.ospn.jp/osc2023-online-spring/session/76415]]
 - Join meeting with YoutubeLive [[https://www.youtube.com/c/OSPNjp]] 
 - Join meeting with ZOOM via connpass [[]]
 - Tour Guide [[]]

Index: wikisrc/projects/project/download-isolation.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/download-isolation.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/download-isolation.mdwn	9 Jan 2023 00:08:54 -0000	1.2
+++ wikisrc/projects/project/download-isolation.mdwn	9 Jan 2023 03:02:48 -0000	1.3
@@ -28,70 +28,115 @@
 more opaque. Consequently, we would like a way to automatically detect
 violations of the rules.
 
-The goal of this project is to set up infrastructure such that bulk
-builds can run without network access during the build phase. (Or,
-more specifically, in pkgsrc terms, everything other than the fetch
-phase.) Then attempts to download things on the fly will fail.
-
-There are two possible approaches to this issue, which are largely
-independent; they even might be considered separate projects. One is
-to make use, in the pkgsrc infrastructure, of system-level security
-frameworks where available: discard the ability to access the network
-when entering the package build environment. This is relatively
-straightforward, but somewhat invasive, OS-specific, and may require a
-compiled support package and thus incur bootstrapping complications.
-Also, frameworks giving adequate granularity of control, or that are
-ready for production use, are not available on most of pkgsrc's
-supported operating systems.
-
-Therefore, the other approach, which is the main thrust of this
-project page, is to introduce changes to pbulk so that system-wide
-steps can be taken to deny network access. Since bulk builds are
-generally done on dedicated systems (whether real or virtual) this is
-sufficient to accomplish the desired goals.
-
 Currently, pbulk runs in two steps: first it scans the tree to find
 out what it needs to build, and once this is done it starts building.
 Builds progress in the usual pkgsrc way: the fetch phase comes first
 and downloads anything needed, then the rest of the build continues.
+This interleaves (expected) downloads and build operations, which on
+the one hand tends to give the best build throughput but on the other
+makes it difficult to apply network access restrictions.
+
+The goal of this project is to set up infrastructure such that bulk
+builds can run without network access during the build phase. (Or,
+more specifically, in pkgsrc terms, everything other than the fetch
+phase.) Then attempts to download things on the fly will fail.
 
-There are also several possible ways one could change this.
+There are two ways to accomplish this and we will probably want both
+of them. One is to add a separate fetch step to pbulk, so it and the
+build step can run with different global network configuration. The
+other is to provide mechanisms so that expected downloads can proceed
+and unwanted ones cannot.
+
+### Separate fetch step
+
+Since bulk builds are generally done on dedicated or mostly-dedicated
+systems (whether real or virtual) system-wide changes to the network
+configuration to prevent downloads during the build step will be in
+most setups acceptable, and also sufficient to accomplish the desired
+goals.
+
+There are also two possible ways to implement a separate fetch step:
+as part of pbulk's own operational flow or as a separate external
+invocation of the pbulk components. The advantage of the former is
+that it requires less operator intervention, while the advantage of
+the latter is that it doesn't require teaching pbulk to manipulate the
+network state on its own. (In general it would need to turn external
+access off before the build step, and then restore it after in order
+to be able to upload the build results.) Since there are many possible
+ways one might manipulate the network state and the details vary
+between operating systems, and in some cases the operations might
+require privileges the pbulk process doesn't have, making pbulk do it
+adds considerable complication; on the other hand, setting up pbulk is
+already notoriously complicated and requiring additional user-written
+scripts to manipulate partial build states and adjust the network is a
+significant drawback.
+
+Another consideration is that to avoid garbaging the failure reports,
+any download failures need to be recorded with pbulk during the
+download step, and the packages affeected marked as failed, so that
+those failures end up in the output results. Otherwise the build step
+will retry the fetch in an environment without a network, and that
+will then fail but nobody will be able to see why. For this reason it
+isn't sufficient to just, for example, run "make -k fetch" from the
+top level of pkgsrc before building.
+
+Also note that rather than just iterating the package list and running
+"make fetch" from inside pbulk, it might be desirable to use "make
+fetch-list" or similar and then combine the results and feed them to a
+separate download tool. The simple approach can't readily adapt to
+available network bandwidth: depending on the build host's effective
+bandwidth from various download sites it might either flood the
+network or be horrendously slow, and no single fixed parallelism
+setting can avoid this. Trying to teach pbulk itself to do download
+load balancing is clearly the wrong idea. However, this is
+considerably more involved, if only because integrating failure
+results into the pbulk state is considerably more complicated.
+
+### Blocking unauthorized downloads
+
+The other approach is to arrange things so that unwanted downloads
+will fail. There are a number of possible ways to arrange this on the
+basic assumption that the system has no network access to the outside
+world by default. (For example, it might have no default route, or it
+might have a firewall config that blocks outgoing connections.) Then
+some additional mechanism is introduced into the pkgsrc fetch stage so
+that authorized downloads can proceed. One mechanism is to set up a
+local HTTP proxy and only make the proxy config available to the fetch
+stage. Another, possibly preferable if the build is happening on a
+cluster of VMs or chroots, is to ssh to another local machine to
+download there; that allows mounting the distfiles directory read-only
+on the build hosts. There are probably others. Part of the goal of
+this project should be to select one or a small number of reasonable
+mechanisms and provide the necessary support in pbulk so each can be
+enabled in a relatively turn-key fashion. We want it to be easy to
+configure this restriction and ideally in the long term we'd like it
+to be able to default to "on".
+
+Note that it will almost certainly be necessary to strengthen the
+pkgsrc infrastructure to support this. For example, conditionally
+passing around HTTP proxy config depending on the pkgsrc phase will
+require changes to pkgsrc itself. Also, while one can redirect fetch
+to a different tool via the FETCH_USING variable, as things stand this
+runs the risk of breaking packages that need to set it itself. There
+was at one point some talk about improving this but it apparently
+never went anywhere.
+
+An additional possibility along these lines is to leverage OS-specific
+security frameworks to prohibit unwanted downloading. This has the
+advantage of not needing to disable the network in general, so it can
+be engaged even for ordinary builds and on non-dedicated hosts.
+However, because security frameworks and their state of useability
+vary, it isn't a general solution. In particular on NetBSD at the
+moment we do not have anything that can do this. (It might be possible
+to ues kauth for it, but if so the necessary policy modules do not
+currently exist.) Consequently this option is in some ways a separate
+project. Note if attempting it that simplistic solutions (e.g.
+blocking all attempts to create sockets) will probably not work
+adequately.
 
-Suggestion 1: Introduce an additional step to pbulk so that, if
-desired, it does all fetches together, after scanning but before
-building. (Or possibly before scanning.) Then it would take whatever
-steps are desired to shut off external network access until the build
-finishes. This mostly requires just iterating the package list and
-running "make fetch", though there will be work involved in
-integrating results into the failure reporting. Note however that some
-more sophisticated approach using "make fetch-list" and a separate
-download tool might be more effective. The simple approach can't
-readily adapt to available network bandwidth and adding that
-functionality to pbulk would be a significant mistake. Also, this
-approach either requires the user to run the download step separately
-or requires giving pbulk the ability to turn the network on and off
-itself. There are a lot of possible ways to manipulate the network,
-some of which may require more privilege than pbulk has in any given
-setup, so it needs to be configurable and devising a suitable
-configuration scheme will not be trivial.
-
-Suggestion 2: Introduce configuration for a way to do (approved)
-fetches indirectly; that is, for example, instead of running wget
-locally one might ssh to another machine in the same VM cluster to run
-wget. (Then only that machine needs access to the network outside the
-cluster at all.) In addition to configuration for pbulk, this might
-require strengthening the pkgsrc infrastructure; one can set
-FETCH_USING but this may break on packages that need to set it
-themselves. (There was some discussion some years ago about improving
-this but it apparently never went anywhere.) The downside of this
-approach is that it adds more moving parts to the user's pbulk setup.
-
-It is probable that we'll actually want both of these suggestions,
-because which one is superior depends on the circumstances.
-Interspersing downloads with builds will almost always provide better
-build throughput, but will inevitably require more setup.
+### Other considerations
 
-Also note when considering this project:
+Note when considering this project:
 
 - Working on pbulk at all is not entirely trivial.
 - It's necessary to coordinate with Joerg and other stakeholders so

Index: wikisrc/projects/project/download-isolation.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/download-isolation.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/download-isolation.mdwn	8 Jan 2023 23:49:27 -0000	1.1
+++ wikisrc/projects/project/download-isolation.mdwn	9 Jan 2023 00:08:54 -0000	1.2
@@ -92,6 +92,7 @@
 build throughput, but will inevitably require more setup.
 
 Also note when considering this project:
+
 - Working on pbulk at all is not entirely trivial.
 - It's necessary to coordinate with Joerg and other stakeholders so
 that the changes can eventually be merged.

Members: 
	projects/project/download-isolation.mdwn:INITIAL->1.1 

--- /dev/null	2023-05-31 15:32:00.271659344 +0000
+++ wikisrc/projects/project/download-isolation.mdwn	2023-05-31 15:33:17.508540373 +0000
@@ -0,0 +1,110 @@
+[[!template id=project
+
+title="Bulk builds with download isolation"
+
+contact="""
+[tech-pkg](mailto:tech-pkg@NetBSD.org)
+"""
+
+mentors="unknown"
+
+category="pkgsrc"
+difficulty="medium"
+duration="unknown"
+
+description="""
+In recent years, packages whose builds download things on the fly have
+become an increasing problem. Such downloads violate both pkgsrc
+principles/rules and standard best practices: at best, they bypass
+integrity checks on the downloaded material, and at worst they may
+check out arbitrary recent changes from GitHub or other hosting sites,
+which in addition to being a supply-chain security risk also makes
+reliable repeatable builds impossible.
+
+It has simultaneously grown more difficult to find and work around
+these issues by hand; these techniques have been growing increasingly
+popular among those who should perhaps know better, and meanwhile
+upstream build automation has been steadily growing more elaborate and
+more opaque. Consequently, we would like a way to automatically detect
+violations of the rules.
+
+The goal of this project is to set up infrastructure such that bulk
+builds can run without network access during the build phase. (Or,
+more specifically, in pkgsrc terms, everything other than the fetch
+phase.) Then attempts to download things on the fly will fail.
+
+There are two possible approaches to this issue, which are largely
+independent; they even might be considered separate projects. One is
+to make use, in the pkgsrc infrastructure, of system-level security
+frameworks where available: discard the ability to access the network
+when entering the package build environment. This is relatively
+straightforward, but somewhat invasive, OS-specific, and may require a
+compiled support package and thus incur bootstrapping complications.
+Also, frameworks giving adequate granularity of control, or that are
+ready for production use, are not available on most of pkgsrc's
+supported operating systems.
+
+Therefore, the other approach, which is the main thrust of this
+project page, is to introduce changes to pbulk so that system-wide
+steps can be taken to deny network access. Since bulk builds are
+generally done on dedicated systems (whether real or virtual) this is
+sufficient to accomplish the desired goals.
+
+Currently, pbulk runs in two steps: first it scans the tree to find
+out what it needs to build, and once this is done it starts building.
+Builds progress in the usual pkgsrc way: the fetch phase comes first
+and downloads anything needed, then the rest of the build continues.
+
+There are also several possible ways one could change this.
+
+Suggestion 1: Introduce an additional step to pbulk so that, if
+desired, it does all fetches together, after scanning but before
+building. (Or possibly before scanning.) Then it would take whatever
+steps are desired to shut off external network access until the build
+finishes. This mostly requires just iterating the package list and
+running "make fetch", though there will be work involved in
+integrating results into the failure reporting. Note however that some
+more sophisticated approach using "make fetch-list" and a separate
+download tool might be more effective. The simple approach can't
+readily adapt to available network bandwidth and adding that
+functionality to pbulk would be a significant mistake. Also, this
+approach either requires the user to run the download step separately
+or requires giving pbulk the ability to turn the network on and off
+itself. There are a lot of possible ways to manipulate the network,
+some of which may require more privilege than pbulk has in any given
+setup, so it needs to be configurable and devising a suitable
+configuration scheme will not be trivial.
+
+Suggestion 2: Introduce configuration for a way to do (approved)
+fetches indirectly; that is, for example, instead of running wget
+locally one might ssh to another machine in the same VM cluster to run
+wget. (Then only that machine needs access to the network outside the
+cluster at all.) In addition to configuration for pbulk, this might
+require strengthening the pkgsrc infrastructure; one can set
+FETCH_USING but this may break on packages that need to set it
+themselves. (There was some discussion some years ago about improving
+this but it apparently never went anywhere.) The downside of this
+approach is that it adds more moving parts to the user's pbulk setup.
+
+It is probable that we'll actually want both of these suggestions,
+because which one is superior depends on the circumstances.
+Interspersing downloads with builds will almost always provide better
+build throughput, but will inevitably require more setup.
+
+Also note when considering this project:
+- Working on pbulk at all is not entirely trivial.
+- It's necessary to coordinate with Joerg and other stakeholders so
+that the changes can eventually be merged.
+- Any scheme will probably break at least a few innocent packages that
+will then probably need somebody to patch them.
+
+Overall, one does hope that any package that attempts to download
+things and finds it can't will then fail rather than silently doing
+something different that we might or might not be able to detect. It
+is possible in the long run that we'll want to use a security
+framework that can log download attempts and provide an audit trail;
+however, first steps first.
+"""
+]]
+
+

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- wikisrc/releng/netbsd-10.mdwn	4 Jan 2023 17:21:57 -0000	1.82
+++ wikisrc/releng/netbsd-10.mdwn	5 Jan 2023 10:49:22 -0000	1.83
@@ -12,7 +12,7 @@
 *  ~~autoconfig API changes need to be backed out or made type-safe see this [backout request](https://mail-index.netbsd.org/tech-kern/2021/05/11/msg027374.html)~~
 * [[!template id=pr number=56653]]: kernel crash in ipv6 fragment reassembly
 * ~~[[!template id=pr number=56713]]: kqueue/kevent does not work with null mounts~~
-* [[!template id=pr number=55707]]: xcalls storm or pgdaemon high CPU consumption
+* ~~[[!template id=pr number=55707]]: xcalls storm or pgdaemon high CPU consumption~~
 * [[!template id=pr number=57127]]: ptyfs fails
 
 ## Open issues with new DRM/KMS

Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- wikisrc/releng/netbsd-10.mdwn	4 Jan 2023 17:01:44 -0000	1.81
+++ wikisrc/releng/netbsd-10.mdwn	4 Jan 2023 17:21:57 -0000	1.82
@@ -103,11 +103,10 @@
 
 ## Current status and timeline
 
-* top 6 architectures below 10 failures, one at 0 - good enough to branch!
-* we are ready to branch!
-* branch is planned for december 14, 2022
+* branch has been created, no fixed date for release yet
+* pullups are being processed, autobuilds are running (including arm images)
 
-## Last Test Results overview
+## Last netbsd-10 Test Results overview
 For all tests, see [releng's tests page](//releng.netbsd.org/test-results.html).
 
 <table>
@@ -116,44 +115,16 @@
   </thead>
   <tbody>
     <tr>
-        <td><a href="//www.NetBSD.org/~martin/aarch64-atf/">evbarm64el-aarch64</a>, real hardware</td>
-        <td>2022-12-07</td><td>0</td><td> </td>
+        <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/netbsd-10/">xen</a></td>
+        <td>2022-12-31</td> <td>2</td><td></td>
     </tr>
     <tr>
-        <td><a href="//releng.netbsd.org/b5reports/i386/">i386</a>, qemu, official b5 runs</td>
-        <td>2022-12-08</td> <td>2</td><td> </td>
+        <td><a href="//www.netbsd.org/~martin/sparc64-atf-netbsd10/">sparc64</a>, real hardware</td>
+        <td>2022-12-28</td><td>3</td><td> </td>
     </tr>
     <tr>
-        <td><a href="//www.NetBSD.org/~martin/sparc64-atf/">sparc64</a>, real hardware</td>
-        <td>2022-12-06</td> <td>5</td><td></td>
-    </tr>
-    <tr>
-        <td><a href="//releng.netbsd.org/b5reports/amd64/">amd64</a>, qemu, official b5 runs</td>
-        <td>2022-12-07</td> <td>5</td><td> </td>
-    </tr>
-    <tr>
-        <td><a href="//www.netbsd.org/~martin/macppc-atf/">macppc</a>, real hardware</td>
-        <td>2022-12-06</td> <td>6</td><td>PR <a href="//gnats.netbsd.org/55272">55272</a>, PR <a href="//gnats.netbsd.org/55338">55338</a></td>
-    </tr>
-    <tr>
-        <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/HEAD/">XEN</a>, i386 and amd64</td>
-        <td>2022-12-05</td><td>7</td><td></td>
-    </tr>
-    <tr>
-        <td><a href="//www.netbsd.org/~martin/evbearmv7hf-atf/">evbearmv7hfeb</a>, real hardware</td>
-        <td>2022-12-05</td> <td>15</td><td> </td>
-    </tr>
-    <tr>
-        <td><a href="//releng.netbsd.org/b5reports/sparc64/">sparc64</a>, qemu, low memory</td>
-        <td>2022-12-07</td><td>18</td><td> </td><td> </td>
-    </tr>
-    <tr>
-        <td><a href="//www.netbsd.org/~martin/landisk-atf/">landisk</a>, SH4, real hardware, low memory</td>
-        <td>2022-12-06</td><td>48</td><td></td>
-    </tr>
-    <tr>
-        <td><a href="//www.netbsd.org/~martin/evbarm-atf/">evbarmv5</a>, real hardware</td>
-        <td>2022-12-05</td><td>69</td><td>userland watchdog starvation<br/>PR <a href="//gnats.netbsd.org/55272">55272</a></td>
+        <td><a href="//www.netbsd.org/~martin/evbarm-atf-netbsd10/">evbarm</a>, real hardware</td>
+        <td>2022-12-29</td><td>64</td><td></td>
     </tr>
   </tbody>
 </table>

Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- wikisrc/releng.mdwn	4 Jan 2023 17:17:20 -0000	1.50
+++ wikisrc/releng.mdwn	4 Jan 2023 17:19:13 -0000	1.51
@@ -6,9 +6,9 @@
 
 ## Next Major Release
 
-The next major release will be NetBSD 10.0 (branch is planned to happen dec 14, 2022)
+The next major release will be NetBSD 10.0 (no date for release set)
 
-* [[Pre-release task list for the netbsd-10 branch|netbsd-10]]
+* [[Pre release task list for NetBSD 10.0|netbsd-10]]
 
 ## Active Major Releases