CVS commit: [netbsd-9] src/doc

2024-03-02 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar  3 07:13:06 UTC 2024

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Amend ticket #1805 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-9.4

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



CVS commit: [netbsd-9] src/doc

2024-03-02 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar  3 07:13:06 UTC 2024

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Amend ticket #1805 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-9.4

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

Modified files:

Index: src/doc/CHANGES-9.4
diff -u src/doc/CHANGES-9.4:1.1.2.136 src/doc/CHANGES-9.4:1.1.2.137
--- src/doc/CHANGES-9.4:1.1.2.136	Fri Mar  1 14:29:40 2024
+++ src/doc/CHANGES-9.4	Sun Mar  3 07:13:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.136 2024/03/01 14:29:40 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.137 2024/03/03 07:13:06 martin Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -13391,6 +13391,8 @@ external/mpl/bind/dist/lib/ns/pfilter.c	
 external/mpl/bind/include/config.h		(apply patch)
 external/mpl/bind/lib/libdns/Makefile		(apply patch)
 external/mpl/bind/lib/libisc/Makefile		(apply patch)
+distrib/sets/lists/base/mi			(manually edited)
+distrib/sets/lists/debug/mi			(manually edited)
 lib/Makefile	(apply patch)
 share/mk/bsd.lib.mk1.383 (adapted),1.391 via patch
 doc/3RDPARTY	(manually edited)



CVS commit: [netbsd-9] src/distrib/sets/lists

2024-03-02 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar  3 07:11:43 UTC 2024

Modified Files:
src/distrib/sets/lists/base [netbsd-9]: mi
src/distrib/sets/lists/debug [netbsd-9]: mi

