CVS commit: [netbsd-9] src/etc/mtree

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Apr 16 19:06:07 UTC 2024

Modified Files:
src/etc/mtree [netbsd-9]: special

Log Message:
Pull up following revision(s) (requested by kim in ticket #1824):
etc/mtree/special: revision 1.172
Add /etc/sshd/ssh_host_ed25519_key* .


To generate a diff of this commit:
cvs rdiff -u -r1.167.2.1 -r1.167.2.2 src/etc/mtree/special

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.167.2.1 src/etc/mtree/special:1.167.2.2
--- src/etc/mtree/special:1.167.2.1	Tue Jun 30 18:22:48 2020
+++ src/etc/mtree/special	Tue Apr 16 19:06:07 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.167.2.1 2020/06/30 18:22:48 martin Exp $
+#	$NetBSD: special,v 1.167.2.2 2024/04/16 19:06:07 martin Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -337,6 +337,8 @@
 ./etc/ssh/ssh_host_dsa_key.pub	type=file mode=0644 optional
 ./etc/ssh/ssh_host_ecdsa_key	type=file mode=0600 optional tags=nodiff
 ./etc/ssh/ssh_host_ecdsa_key.pub	type=file mode=0644 optional
+./etc/ssh/ssh_host_ed25519_key	type=file mode=0600 optional tags=nodiff
+./etc/ssh/ssh_host_ed25519_key.pub	type=file mode=0644 optional
 ./etc/ssh/ssh_host_key		type=file mode=0600 optional tags=nodiff tags=nodiff
 ./etc/ssh/ssh_host_key.pub	type=file mode=0644 optional
 ./etc/ssh/ssh_host_rsa_key	type=file mode=0600 optional tags=nodiff

CVS commit: [netbsd-9] src/etc/mtree

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Apr 16 19:06:07 UTC 2024

Modified Files:
src/etc/mtree [netbsd-9]: special

Log Message:
Pull up following revision(s) (requested by kim in ticket #1824):
etc/mtree/special: revision 1.172
Add /etc/sshd/ssh_host_ed25519_key* .


To generate a diff of this commit:
cvs rdiff -u -r1.167.2.1 -r1.167.2.2 src/etc/mtree/special

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Dec 31 12:50:23 UTC 2023

Modified Files:
src/etc [netbsd-9]: newsyslog.conf

Log Message:
Pull up following revision(s) (requested by uwe in ticket #1784):

etc/newsyslog.conf: revision 1.25

newsyslog.conf: collate npflog0.pcap properly


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/etc/newsyslog.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/newsyslog.conf
diff -u src/etc/newsyslog.conf:1.24 src/etc/newsyslog.conf:1.24.2.1
--- src/etc/newsyslog.conf:1.24	Thu May 16 20:12:35 2019
+++ src/etc/newsyslog.conf	Sun Dec 31 12:50:23 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: newsyslog.conf,v 1.24 2019/05/16 20:12:35 nakayama Exp $
+#	$NetBSD: newsyslog.conf,v 1.24.2.1 2023/12/31 12:50:23 martin Exp $
 #
 # Configuration file for newsyslog(8).
 #
@@ -8,9 +8,9 @@
 /var/log/cron		root:wheel	600  3100  *Z
 /var/log/kerberos.log			640  7*24   ZN
 /var/log/lpd-errs			640  7100  *Z
-/var/log/npflog0.pcap			600  7100  *ZB /var/run/npfd.pid
 /var/log/maillog			600  7*24   Z
 /var/log/messages			644  10   250  *Z
+/var/log/npflog0.pcap			600  7100  *ZB /var/run/npfd.pid
 /var/log/wtmp		root:utmp	664  7*168  ZBN
 /var/log/wtmpx		root:utmp	664  7*168  ZBN
 /var/log/xferlog			640  7250  *Z

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Dec 31 12:50:23 UTC 2023

Modified Files:
src/etc [netbsd-9]: newsyslog.conf

Log Message:
Pull up following revision(s) (requested by uwe in ticket #1784):

etc/newsyslog.conf: revision 1.25

newsyslog.conf: collate npflog0.pcap properly


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/etc/newsyslog.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/namedb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:04:09 UTC 2023

Modified Files:
src/etc/namedb [netbsd-9]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1771):

etc/namedb/root.cache: revision 1.26

Update to 2023112702 (November 27, 2023).


To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/etc/namedb/root.cache

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.24.2.1 src/etc/namedb/root.cache:1.24.2.2
--- src/etc/namedb/root.cache:1.24.2.1	Thu Oct 10 17:27:23 2019
+++ src/etc/namedb/root.cache	Wed Nov 29 18:04:09 2023
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.24.2.1 2019/10/10 17:27:23 martin Exp $
+;	$NetBSD: root.cache,v 1.24.2.2 2023/11/29 18:04:09 martin Exp $
 ;   This file holds the information on root name servers needed to 
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -9,9 +9,9 @@
 ;   file/domain/named.cache 
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
-; 
-;   last update: September 30, 2019 
-;   related version of root zone: 2019093001
+;
+;   last update: November 27, 2023
+;   related version of root zone: 2023112702
 ; 
 ; FORMERLY NS.INTERNIC.NET 
 ;
@@ -22,8 +22,8 @@ A.ROOT-SERVERS.NET.  360  AA
 ; FORMERLY NS1.ISI.EDU 
 ;
 .360  NSB.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.  360  A 199.9.14.201
-B.ROOT-SERVERS.NET.  360    2001:500:200::b
+B.ROOT-SERVERS.NET.  360  A 170.247.170.2
+B.ROOT-SERVERS.NET.  360    2801:1b8:10::b
 ; 
 ; FORMERLY C.PSI.NET 
 ;

CVS commit: [netbsd-9] src/etc/namedb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:04:09 UTC 2023

Modified Files:
src/etc/namedb [netbsd-9]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1771):

etc/namedb/root.cache: revision 1.26

Update to 2023112702 (November 27, 2023).


To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/etc/namedb/root.cache

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/pam.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Jun 21 21:47:51 UTC 2023

Modified Files:
src/etc/pam.d [netbsd-9]: display_manager ftpd sshd su system

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1651):

etc/pam.d/ftpd: revision 1.8
etc/pam.d/su: revision 1.9
etc/pam.d/system: revision 1.9
etc/pam.d/display_manager: revision 1.6
etc/pam.d/sshd: revision 1.10

pam: Disable pam_krb5, pam_ksu by default.

These are not useful unless you also set up /etc/krb5.conf and a
keytab for the host from the Kerberos KDC.  But having them enabled
by default means that creating /etc/krb5.conf just to enable use of
Kerberos for _client-side_ single sign-on creates usability issues.

As proposed on tech-security:
https://mail-index.netbsd.org/tech-security/2023/06/16/msg001160.html


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.50.1 src/etc/pam.d/display_manager
cvs rdiff -u -r1.7 -r1.7.68.1 src/etc/pam.d/ftpd src/etc/pam.d/su
cvs rdiff -u -r1.9 -r1.9.68.1 src/etc/pam.d/sshd
cvs rdiff -u -r1.8 -r1.8.68.1 src/etc/pam.d/system

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/pam.d/display_manager
diff -u src/etc/pam.d/display_manager:1.5 src/etc/pam.d/display_manager:1.5.50.1
--- src/etc/pam.d/display_manager:1.5	Sat Nov 13 19:19:40 2010
+++ src/etc/pam.d/display_manager	Wed Jun 21 21:47:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: display_manager,v 1.5 2010/11/13 19:19:40 christos Exp $
+# $NetBSD: display_manager,v 1.5.50.1 2023/06/21 21:47:51 martin Exp $
 #
 # PAM configuration for the display manager services.  Specific display
 # manager service configurations can include this one.
@@ -7,14 +7,14 @@
 # auth
 auth		required	pam_nologin.so		no_warn
 auth		sufficient	pam_skey.so		no_warn try_first_pass
-auth		sufficient	pam_krb5.so		no_warn try_first_pass
+#auth		sufficient	pam_krb5.so		no_warn try_first_pass
 auth		optional	pam_afslog.so		no_warn try_first_pass
 # pam_ssh has potential security risks.  See pam_ssh(8).
 #auth		sufficient	pam_ssh.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass
 
 # account
-account 	required	pam_krb5.so
+#account 	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session

Index: src/etc/pam.d/ftpd
diff -u src/etc/pam.d/ftpd:1.7 src/etc/pam.d/ftpd:1.7.68.1
--- src/etc/pam.d/ftpd:1.7	Wed Mar 26 11:31:17 2008
+++ src/etc/pam.d/ftpd	Wed Jun 21 21:47:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ftpd,v 1.7 2008/03/26 11:31:17 lukem Exp $
+# $NetBSD: ftpd,v 1.7.68.1 2023/06/21 21:47:51 martin Exp $
 #
 # PAM configuration for the "ftpd" service
 #
@@ -8,14 +8,14 @@
 # pam_unix.
 auth		required	pam_nologin.so		no_warn
 auth		sufficient	pam_skey.so		no_warn try_first_pass
-auth		sufficient	pam_krb5.so		no_warn try_first_pass
+#auth		sufficient	pam_krb5.so		no_warn try_first_pass
 auth		optional	pam_afslog.so		no_warn try_first_pass
 auth		required	pam_unix.so		no_warn try_first_pass
 
 # account
 # Even though this is identical to "system", we open code it here because
 # we open code the auth stack.
-account		required	pam_krb5.so
+#account	required	pam_krb5.so
 account		required	pam_unix.so
 
 # session
Index: src/etc/pam.d/su
diff -u src/etc/pam.d/su:1.7 src/etc/pam.d/su:1.7.68.1
--- src/etc/pam.d/su:1.7	Wed Mar 26 11:31:17 2008
+++ src/etc/pam.d/su	Wed Jun 21 21:47:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: su,v 1.7 2008/03/26 11:31:17 lukem Exp $
+# $NetBSD: su,v 1.7.68.1 2023/06/21 21:47:51 martin Exp $
 #
 # PAM configuration for the "su" service
 #
@@ -7,7 +7,7 @@
 auth		sufficient	pam_rootok.so		no_warn
 auth		sufficient	pam_self.so		no_warn
 auth		sufficient	pam_skey.so		no_warn try_first_pass
-auth		sufficient	pam_ksu.so		no_warn try_first_pass
+#auth		sufficient	pam_ksu.so		no_warn try_first_pass
 #auth		sufficient	pam_group.so		no_warn group=rootauth root_only authenticate
 auth		requisite	pam_group.so		no_warn group=wheel root_only fail_safe
 auth		required	pam_unix.so		no_warn try_first_pass nullok

Index: src/etc/pam.d/sshd
diff -u src/etc/pam.d/sshd:1.9 src/etc/pam.d/sshd:1.9.68.1
--- src/etc/pam.d/sshd:1.9	Wed Mar 26 11:31:17 2008
+++ src/etc/pam.d/sshd	Wed Jun 21 21:47:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: sshd,v 1.9 2008/03/26 11:31:17 lukem Exp $
+# $NetBSD: sshd,v 1.9.68.1 2023/06/21 21:47:51 martin Exp $
 #
 # PAM configuration for the "sshd" service
 #
@@ -6,14 +6,14 @@
 # auth
 auth		required	pam_nologin.so	no_warn
 auth		sufficient	pam_skey.so	no_warn try_first_pass
-auth		sufficient	pam_krb5.so	no_warn try_first_pass
+#auth		sufficient	pam_krb5.so	no_warn try_first_pass
 auth		optional	pam_afslog.so	no_warn try_first_pass
 # pam_ssh has potential security risks.  See pam_ssh(8).
 #auth		sufficient	pam_ssh.so	no_warn try_first_pass
 auth		required	pam_unix.so	no_warn try_first_pass
 
 # account
-account		required	pam_krb5.so
+#account	required	pam_krb5.so
 a

CVS commit: [netbsd-9] src/etc/pam.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Jun 21 21:47:51 UTC 2023

Modified Files:
src/etc/pam.d [netbsd-9]: display_manager ftpd sshd su system

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1651):