Log Message:
Fix entry for /usr/libdata/debug/usr/lib/named (fallout from ticket #1805)


To generate a diff of this commit:
cvs rdiff -u -r1.1209.2.12 -r1.1209.2.13 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.285.2.5 -r1.285.2.6 src/distrib/sets/lists/debug/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1209.2.12 src/distrib/sets/lists/base/mi:1.1209.2.13
--- src/distrib/sets/lists/base/mi:1.1209.2.12	Fri Mar  1 14:28:51 2024
+++ src/distrib/sets/lists/base/mi	Sun Mar  3 07:11:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1209.2.12 2024/03/01 14:28:51 martin Exp $
+# $NetBSD: mi,v 1.1209.2.13 2024/03/03 07:11:42 martin Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1337,6 +1337,7 @@
 ./usr/libdata/debug/usr/games			base-sys-usr
 ./usr/libdata/debug/usr/lib			base-sys-usr		compatdir
 ./usr/libdata/debug/usr/lib/i18n		base-i18n-root		compatfile
+./usr/libdata/debug/usr/lib/named		base-sys-usr
 ./usr/libdata/debug/usr/lib/npf			base-obsolete		obsolete
 ./usr/libdata/debug/usr/libexec			base-sys-usr
 ./usr/libdata/debug/usr/libexec/ching		base-sys-usr

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.285.2.5 src/distrib/sets/lists/debug/mi:1.285.2.6
--- src/distrib/sets/lists/debug/mi:1.285.2.5	Fri Mar  1 14:28:52 2024
+++ src/distrib/sets/lists/debug/mi	Sun Mar  3 07:11:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.285.2.5 2024/03/01 14:28:52 martin Exp $
+# $NetBSD: mi,v 1.285.2.6 2024/03/03 07:11:43 martin Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -921,7 +921,6 @@
 ./usr/libdata/debug/usr/games/worm.debug	comp-games-debug	debug
 ./usr/libdata/debug/usr/games/worms.debug	comp-games-debug	debug
 ./usr/libdata/debug/usr/games/wump.debug	comp-games-debug	debug
-./usr/libdata/debug/usr/lib/named		comp-sys-usr		debug
 ./usr/libdata/debug/usr/libexec/atf-check.debug	comp-atf-debug		atf,debug
 ./usr/libdata/debug/usr/libexec/atf-cleanup.debug	comp-obsolete		obsolete
 ./usr/libdata/debug/usr/libexec/atf-exec.debug	comp-obsolete		obsolete



CVS commit: [netbsd-9] src/distrib/sets/lists

2024-03-02 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun Mar  3 07:11:43 UTC 2024

Modified Files:
src/distrib/sets/lists/base [netbsd-9]: mi
src/distrib/sets/lists/debug [netbsd-9]: mi

Log Message:
Fix entry for /usr/libdata/debug/usr/lib/named (fallout from ticket #1805)


To generate a diff of this commit:
cvs rdiff -u -r1.1209.2.12 -r1.1209.2.13 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.285.2.5 -r1.285.2.6 src/distrib/sets/lists/debug/mi

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



CVS commit: src/external/mpl/mozilla-certdata/share

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:35:58 UTC 2024

Modified Files:
src/external/mpl/mozilla-certdata/share: certdata.awk

Log Message:
mozilla-certdata: Fix typo: sprintf, not snprintf, in awk.

Only used during import, and only in case something is wrong anyway
requiring manual intervention, so no change to builds.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/mozilla-certdata/share/certdata.awk

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

Modified files:

Index: src/external/mpl/mozilla-certdata/share/certdata.awk
diff -u src/external/mpl/mozilla-certdata/share/certdata.awk:1.2 src/external/mpl/mozilla-certdata/share/certdata.awk:1.3
--- src/external/mpl/mozilla-certdata/share/certdata.awk:1.2	Wed Oct 11 19:57:25 2023
+++ src/external/mpl/mozilla-certdata/share/certdata.awk	Sun Mar  3 04:35:58 2024
@@ -427,7 +427,7 @@ $1 == "CKA_LABEL" {
 			NR, label
 		}
 		if (!(lolab in label_lineno)) {
-			err(snprintf("Missing label: %s", label))
+			err(sprintf("Missing label: %s", label))
 			skip()
 			next
 		}



CVS commit: src/external/mpl/mozilla-certdata/share

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:35:58 UTC 2024

Modified Files:
src/external/mpl/mozilla-certdata/share: certdata.awk

Log Message:
mozilla-certdata: Fix typo: sprintf, not snprintf, in awk.

Only used during import, and only in case something is wrong anyway
requiring manual intervention, so no change to builds.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/mozilla-certdata/share/certdata.awk

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



CVS commit: src/doc

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:35:44 UTC 2024

Modified Files:
src/doc: 3RDPARTY

Log Message:
doc/3RDPARTY: mozilla-certdata is up-to-date.


To generate a diff of this commit:
cvs rdiff -u -r1.1993 -r1.1994 src/doc/3RDPARTY

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



CVS commit: src/doc

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:35:44 UTC 2024

Modified Files:
src/doc: 3RDPARTY

Log Message:
doc/3RDPARTY: mozilla-certdata is up-to-date.


To generate a diff of this commit:
cvs rdiff -u -r1.1993 -r1.1994 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1993 src/doc/3RDPARTY:1.1994
--- src/doc/3RDPARTY:1.1993	Fri Mar  1 15:49:41 2024
+++ src/doc/3RDPARTY	Sun Mar  3 04:35:44 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1993 2024/03/01 15:49:41 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1994 2024/03/03 04:35:44 riastradh Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -2327,12 +2327,12 @@ Location:	share/wscons/fonts
 Notes:
 
 Package:	mozilla-certdata
-Version:	2023-07-19 (f479bdba756c78ef9355a48c88744c69fdb4768e)
-Current Vers:	2024-01-31 (a6efd358880291357a62d58586f9a218d47ad98b)
+Version:	2024-02-12 (a6efd358880291357a62d58586f9a218d47ad98b)
+Current Vers:	2024-02-12 (a6efd358880291357a62d58586f9a218d47ad98b)
 Maintainer:	Mozilla
 Archive Site:	https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
 Home Page:	https://wiki.mozilla.org/CA
-Date:		2024-02-01
+Date:		2024-02-12
 Mailing List:	
 License:	MPL
 Responsible:	riastradh, security-team



CVS commit: src/distrib/sets/lists/base

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:35:18 UTC 2024

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
mozilla-certdata: Update set lists.


To generate a diff of this commit:
cvs rdiff -u -r1.1333 -r1.1334 src/distrib/sets/lists/base/mi

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



CVS commit: src/distrib/sets/lists/base

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:35:18 UTC 2024

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
mozilla-certdata: Update set lists.


To generate a diff of this commit:
cvs rdiff -u -r1.1333 -r1.1334 src/distrib/sets/lists/base/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1333 src/distrib/sets/lists/base/mi:1.1334
--- src/distrib/sets/lists/base/mi:1.1333	Thu Feb 22 01:13:42 2024
+++ src/distrib/sets/lists/base/mi	Sun Mar  3 04:35:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1333 2024/02/22 01:13:42 christos Exp $
+# $NetBSD: mi,v 1.1334 2024/03/03 04:35:18 riastradh Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1905,7 +1905,7 @@
 ./usr/share/certs/mozilla/all/Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Atos_TrustedRoot_Root_CA_RSA_G2_2020.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem	base-mozcerts-share	share
-./usr/share/certs/mozilla/all/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem	base-obsolete	obsolete
 ./usr/share/certs/mozilla/all/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/BJCA_Global_Root_CA1.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/BJCA_Global_Root_CA2.pem	base-mozcerts-share	share
@@ -1926,13 +1926,19 @@
 ./usr/share/certs/mozilla/all/Certum_Trusted_Network_CA.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Certum_Trusted_Network_CA_2.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Certum_Trusted_Root_CA.pem	base-mozcerts-share	share
-./usr/share/certs/mozilla/all/Chambers_of_Commerce_Root_-_2008.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/Chambers_of_Commerce_Root_-_2008.pem	base-obsolete	obsolete
+./usr/share/certs/mozilla/all/CommScope_Public_Trust_ECC_Root-01.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/CommScope_Public_Trust_ECC_Root-02.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/CommScope_Public_Trust_RSA_Root-01.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/CommScope_Public_Trust_RSA_Root-02.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Comodo_AAA_Services_root.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/D-TRUST_BR_Root_CA_1_2020.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/D-TRUST_EV_Root_CA_1_2020.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/D-TRUST_Root_CA_3_2013.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/D-TRUST_Root_Class_3_CA_2_2009.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/D-TRUST_Root_Class_3_CA_2_EV_2009.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/D-Trust_SBR_Root_CA_1_2022.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/D-Trust_SBR_Root_CA_2_2022.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/DIGITALSIGN_GLOBAL_ROOT_ECDSA_CA.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/DIGITALSIGN_GLOBAL_ROOT_RSA_CA.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/DigiCert_Assured_ID_Root_CA.pem	base-mozcerts-share	share
@@ -1968,7 +1974,7 @@
 ./usr/share/certs/mozilla/all/GlobalSign_Root_R46.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/GlobalSign_Secure_Mail_Root_E45.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/GlobalSign_Secure_Mail_Root_R45.pem	base-mozcerts-share	share
-./usr/share/certs/mozilla/all/Global_Chambersign_Root_-_2008.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/Global_Chambersign_Root_-_2008.pem	base-obsolete	obsolete
 ./usr/share/certs/mozilla/all/Go_Daddy_Class_2_CA.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Go_Daddy_Root_Certificate_Authority_-_G2.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/HARICA_Client_ECC_Root_CA_2021.pem	base-mozcerts-share	share
@@ -2017,25 +2023,31 @@
 ./usr/share/certs/mozilla/all/Security_Communication_ECC_RootCA1.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Security_Communication_RootCA2.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Security_Communication_RootCA3.pem	base-mozcerts-share	share
-./usr/share/certs/mozilla/all/Security_Communication_Root_CA.pem	base-mozcerts-share	share
+./usr/share/certs/mozilla/all/Security_Communication_Root_CA.pem	base-obsolete	obsolete
 ./usr/share/certs/mozilla/all/Staat_der_Nederlanden_Root_CA_-_G3.pem	base-mozcerts-share	share
 ./usr/share/certs/mozilla/all/Starfield_Class_2_CA.pem	

CVS commit: src/external/mpl/mozilla-certdata/share

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:26:19 UTC 2024

Modified Files:
src/external/mpl/mozilla-certdata/share: email.trust server.trust
src/external/mpl/mozilla-certdata/share/certs:
Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem
Added Files:
src/external/mpl/mozilla-certdata/share/certs:
CommScope_Public_Trust_ECC_Root-01.pem
CommScope_Public_Trust_ECC_Root-02.pem
CommScope_Public_Trust_RSA_Root-01.pem
CommScope_Public_Trust_RSA_Root-02.pem
D-Trust_SBR_Root_CA_1_2022.pem D-Trust_SBR_Root_CA_2_2022.pem
Telekom_Security_SMIME_ECC_Root_2021.pem
Telekom_Security_SMIME_RSA_Root_2023.pem
Telekom_Security_TLS_ECC_Root_2020.pem
Telekom_Security_TLS_RSA_Root_2023.pem
TrustAsia_Global_Root_CA_G3.pem TrustAsia_Global_Root_CA_G4.pem
Removed Files:
src/external/mpl/mozilla-certdata/share/certs:
Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem
Chambers_of_Commerce_Root_-_2008.pem
Global_Chambersign_Root_-_2008.pem
Security_Communication_Root_CA.pem
Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
TrustCor_ECA-1.pem TrustCor_RootCert_CA-1.pem
TrustCor_RootCert_CA-2.pem
Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem

Log Message:
mozilla-certdata: regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/mozilla-certdata/share/email.trust \
src/external/mpl/mozilla-certdata/share/server.trust
cvs rdiff -u -r1.1 -r0 \

src/external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Chambers_of_Commerce_Root_-_2008.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Global_Chambersign_Root_-_2008.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Security_Communication_Root_CA.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
 \
src/external/mpl/mozilla-certdata/share/certs/TrustCor_ECA-1.pem \
src/external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-1.pem \
src/external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-2.pem \

src/external/mpl/mozilla-certdata/share/certs/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
cvs rdiff -u -r1.1 -r1.2 \

src/external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem
cvs rdiff -u -r0 -r1.1 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-01.pem
 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-02.pem
 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-01.pem
 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-02.pem
 \

src/external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_1_2022.pem \

src/external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_2_2022.pem \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_ECC_Root_2021.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_RSA_Root_2023.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_ECC_Root_2020.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_RSA_Root_2023.pem
 \

src/external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G3.pem \

src/external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G4.pem

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

Modified files:

Index: src/external/mpl/mozilla-certdata/share/email.trust
diff -u src/external/mpl/mozilla-certdata/share/email.trust:1.1 src/external/mpl/mozilla-certdata/share/email.trust:1.2
--- src/external/mpl/mozilla-certdata/share/email.trust:1.1	Sat Aug 26 05:58:18 2023
+++ src/external/mpl/mozilla-certdata/share/email.trust	Sun Mar  3 04:26:19 2024
@@ -5,7 +5,6 @@ Certum_Root_CA
 Comodo_AAA_Services_root
 QuoVadis_Root_CA_2
 QuoVadis_Root_CA_3
-Security_Communication_Root_CA
 XRamp_Global_CA_Root
 Go_Daddy_Class_2_CA
 Starfield_Class_2_CA
@@ -24,9 +23,6 @@ certSIGN_ROOT_CA
 NetLock_Arany_Class_Gold
 Microsec_e-Szigno_Root_CA_2009
 GlobalSign_Root_CA_-_R3

CVS commit: src/external/mpl/mozilla-certdata/share

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:26:19 UTC 2024

Modified Files:
src/external/mpl/mozilla-certdata/share: email.trust server.trust
src/external/mpl/mozilla-certdata/share/certs:
Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem
Added Files:
src/external/mpl/mozilla-certdata/share/certs:
CommScope_Public_Trust_ECC_Root-01.pem
CommScope_Public_Trust_ECC_Root-02.pem
CommScope_Public_Trust_RSA_Root-01.pem
CommScope_Public_Trust_RSA_Root-02.pem
D-Trust_SBR_Root_CA_1_2022.pem D-Trust_SBR_Root_CA_2_2022.pem
Telekom_Security_SMIME_ECC_Root_2021.pem
Telekom_Security_SMIME_RSA_Root_2023.pem
Telekom_Security_TLS_ECC_Root_2020.pem
Telekom_Security_TLS_RSA_Root_2023.pem
TrustAsia_Global_Root_CA_G3.pem TrustAsia_Global_Root_CA_G4.pem
Removed Files:
src/external/mpl/mozilla-certdata/share/certs:
Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem
Chambers_of_Commerce_Root_-_2008.pem
Global_Chambersign_Root_-_2008.pem
Security_Communication_Root_CA.pem
Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
TrustCor_ECA-1.pem TrustCor_RootCert_CA-1.pem
TrustCor_RootCert_CA-2.pem
Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem

Log Message:
mozilla-certdata: regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/mozilla-certdata/share/email.trust \
src/external/mpl/mozilla-certdata/share/server.trust
cvs rdiff -u -r1.1 -r0 \

src/external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.1.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Chambers_of_Commerce_Root_-_2008.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Global_Chambersign_Root_-_2008.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Security_Communication_Root_CA.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
 \
src/external/mpl/mozilla-certdata/share/certs/TrustCor_ECA-1.pem \
src/external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-1.pem \
src/external/mpl/mozilla-certdata/share/certs/TrustCor_RootCert_CA-2.pem \

src/external/mpl/mozilla-certdata/share/certs/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
cvs rdiff -u -r1.1 -r1.2 \

src/external/mpl/mozilla-certdata/share/certs/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem
cvs rdiff -u -r0 -r1.1 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-01.pem
 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_ECC_Root-02.pem
 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-01.pem
 \

src/external/mpl/mozilla-certdata/share/certs/CommScope_Public_Trust_RSA_Root-02.pem
 \

src/external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_1_2022.pem \

src/external/mpl/mozilla-certdata/share/certs/D-Trust_SBR_Root_CA_2_2022.pem \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_ECC_Root_2021.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_SMIME_RSA_Root_2023.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_ECC_Root_2020.pem
 \

src/external/mpl/mozilla-certdata/share/certs/Telekom_Security_TLS_RSA_Root_2023.pem
 \

src/external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G3.pem \

src/external/mpl/mozilla-certdata/share/certs/TrustAsia_Global_Root_CA_G4.pem

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



CVS commit: src/external/mpl/mozilla-certdata/share

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:24:41 UTC 2024

Modified Files:
src/external/mpl/mozilla-certdata/share: Makefile

Log Message:
mozilla-certdata: Update reference in Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/mozilla-certdata/share/Makefile

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



CVS commit: src/external/mpl/mozilla-certdata/share

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:24:41 UTC 2024

Modified Files:
src/external/mpl/mozilla-certdata/share: Makefile

Log Message:
mozilla-certdata: Update reference in Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/mozilla-certdata/share/Makefile

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

Modified files:

Index: src/external/mpl/mozilla-certdata/share/Makefile
diff -u src/external/mpl/mozilla-certdata/share/Makefile:1.3 src/external/mpl/mozilla-certdata/share/Makefile:1.4
--- src/external/mpl/mozilla-certdata/share/Makefile:1.3	Wed Sep 27 00:28:32 2023
+++ src/external/mpl/mozilla-certdata/share/Makefile	Sun Mar  3 04:24:41 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2023/09/27 00:28:32 riastradh Exp $
+#	$NetBSD: Makefile,v 1.4 2024/03/03 04:24:41 riastradh Exp $
 #
 
 MOZCERTS=	/usr/share/certs/mozilla
@@ -57,9 +57,9 @@ SYMLINKS+=	../all/$C.pem ${MOZCERTS}/$D/
 #	   any new files and cvs rm any deleted files under certs/,
 #	   and commit certs/ and *.trust.
 #
-# Latest revision, from 2023-07-19:
+# Latest revision, from 2024-02-12:
 #
-# https://hg.mozilla.org/projects/nss/raw-file/f479bdba756c78ef9355a48c88744c69fdb4768e/lib/ckfw/builtins/certdata.txt
+# https://hg.mozilla.org/projects/nss/raw-file/c17a3709bdd6e706040ac268a1d2b488c2fab5d8/lib/ckfw/builtins/certdata.txt
 #
 regen: .PHONY
 	rm -f certs/*.pem



CVS import: src/external/mpl/mozilla-certdata/dist

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:20:55 UTC 2024

Update of /cvsroot/src/external/mpl/mozilla-certdata/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3110

Log Message:
mozilla-certdata: Update Mozilla certdata.txt.

nss hg date: 2024-02-12
nss hg revision: c17a3709bdd6e706040ac268a1d2b488c2fab5d8


Status:

Vendor Tag: MOZILLA-CERTDATA
Release Tags:   mozilla-certdata-20240212

U src/external/mpl/mozilla-certdata/dist/certdata.txt

No conflicts created by this import



CVS import: src/external/mpl/mozilla-certdata/dist

2024-03-02 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sun Mar  3 04:20:55 UTC 2024

Update of /cvsroot/src/external/mpl/mozilla-certdata/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv3110

Log Message:
mozilla-certdata: Update Mozilla certdata.txt.

nss hg date: 2024-02-12
nss hg revision: c17a3709bdd6e706040ac268a1d2b488c2fab5d8


Status:

Vendor Tag: MOZILLA-CERTDATA
Release Tags:   mozilla-certdata-20240212

U src/external/mpl/mozilla-certdata/dist/certdata.txt

No conflicts created by this import



CVS commit: src

2024-03-02 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Mar  3 00:50:42 UTC 2024

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: msg_360.c msg_361.c msg_366.c msg_374.c
msg_375.c msg_376.c t_usage.sh
src/usr.bin/xlint/lint1: cksnprintb.c err.c externs1.h tree.c
Added Files:
src/tests/usr.bin/xlint/lint1: msg_377.c msg_378.c

Log Message:
lint: check for unreachable bits and fields in snprintb formats

While here, clean up a few existing checks.


To generate a diff of this commit:
cvs rdiff -u -r1.1308 -r1.1309 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_360.c \
src/tests/usr.bin/xlint/lint1/msg_361.c \
src/tests/usr.bin/xlint/lint1/msg_366.c \
src/tests/usr.bin/xlint/lint1/msg_374.c \
src/tests/usr.bin/xlint/lint1/msg_376.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_375.c
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/msg_377.c \
src/tests/usr.bin/xlint/lint1/msg_378.c
cvs rdiff -u -r1.17 -r1.18 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.228 -r1.229 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.217 -r1.218 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.607 -r1.608 src/usr.bin/xlint/lint1/tree.c

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1308 src/distrib/sets/lists/tests/mi:1.1309
--- src/distrib/sets/lists/tests/mi:1.1308	Sat Mar  2 11:56:37 2024
+++ src/distrib/sets/lists/tests/mi	Sun Mar  3 00:50:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1308 2024/03/02 11:56:37 rillig Exp $
+# $NetBSD: mi,v 1.1309 2024/03/03 00:50:41 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7491,6 +7491,8 @@
 ./usr/tests/usr.bin/xlint/lint1/msg_374.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_375.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_376.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_377.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_378.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/op_colon.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/op_colon.exp			tests-obsolete		obsolete,atf
 ./usr/tests/usr.bin/xlint/lint1/op_shl_lp64.c			tests-usr.bin-tests	compattestfile,atf

Index: src/tests/usr.bin/xlint/lint1/msg_360.c
diff -u src/tests/usr.bin/xlint/lint1/msg_360.c:1.1 src/tests/usr.bin/xlint/lint1/msg_360.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_360.c:1.1	Fri Mar  1 19:39:28 2024
+++ src/tests/usr.bin/xlint/lint1/msg_360.c	Sun Mar  3 00:50:41 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_360.c,v 1.1 2024/03/01 19:39:28 rillig Exp $	*/
+/*	$NetBSD: msg_360.c,v 1.2 2024/03/03 00:50:41 rillig Exp $	*/
 # 3 "msg_360.c"
 
 // Test for message: missing new-style number base after '\177' [360]
@@ -23,6 +23,6 @@ new_style_number_base(void)
 
 	/* expect+1: warning: missing new-style number base after '\177' [360] */
 	snprintb(buf, sizeof(buf), "\177", 0);
-	/* expect+1: warning: number base '\002' is 2, should be 8, 10 or 16 [361] */
+	/* expect+1: warning: number base '\002' is 2, must be 8, 10 or 16 [361] */
 	snprintb(buf, sizeof(buf), "\177\002", 0);
 }
Index: src/tests/usr.bin/xlint/lint1/msg_361.c
diff -u src/tests/usr.bin/xlint/lint1/msg_361.c:1.1 src/tests/usr.bin/xlint/lint1/msg_361.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_361.c:1.1	Fri Mar  1 19:39:28 2024
+++ src/tests/usr.bin/xlint/lint1/msg_361.c	Sun Mar  3 00:50:41 2024
@@ -1,7 +1,7 @@
-/*	$NetBSD: msg_361.c,v 1.1 2024/03/01 19:39:28 rillig Exp $	*/
+/*	$NetBSD: msg_361.c,v 1.2 2024/03/03 00:50:41 rillig Exp $	*/
 # 3 "msg_361.c"
 
-// Test for message: number base '%.*s' is %ju, should be 8, 10 or 16 [361]
+// Test for message: number base '%.*s' is %ju, must be 8, 10 or 16 [361]
 
 /*
  * The first or second character of the snprintb format specifies the number
@@ -22,12 +22,12 @@ old_style_number_base(void)
 
 	/* expect+1: warning: missing new-style '\177' or old-style number base [359] */
 	snprintb(buf, sizeof(buf), "", 0);
-	/* expect+1: warning: number base '\002' is 2, should be 8, 10 or 16 [361] */
+	/* expect+1: warning: number base '\002' is 2, must be 8, 10 or 16 [361] */
 	snprintb(buf, sizeof(buf), "\002", 0);
 	snprintb(buf, sizeof(buf), "\010", 0);
 	snprintb(buf, sizeof(buf), "\n", 0);
 	snprintb(buf, sizeof(buf), "\020", 0);
-	/* expect+1: warning: number base '\014' is 12, should be 8, 10 or 16 [361] */
+	/* expect+1: warning: number base '\014' is 12, must be 8, 10 or 16 [361] */
 	snprintb(buf, sizeof(buf), "" "\014" "", 0);
 	snprintb(buf, sizeof(buf), "" "\020" "", 0);
 }
@@ -39,14 +39,14 

CVS commit: src

2024-03-02 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Mar  3 00:50:42 UTC 2024

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: msg_360.c msg_361.c msg_366.c msg_374.c
msg_375.c msg_376.c t_usage.sh
src/usr.bin/xlint/lint1: cksnprintb.c err.c externs1.h tree.c
Added Files:
src/tests/usr.bin/xlint/lint1: msg_377.c msg_378.c

Log Message:
lint: check for unreachable bits and fields in snprintb formats

While here, clean up a few existing checks.


To generate a diff of this commit:
cvs rdiff -u -r1.1308 -r1.1309 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_360.c \
src/tests/usr.bin/xlint/lint1/msg_361.c \
src/tests/usr.bin/xlint/lint1/msg_366.c \
src/tests/usr.bin/xlint/lint1/msg_374.c \
src/tests/usr.bin/xlint/lint1/msg_376.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_375.c
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/msg_377.c \
src/tests/usr.bin/xlint/lint1/msg_378.c
cvs rdiff -u -r1.17 -r1.18 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.228 -r1.229 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.217 -r1.218 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.607 -r1.608 src/usr.bin/xlint/lint1/tree.c

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



CVS commit: src/sys/arch/alpha/gbus

2024-03-02 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Mar  2 22:58:29 UTC 2024