etc/pam.d/ftpd: revision 1.8
etc/pam.d/su: revision 1.9
etc/pam.d/system: revision 1.9
etc/pam.d/display_manager: revision 1.6
etc/pam.d/sshd: revision 1.10

pam: Disable pam_krb5, pam_ksu by default.

These are not useful unless you also set up /etc/krb5.conf and a
keytab for the host from the Kerberos KDC.  But having them enabled
by default means that creating /etc/krb5.conf just to enable use of
Kerberos for _client-side_ single sign-on creates usability issues.

As proposed on tech-security:
https://mail-index.netbsd.org/tech-security/2023/06/16/msg001160.html


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.50.1 src/etc/pam.d/display_manager
cvs rdiff -u -r1.7 -r1.7.68.1 src/etc/pam.d/ftpd src/etc/pam.d/su
cvs rdiff -u -r1.9 -r1.9.68.1 src/etc/pam.d/sshd
cvs rdiff -u -r1.8 -r1.8.68.1 src/etc/pam.d/system

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Jun 21 16:06:14 UTC 2023

Modified Files:
src/etc/rc.d [netbsd-9]: sshd

Log Message:
Pull up following revision(s) (requested by kim in ticket #1643):

etc/rc.d/sshd: revision 1.30
etc/rc.d/sshd: revision 1.33
etc/rc.d/sshd: revision 1.34
etc/rc.d/sshd: revision 1.35

simplify more (from rudolf)

/etc/rc.d/sshd: New check cmd and reload precmd.
- check cmd: run `sshd -t' to check sshd_config file
- reload precmd: run check cmd before reloading so we don't nuke sshd
  if there's an error in the sshd_config file

(It is still possible to effectively nuke sshd by changing the
configuration tosomething that won't work on your network, but at
least we avoid making sshd just exit on reload when you make a typo
in a config option.)

/etc/rc.d/sshd: Stop generating DSA host keys by default.
If you want them you can generate them yourself, but in this day and
age (Monday and 2023, specifically) there's no reason to be using DSA
except for compatibility with ancient legacy software.
/etc/rc.d/sshd: Use default curve for ECDSA keygen, not NIST P-521.

The default is NIST P-256, which:
(a) has plenty of cryptanalytic security,
(b) performs better on essentially all platforms (smaller enough that
even the advantage of the Mersenne prime structure of P-521 can't
compete), and
(c) likely gets more scrutiny on implementations than P-521 since it's
more widespread.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.4.1 src/etc/rc.d/sshd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/sshd
diff -u src/etc/rc.d/sshd:1.29 src/etc/rc.d/sshd:1.29.4.1
--- src/etc/rc.d/sshd:1.29	Sat May 26 19:18:11 2018
+++ src/etc/rc.d/sshd	Wed Jun 21 16:06:14 2023
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.29 2018/05/26 19:18:11 riastradh Exp $
+# $NetBSD: sshd,v 1.29.4.1 2023/06/21 16:06:14 martin Exp $
 #
 
 # PROVIDE: sshd
@@ -13,14 +13,14 @@ rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/ssh/sshd_config"
-extra_commands="keygen reload"
+extra_commands="check keygen reload"
 
 sshd_keygen()
 {
 (
 	keygen="/usr/bin/ssh-keygen"
 	umask 022
-	while read type bits filename version name;  do
+	while read type bits filename;  do
 		f="/etc/ssh/$filename"
 		if [ -f "$f" ]; then
 			continue
@@ -33,10 +33,9 @@ sshd_keygen()
 		"${keygen}" -t "${type}" ${bitarg} -f "${f}" -N '' -q && \
 		printf "ssh-keygen: " && "${keygen}" -f "${f}" -l
 	done << _EOF
-dsa	1024	ssh_host_dsa_key	2	DSA
-ecdsa	521	ssh_host_ecdsa_key	1	ECDSA
-ed25519	-1	ssh_host_ed25519_key	1	ED25519
-rsa	0	ssh_host_rsa_key	2	RSA
+ecdsa	-1	ssh_host_ecdsa_key
+ed25519	-1	ssh_host_ed25519_key
+rsa	0	ssh_host_rsa_key
 _EOF
 )
 }
@@ -46,7 +45,19 @@ sshd_precmd()
 	run_rc_command keygen
 }
 
+sshd_check()
+{
+	sshd -t
+}
+
+sshd_reload_precmd()
+{
+	run_rc_command check
+}
+
+check_cmd=sshd_check
 keygen_cmd=sshd_keygen
+reload_precmd=sshd_reload_precmd
 start_precmd=sshd_precmd
 
 load_rc_config $name

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Jun 21 16:06:14 UTC 2023

Modified Files:
src/etc/rc.d [netbsd-9]: sshd

Log Message:
Pull up following revision(s) (requested by kim in ticket #1643):

etc/rc.d/sshd: revision 1.30
etc/rc.d/sshd: revision 1.33
etc/rc.d/sshd: revision 1.34
etc/rc.d/sshd: revision 1.35

simplify more (from rudolf)

/etc/rc.d/sshd: New check cmd and reload precmd.
- check cmd: run `sshd -t' to check sshd_config file
- reload precmd: run check cmd before reloading so we don't nuke sshd
  if there's an error in the sshd_config file

(It is still possible to effectively nuke sshd by changing the
configuration tosomething that won't work on your network, but at
least we avoid making sshd just exit on reload when you make a typo
in a config option.)

/etc/rc.d/sshd: Stop generating DSA host keys by default.
If you want them you can generate them yourself, but in this day and
age (Monday and 2023, specifically) there's no reason to be using DSA
except for compatibility with ancient legacy software.
/etc/rc.d/sshd: Use default curve for ECDSA keygen, not NIST P-521.

The default is NIST P-256, which:
(a) has plenty of cryptanalytic security,
(b) performs better on essentially all platforms (smaller enough that
even the advantage of the Mersenne prime structure of P-521 can't
compete), and
(c) likely gets more scrutiny on implementations than P-521 since it's
more widespread.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.4.1 src/etc/rc.d/sshd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/etc.next68k

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:54:53 UTC 2023

Modified Files:
src/etc/etc.next68k [netbsd-9]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1586):