Modified Files:
src/sys/arch/alpha/gbus: mcclock_gbus.c

Log Message:
tlsb -> gbus.  No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/gbus/mcclock_gbus.c

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



CVS commit: src/sys/arch/alpha/gbus

2024-03-02 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Mar  2 22:58:29 UTC 2024

Modified Files:
src/sys/arch/alpha/gbus: mcclock_gbus.c

Log Message:
tlsb -> gbus.  No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/alpha/gbus/mcclock_gbus.c

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

Modified files:

Index: src/sys/arch/alpha/gbus/mcclock_gbus.c
diff -u src/sys/arch/alpha/gbus/mcclock_gbus.c:1.1 src/sys/arch/alpha/gbus/mcclock_gbus.c:1.2
--- src/sys/arch/alpha/gbus/mcclock_gbus.c:1.1	Sat Mar  2 19:57:57 2024
+++ src/sys/arch/alpha/gbus/mcclock_gbus.c	Sat Mar  2 22:58:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_gbus.c,v 1.1 2024/03/02 19:57:57 thorpej Exp $ */
+/* $NetBSD: mcclock_gbus.c,v 1.2 2024/03/02 22:58:29 thorpej Exp $ */
 
 /*
  * Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcclock_gbus.c,v 1.1 2024/03/02 19:57:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_gbus.c,v 1.2 2024/03/02 22:58:29 thorpej Exp $");
 
 #include 
 #include 
@@ -60,23 +60,23 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_gbus
  */
 #define	REGSHIFT	6
 