etc/etc.next68k/MAKEDEV.conf: revision 1.6

Remove obsolete bpf entries not neceerary for clonified bpf(4).
Fixes "MAKEDEV: bpf8: unknown device" errors.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/etc/etc.next68k/MAKEDEV.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/etc.next68k

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Feb  6 16:54:53 UTC 2023

Modified Files:
src/etc/etc.next68k [netbsd-9]: MAKEDEV.conf

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1586):

etc/etc.next68k/MAKEDEV.conf: revision 1.6

Remove obsolete bpf entries not neceerary for clonified bpf(4).
Fixes "MAKEDEV: bpf8: unknown device" errors.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.8.1 src/etc/etc.next68k/MAKEDEV.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/etc.next68k/MAKEDEV.conf
diff -u src/etc/etc.next68k/MAKEDEV.conf:1.5 src/etc/etc.next68k/MAKEDEV.conf:1.5.8.1
--- src/etc/etc.next68k/MAKEDEV.conf:1.5	Sun Jul  9 05:58:13 2017
+++ src/etc/etc.next68k/MAKEDEV.conf	Mon Feb  6 16:54:53 2023
@@ -1,10 +1,9 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2017/07/09 05:58:13 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5.8.1 2023/02/06 16:54:53 martin Exp $
 
 all_md)
 	makedev wscons sd0 sd1 sd2 sd3 tty0 tty1
 	makedev st0 st1 ch0 cd0 cd1
 	makedev ss0 uk0 uk1
-	makedev bpf8 bpf9 bpf10 bpf11
 	makedev scsibus0 scsibus1 scsibus2 scsibus3
 	makedev ses0 ses1 ses2 ses3
 	;;

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Nov 26 18:04:09 UTC 2021

Modified Files:
src/etc/rc.d [netbsd-9]: npf_boot pf_boot

Log Message:
Backout previous pullup from ticket #1377:

etc/rc.d/npf_boot: revision 1.5
etc/rc.d/pf_boot: revision 1.8


To generate a diff of this commit:
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.4.52.2 -r1.4.52.3 src/etc/rc.d/pf_boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/npf_boot
diff -u src/etc/rc.d/npf_boot:1.1.4.2 src/etc/rc.d/npf_boot:1.1.4.3
--- src/etc/rc.d/npf_boot:1.1.4.2	Fri Nov 26 16:50:18 2021
+++ src/etc/rc.d/npf_boot	Fri Nov 26 18:04:09 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf_boot,v 1.1.4.2 2021/11/26 16:50:18 martin Exp $
+# $NetBSD: npf_boot,v 1.1.4.3 2021/11/26 18:04:09 martin Exp $
 #
 
 # PROVIDE: npf_boot
@@ -29,5 +29,5 @@ npf_boot_start()
 	/sbin/npfctl start
 }
 
-load_rc_config $rcvar
+load_rc_config $name
 run_rc_command "$1"

Index: src/etc/rc.d/pf_boot
diff -u src/etc/rc.d/pf_boot:1.4.52.2 src/etc/rc.d/pf_boot:1.4.52.3
--- src/etc/rc.d/pf_boot:1.4.52.2	Fri Nov 26 16:50:18 2021
+++ src/etc/rc.d/pf_boot	Fri Nov 26 18:04:09 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pf_boot,v 1.4.52.2 2021/11/26 16:50:18 martin Exp $
+# $NetBSD: pf_boot,v 1.4.52.3 2021/11/26 18:04:09 martin Exp $
 #
 
 # PROVIDE: pf_boot
@@ -29,5 +29,5 @@ pf_boot_start()
 	/sbin/pfctl -q -e
 }
 
-load_rc_config $rcvar
+load_rc_config $name
 run_rc_command "$1"

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Nov 26 18:04:09 UTC 2021

Modified Files:
src/etc/rc.d [netbsd-9]: npf_boot pf_boot

Log Message:
Backout previous pullup from ticket #1377:

etc/rc.d/npf_boot: revision 1.5
etc/rc.d/pf_boot: revision 1.8


To generate a diff of this commit:
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.4.52.2 -r1.4.52.3 src/etc/rc.d/pf_boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Nov 26 16:50:18 UTC 2021

Modified Files:
src/etc/rc.d [netbsd-9]: npf_boot pf_boot

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1377):

etc/rc.d/npf_boot: revision 1.5
etc/rc.d/pf_boot: revision 1.8

Load rc configuration based on rcvar, not name, so that correct settings
in /etc/rc.conf.d are loaded.

Usually this does not matter as rcvar and name are set to the same value.

For pf_boot and npf_boot, rcvar is set to pf and npf respectively.

Prior to the change, if:
rc.conf contains nfp=YES
rc.conf.d/npf does not exist
Then:
/etc/rc.d/npf_boot rcvar
outputs:
$npf=YES

If:
rc.conf contains npf=NO (or is not set)
rc.conf.d/npf contains npf=YES
Then:
/etc/rc.d/npf_boot rcvar
outputs:
$npf=NO

This means that in the latter case, at boot time the npfctl start command
is never run and the firewall is not operational.


To generate a diff of this commit:
cvs rdiff -u -r1.1.4.1 -r1.1.4.2 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.4.52.1 -r1.4.52.2 src/etc/rc.d/pf_boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Nov 26 16:50:18 UTC 2021

Modified Files:
src/etc/rc.d [netbsd-9]: npf_boot pf_boot

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1377):

etc/rc.d/npf_boot: revision 1.5
etc/rc.d/pf_boot: revision 1.8

Load rc configuration based on rcvar, not name, so that correct settings
in /etc/rc.conf.d are loaded.

Usually this does not matter as rcvar and name are set to the same value.

For pf_boot and npf_boot, rcvar is set to pf and npf respectively.

Prior to the change, if:
rc.conf contains nfp=YES
rc.conf.d/npf does not exist
Then:
/etc/rc.d/npf_boot rcvar
outputs:
$npf=YES

If:
rc.conf contains npf=NO (or is not set)
rc.conf.d/npf contains npf=YES
Then:
/etc/rc.d/npf_boot rcvar
outputs:
$npf=NO

This means that in the latter case, at boot time the npfctl start command
is never run and the firewall is not operational.


To generate a diff of this commit:
cvs rdiff -u -r1.1.4.1 -r1.1.4.2 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.4.52.1 -r1.4.52.2 src/etc/rc.d/pf_boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/npf_boot
diff -u src/etc/rc.d/npf_boot:1.1.4.1 src/etc/rc.d/npf_boot:1.1.4.2
--- src/etc/rc.d/npf_boot:1.1.4.1	Sun Oct  6 11:13:35 2019
+++ src/etc/rc.d/npf_boot	Fri Nov 26 16:50:18 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf_boot,v 1.1.4.1 2019/10/06 11:13:35 martin Exp $
+# $NetBSD: npf_boot,v 1.1.4.2 2021/11/26 16:50:18 martin Exp $
 #
 
 # PROVIDE: npf_boot
@@ -29,5 +29,5 @@ npf_boot_start()
 	/sbin/npfctl start
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"

Index: src/etc/rc.d/pf_boot
diff -u src/etc/rc.d/pf_boot:1.4.52.1 src/etc/rc.d/pf_boot:1.4.52.2
--- src/etc/rc.d/pf_boot:1.4.52.1	Sun Oct  6 11:13:35 2019
+++ src/etc/rc.d/pf_boot	Fri Nov 26 16:50:18 2021
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pf_boot,v 1.4.52.1 2019/10/06 11:13:35 martin Exp $
+# $NetBSD: pf_boot,v 1.4.52.2 2021/11/26 16:50:18 martin Exp $
 #
 
 # PROVIDE: pf_boot
@@ -29,5 +29,5 @@ pf_boot_start()
 	/sbin/pfctl -q -e
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Nov  4 14:35:57 UTC 2019

Modified Files:
src/etc [netbsd-9]: MAKEDEV.awk

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #397):

etc/MAKEDEV.awk: revision 1.28

PR port-arm/54640: hack to work around conditional RAW_PART definition in
arm/include/disklabel.h.

Recognize this special case and skip lines between #ifndef RAW_PART and
the next #endif.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/etc/MAKEDEV.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Nov  4 14:35:57 UTC 2019

Modified Files:
src/etc [netbsd-9]: MAKEDEV.awk

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #397):

etc/MAKEDEV.awk: revision 1.28

PR port-arm/54640: hack to work around conditional RAW_PART definition in
arm/include/disklabel.h.

Recognize this special case and skip lines between #ifndef RAW_PART and
the next #endif.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/etc/MAKEDEV.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/MAKEDEV.awk
diff -u src/etc/MAKEDEV.awk:1.26 src/etc/MAKEDEV.awk:1.26.2.1
--- src/etc/MAKEDEV.awk:1.26	Thu Jun 13 20:54:04 2019
+++ src/etc/MAKEDEV.awk	Mon Nov  4 14:35:57 2019
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -
 #
-#	$NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $
+#	$NetBSD: MAKEDEV.awk,v 1.26.2.1 2019/11/04 14:35:57 martin Exp $
 #
 # Copyright (c) 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -135,7 +135,18 @@ BEGIN {
 diskpartitions = $3
 			else if ($1 == "#define" && $2 == "OLDMAXPARTITIONS")
 diskbackcompat = $3