-struct mcclock_tlsb_softc {
+struct mcclock_gbus_softc {
 	struct mc146818_softc	sc_mc146818;
 	unsigned long regbase;
 };
 
-static int	mcclock_tlsb_match(device_t, cfdata_t, void *);
-static void	mcclock_tlsb_attach(device_t, device_t, void *);
+static int	mcclock_gbus_match(device_t, cfdata_t, void *);
+static void	mcclock_gbus_attach(device_t, device_t, void *);
 
-CFATTACH_DECL_NEW(mcclock_gbus, sizeof(struct mcclock_tlsb_softc),
-mcclock_tlsb_match, mcclock_tlsb_attach, NULL, NULL);
+CFATTACH_DECL_NEW(mcclock_gbus, sizeof(struct mcclock_gbus_softc),
+mcclock_gbus_match, mcclock_gbus_attach, NULL, NULL);
 
-static void	mcclock_tlsb_write(struct mc146818_softc *, u_int, u_int);
-static u_int	mcclock_tlsb_read(struct mc146818_softc *, u_int);
+static void	mcclock_gbus_write(struct mc146818_softc *, u_int, u_int);
+static u_int	mcclock_gbus_read(struct mc146818_softc *, u_int);
 
 
 static int
-mcclock_tlsb_match(device_t parent, cfdata_t cf, void *aux)
+mcclock_gbus_match(device_t parent, cfdata_t cf, void *aux)
 {
 	struct gbus_attach_args *ga = aux;
 
@@ -86,9 +86,9 @@ mcclock_tlsb_match(device_t parent, cfda
 }
 
 static void
-mcclock_tlsb_attach(device_t parent, device_t self, void *aux)
+mcclock_gbus_attach(device_t parent, device_t self, void *aux)
 {
-	struct mcclock_tlsb_softc *tsc = device_private(self);
+	struct mcclock_gbus_softc *tsc = device_private(self);
 	struct gbus_attach_args *ga = aux;
 	struct mc146818_softc *sc = >sc_mc146818;
 
@@ -96,16 +96,16 @@ mcclock_tlsb_attach(device_t parent, dev
 	tsc->regbase = TLSB_GBUS_BASE + ga->ga_offset;
 
 	sc->sc_dev = self;
-	sc->sc_mcread  = mcclock_tlsb_read;
-	sc->sc_mcwrite = mcclock_tlsb_write;
+	sc->sc_mcread  = mcclock_gbus_read;
+	sc->sc_mcwrite = mcclock_gbus_write;
 
 	mcclock_attach(sc);
 }
 
 static void
-mcclock_tlsb_write(struct mc146818_softc *sc, u_int reg, u_int val)
+mcclock_gbus_write(struct mc146818_softc *sc, u_int reg, u_int val)
 {
-	struct mcclock_tlsb_softc *tsc = (void *)sc;
+	struct mcclock_gbus_softc *tsc = (void *)sc;
 	unsigned char *ptr = (unsigned char *)
 		KV(tsc->regbase + (reg << REGSHIFT));
 
@@ -113,9 +113,9 @@ mcclock_tlsb_write(struct mc146818_softc
 }
 
 static u_int
-mcclock_tlsb_read(struct mc146818_softc *sc, u_int reg)
+mcclock_gbus_read(struct mc146818_softc *sc, u_int reg)
 {
-	struct mcclock_tlsb_softc *tsc = (void *)sc;
+	struct mcclock_gbus_softc *tsc = (void *)sc;
 	unsigned char *ptr = (unsigned char *)
 		KV(tsc->regbase + (reg << REGSHIFT));
 



CVS commit: src/sys/arch/alpha

2024-03-02 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Mar  2 20:15:33 UTC 2024

Modified Files:
src/sys/arch/alpha/alpha: cpuconf.c
src/sys/arch/alpha/conf: GENERIC INSTALL files.alpha
src/sys/arch/alpha/include: prom.h
Added Files:
src/sys/arch/alpha/alpha: dec_kn7aa.c

Log Message:
Add the basic framework for the DEC KN7AA ("Ruby") systems -- DEC 7000
and DEC 1.

This is a work-in-progress, but this should be sufficient for the system
to boot, using the PROM console routines (and then proceed to not find any
devices because we don't yet support the "Laser System Bus").


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/alpha/cpuconf.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/alpha/alpha/dec_kn7aa.c
cvs rdiff -u -r1.419 -r1.420 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/alpha/conf/INSTALL
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/include/prom.h

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



CVS commit: src/sys/arch/alpha

2024-03-02 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Mar  2 20:15:33 UTC 2024

Modified Files:
src/sys/arch/alpha/alpha: cpuconf.c
src/sys/arch/alpha/conf: GENERIC INSTALL files.alpha
src/sys/arch/alpha/include: prom.h
Added Files:
src/sys/arch/alpha/alpha: dec_kn7aa.c

Log Message:
Add the basic framework for the DEC KN7AA ("Ruby") systems -- DEC 7000
and DEC 1.

This is a work-in-progress, but this should be sufficient for the system
to boot, using the PROM console routines (and then proceed to not find any
devices because we don't yet support the "Laser System Bus").


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/alpha/cpuconf.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/alpha/alpha/dec_kn7aa.c
cvs rdiff -u -r1.419 -r1.420 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/alpha/conf/INSTALL
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/include/prom.h

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

Modified files:

Index: src/sys/arch/alpha/alpha/cpuconf.c
diff -u src/sys/arch/alpha/alpha/cpuconf.c:1.37 src/sys/arch/alpha/alpha/cpuconf.c:1.38
--- src/sys/arch/alpha/alpha/cpuconf.c:1.37	Mon Apr  8 00:47:21 2019
+++ src/sys/arch/alpha/alpha/cpuconf.c	Sat Mar  2 20:15:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuconf.c,v 1.37 2019/04/08 00:47:21 thorpej Exp $ */
+/* $NetBSD: cpuconf.c,v 1.38 2024/03/02 20:15:33 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.37 2019/04/08 00:47:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.38 2024/03/02 20:15:33 thorpej Exp $");
 
 #include 
 #include 
@@ -68,6 +68,13 @@ __KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 
 #include 
 #include 
 
+#include "opt_dec_kn7aa.h"
+#ifdef DEC_KN7AA
+extern void dec_kn7aa_init(void);
+#else
+#define	dec_kn7aa_init		platform_not_configured
+#endif
+
 #include "opt_dec_3000_500.h"
 #ifdef DEC_3000_500
 extern void dec_3000_500_init(void);
@@ -208,7 +215,7 @@ extern void dec_2000_300_init(void);
 static const struct cpuinit cpuinit[] = {
 	cpu_notsupp(ST_ADU, "Alpha Demo Unit"),
 	cpu_notsupp(ST_DEC_4000, "DEC 4000 (``Cobra'')"),
-	cpu_notsupp(ST_DEC_7000, "DEC 7000 (``Ruby'')"),
+	cpu_init(ST_DEC_7000, dec_kn7aa_init, "DEC_KN7AA"),
 	cpu_init(ST_DEC_3000_500, dec_3000_500_init, "DEC_3000_500"),
 	cpu_init(ST_DEC_2000_300, dec_2000_300_init, "DEC_2000_300"),
 	cpu_init(ST_DEC_3000_300, dec_3000_300_init, "DEC_3000_300"),

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.419 src/sys/arch/alpha/conf/GENERIC:1.420
--- src/sys/arch/alpha/conf/GENERIC:1.419	Sun Dec 17 18:48:53 2023
+++ src/sys/arch/alpha/conf/GENERIC	Sat Mar  2 20:15:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.419 2023/12/17 18:48:53 andvar Exp $
+# $NetBSD: GENERIC,v 1.420 2024/03/02 20:15:33 thorpej Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.419 $"
+ident		"GENERIC-$Revision: 1.420 $"
 
 maxusers 32
 
@@ -34,6 +34,7 @@ options 	DEC_AXPPCI_33	# NoName:	AXPpci3
 options 	DEC_EB164	# EB164:	AlphaPC 164
 options 	DEC_EB64PLUS	# EB64+:	AlphaPC 64, etc.
 options 	DEC_KN20AA	# KN20AA:	AlphaStation 500 and 600
+options 	DEC_KN7AA	# KN7AA:	DEC 7000 and 1
 options 	DEC_KN8AE	# KN8AE:	AlphaServer 8200 and 8400
 options 	DEC_KN300	# KN300:	AlphaServer 4100 and 1200
 options 	DEC_550		# Miata:	Digital Personal Workstation

Index: src/sys/arch/alpha/conf/INSTALL
diff -u src/sys/arch/alpha/conf/INSTALL:1.118 src/sys/arch/alpha/conf/INSTALL:1.119
--- src/sys/arch/alpha/conf/INSTALL:1.118	Fri Jul 23 14:38:58 2021
+++ src/sys/arch/alpha/conf/INSTALL	Sat Mar  2 20:15:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.118 2021/07/23 14:38:58 thorpej Exp $
+# $NetBSD: INSTALL,v 1.119 2024/03/02 20:15:33 thorpej Exp $
 #
 # Alpha INSTALL kernel.
 
@@ -29,6 +29,7 @@ options 	DEC_AXPPCI_33	# NoName:	AXPpci3
 options 	DEC_EB164	# EB164:	AlphaPC 164
 options 	DEC_EB64PLUS	# EB64+:	AlphaPC 64, etc.
 options 	DEC_KN20AA	# KN20AA:	AlphaStation 500 and 600
+options 	DEC_KN7AA	# KN7AA:	DEC 7000 and 1
 options 	DEC_KN8AE	# KN8AE:	AlphaServer 8200 and 8400
 options 	DEC_KN300	# KN300:	AlphaServer 4100 and 1200
 options 	DEC_550		# Miata:	Digital Personal Workstation

Index: src/sys/arch/alpha/conf/files.alpha
diff -u src/sys/arch/alpha/conf/files.alpha:1.195 src/sys/arch/alpha/conf/files.alpha:1.196
--- src/sys/arch/alpha/conf/files.alpha:1.195	Sat Mar  2 19:57:57 2024
+++ src/sys/arch/alpha/conf/files.alpha	Sat Mar  2 20:15:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.195 2024/03/02 19:57:57 thorpej Exp $
+# $NetBSD: 

CVS commit: src/sys/arch/alpha

2024-03-02 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Mar  2 19:57:58 UTC 2024

Modified Files:
src/sys/arch/alpha/conf: files.alpha
Added Files:
src/sys/arch/alpha/gbus: gbus.c gbusreg.h gbusvar.h mcclock_gbus.c
Removed Files:
src/sys/arch/alpha/tlsb: gbus.c gbusreg.h gbusvar.h mcclock_tlsb.c

Log Message:
Shuffle GBus-related files into their own directory in preparation for
other GBus attachments.  No functional change here; just minimal editing
to reflect path differences after moving the files.


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r0 -r1.1 src/sys/arch/alpha/gbus/gbus.c \
src/sys/arch/alpha/gbus/gbusreg.h src/sys/arch/alpha/gbus/gbusvar.h \
src/sys/arch/alpha/gbus/mcclock_gbus.c
cvs rdiff -u -r1.25 -r0 src/sys/arch/alpha/tlsb/gbus.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/alpha/tlsb/gbusreg.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/alpha/tlsb/gbusvar.h
cvs rdiff -u -r1.18 -r0 src/sys/arch/alpha/tlsb/mcclock_tlsb.c

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

Modified files:

Index: src/sys/arch/alpha/conf/files.alpha
diff -u src/sys/arch/alpha/conf/files.alpha:1.194 src/sys/arch/alpha/conf/files.alpha:1.195
--- src/sys/arch/alpha/conf/files.alpha:1.194	Wed Oct 21 13:31:50 2020
+++ src/sys/arch/alpha/conf/files.alpha	Sat Mar  2 19:57:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.194 2020/10/21 13:31:50 christos Exp $
+# $NetBSD: files.alpha,v 1.195 2024/03/02 19:57:57 thorpej Exp $
 #
 # alpha-specific configuration info
 
@@ -96,9 +96,13 @@ device	tlsbmem
 attach	tlsbmem at tlsb
 file	arch/alpha/tlsb/tlsbmem.c	tlsbmem
 
+#
+# GBus support
+#
+
 device	gbus { offset = -1 }
 attach	gbus at tlsb
-file	arch/alpha/tlsb/gbus.c		gbus
+file	arch/alpha/gbus/gbus.c		gbus
 
 #
 # MCBUS support
@@ -316,7 +320,6 @@ attach	fdc at sableio with fdc_sableio
 file	arch/alpha/sableio/fdc_sableio.c	fdc_sableio
 
 # CPU support files
-file	arch/alpha/alpha/dec_2000_300.c	dec_2000_300
 file	arch/alpha/pci/pci_2100_a50.c	dec_2100_a50
 file	arch/alpha/pci/pci_2100_a500.c	dec_2100_a500 | dec_2100a_a500
 file	arch/alpha/pci/pci_up1000.c	api_up1000
@@ -358,12 +361,12 @@ file	arch/alpha/pci/sio_pic.c	sio | pceb
 device	mcclock: mc146818
 attach	mcclock at ioasic with mcclock_ioasic
 attach	mcclock at isa with mcclock_isa
-attach	mcclock at gbus with mcclock_tlsb
+attach	mcclock at gbus with mcclock_gbus
 attach	mcclock at jensenio with mcclock_jensenio
 file	arch/alpha/alpha/mcclock.c	mcclock
 file	arch/alpha/tc/mcclock_ioasic.c	mcclock_ioasic
 file	arch/alpha/isa/mcclock_isa.c	mcclock_isa
-file	arch/alpha/tlsb/mcclock_tlsb.c	mcclock_tlsb
+file	arch/alpha/gbus/mcclock_gbus.c	mcclock_gbus
 file	arch/alpha/jensenio/mcclock_jensenio.c	mcclock_jensenio
 
 
@@ -401,6 +404,7 @@ file	dev/bus_dma/bus_dmamem_common.c
 file	arch/alpha/alpha/promcons.c
 
 # CPU support
+file	arch/alpha/alpha/dec_2000_300.c		dec_2000_300
 file	arch/alpha/alpha/dec_2100_a50.c		dec_2100_a50
 file	arch/alpha/alpha/dec_2100_a500.c	dec_2100_a500 | dec_2100a_a500
 file	arch/alpha/alpha/dec_3000_300.c		dec_3000_300

Added files:

Index: src/sys/arch/alpha/gbus/gbus.c
diff -u /dev/null src/sys/arch/alpha/gbus/gbus.c:1.1
--- /dev/null	Sat Mar  2 19:57:58 2024
+++ src/sys/arch/alpha/gbus/gbus.c	Sat Mar  2 19:57:57 2024
@@ -0,0 +1,131 @@
+/* $NetBSD: gbus.c,v 1.1 2024/03/02 19:57:57 thorpej Exp $ */
+
+/*
+ * Copyright (c) 1997 by Matthew Jacob
+ * NASA AMES Research Center.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice immediately at the beginning of the file, without modification,
+ *this list of conditions, and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 

CVS commit: src/sys/arch/alpha

2024-03-02 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sat Mar  2 19:57:58 UTC 2024

Modified Files:
src/sys/arch/alpha/conf: files.alpha
Added Files:
src/sys/arch/alpha/gbus: gbus.c gbusreg.h gbusvar.h mcclock_gbus.c
Removed Files:
src/sys/arch/alpha/tlsb: gbus.c gbusreg.h gbusvar.h mcclock_tlsb.c

Log Message:
Shuffle GBus-related files into their own directory in preparation for
other GBus attachments.  No functional change here; just minimal editing
to reflect path differences after moving the files.


To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/alpha/conf/files.alpha
cvs rdiff -u -r0 -r1.1 src/sys/arch/alpha/gbus/gbus.c \
src/sys/arch/alpha/gbus/gbusreg.h src/sys/arch/alpha/gbus/gbusvar.h \
src/sys/arch/alpha/gbus/mcclock_gbus.c
cvs rdiff -u -r1.25 -r0 src/sys/arch/alpha/tlsb/gbus.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/alpha/tlsb/gbusreg.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/alpha/tlsb/gbusvar.h
cvs rdiff -u -r1.18 -r0 src/sys/arch/alpha/tlsb/mcclock_tlsb.c

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



CVS commit: src

2024-03-02 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Mar  2 11:56:37 UTC 2024

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: msg_369.c msg_370.c msg_372.c msg_373.c
msg_375.c t_usage.sh
src/usr.bin/xlint/lint1: cksnprintb.c err.c
Added Files:
src/tests/usr.bin/xlint/lint1: msg_376.c

Log Message:
lint: check snprintb formats for overlapping bits and fields


To generate a diff of this commit:
cvs rdiff -u -r1.1307 -r1.1308 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_369.c \
src/tests/usr.bin/xlint/lint1/msg_370.c \
src/tests/usr.bin/xlint/lint1/msg_372.c \
src/tests/usr.bin/xlint/lint1/msg_373.c \
src/tests/usr.bin/xlint/lint1/msg_375.c
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/msg_376.c
cvs rdiff -u -r1.16 -r1.17 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/xlint/lint1/err.c

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



CVS commit: src

2024-03-02 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Mar  2 11:56:37 UTC 2024

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: msg_369.c msg_370.c msg_372.c msg_373.c
msg_375.c t_usage.sh
src/usr.bin/xlint/lint1: cksnprintb.c err.c
Added Files:
src/tests/usr.bin/xlint/lint1: msg_376.c

Log Message:
lint: check snprintb formats for overlapping bits and fields


To generate a diff of this commit:
cvs rdiff -u -r1.1307 -r1.1308 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_369.c \
src/tests/usr.bin/xlint/lint1/msg_370.c \
src/tests/usr.bin/xlint/lint1/msg_372.c \
src/tests/usr.bin/xlint/lint1/msg_373.c \
src/tests/usr.bin/xlint/lint1/msg_375.c
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/msg_376.c
cvs rdiff -u -r1.16 -r1.17 src/tests/usr.bin/xlint/lint1/t_usage.sh
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/lint1/cksnprintb.c
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/xlint/lint1/err.c

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1307 src/distrib/sets/lists/tests/mi:1.1308
--- src/distrib/sets/lists/tests/mi:1.1307	Fri Mar  1 19:39:28 2024
+++ src/distrib/sets/lists/tests/mi	Sat Mar  2 11:56:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1307 2024/03/01 19:39:28 rillig Exp $
+# $NetBSD: mi,v 1.1308 2024/03/02 11:56:37 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7490,6 +7490,7 @@
 ./usr/tests/usr.bin/xlint/lint1/msg_373.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_374.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/msg_375.c			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_376.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/op_colon.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/op_colon.exp			tests-obsolete		obsolete,atf
 ./usr/tests/usr.bin/xlint/lint1/op_shl_lp64.c			tests-usr.bin-tests	compattestfile,atf

Index: src/tests/usr.bin/xlint/lint1/msg_369.c
diff -u src/tests/usr.bin/xlint/lint1/msg_369.c:1.1 src/tests/usr.bin/xlint/lint1/msg_369.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_369.c:1.1	Fri Mar  1 19:39:29 2024
+++ src/tests/usr.bin/xlint/lint1/msg_369.c	Sat Mar  2 11:56:37 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_369.c,v 1.1 2024/03/01 19:39:29 rillig Exp $	*/
+/*	$NetBSD: msg_369.c,v 1.2 2024/03/02 11:56:37 rillig Exp $	*/
 # 3 "msg_369.c"
 
 // Test for message: bit position '%.*s' in '%.*s' should be escaped as octal or hex [369]
@@ -42,11 +42,11 @@ example(unsigned u32, uint64_t u64)
 	"b\nnewline\0",
 	u64);
 
-	/* expect+6: warning: bit position '\t' in 'f\t\010tab\0' should be escaped as octal or hex [369] */
-	/* expect+5: warning: bit position '\n' in 'F\n\010newline\0' should be escaped as octal or hex [369] */
+	/* expect+6: warning: bit position '\t' in 'f\t\001tab\0' should be escaped as octal or hex [369] */
+	/* expect+5: warning: bit position '\n' in 'F\n\001newline\0' should be escaped as octal or hex [369] */
 	snprintb(buf, sizeof(buf),
 	"\177\020"
-	"f\t\010tab\0"
-	"F\n\010newline\0",
+	"f\t\001tab\0"
+	"F\n\001newline\0",
 	u64);
 }
Index: src/tests/usr.bin/xlint/lint1/msg_370.c
diff -u src/tests/usr.bin/xlint/lint1/msg_370.c:1.1 src/tests/usr.bin/xlint/lint1/msg_370.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_370.c:1.1	Fri Mar  1 19:39:29 2024
+++ src/tests/usr.bin/xlint/lint1/msg_370.c	Sat Mar  2 11:56:37 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_370.c,v 1.1 2024/03/01 19:39:29 rillig Exp $	*/
+/*	$NetBSD: msg_370.c,v 1.2 2024/03/02 11:56:37 rillig Exp $	*/
 # 3 "msg_370.c"
 
 // Test for message: field width '%.*s' in '%.*s' should be escaped as octal or hex [370]
@@ -34,6 +34,7 @@ example(uint64_t u64)
 	"f\t\ttab\0"
 	"f\n\nnewline\0",
 	u64);
+	/* expect-1: warning: 'f\n\nnewline\0' overlaps earlier 'f\t\ttab\0' on bit 10 [376] */
 
 	/* expect+11: warning: bit position ' ' in 'F  space\0' should be escaped as octal or hex [369] */
 	/* expect+10: warning: field width ' ' in 'F  space\0' should be escaped as octal or hex [370] */
@@ -47,4 +48,5 @@ example(uint64_t u64)
 	"F\t\ttab\0"
 	"F\n\nnewline\0",
 	u64);
+	/* expect-1: warning: 'F\n\nnewline\0' overlaps earlier 'F\t\ttab\0' on bit 10 [376] */
 }
Index: src/tests/usr.bin/xlint/lint1/msg_372.c
diff -u src/tests/usr.bin/xlint/lint1/msg_372.c:1.1 src/tests/usr.bin/xlint/lint1/msg_372.c:1.2
--- src/tests/usr.bin/xlint/lint1/msg_372.c:1.1	Fri Mar  1 19:39:29 2024
+++ src/tests/usr.bin/xlint/lint1/msg_372.c	Sat Mar  2 11:56:37 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_372.c,v 1.1 2024/03/01 19:39:29 rillig Exp $	*/
+/*	$NetBSD: msg_372.c,v 1.2 2024/03/02 11:56:37 

CVS commit: src/usr.bin/xlint

2024-03-02 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Mar  2 09:32:19 UTC 2024

Modified Files:
src/usr.bin/xlint/common: lint.h
src/usr.bin/xlint/lint1: decl.c emit1.c err.c lex.c
src/usr.bin/xlint/lint2: chk.c emit2.c read.c
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: remove custom wrappers around  functions


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/xlint/common/lint.h
cvs rdiff -u -r1.393 -r1.394 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.226 -r1.227 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.220 -r1.221 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/xlint/lint2/emit2.c
cvs rdiff -u -r1.90 -r1.91 src/usr.bin/xlint/lint2/read.c
cvs rdiff -u -r1.122 -r1.123 src/usr.bin/xlint/xlint/xlint.c

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

Modified files:

Index: src/usr.bin/xlint/common/lint.h
diff -u src/usr.bin/xlint/common/lint.h:1.48 src/usr.bin/xlint/common/lint.h:1.49
--- src/usr.bin/xlint/common/lint.h:1.48	Thu Feb  1 18:37:06 2024
+++ src/usr.bin/xlint/common/lint.h	Sat Mar  2 09:32:18 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: lint.h,v 1.48 2024/02/01 18:37:06 rillig Exp $	*/
+/*	$NetBSD: lint.h,v 1.49 2024/03/02 09:32:18 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -161,33 +161,3 @@ typedef struct lint2_type type_t;
 #endif
 
 #include "externs.h"
-
-static inline bool
-ch_isalnum(char ch)
-{
-	return isalnum((unsigned char)ch) != 0;
-}
-
-static inline bool
-ch_isdigit(char ch)
-{
-	return isdigit((unsigned char)ch) != 0;
-}
-
-static inline bool
-ch_isprint(char ch)
-{
-	return isprint((unsigned char)ch) != 0;
-}
-
-static inline bool
-ch_isspace(char ch)
-{
-	return isspace((unsigned char)ch) != 0;
-}
-
-static inline bool
-ch_isupper(char ch)
-{
-	return isupper((unsigned char)ch) != 0;
-}

Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.393 src/usr.bin/xlint/lint1/decl.c:1.394
--- src/usr.bin/xlint/lint1/decl.c:1.393	Thu Feb  8 20:59:19 2024
+++ src/usr.bin/xlint/lint1/decl.c	Sat Mar  2 09:32:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.393 2024/02/08 20:59:19 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.394 2024/03/02 09:32:18 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.393 2024/02/08 20:59:19 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.394 2024/03/02 09:32:18 rillig Exp $");
 #endif
 
 #include 
@@ -1776,7 +1776,7 @@ check_extern_declaration(const sym_t *sy
 	dcs->d_redeclared_symbol == NULL &&
 	ends_with(curr_pos.p_file, ".c") &&
 	allow_c90 &&
-	!ch_isdigit(sym->s_name[0]) &&	/* see mktempsym */
+	!isdigit((unsigned char)sym->s_name[0]) &&	/* see mktempsym */
 	strcmp(sym->s_name, "main") != 0) {
 		/* missing%s header declaration for '%s' */
 		warning(351, sym->s_type->t_tspec == FUNC ? "" : " 'extern'",
@@ -2873,7 +2873,7 @@ check_variable_usage(bool novar, const s
 	lint_assert(block_level != 0);
 
 	/* example at file scope: int c = ({ return 3; }); */
-	if (sym->s_block_level == 0 && ch_isdigit(sym->s_name[0]))
+	if (sym->s_block_level == 0 && isdigit((unsigned char)sym->s_name[0]))
 		return;
 
 	/* errors in expressions easily cause lots of these warnings */

Index: src/usr.bin/xlint/lint1/emit1.c
diff -u src/usr.bin/xlint/lint1/emit1.c:1.88 src/usr.bin/xlint/lint1/emit1.c:1.89
--- src/usr.bin/xlint/lint1/emit1.c:1.88	Fri Mar  1 21:52:48 2024
+++ src/usr.bin/xlint/lint1/emit1.c	Sat Mar  2 09:32:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.88 2024/03/01 21:52:48 rillig Exp $ */
+/* $NetBSD: emit1.c,v 1.89 2024/03/02 09:32:18 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID)
-__RCSID("$NetBSD: emit1.c,v 1.88 2024/03/01 21:52:48 rillig Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.89 2024/03/02 09:32:18 rillig Exp $");
 #endif
 
 #include 
@@ -185,7 +185,7 @@ outsym(const sym_t *sym, scl_t sc, def_t
 	 */
 	if (sc != EXTERN && !(sc == STATIC && sym->s_type->t_tspec == FUNC))
 		return;
-	if (ch_isdigit(sym->s_name[0]))	/* _tmp */
+	if (isdigit((unsigned char)sym->s_name[0]))	/* _tmp */
 		return;
 
 	outint(csrc_pos.p_line);
@@ -392,7 +392,7 @@ static void
 outqchar(char c)
 {
 
-	if (ch_isprint(c) && c != '\\' && c != '"' && c != '\'') {
+	if (isprint((unsigned char)c) && c != '\\' && c != '"' && c != '\'') {
 		outchar(c);
 		return;
 	}
@@ -466,7 +466,7 @@ outfstrg(const char *cp)
 		}
 
 		/* numeric field width */
-		while (ch_isdigit(c)) {
+		while (isdigit((unsigned char)c)) {
 			outchar(c);
 			c = *cp++;
 		}
@@ -479,7 +479,7 @@ outfstrg(const char *cp)
 outchar(c);
 c = 

CVS commit: src/usr.bin/xlint

2024-03-02 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Mar  2 09:32:19 UTC 2024

Modified Files:
src/usr.bin/xlint/common: lint.h
src/usr.bin/xlint/lint1: decl.c emit1.c err.c lex.c
src/usr.bin/xlint/lint2: chk.c emit2.c read.c
src/usr.bin/xlint/xlint: xlint.c

Log Message:
lint: remove custom wrappers around  functions


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/xlint/common/lint.h
cvs rdiff -u -r1.393 -r1.394 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.88 -r1.89 src/usr.bin/xlint/lint1/emit1.c
cvs rdiff -u -r1.226 -r1.227 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.220 -r1.221 src/usr.bin/xlint/lint1/lex.c
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/xlint/lint2/chk.c
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/xlint/lint2/emit2.c
cvs rdiff -u -r1.90 -r1.91 src/usr.bin/xlint/lint2/read.c
cvs rdiff -u -r1.122 -r1.123 src/usr.bin/xlint/xlint/xlint.c

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



CVS commit: src/sys/kern

2024-03-02 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Mar  2 08:59:47 UTC 2024

Modified Files:
src/sys/kern: sysv_shm.c

Log Message:
Avoid overflow when computing kern.ipc.shmmax. Keep shmmax (bytes) and
shmall (pages) values aligned and use arithmetic everywhere instead
of shifts.
Should fix PR 57979


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/sysv_shm.c

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

Modified files:

Index: src/sys/kern/sysv_shm.c
diff -u src/sys/kern/sysv_shm.c:1.141 src/sys/kern/sysv_shm.c:1.142
--- src/sys/kern/sysv_shm.c:1.141	Wed Oct  9 17:47:13 2019
+++ src/sys/kern/sysv_shm.c	Sat Mar  2 08:59:47 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysv_shm.c,v 1.141 2019/10/09 17:47:13 chs Exp $	*/
+/*	$NetBSD: sysv_shm.c,v 1.142 2024/03/02 08:59:47 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.141 2019/10/09 17:47:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm.c,v 1.142 2024/03/02 08:59:47 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sysv.h"
@@ -961,10 +961,10 @@ shminit(void)
 	ALIGN(shminfo.shmmni * sizeof(struct shmid_ds)));
 
 	if (shminfo.shmmax == 0)
-		shminfo.shmmax = uimax(physmem / 4, 1024) * PAGE_SIZE;
+		shminfo.shmall = uimax(physmem / 4, 1024);
 	else
-		shminfo.shmmax *= PAGE_SIZE;
-	shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
+		shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
+	shminfo.shmmax = (uint64_t)shminfo.shmall * PAGE_SIZE;
 
 	for (i = 0; i < shminfo.shmmni; i++) {
 		cv_init(_cv[i], "shmwait");
@@ -1083,7 +1083,7 @@ sysctl_ipc_shmmax(SYSCTLFN_ARGS)
 		return EINVAL;
 
 	shminfo.shmmax = round_page(newsize);
-	shminfo.shmall = shminfo.shmmax >> PAGE_SHIFT;
+	shminfo.shmall = shminfo.shmmax / PAGE_SIZE;
 
 	return 0;
 }



CVS commit: src/sys/kern

2024-03-02 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Mar  2 08:59:47 UTC 2024

Modified Files:
src/sys/kern: sysv_shm.c

Log Message:
Avoid overflow when computing kern.ipc.shmmax. Keep shmmax (bytes) and
shmall (pages) values aligned and use arithmetic everywhere instead
of shifts.
Should fix PR 57979


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/sysv_shm.c

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