-			else if ($1 == "#define" && $2 == "RAW_PART")
+			else if ($1 == "#ifndef" && $2 == "RAW_PART" &&
+			RAWDISK_OFF) {
+# special case to ignore #ifndef RAW_PART
+# sections (e.g. in arm/include/disklabel.h,
+# when it is already set in
+# zaurus/include/disklabel.h)
+while (getline < inc) {
+	# skip all lines upto the next #endif
+	if ($1 == "#endif")
+		break;
+}
+			} else if ($1 == "#define" && $2 == "RAW_PART")
 RAWDISK_OFF = $3
 			else if ($1 == "#include" && 
  $2 ~ "<.*/disklabel.h>" &&
@@ -214,7 +225,7 @@ BEGIN {
 	print "# Generated from:"
 
 	# MAKEDEV.awk (this script) RCS Id
-	ARCSID = "$NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $"
+	ARCSID = "$NetBSD: MAKEDEV.awk,v 1.26.2.1 2019/11/04 14:35:57 martin Exp $"
 	gsub(/\$/, "", ARCSID)
 	print "#	" ARCSID
 	

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Oct 28 18:38:37 UTC 2019

Modified Files:
src/etc/etc.aarch64 [netbsd-9]: ttys
src/etc/etc.algor [netbsd-9]: ttys
src/etc/etc.alpha [netbsd-9]: ttys
src/etc/etc.amd64 [netbsd-9]: ttys
src/etc/etc.amiga [netbsd-9]: ttys
src/etc/etc.amigappc [netbsd-9]: ttys
src/etc/etc.arc [netbsd-9]: ttys
src/etc/etc.cesfic [netbsd-9]: ttys
src/etc/etc.emips [netbsd-9]: ttys
src/etc/etc.epoc32 [netbsd-9]: ttys
src/etc/etc.evbarm [netbsd-9]: ttys
src/etc/etc.evbcf [netbsd-9]: ttys
src/etc/etc.evbmips [netbsd-9]: ttys
src/etc/etc.evbppc [netbsd-9]: ttys
src/etc/etc.evbsh3 [netbsd-9]: ttys
src/etc/etc.ews4800mips [netbsd-9]: ttys
src/etc/etc.hp300 [netbsd-9]: ttys
src/etc/etc.hpcmips [netbsd-9]: ttys
src/etc/etc.hppa [netbsd-9]: ttys
src/etc/etc.i386 [netbsd-9]: ttys
src/etc/etc.ia64 [netbsd-9]: ttys
src/etc/etc.iyonix [netbsd-9]: ttys
src/etc/etc.landisk [netbsd-9]: ttys
src/etc/etc.luna68k [netbsd-9]: ttys
src/etc/etc.mipsco [netbsd-9]: ttys
src/etc/etc.mmeye [netbsd-9]: ttys
src/etc/etc.mvme68k [netbsd-9]: ttys
src/etc/etc.mvmeppc [netbsd-9]: ttys
src/etc/etc.netwinder [netbsd-9]: ttys
src/etc/etc.news68k [netbsd-9]: ttys
src/etc/etc.newsmips [netbsd-9]: ttys
src/etc/etc.next68k [netbsd-9]: ttys
src/etc/etc.or1k [netbsd-9]: ttys
src/etc/etc.playstation2 [netbsd-9]: ttys
src/etc/etc.pmax [netbsd-9]: ttys
src/etc/etc.riscv [netbsd-9]: ttys
src/etc/etc.sandpoint [netbsd-9]: ttys
src/etc/etc.sbmips [netbsd-9]: ttys
src/etc/etc.sgimips [netbsd-9]: ttys
src/etc/etc.shark [netbsd-9]: ttys
src/etc/etc.sparc [netbsd-9]: ttys
src/etc/etc.sparc64 [netbsd-9]: ttys
src/etc/etc.vax [netbsd-9]: ttys
src/etc/etc.zaurus [netbsd-9]: ttys

Log Message:
Pull up following revision(s) (requested by abs in ticket #384):

etc/etc.evbmips/ttys: revision 1.7
etc/etc.sparc64/ttys: revision 1.12
etc/etc.shark/ttys: revision 1.9
etc/etc.amiga/ttys: revision 1.25
etc/etc.arc/ttys: revision 1.9
etc/etc.sbmips/ttys: revision 1.6
etc/etc.landisk/ttys: revision 1.4
etc/etc.alpha/ttys: revision 1.13
etc/etc.amigappc/ttys: revision 1.4
etc/etc.mmeye/ttys: revision 1.8
etc/etc.ia64/ttys: revision 1.2
etc/etc.sandpoint/ttys: revision 1.8
etc/etc.hp300/ttys: revision 1.17
etc/etc.riscv/ttys: revision 1.2
etc/etc.i386/ttys: revision 1.21
etc/etc.aarch64/ttys: revision 1.2
etc/etc.algor/ttys: revision 1.6
etc/etc.sparc/ttys: revision 1.17
etc/etc.mipsco/ttys: revision 1.7
etc/etc.luna68k/ttys: revision 1.9
etc/etc.iyonix/ttys: revision 1.5
etc/etc.evbcf/ttys: revision 1.3
etc/etc.netwinder/ttys: revision 1.9
etc/etc.mvme68k/ttys: revision 1.10
etc/etc.evbarm/ttys: revision 1.8
etc/etc.evbsh3/ttys: revision 1.7
etc/etc.pmax/ttys: revision 1.16
etc/etc.hpcmips/ttys: revision 1.12
etc/etc.vax/ttys: revision 1.10
etc/etc.news68k/ttys: revision 1.10
etc/etc.mvmeppc/ttys: revision 1.7
etc/etc.hppa/ttys: revision 1.2
etc/etc.next68k/ttys: revision 1.11
etc/etc.ews4800mips/ttys: revision 1.3
etc/etc.epoc32/ttys: revision 1.2
etc/etc.emips/ttys: revision 1.2
etc/etc.evbppc/ttys: revision 1.7
etc/etc.sgimips/ttys: revision 1.11
etc/etc.or1k/ttys: revision 1.2
etc/etc.cesfic/ttys: revision 1.6
etc/etc.amd64/ttys: revision 1.7
etc/etc.playstation2/ttys: revision 1.7
etc/etc.zaurus/ttys: revision 1.4
etc/etc.newsmips/ttys: revision 1.10

Switch default console tty from /dev/console to /dev/constty

With this switch processes (such as xconsole) can open /dev/console
without breaking login on the text or serial console. This can be
trivially triggered by enabling xdm in rc.conf and hitting
Ctrl+Alt+F1 or equivalent once booted.

The changes:
- Add entry for /dev/console or /dev/constty if missing
- If a port's had /dev/console 'on' switch it off and enable /dev/constty
- If a port did not have /dev/console 'on', leave /dev/constty off

Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to
avoid just this issue. It may make sense to adjust these also (but not
in this pass)

As discussed on current-users


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.28.1 src/etc/etc.aarch64/ttys
cvs rdiff -u -r1.5 -r1.5.64.1 src/etc/etc.algor/ttys
cvs rdiff -u -r1.12 -r1.12.36.1 src/etc/etc.alpha/ttys
cvs rdiff -u -r1.6 -r1.6.36.1 src/etc/etc.amd64/ttys
cvs rdiff -u -r1.24 -r1.24.36.1 src/etc/etc.amiga/ttys
cvs r

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Oct 28 18:38:37 UTC 2019

Modified Files:
src/etc/etc.aarch64 [netbsd-9]: ttys
src/etc/etc.algor [netbsd-9]: ttys
src/etc/etc.alpha [netbsd-9]: ttys
src/etc/etc.amd64 [netbsd-9]: ttys
src/etc/etc.amiga [netbsd-9]: ttys
src/etc/etc.amigappc [netbsd-9]: ttys
src/etc/etc.arc [netbsd-9]: ttys
src/etc/etc.cesfic [netbsd-9]: ttys
src/etc/etc.emips [netbsd-9]: ttys
src/etc/etc.epoc32 [netbsd-9]: ttys
src/etc/etc.evbarm [netbsd-9]: ttys
src/etc/etc.evbcf [netbsd-9]: ttys
src/etc/etc.evbmips [netbsd-9]: ttys
src/etc/etc.evbppc [netbsd-9]: ttys
src/etc/etc.evbsh3 [netbsd-9]: ttys
src/etc/etc.ews4800mips [netbsd-9]: ttys
src/etc/etc.hp300 [netbsd-9]: ttys
src/etc/etc.hpcmips [netbsd-9]: ttys
src/etc/etc.hppa [netbsd-9]: ttys
src/etc/etc.i386 [netbsd-9]: ttys
src/etc/etc.ia64 [netbsd-9]: ttys
src/etc/etc.iyonix [netbsd-9]: ttys
src/etc/etc.landisk [netbsd-9]: ttys
src/etc/etc.luna68k [netbsd-9]: ttys
src/etc/etc.mipsco [netbsd-9]: ttys
src/etc/etc.mmeye [netbsd-9]: ttys
src/etc/etc.mvme68k [netbsd-9]: ttys
src/etc/etc.mvmeppc [netbsd-9]: ttys
src/etc/etc.netwinder [netbsd-9]: ttys
src/etc/etc.news68k [netbsd-9]: ttys
src/etc/etc.newsmips [netbsd-9]: ttys
src/etc/etc.next68k [netbsd-9]: ttys
src/etc/etc.or1k [netbsd-9]: ttys
src/etc/etc.playstation2 [netbsd-9]: ttys
src/etc/etc.pmax [netbsd-9]: ttys
src/etc/etc.riscv [netbsd-9]: ttys
src/etc/etc.sandpoint [netbsd-9]: ttys
src/etc/etc.sbmips [netbsd-9]: ttys
src/etc/etc.sgimips [netbsd-9]: ttys
src/etc/etc.shark [netbsd-9]: ttys
src/etc/etc.sparc [netbsd-9]: ttys
src/etc/etc.sparc64 [netbsd-9]: ttys
src/etc/etc.vax [netbsd-9]: ttys
src/etc/etc.zaurus [netbsd-9]: ttys

Log Message:
Pull up following revision(s) (requested by abs in ticket #384):

etc/etc.evbmips/ttys: revision 1.7
etc/etc.sparc64/ttys: revision 1.12
etc/etc.shark/ttys: revision 1.9
etc/etc.amiga/ttys: revision 1.25
etc/etc.arc/ttys: revision 1.9
etc/etc.sbmips/ttys: revision 1.6
etc/etc.landisk/ttys: revision 1.4
etc/etc.alpha/ttys: revision 1.13
etc/etc.amigappc/ttys: revision 1.4
etc/etc.mmeye/ttys: revision 1.8
etc/etc.ia64/ttys: revision 1.2
etc/etc.sandpoint/ttys: revision 1.8
etc/etc.hp300/ttys: revision 1.17
etc/etc.riscv/ttys: revision 1.2
etc/etc.i386/ttys: revision 1.21
etc/etc.aarch64/ttys: revision 1.2
etc/etc.algor/ttys: revision 1.6
etc/etc.sparc/ttys: revision 1.17
etc/etc.mipsco/ttys: revision 1.7
etc/etc.luna68k/ttys: revision 1.9
etc/etc.iyonix/ttys: revision 1.5
etc/etc.evbcf/ttys: revision 1.3
etc/etc.netwinder/ttys: revision 1.9
etc/etc.mvme68k/ttys: revision 1.10
etc/etc.evbarm/ttys: revision 1.8
etc/etc.evbsh3/ttys: revision 1.7
etc/etc.pmax/ttys: revision 1.16
etc/etc.hpcmips/ttys: revision 1.12
etc/etc.vax/ttys: revision 1.10
etc/etc.news68k/ttys: revision 1.10
etc/etc.mvmeppc/ttys: revision 1.7
etc/etc.hppa/ttys: revision 1.2
etc/etc.next68k/ttys: revision 1.11
etc/etc.ews4800mips/ttys: revision 1.3
etc/etc.epoc32/ttys: revision 1.2
etc/etc.emips/ttys: revision 1.2
etc/etc.evbppc/ttys: revision 1.7
etc/etc.sgimips/ttys: revision 1.11
etc/etc.or1k/ttys: revision 1.2
etc/etc.cesfic/ttys: revision 1.6
etc/etc.amd64/ttys: revision 1.7
etc/etc.playstation2/ttys: revision 1.7
etc/etc.zaurus/ttys: revision 1.4
etc/etc.newsmips/ttys: revision 1.10

Switch default console tty from /dev/console to /dev/constty

With this switch processes (such as xconsole) can open /dev/console
without breaking login on the text or serial console. This can be
trivially triggered by enabling xdm in rc.conf and hitting
Ctrl+Alt+F1 or equivalent once booted.

The changes:
- Add entry for /dev/console or /dev/constty if missing
- If a port's had /dev/console 'on' switch it off and enable /dev/constty
- If a port did not have /dev/console 'on', leave /dev/constty off

Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to
avoid just this issue. It may make sense to adjust these also (but not
in this pass)

As discussed on current-users


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.28.1 src/etc/etc.aarch64/ttys
cvs rdiff -u -r1.5 -r1.5.64.1 src/etc/etc.algor/ttys
cvs rdiff -u -r1.12 -r1.12.36.1 src/etc/etc.alpha/ttys
cvs rdiff -u -r1.6 -r1.6.36.1 src/etc/etc.amd64/ttys
cvs rdiff -u -r1.24 -r1.24.36.1 src/etc/etc.amiga/ttys
cvs r

CVS commit: [netbsd-9] src/etc/namedb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Oct 10 17:27:23 UTC 2019

Modified Files:
src/etc/namedb [netbsd-9]: root.cache

Log Message:
Pull up following revision(s) (requested by sevan in ticket #296):

etc/namedb/root.cache: revision 1.25

Update to 2019093001


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/etc/namedb/root.cache

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.24 src/etc/namedb/root.cache:1.24.2.1
--- src/etc/namedb/root.cache:1.24	Sat Jan  5 21:47:40 2019
+++ src/etc/namedb/root.cache	Thu Oct 10 17:27:23 2019
@@ -1,90 +1,90 @@
-;	$NetBSD: root.cache,v 1.24 2019/01/05 21:47:40 christos Exp $
-;   This file holds the information on root name servers needed to
+;	$NetBSD: root.cache,v 1.24.2.1 2019/10/10 17:27:23 martin Exp $
+;   This file holds the information on root name servers needed to 
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
-;   configuration file of BIND domain name servers).
-;
-;   This file is made available by InterNIC
+;   configuration file of BIND domain name servers). 
+; 
+;   This file is made available by InterNIC 
 ;   under anonymous FTP as
-;   file/domain/named.cache
+;   file/domain/named.cache 
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
-;
-;   last update: November 14, 2018
-;   related version of root zone: 2018111402
-;
-; FORMERLY NS.INTERNIC.NET
+; 
+;   last update: September 30, 2019 
+;   related version of root zone: 2019093001
+; 
+; FORMERLY NS.INTERNIC.NET 
 ;
 .360  NSA.ROOT-SERVERS.NET.
 A.ROOT-SERVERS.NET.  360  A 198.41.0.4
 A.ROOT-SERVERS.NET.  360    2001:503:ba3e::2:30
-;
-; FORMERLY NS1.ISI.EDU
+; 
+; FORMERLY NS1.ISI.EDU 
 ;
 .360  NSB.ROOT-SERVERS.NET.
 B.ROOT-SERVERS.NET.  360  A 199.9.14.201
 B.ROOT-SERVERS.NET.  360    2001:500:200::b
-;
-; FORMERLY C.PSI.NET
+; 
+; FORMERLY C.PSI.NET 
 ;
 .360  NSC.ROOT-SERVERS.NET.
 C.ROOT-SERVERS.NET.  360  A 192.33.4.12
 C.ROOT-SERVERS.NET.  360    2001:500:2::c
-;
-; FORMERLY TERP.UMD.EDU
+; 
+; FORMERLY TERP.UMD.EDU 
 ;
 .360  NSD.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.  360  A 199.7.91.13
 D.ROOT-SERVERS.NET.  360    2001:500:2d::d
-;
+; 
 ; FORMERLY NS.NASA.GOV
 ;
 .360  NSE.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.  360  A 192.203.230.10
 E.ROOT-SERVERS.NET.  360    2001:500:a8::e
-;
+; 
 ; FORMERLY NS.ISC.ORG
 ;
 .360  NSF.ROOT-SERVERS.NET.
 F.ROOT-SERVERS.NET.  360  A 192.5.5.241
 F.ROOT-SERVERS.NET.  360    2001:500:2f::f
-;
+; 
 ; FORMERLY NS.NIC.DDN.MIL
 ;
 .360  NSG.ROOT-SERVERS.NET.
 G.ROOT-SERVERS.NET.  360  A 192.112.36.4
 G.ROOT-SERVERS.NET.  360    2001:500:12::d0d
-;
+; 
 ; FORMERLY AOS.ARL.ARMY.MIL
 ;
 .360  NSH.ROOT-SERVERS.NET.
 H.ROOT-SERVERS.NET.  360  A 198.97.190.53
 H.ROOT-SERVERS.NET.  360    2001:500:1::53
-;
+; 
 ; FORMERLY NIC.NORDU.NET
 ;
 .360  NSI.ROOT-SERVERS.NET.
 I.ROOT-SERVERS.NET.  360  A 192.36.148.17
 I.ROOT-SERVERS.NET.  360    2001:7fe::53
-;
+; 
 ; OPERATED BY VERISIGN, INC.
 ;
 .360  NSJ.ROOT-SERVERS.NET.
 J.ROOT-SERVERS.NET.  360  A 192.58.128.30
 J.ROOT-SERVERS.NET.  360    2001:503:c27::2:30
-;
+; 
 ; OPERATED BY RIPE NCC
 ;
 .360  NSK.ROOT-SERVERS.NET.
 K.ROOT-SERVERS.NET.  360  A 193.0.14.129
 K.ROOT-SERVERS.NET.  360    2001:7fd::1
-;
+; 
 ; OPERATED BY ICANN
 ;
 .360  NSL.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.  360  A 199.7.83.42
 L.ROOT-SERVERS.NET.  360    2001:500:9f::42
-;
+; 
 ; OPERATED BY WIDE
 ;
 .360  NSM.ROOT-SERVERS.NET.

CVS commit: [netbsd-9] src/etc/namedb

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Oct 10 17:27:23 UTC 2019

Modified Files:
src/etc/namedb [netbsd-9]: root.cache

Log Message:
Pull up following revision(s) (requested by sevan in ticket #296):

etc/namedb/root.cache: revision 1.25

Update to 2019093001


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/etc/namedb/root.cache

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Oct 10 17:25:48 UTC 2019

Modified Files:
src/etc [netbsd-9]: services

Log Message:
Pull up following revision(s) (requested by sevan in ticket #295):

etc/services: revision 1.102

sync with latest from IANA


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.101.2.1 src/etc/services

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Oct 10 17:25:48 UTC 2019

Modified Files:
src/etc [netbsd-9]: services

Log Message:
Pull up following revision(s) (requested by sevan in ticket #295):

etc/services: revision 1.102

sync with latest from IANA


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.101.2.1 src/etc/services

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Oct  6 11:13:35 UTC 2019

Modified Files:
src/etc/rc.d [netbsd-9]: npf_boot pf_boot

Log Message:
Pull up following revision(s) (requested by sevan in ticket #288):

etc/rc.d/npf_boot: revision 1.2
etc/rc.d/pf_boot: revision 1.5

No need to empose the script to be runnable during boot time, it
prevents the
script from wroking if the system is booted into single user mode & then
moved onto multi-user mode.

Reported by  for NPF but the issue is there in PF too.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.4.1 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.4 -r1.4.52.1 src/etc/rc.d/pf_boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Oct  6 11:13:35 UTC 2019

Modified Files:
src/etc/rc.d [netbsd-9]: npf_boot pf_boot

Log Message:
Pull up following revision(s) (requested by sevan in ticket #288):

etc/rc.d/npf_boot: revision 1.2
etc/rc.d/pf_boot: revision 1.5

No need to empose the script to be runnable during boot time, it
prevents the
script from wroking if the system is booted into single user mode & then
moved onto multi-user mode.

Reported by  for NPF but the issue is there in PF too.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.4.1 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.4 -r1.4.52.1 src/etc/rc.d/pf_boot

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/npf_boot
diff -u src/etc/rc.d/npf_boot:1.1 src/etc/rc.d/npf_boot:1.1.4.1
--- src/etc/rc.d/npf_boot:1.1	Tue Apr  2 01:50:32 2019
+++ src/etc/rc.d/npf_boot	Sun Oct  6 11:13:35 2019
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf_boot,v 1.1 2019/04/02 01:50:32 sevan Exp $
+# $NetBSD: npf_boot,v 1.1.4.1 2019/10/06 11:13:35 martin Exp $
 #
 
 # PROVIDE: npf_boot
@@ -16,10 +16,6 @@ stop_cmd=":"
 
 npf_boot_start()
 {
-	if [ "$autoboot" != "yes" ]; then
-		err 1 "This script should only be executed at boot time."
-	fi
-
 	if [ -f /etc/npf.boot.conf ]; then
 		/sbin/npfctl reload /etc/npf.boot.conf
 	elif [ -f /etc/defaults/npf.boot.conf ]; then

Index: src/etc/rc.d/pf_boot
diff -u src/etc/rc.d/pf_boot:1.4 src/etc/rc.d/pf_boot:1.4.52.1
--- src/etc/rc.d/pf_boot:1.4	Sat Nov 22 20:23:33 2008
+++ src/etc/rc.d/pf_boot	Sun Oct  6 11:13:35 2019
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pf_boot,v 1.4 2008/11/22 20:23:33 tsutsui Exp $
+# $NetBSD: pf_boot,v 1.4.52.1 2019/10/06 11:13:35 martin Exp $
 #
 
 # PROVIDE: pf_boot
@@ -16,10 +16,6 @@ stop_cmd=":"
 
 pf_boot_start()
 {
-	if [ "$autoboot" != "yes" ]; then
-		err 1 "This script should only be executed at boot time."
-	fi
-
 	if [ -f /etc/pf.boot.conf ]; then
 		/sbin/pfctl -q -f /etc/pf.boot.conf
 	elif [ -f /etc/defaults/pf.boot.conf ]; then

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Sep 22 10:22:15 UTC 2019

Modified Files:
src/etc [netbsd-9]: MAKEDEV.tmpl

Log Message:
Pull up following revision(s) (requested by thorpej in ticket #211):

etc/MAKEDEV.tmpl: revision 1.208

Create the character device for spiflash, in addition to the block device.

This is needed for getdiskrawname() to DTRT (for installboot(8)).
XXX pullup-9


To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.205.2.1 src/etc/MAKEDEV.tmpl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Sep 22 10:22:15 UTC 2019

Modified Files:
src/etc [netbsd-9]: MAKEDEV.tmpl

Log Message:
Pull up following revision(s) (requested by thorpej in ticket #211):

etc/MAKEDEV.tmpl: revision 1.208

Create the character device for spiflash, in addition to the block device.

This is needed for getdiskrawname() to DTRT (for installboot(8)).
XXX pullup-9


To generate a diff of this commit:
cvs rdiff -u -r1.205 -r1.205.2.1 src/etc/MAKEDEV.tmpl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.205 src/etc/MAKEDEV.tmpl:1.205.2.1
--- src/etc/MAKEDEV.tmpl:1.205	Mon Jul 29 17:53:20 2019
+++ src/etc/MAKEDEV.tmpl	Sun Sep 22 10:22:15 2019
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.205 2019/07/29 17:53:20 gdt Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.205.2.1 2019/09/22 10:22:15 martin Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1218,6 +1218,7 @@ spiflash[0-9]*)
 	unit=${i#spiflash}
 	spiflash=spiflash$unit
 	mkdev spiflash$unit b %spiflash_blk% $unit
+	mkdev rspiflash$unit c %spiflash_chr% $unit
 	;;
 
 altmem[0-9]*)

CVS commit: [netbsd-9] src/etc/mtree

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Aug  8 11:52:14 UTC 2019

Modified Files:
src/etc/mtree [netbsd-9]: NetBSD.dist.base

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #31):

etc/mtree/NetBSD.dist.base: revision 1.201

Change uname and gname to sync with etc/mtree/special.
It was missing in rev 1.195 changes.


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.200.2.1 src/etc/mtree/NetBSD.dist.base

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/mtree

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Aug  8 11:52:14 UTC 2019

Modified Files:
src/etc/mtree [netbsd-9]: NetBSD.dist.base

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #31):

etc/mtree/NetBSD.dist.base: revision 1.201

Change uname and gname to sync with etc/mtree/special.
It was missing in rev 1.195 changes.


To generate a diff of this commit:
cvs rdiff -u -r1.200 -r1.200.2.1 src/etc/mtree/NetBSD.dist.base

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.200 src/etc/mtree/NetBSD.dist.base:1.200.2.1
--- src/etc/mtree/NetBSD.dist.base:1.200	Wed Jul 24 06:53:42 2019
+++ src/etc/mtree/NetBSD.dist.base	Thu Aug  8 11:52:14 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.200 2019/07/24 06:53:42 wiz Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.200.2.1 2019/08/08 11:52:14 martin Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -1271,7 +1271,7 @@
 ./var/chroot/named
 ./var/chroot/named/dev
 ./var/chroot/named/etc
-./var/chroot/named/etc/namedb
+./var/chroot/named/etc/namedb		mode=0755 uname=named gname=named
 ./var/chroot/named/etc/namedb/cache	mode=0775 uname=named gname=named
 ./var/chroot/named/etc/namedb/keys	type=dir mode=0775 uname=named gname=named
 ./var/chroot/named/etc/namedb/nta	type=dir mode=0775 uname=named gname=named

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Aug  8 11:48:59 UTC 2019

Modified Files:
src/etc/rc.d [netbsd-9]: automount automountd autounmountd ip6addrctl

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #30):

etc/rc.d/autounmountd: revision 1.2
etc/rc.d/ip6addrctl: revision 1.3
etc/rc.d/automountd: revision 1.2
etc/rc.d/automount: revision 1.2

Add $_rc_subr_loaded before ". /etc/rc.subr" for speedup and consistency.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/etc/rc.d/automount src/etc/rc.d/automountd \
src/etc/rc.d/autounmountd
cvs rdiff -u -r1.2 -r1.2.18.1 src/etc/rc.d/ip6addrctl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-9] src/etc/rc.d

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Aug  8 11:48:59 UTC 2019

Modified Files:
src/etc/rc.d [netbsd-9]: automount automountd autounmountd ip6addrctl

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #30):

etc/rc.d/autounmountd: revision 1.2
etc/rc.d/ip6addrctl: revision 1.3
etc/rc.d/automountd: revision 1.2
etc/rc.d/automount: revision 1.2

Add $_rc_subr_loaded before ". /etc/rc.subr" for speedup and consistency.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/etc/rc.d/automount src/etc/rc.d/automountd \
src/etc/rc.d/autounmountd
cvs rdiff -u -r1.2 -r1.2.18.1 src/etc/rc.d/ip6addrctl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/rc.d/automount
diff -u src/etc/rc.d/automount:1.1 src/etc/rc.d/automount:1.1.6.1
--- src/etc/rc.d/automount:1.1	Tue Jan  9 03:31:14 2018
+++ src/etc/rc.d/automount	Thu Aug  8 11:48:58 2019
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: automount,v 1.1 2018/01/09 03:31:14 christos Exp $
+# $NetBSD: automount,v 1.1.6.1 2019/08/08 11:48:58 martin Exp $
 #
 
 # PROVIDE: automount
 # REQUIRE: automountd
 # KEYWORD: nojail shutdown
 
-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr
 
 name="automount"
 rcvar="autofs"
Index: src/etc/rc.d/automountd
diff -u src/etc/rc.d/automountd:1.1 src/etc/rc.d/automountd:1.1.6.1
--- src/etc/rc.d/automountd:1.1	Tue Jan  9 03:31:14 2018
+++ src/etc/rc.d/automountd	Thu Aug  8 11:48:58 2019
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: automountd,v 1.1 2018/01/09 03:31:14 christos Exp $
+# $NetBSD: automountd,v 1.1.6.1 2019/08/08 11:48:58 martin Exp $
 #
 
 # PROVIDE: automountd
 # REQUIRE: DAEMON
 # KEYWORD: nojail
 
-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr
 
 name="automountd"
 rcvar="autofs"
Index: src/etc/rc.d/autounmountd
diff -u src/etc/rc.d/autounmountd:1.1 src/etc/rc.d/autounmountd:1.1.6.1
--- src/etc/rc.d/autounmountd:1.1	Tue Jan  9 03:31:14 2018
+++ src/etc/rc.d/autounmountd	Thu Aug  8 11:48:58 2019
@@ -7,7 +7,7 @@
 # REQUIRE: DAEMON
 # KEYWORD: nojail
 
-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr
 
 name="autounmountd"
 rcvar="autofs"

Index: src/etc/rc.d/ip6addrctl
diff -u src/etc/rc.d/ip6addrctl:1.2 src/etc/rc.d/ip6addrctl:1.2.18.1
--- src/etc/rc.d/ip6addrctl:1.2	Wed Dec 23 04:38:00 2015
+++ src/etc/rc.d/ip6addrctl	Thu Aug  8 11:48:58 2019
@@ -6,7 +6,7 @@
 # PROVIDE: ip6addrctl
 # REQUIRE: root bootconf mountcritlocal tty
 
-. /etc/rc.subr
+$_rc_subr_loaded . /etc/rc.subr
 
 name="ip6addrctl"
 rcvar="ip6addrctl"

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Aug  7 10:18:13 UTC 2019

Modified Files:
src/etc [netbsd-9]: Makefile

Log Message:
Pull up following revision(s) (requested by hannken in ticket #26):

etc/Makefile: revision 1.439

PR kern/53590: remove -U DEBUG from config(1) invocation (that is:
revert r1.413). DTrace needs the full symbol information.


To generate a diff of this commit:
cvs rdiff -u -r1.438 -r1.438.2.1 src/etc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/Makefile
diff -u src/etc/Makefile:1.438 src/etc/Makefile:1.438.2.1
--- src/etc/Makefile:1.438	Sat Jan 12 17:25:09 2019
+++ src/etc/Makefile	Wed Aug  7 10:18:13 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.438 2019/01/12 17:25:09 roy Exp $
+#	$NetBSD: Makefile,v 1.438.2.1 2019/08/07 10:18:13 martin Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -590,7 +590,7 @@ build_kernels: .PHONY
 build_kernels: kern-${configfile}
 kern-${configfile}: .PHONY .MAKE
 	cd ${KERNCONFDIR} && ${TOOL_CONFIG} ${CONFIGOPTS} -s ${KERNSRCDIR} \
-	-U DEBUG -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
+	-b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
 .if ${MKUPDATE} == "no"
 	${MAKE} -C ${KERNOBJDIR}/${configfile:C/.*\///} distclean
 .endif

CVS commit: [netbsd-9] src/etc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Aug  7 10:18:13 UTC 2019

Modified Files:
src/etc [netbsd-9]: Makefile

Log Message:
Pull up following revision(s) (requested by hannken in ticket #26):

etc/Makefile: revision 1.439

PR kern/53590: remove -U DEBUG from config(1) invocation (that is:
revert r1.413). DTrace needs the full symbol information.


To generate a diff of this commit:
cvs rdiff -u -r1.438 -r1.438.2.1 src/etc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.