CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Tue Aug 29 04:35:27 UTC 2023 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.hppa ad.m68k ad.mips ad.powerpc ad.riscv ad.sh3 md.alpha md.amd64 md.hppa md.i386 md.ia64 md.or1k md.sparc md.sparc64 md.vax Log Message: mark all previously gcc=9 files as obsolete. also mark a bunch of obsolete gcc headers as "comp-obsolete" "set". should fix a 'postinstall fix obsolete' issue reported by uwe@. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/comp/ad.hppa cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/comp/ad.powerpc \ src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.298 -r1.299 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/comp/md.hppa cvs rdiff -u -r1.206 -r1.207 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/comp/md.ia64 cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/md.or1k cvs rdiff -u -r1.214 -r1.215 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/md.vax 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/comp/ad.aarch64 diff -u src/distrib/sets/lists/comp/ad.aarch64:1.50 src/distrib/sets/lists/comp/ad.aarch64:1.51 --- src/distrib/sets/lists/comp/ad.aarch64:1.50 Mon Aug 7 00:45:47 2023 +++ src/distrib/sets/lists/comp/ad.aarch64 Tue Aug 29 04:35:26 2023 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.50 2023/08/07 00:45:47 rin Exp $ +# $NetBSD: ad.aarch64,v 1.51 2023/08/29 04:35:26 mrg Exp $ ./usr/include/aarch64comp-c-include ./usr/include/aarch64/ansi.h comp-c-include ./usr/include/aarch64/aout_machdep.h comp-c-include @@ -142,21 +142,21 @@ ./usr/include/gcc-4.8/mmintrin.h comp-c-include gcc=48 ./usr/include/gcc-4.8/tgmath.h comp-c-include gcc=48 ./usr/include/gcc-4.8/unwind-arm-common.h comp-c-include gcc=48,eabi -./usr/include/gcc-6/arm_acle.h comp-c-include obsolete -./usr/include/gcc-6/arm_neon.h comp-c-include obsolete -./usr/include/gcc-6/tgmath.h comp-c-include obsolete -./usr/include/gcc-7/arm_acle.h comp-c-include obsolete -./usr/include/gcc-7/arm_fp16.h comp-c-include obsolete -./usr/include/gcc-7/arm_neon.h comp-c-include obsolete -./usr/include/gcc-7/tgmath.h comp-c-include obsolete -./usr/include/gcc-8/arm_acle.h comp-c-include obsolete -./usr/include/gcc-8/arm_fp16.h comp-c-include obsolete -./usr/include/gcc-8/arm_neon.h comp-c-include obsolete -./usr/include/gcc-8/tgmath.h comp-c-include obsolete -./usr/include/gcc-9/arm_acle.h comp-c-include obsolete -./usr/include/gcc-9/arm_fp16.h comp-c-include obsolete -./usr/include/gcc-9/arm_neon.h comp-c-include obsolete -./usr/include/gcc-9/tgmath.h comp-c-include obsolete +./usr/include/gcc-6/arm_acle.h comp-obsolete obsolete +./usr/include/gcc-6/arm_neon.h comp-obsolete obsolete +./usr/include/gcc-6/tgmath.h comp-obsolete obsolete +./usr/include/gcc-7/arm_acle.h comp-obsolete obsolete +./usr/include/gcc-7/arm_fp16.h comp-obsolete obsolete +./usr/include/gcc-7/arm_neon.h comp-obsolete obsolete +./usr/include/gcc-7/tgmath.h comp-obsolete obsolete +./usr/include/gcc-8/arm_acle.h comp-obsolete obsolete +./usr/include/gcc-8/arm_fp16.h comp-obsolete obsolete +./usr/include/gcc-8/arm_neon.h comp-obsolete obsolete +./usr/include/gcc-8/tgmath.h comp-obsolete obsolete +./usr/include/gcc-9/arm_acle.h comp-obsolete obsolete +./usr/include/gcc-9/arm_fp16.h comp-obsolete obsolete +./usr/include/gcc-9/arm_neon.h comp-obsolete obsolete +./usr/include/gcc-9/tgmath.h comp-obsolete obsolete ./usr/include/gcc-10/arm_acle.h comp-c-include gcc=10 ./usr/include/gcc-10/arm_bf16.h comp-c-include gcc=10 ./usr/include/gcc-10/arm_fp16.h comp-c-include gcc=10 Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.108 src/distrib/sets/lists/comp/ad.arm:1.109 --- src/distrib/sets/lists/comp/ad.arm:1.108 Tue Aug 1 06:35:55 2023 +++ src/distrib/sets/lists/comp/ad.arm Tue Aug 29 04:35:26 2023 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.108 2023/08/01 06:35:55 mrg Exp $ +# $NetBSD: ad.arm,v 1.109 2023/08/29 04:35:26 mrg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/include/acorn26comp-obsolete obsolete ./usr/include/acorn26/ansi.h comp-obsolete obsolete @@ -418,30 +418,30 @@
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Tue Aug 29 04:35:27 UTC 2023 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.hppa ad.m68k ad.mips ad.powerpc ad.riscv ad.sh3 md.alpha md.amd64 md.hppa md.i386 md.ia64 md.or1k md.sparc md.sparc64 md.vax Log Message: mark all previously gcc=9 files as obsolete. also mark a bunch of obsolete gcc headers as "comp-obsolete" "set". should fix a 'postinstall fix obsolete' issue reported by uwe@. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.108 -r1.109 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/comp/ad.hppa cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/comp/ad.powerpc \ src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.298 -r1.299 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/comp/md.hppa cvs rdiff -u -r1.206 -r1.207 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/comp/md.ia64 cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/md.or1k cvs rdiff -u -r1.214 -r1.215 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/md.vax Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: riastradh Date: Mon Aug 28 23:57:25 UTC 2023 Modified Files: src/etc/mtree: special src/usr.sbin/certctl: Makefile Log Message: certctl(8): Set certs.conf 644 and add it to etc/mtree/special. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/etc/mtree/special cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/certctl/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/mtree/special diff -u src/etc/mtree/special:1.175 src/etc/mtree/special:1.176 --- src/etc/mtree/special:1.175 Mon Jun 6 10:56:28 2022 +++ src/etc/mtree/special Mon Aug 28 23:57:24 2023 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.175 2022/06/06 10:56:28 nia Exp $ +# $NetBSD: special,v 1.176 2023/08/28 23:57:24 riastradh Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -133,6 +133,7 @@ ./etc/npf.conf type=file mode=0644 optional ./etc/nsswitch.conf type=file mode=0644 ./etc/ntp.conf type=file mode=0644 optional +./etc/openssl/certs.conftype=file mode=0644 ./etc/pam.conf type=file mode=0644 optional ./etc/pam.d type=dir mode=0755 ./etc/pam.d/display_manager type=file mode=0644 Index: src/usr.sbin/certctl/Makefile diff -u src/usr.sbin/certctl/Makefile:1.1 src/usr.sbin/certctl/Makefile:1.2 --- src/usr.sbin/certctl/Makefile:1.1 Sat Aug 26 05:27:15 2023 +++ src/usr.sbin/certctl/Makefile Mon Aug 28 23:57:25 2023 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2023/08/26 05:27:15 riastradh Exp $ +# $NetBSD: Makefile,v 1.2 2023/08/28 23:57:25 riastradh Exp $ # MAN= certctl.8 SCRIPTS= certctl.sh FILESDIR= /etc/openssl +FILESMODE= 644 CONFIGFILES= certs.conf .include
CVS commit: src
Module Name:src Committed By: riastradh Date: Mon Aug 28 23:57:25 UTC 2023 Modified Files: src/etc/mtree: special src/usr.sbin/certctl: Makefile Log Message: certctl(8): Set certs.conf 644 and add it to etc/mtree/special. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/etc/mtree/special cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/certctl/Makefile 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
Module Name:src Committed By: riastradh Date: Mon Aug 28 23:57:18 UTC 2023 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/etc: mi Log Message: distrib/sets/lists: certs.conf belongs in etc, not in base. Oops. To generate a diff of this commit: cvs rdiff -u -r1.1327 -r1.1328 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.271 -r1.272 src/distrib/sets/lists/etc/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.1327 src/distrib/sets/lists/base/mi:1.1328 --- src/distrib/sets/lists/base/mi:1.1327 Sat Aug 26 05:58:48 2023 +++ src/distrib/sets/lists/base/mi Mon Aug 28 23:57:17 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1327 2023/08/26 05:58:48 riastradh Exp $ +# $NetBSD: mi,v 1.1328 2023/08/28 23:57:17 riastradh Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -114,7 +114,6 @@ ./etc/openldap base-ldap-root ./etc/openssl base-crypto-root ./etc/openssl/certsbase-crypto-root -./etc/openssl/certs.conf base-sysutil-bin ./etc/openssl/miscbase-crypto-root ./etc/openssl/privatebase-crypto-root ./etc/pam.d base-sys-root Index: src/distrib/sets/lists/etc/mi diff -u src/distrib/sets/lists/etc/mi:1.271 src/distrib/sets/lists/etc/mi:1.272 --- src/distrib/sets/lists/etc/mi:1.271 Fri Feb 3 13:53:40 2023 +++ src/distrib/sets/lists/etc/mi Mon Aug 28 23:57:18 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.271 2023/02/03 13:53:40 mlelstv Exp $ +# $NetBSD: mi,v 1.272 2023/08/28 23:57:18 riastradh Exp $ # # Note: end-user configuration files that are moved to another location # should not be marked "obsolete"; they should just be removed from @@ -113,6 +113,7 @@ ./etc/newsyslog.confetc-sysutil-etc ./etc/nsswitch.confetc-net-etc ./etc/ntp.conf etc-ntp-etc +./etc/openssl/certs.conf etc-net-etc ./etc/obsolete/baseetc-obsolete obsolete ./etc/obsolete/competc-obsolete obsolete ./etc/obsolete/etcetc-obsolete obsolete
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: riastradh Date: Mon Aug 28 23:57:18 UTC 2023 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/etc: mi Log Message: distrib/sets/lists: certs.conf belongs in etc, not in base. Oops. To generate a diff of this commit: cvs rdiff -u -r1.1327 -r1.1328 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.271 -r1.272 src/distrib/sets/lists/etc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: riastradh Date: Mon Aug 28 23:57:08 UTC 2023 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: postinstall(8): Fail if `certctl rehash' fails. Not using `set -e' here, evidently (maybe we should), so the separate return 0 suppressed the error. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/postinstall/postinstall.in diff -u src/usr.sbin/postinstall/postinstall.in:1.53 src/usr.sbin/postinstall/postinstall.in:1.54 --- src/usr.sbin/postinstall/postinstall.in:1.53 Sat Aug 26 05:59:00 2023 +++ src/usr.sbin/postinstall/postinstall.in Mon Aug 28 23:57:08 2023 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall.in,v 1.53 2023/08/26 05:59:00 riastradh Exp $ +# $NetBSD: postinstall.in,v 1.54 2023/08/28 23:57:08 riastradh Exp $ # # Copyright (c) 2002-2022 The NetBSD Foundation, Inc. # All rights reserved. @@ -1684,7 +1684,6 @@ do_opensslcerts() ;; esac certctl rehash - return 0 ;; *) err 3 "USAGE: do_opensslcerts fix|check" ;;
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: riastradh Date: Mon Aug 28 23:57:08 UTC 2023 Modified Files: src/usr.sbin/postinstall: postinstall.in Log Message: postinstall(8): Fail if `certctl rehash' fails. Not using `set -e' here, evidently (maybe we should), so the separate return 0 suppressed the error. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: riastradh Date: Mon Aug 28 22:25:50 UTC 2023 Modified Files: src: UPDATING src/tests/usr.sbin/certctl: t_certctl.sh src/usr.sbin/certctl: certctl.sh Log Message: certctl(8): Avoid clobbering prepopulated /etc/openssl/certs. Also avoid clobbering some other edge cases like symlinks or non-directories there. This way, we have the following transitions on system updates: - If /etc/openssl/certs is empty (as in default NetBSD<10 installs): quietly populated on rehash. - If /etc/openssl/certs is nonempty (you've added things to it, e.g. by hand or with mozilla-rootcerts) and has never been managed by certctl(8): left alone on rehash, with an error message to explain what you need to do. - If /etc/openssl/certs has been managed by certctl(8): quietly updated on rehash. Note: This means current installations made since certctl(8) was added will be treated like /etc/openssl/certs is nonempty and has never been managed by certctl(8). To work around this, you can just delete /etc/openssl/certs and rerun `certctl rehash'. To generate a diff of this commit: cvs rdiff -u -r1.342 -r1.343 src/UPDATING cvs rdiff -u -r1.4 -r1.5 src/tests/usr.sbin/certctl/t_certctl.sh cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/certctl/certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: riastradh Date: Mon Aug 28 22:25:50 UTC 2023 Modified Files: src: UPDATING src/tests/usr.sbin/certctl: t_certctl.sh src/usr.sbin/certctl: certctl.sh Log Message: certctl(8): Avoid clobbering prepopulated /etc/openssl/certs. Also avoid clobbering some other edge cases like symlinks or non-directories there. This way, we have the following transitions on system updates: - If /etc/openssl/certs is empty (as in default NetBSD<10 installs): quietly populated on rehash. - If /etc/openssl/certs is nonempty (you've added things to it, e.g. by hand or with mozilla-rootcerts) and has never been managed by certctl(8): left alone on rehash, with an error message to explain what you need to do. - If /etc/openssl/certs has been managed by certctl(8): quietly updated on rehash. Note: This means current installations made since certctl(8) was added will be treated like /etc/openssl/certs is nonempty and has never been managed by certctl(8). To work around this, you can just delete /etc/openssl/certs and rerun `certctl rehash'. To generate a diff of this commit: cvs rdiff -u -r1.342 -r1.343 src/UPDATING cvs rdiff -u -r1.4 -r1.5 src/tests/usr.sbin/certctl/t_certctl.sh cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/certctl/certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.342 src/UPDATING:1.343 --- src/UPDATING:1.342 Wed Jul 19 17:49:40 2023 +++ src/UPDATING Mon Aug 28 22:25:49 2023 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.342 2023/07/19 17:49:40 martin Exp $ +$NetBSD: UPDATING,v 1.343 2023/08/28 22:25:49 riastradh Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -19,6 +19,21 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20230828: + If: +- you updated to current and ran postinstall between 20230826 + and 20230828 inclusive, and +- you are not using anything outside the base system to + populate /etc/openssl/certs (e.g., manually adding + certificates or using ca-certificates or mozilla-rootcerts or + mozilla-rootcerts-openssl from pkgsrc), + delete /etc/openssl/certs and rerun postinstall or just + `certctl rehash'. + + Otherwise, certctl(8) will think someone else has left + /etc/openssl/certs in the way and will avoid clobbering it on + upgrade from older NetBSD. + 20230718: build.sh will use mk.conf in the same directory as build.sh instead of /etc/mk.conf, unless MAKECONF is already defined in the environment. Index: src/tests/usr.sbin/certctl/t_certctl.sh diff -u src/tests/usr.sbin/certctl/t_certctl.sh:1.4 src/tests/usr.sbin/certctl/t_certctl.sh:1.5 --- src/tests/usr.sbin/certctl/t_certctl.sh:1.4 Mon Aug 28 22:25:41 2023 +++ src/tests/usr.sbin/certctl/t_certctl.sh Mon Aug 28 22:25:49 2023 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: t_certctl.sh,v 1.4 2023/08/28 22:25:41 riastradh Exp $ +# $NetBSD: t_certctl.sh,v 1.5 2023/08/28 22:25:49 riastradh Exp $ # # Copyright (c) 2023 The NetBSD Foundation, Inc. # All rights reserved. @@ -358,7 +358,6 @@ symlinkcertsdir_body() mkdir empty ln -sfn empty certs - atf_expect_fail "certctl clobbers symlink at /etc/openssl/certs" atf_check -s not-exit:0 -e match:symlink $CERTCTL -n rehash atf_check -s not-exit:0 -e match:symlink $CERTCTL rehash atf_check -s exit:0 rmdir empty @@ -375,7 +374,6 @@ regularfilecertsdir_body() rmdir certs echo 'hello world' >certs - atf_expect_fail "certctl clobbers file at /etc/openssl/certs" atf_check -s not-exit:0 -e match:directory $CERTCTL -n rehash atf_check -s not-exit:0 -e match:directory $CERTCTL rehash atf_check -s exit:0 rm certs @@ -393,7 +391,6 @@ prepopulatedcerts_body() setupconf certs1 ln -sfn "$(atf_get_srcdir)/certs2"/*.pem certs/ - atf_expect_fail "certctl clobbers prepopulated /etc/openssl/certs" atf_check -s not-exit:0 -e match:manual $CERTCTL -n rehash atf_check -s not-exit:0 -e match:manual $CERTCTL rehash for cert in "$(atf_get_srcdir)/certs2"/*.pem; do Index: src/usr.sbin/certctl/certctl.sh diff -u src/usr.sbin/certctl/certctl.sh:1.2 src/usr.sbin/certctl/certctl.sh:1.3 --- src/usr.sbin/certctl/certctl.sh:1.2 Mon Aug 28 22:25:32 2023 +++ src/usr.sbin/certctl/certctl.sh Mon Aug 28 22:25:50 2023 @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: certctl.sh,v 1.2 2023/08/28 22:25:32 riastradh Exp $ +# $NetBSD: certctl.sh,v 1.3 2023/08/28 22:25:50 riastradh Exp $ # # Copyright (c) 2023 The NetBSD Foundation, Inc. # All rights reserved. @@ -427,9 +427,40 @@ rehash() return fi - # Delete the active certificates symlink cache. - run rm -rf "$certsdir" + # Delete the active certificates symlink cache, if either it is + # empty or nonexistent, or it is tagged for use
CVS commit: src/tests/usr.sbin/certctl
Module Name:src
Committed By: riastradh
Date: Mon Aug 28 22:25:41 UTC 2023
Modified Files:
src/tests/usr.sbin/certctl: t_certctl.sh
Log Message:
certctl(8): Test prepopulated /etc/openssl/certs.
This is the scenario when you have previously populated
/etc/openssl/certs manually, or with a package like mozilla-rootcerts
or mozilla-rootcerts-openssl, and you update to a version of NetBSD
with certctl(8). In this case, certctl(8) should avoid destroying
your work.
While here, also test some related but less likely edge cases:
- nonexistent
- symlink
- regular file
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.sbin/certctl/t_certctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/certctl/t_certctl.sh
diff -u src/tests/usr.sbin/certctl/t_certctl.sh:1.3 src/tests/usr.sbin/certctl/t_certctl.sh:1.4
--- src/tests/usr.sbin/certctl/t_certctl.sh:1.3 Mon Aug 28 22:25:32 2023
+++ src/tests/usr.sbin/certctl/t_certctl.sh Mon Aug 28 22:25:41 2023
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: t_certctl.sh,v 1.3 2023/08/28 22:25:32 riastradh Exp $
+# $NetBSD: t_certctl.sh,v 1.4 2023/08/28 22:25:41 riastradh Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -334,6 +334,77 @@ missingconf_body()
$CERTCTL rehash
}
+atf_test_case nonexistentcertsdir
+nonexistentcertsdir_head()
+{
+ atf_set "descr" "Test certctl succeeds when certsdir is nonexistent"
+}
+nonexistentcertsdir_body()
+{
+ setupconf certs1
+ rmdir certs
+ checks certs1
+}
+
+atf_test_case symlinkcertsdir
+symlinkcertsdir_head()
+{
+ atf_set "descr" "Test certctl fails when certsdir is a symlink"
+}
+symlinkcertsdir_body()
+{
+ setupconf certs1
+ rmdir certs
+ mkdir empty
+ ln -sfn empty certs
+
+ atf_expect_fail "certctl clobbers symlink at /etc/openssl/certs"
+ atf_check -s not-exit:0 -e match:symlink $CERTCTL -n rehash
+ atf_check -s not-exit:0 -e match:symlink $CERTCTL rehash
+ atf_check -s exit:0 rmdir empty
+}
+
+atf_test_case regularfilecertsdir
+regularfilecertsdir_head()
+{
+ atf_set "descr" "Test certctl fails when certsdir is a regular file"
+}
+regularfilecertsdir_body()
+{
+ setupconf certs1
+ rmdir certs
+ echo 'hello world' >certs
+
+ atf_expect_fail "certctl clobbers file at /etc/openssl/certs"
+ atf_check -s not-exit:0 -e match:directory $CERTCTL -n rehash
+ atf_check -s not-exit:0 -e match:directory $CERTCTL rehash
+ atf_check -s exit:0 rm certs
+}
+
+atf_test_case prepopulatedcerts
+prepopulatedcerts_head()
+{
+ atf_set "descr" "Test certctl fails when directory is prepopulated"
+}
+prepopulatedcerts_body()
+{
+ local cert certbase target
+
+ setupconf certs1
+ ln -sfn "$(atf_get_srcdir)/certs2"/*.pem certs/
+
+ atf_expect_fail "certctl clobbers prepopulated /etc/openssl/certs"
+ atf_check -s not-exit:0 -e match:manual $CERTCTL -n rehash
+ atf_check -s not-exit:0 -e match:manual $CERTCTL rehash
+ for cert in "$(atf_get_srcdir)/certs2"/*.pem; do
+ certbase=$(basename "$cert")
+ atf_check -s exit:0 -o inline:"$cert" \
+ readlink -n "certs/$certbase"
+ rm "certs/$certbase"
+ done
+ check_empty
+}
+
atf_init_test_cases()
{
atf_add_test_case collidebase
@@ -342,6 +413,10 @@ atf_init_test_cases()
atf_add_test_case evilpath
atf_add_test_case manual
atf_add_test_case missingconf
+ atf_add_test_case nonexistentcertsdir
atf_add_test_case onedir
+ atf_add_test_case prepopulatedcerts
+ atf_add_test_case regularfilecertsdir
+ atf_add_test_case symlinkcertsdir
atf_add_test_case twodir
}
CVS commit: src/tests/usr.sbin/certctl
Module Name:src Committed By: riastradh Date: Mon Aug 28 22:25:41 UTC 2023 Modified Files: src/tests/usr.sbin/certctl: t_certctl.sh Log Message: certctl(8): Test prepopulated /etc/openssl/certs. This is the scenario when you have previously populated /etc/openssl/certs manually, or with a package like mozilla-rootcerts or mozilla-rootcerts-openssl, and you update to a version of NetBSD with certctl(8). In this case, certctl(8) should avoid destroying your work. While here, also test some related but less likely edge cases: - nonexistent - symlink - regular file To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.sbin/certctl/t_certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Mon Aug 28 22:25:33 UTC 2023
Modified Files:
src/tests/usr.sbin/certctl: t_certctl.sh
src/usr.sbin/certctl: certctl.sh
Log Message:
certctl(8): Exit nonzero on missing certs.conf.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/certctl/t_certctl.sh
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/certctl/certctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/certctl/t_certctl.sh
diff -u src/tests/usr.sbin/certctl/t_certctl.sh:1.2 src/tests/usr.sbin/certctl/t_certctl.sh:1.3
--- src/tests/usr.sbin/certctl/t_certctl.sh:1.2 Mon Aug 28 22:25:21 2023
+++ src/tests/usr.sbin/certctl/t_certctl.sh Mon Aug 28 22:25:32 2023
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: t_certctl.sh,v 1.2 2023/08/28 22:25:21 riastradh Exp $
+# $NetBSD: t_certctl.sh,v 1.3 2023/08/28 22:25:32 riastradh Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -330,7 +330,6 @@ missingconf_body()
{
mkdir certs
atf_check -s exit:0 test ! -e certs.conf
- atf_expect_fail 'wrong exit code on missing config file'
atf_check -s not-exit:0 -e match:'certs\.conf' \
$CERTCTL rehash
}
Index: src/usr.sbin/certctl/certctl.sh
diff -u src/usr.sbin/certctl/certctl.sh:1.1 src/usr.sbin/certctl/certctl.sh:1.2
--- src/usr.sbin/certctl/certctl.sh:1.1 Sat Aug 26 05:27:15 2023
+++ src/usr.sbin/certctl/certctl.sh Mon Aug 28 22:25:32 2023
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: certctl.sh,v 1.1 2023/08/26 05:27:15 riastradh Exp $
+# $NetBSD: certctl.sh,v 1.2 2023/08/28 22:25:32 riastradh Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -234,7 +234,7 @@ configure()
error "$vconfig:$lineno: unknown command: $vop"
;;
esac
- done <$config
+ done <$config || status=$?
return $status
}
CVS commit: src
Module Name:src Committed By: riastradh Date: Mon Aug 28 22:25:33 UTC 2023 Modified Files: src/tests/usr.sbin/certctl: t_certctl.sh src/usr.sbin/certctl: certctl.sh Log Message: certctl(8): Exit nonzero on missing certs.conf. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/certctl/t_certctl.sh cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/certctl/certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.sbin/certctl
Module Name:src
Committed By: riastradh
Date: Mon Aug 28 22:25:21 UTC 2023
Modified Files:
src/tests/usr.sbin/certctl: t_certctl.sh
Log Message:
certctl(8): Add xfail test for missing certs.conf.
Command should fail, i.e., exit with nonzero status, but it exits
with zero instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.sbin/certctl/t_certctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/certctl/t_certctl.sh
diff -u src/tests/usr.sbin/certctl/t_certctl.sh:1.1 src/tests/usr.sbin/certctl/t_certctl.sh:1.2
--- src/tests/usr.sbin/certctl/t_certctl.sh:1.1 Sat Aug 26 05:27:14 2023
+++ src/tests/usr.sbin/certctl/t_certctl.sh Mon Aug 28 22:25:21 2023
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: t_certctl.sh,v 1.1 2023/08/26 05:27:14 riastradh Exp $
+# $NetBSD: t_certctl.sh,v 1.2 2023/08/28 22:25:21 riastradh Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -321,6 +321,20 @@ EOF
checks certs1 "$(pwd)/$evildir"
}
+atf_test_case missingconf
+missingconf_head()
+{
+ atf_set "descr" "Test certctl with missing certs.conf"
+}
+missingconf_body()
+{
+ mkdir certs
+ atf_check -s exit:0 test ! -e certs.conf
+ atf_expect_fail 'wrong exit code on missing config file'
+ atf_check -s not-exit:0 -e match:'certs\.conf' \
+ $CERTCTL rehash
+}
+
atf_init_test_cases()
{
atf_add_test_case collidebase
@@ -328,6 +342,7 @@ atf_init_test_cases()
atf_add_test_case empty
atf_add_test_case evilpath
atf_add_test_case manual
+ atf_add_test_case missingconf
atf_add_test_case onedir
atf_add_test_case twodir
}
CVS commit: src/tests/usr.sbin/certctl
Module Name:src Committed By: riastradh Date: Mon Aug 28 22:25:21 UTC 2023 Modified Files: src/tests/usr.sbin/certctl: t_certctl.sh Log Message: certctl(8): Add xfail test for missing certs.conf. Command should fail, i.e., exit with nonzero status, but it exits with zero instead. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.sbin/certctl/t_certctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/acorn32/podulebus
Module Name:src Committed By: andvar Date: Mon Aug 28 18:04:33 UTC 2023 Modified Files: src/sys/arch/acorn32/podulebus: sfas.c Log Message: fix SFAS_DEBUG enabled build for acorn32: declare dump_nexus(), dump_nexii(), dump_sfassoftc() than option is enabled. fix specifier for nexus->dma[loop].ptr in printf(). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn32/podulebus/sfas.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/acorn32/podulebus
Module Name:src
Committed By: andvar
Date: Mon Aug 28 18:04:33 UTC 2023
Modified Files:
src/sys/arch/acorn32/podulebus: sfas.c
Log Message:
fix SFAS_DEBUG enabled build for acorn32:
declare dump_nexus(), dump_nexii(), dump_sfassoftc() than option is enabled.
fix specifier for nexus->dma[loop].ptr in printf().
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn32/podulebus/sfas.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/acorn32/podulebus/sfas.c
diff -u src/sys/arch/acorn32/podulebus/sfas.c:1.30 src/sys/arch/acorn32/podulebus/sfas.c:1.31
--- src/sys/arch/acorn32/podulebus/sfas.c:1.30 Sat Aug 21 11:55:24 2021
+++ src/sys/arch/acorn32/podulebus/sfas.c Mon Aug 28 18:04:33 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sfas.c,v 1.30 2021/08/21 11:55:24 andvar Exp $ */
+/* $NetBSD: sfas.c,v 1.31 2023/08/28 18:04:33 andvar Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.30 2021/08/21 11:55:24 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfas.c,v 1.31 2023/08/28 18:04:33 andvar Exp $");
#include
#include
@@ -130,6 +130,12 @@ int sfas_pretests(struct sfas_softc *, s
int sfas_midaction(struct sfas_softc *, sfas_regmap_p, struct nexus *);
int sfas_postaction(struct sfas_softc *, sfas_regmap_p, struct nexus *);
+#ifdef SFAS_DEBUG
+void dump_nexus(struct nexus *nexus);
+void dump_nexii(struct sfas_softc *sc);
+void dump_sfassoftc(struct sfas_softc *sc);
+#endif
+
/*
* Initialize these to make 'em patchable. Defaults to enable sync and discon.
*/
@@ -1573,7 +1579,7 @@ dump_nexus(struct nexus *nexus)
printf("\n");
printf("DMA:\n");
for (loop = 0; loop < MAXCHAIN; ++loop)
- printf("dma_chain: %08x %04x %04x\n", nexus->dma[loop].ptr,
+ printf("dma_chain: %8p %04x %04x\n", (void *)nexus->dma[loop].ptr,
nexus->dma[loop].len, nexus->dma[loop].flg);
printf("\n");
CVS commit: src/sys/arch/acorn32/mainbus
Module Name:src
Committed By: andvar
Date: Mon Aug 28 17:53:47 UTC 2023
Modified Files:
src/sys/arch/acorn32/mainbus: fd.c
Log Message:
acorn32/fdc(4): fix modifiers blkno values to %lld and
fix typos in fr_r10-r12 variables (fh->fr).
Fixes acorn32 build with FD_DEBUG enabled option.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/acorn32/mainbus/fd.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/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.64 src/sys/arch/acorn32/mainbus/fd.c:1.65
--- src/sys/arch/acorn32/mainbus/fd.c:1.64 Sat Aug 7 16:18:40 2021
+++ src/sys/arch/acorn32/mainbus/fd.c Mon Aug 28 17:53:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.64 2021/08/07 16:18:40 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.65 2023/08/28 17:53:46 andvar Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.64 2021/08/07 16:18:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.65 2023/08/28 17:53:46 andvar Exp $");
#include "opt_ddb.h"
@@ -604,7 +604,7 @@ fdstrategy(struct buf *bp)
bp->b_cylinder = bp->b_blkno / (FDC_BSIZE / DEV_BSIZE) / fd->sc_type->seccyl;
#ifdef FD_DEBUG
- printf("fdstrategy: b_blkno %d b_bcount %d blkno %d cylin %d sz %d\n",
+ printf("fdstrategy: b_blkno %lld b_bcount %d blkno %lld cylin %d sz %d\n",
bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder, sz);
#endif
@@ -1045,8 +1045,8 @@ loop:
fdc->sc_fr.fr_r12 = fdc->sc_drq;
#ifdef FD_DEBUG
printf("fdc-doio:r9=%x r10=%x r11=%x r12=%x data=%x skip=%x\n",
- fdc->sc_fr.fr_r9, fdc->sc_fr.fh_r10, fdc->sc_fr.fh_r11,
- fdc->sc_fr.fh_r12, (u_int)bp->b_data, fd->sc_skip);
+ fdc->sc_fr.fr_r9, fdc->sc_fr.fr_r10, fdc->sc_fr.fr_r11,
+ fdc->sc_fr.fr_r12, (u_int)bp->b_data, fd->sc_skip);
#endif
if (fiq_claim(>sc_fh) == -1)
panic("%s: Cannot claim FIQ vector",
@@ -1139,7 +1139,7 @@ loop:
#ifdef FD_DEBUG
fdcstatus(fd->sc_dev, 7, bp->b_flags & B_READ ?
"read failed" : "write failed");
- printf("blkno %d nblks %d\n",
+ printf("blkno %lld nblks %d\n",
fd->sc_blkno, fd->sc_nblks);
#endif
fdcretry(fdc);
CVS commit: src/sys/arch/acorn32/mainbus
Module Name:src Committed By: andvar Date: Mon Aug 28 17:53:47 UTC 2023 Modified Files: src/sys/arch/acorn32/mainbus: fd.c Log Message: acorn32/fdc(4): fix modifiers blkno values to %lld and fix typos in fr_r10-r12 variables (fh->fr). Fixes acorn32 build with FD_DEBUG enabled option. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/acorn32/mainbus/fd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Mon Aug 28 15:50:17 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +IAB - Internet Architecture Board To generate a diff of this commit: cvs rdiff -u -r1.360 -r1.361 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Mon Aug 28 15:50:17 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +IAB - Internet Architecture Board To generate a diff of this commit: cvs rdiff -u -r1.360 -r1.361 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.360 src/share/misc/acronyms.comp:1.361 --- src/share/misc/acronyms.comp:1.360 Fri Aug 4 15:42:09 2023 +++ src/share/misc/acronyms.comp Mon Aug 28 15:50:17 2023 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.360 2023/08/04 15:42:09 jschauma Exp $ +$NetBSD: acronyms.comp,v 1.361 2023/08/28 15:50:17 jschauma Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -727,6 +727,7 @@ I2O intelligent input/output IA information assurance IAAS infrastructure as a service IANA Internet Assigned Numbers Authority +IAB Internet Architecture Board IBC iterated block cipher IBM International Business Machines IBPI international blinking pattern interpretation
CVS commit: src/sys/arch/riscv/riscv
Module Name:src
Committed By: skrll
Date: Mon Aug 28 11:12:42 UTC 2023
Modified Files:
src/sys/arch/riscv/riscv: cpu.c
Log Message:
Remove duplicate .ci_cpl initialiser.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/riscv/cpu.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/riscv/riscv/cpu.c
diff -u src/sys/arch/riscv/riscv/cpu.c:1.3 src/sys/arch/riscv/riscv/cpu.c:1.4
--- src/sys/arch/riscv/riscv/cpu.c:1.3 Sat Jun 24 07:23:07 2023
+++ src/sys/arch/riscv/riscv/cpu.c Mon Aug 28 11:12:42 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.3 2023/06/24 07:23:07 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.4 2023/08/28 11:12:42 skrll Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.3 2023/06/24 07:23:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.4 2023/08/28 11:12:42 skrll Exp $");
#include
@@ -102,7 +102,6 @@ struct cpu_info cpu_info_store[NCPUINFO]
[0] = {
.ci_cpl = IPL_HIGH,
.ci_curlwp = ,
- .ci_cpl = IPL_HIGH,
.ci_tlb_info = _tlb0_info,
#ifdef MULTIPROCESSOR
.ci_flags = CPUF_PRIMARY | CPUF_PRESENT | CPUF_RUNNING,
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: skrll Date: Mon Aug 28 11:12:42 UTC 2023 Modified Files: src/sys/arch/riscv/riscv: cpu.c Log Message: Remove duplicate .ci_cpl initialiser. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/riscv/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/gpl3/binutils/dist/bfd
On Mon, Aug 28, 2023 at 00:02:50 +, Rin Okuyama wrote: > Log Message: > binutils/bfd: Adjust blank line to reduce diff from upstream Thanks a lot for these cleanups! Do we need to apply similar cleanups to the bfd version in gdb? (external/gpl3/gdb/dist/bfd) -uwe
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Aug 28 09:50:12 UTC 2023 Modified Files: src/sys/dev/pci: if_vmx.c Log Message: Set IFM_FDX flag if the link is up. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_vmx.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/dev/pci/if_vmx.c diff -u src/sys/dev/pci/if_vmx.c:1.12 src/sys/dev/pci/if_vmx.c:1.13 --- src/sys/dev/pci/if_vmx.c:1.12 Thu Aug 10 08:24:44 2023 +++ src/sys/dev/pci/if_vmx.c Mon Aug 28 09:50:12 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vmx.c,v 1.12 2023/08/10 08:24:44 riastradh Exp $ */ +/* $NetBSD: if_vmx.c,v 1.13 2023/08/28 09:50:12 msaitoh Exp $ */ /* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */ /* @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.12 2023/08/10 08:24:44 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.13 2023/08/28 09:50:12 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_if_vmx.h" @@ -3638,7 +3638,7 @@ vmxnet3_ifmedia_status(struct ifnet *ifp ifmr->ifm_status |= IFM_ACTIVE; if (ifp->if_baudrate >= IF_Gbps(10ULL)) - ifmr->ifm_active |= IFM_10G_T; + ifmr->ifm_active |= IFM_10G_T | IFM_FDX; } static int
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Aug 28 09:50:12 UTC 2023 Modified Files: src/sys/dev/pci: if_vmx.c Log Message: Set IFM_FDX flag if the link is up. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_vmx.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/amiga/dev
Module Name:src
Committed By: andvar
Date: Mon Aug 28 09:22:26 UTC 2023
Modified Files:
src/sys/arch/amiga/dev: grf_ul.c ite_ul.c
Log Message:
rename DEBUG_UL to UL_DEBUG for naming consistency.
remove stray UL_DEBUG definition in grf_ul.c
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/ite_ul.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/amiga/dev/grf_ul.c
diff -u src/sys/arch/amiga/dev/grf_ul.c:1.54 src/sys/arch/amiga/dev/grf_ul.c:1.55
--- src/sys/arch/amiga/dev/grf_ul.c:1.54 Mon Mar 28 12:38:57 2022
+++ src/sys/arch/amiga/dev/grf_ul.c Mon Aug 28 09:22:26 2023
@@ -1,5 +1,4 @@
-/* $NetBSD: grf_ul.c,v 1.54 2022/03/28 12:38:57 riastradh Exp $ */
-#define UL_DEBUG
+/* $NetBSD: grf_ul.c,v 1.55 2023/08/28 09:22:26 andvar Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -33,7 +32,7 @@
#include "opt_amigacons.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.54 2022/03/28 12:38:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.55 2023/08/28 09:22:26 andvar Exp $");
#include "grful.h"
#include "ite.h"
Index: src/sys/arch/amiga/dev/ite_ul.c
diff -u src/sys/arch/amiga/dev/ite_ul.c:1.16 src/sys/arch/amiga/dev/ite_ul.c:1.17
--- src/sys/arch/amiga/dev/ite_ul.c:1.16 Mon Aug 28 09:14:02 2023
+++ src/sys/arch/amiga/dev/ite_ul.c Mon Aug 28 09:22:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $ */
+/* $NetBSD: ite_ul.c,v 1.17 2023/08/28 09:22:26 andvar Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.17 2023/08/28 09:22:26 andvar Exp $");
#include "grful.h"
#if NGRFUL > 0
@@ -79,7 +79,7 @@ extern u_int8_t kernel_font_lo, kernel_f
extern u_int8_t kernel_font[], kernel_cursor[];
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
#define gsp_out(ba,cmd,len) gsp_dump(cmd,len); gsp_write(ba,cmd,len)
#else
#define gsp_out(ba,cmd,len) gsp_write(ba,cmd,len)
@@ -94,7 +94,7 @@ void ulowell_clear(struct ite_softc *, i
void ulowell_putc(struct ite_softc *, int, int, int, int);
void ulowell_init(struct ite_softc *);
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
void gsp_dump(u_int16_t *, int);
#endif
@@ -305,7 +305,7 @@ static void screen_up(struct ite_softc *
ba = (volatile struct gspregs *)ip->grf->g_regkva;
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
printf("screen_up %d %d %d ->",top,bottom,lines);
#endif
/* do some bounds-checking here.. */
@@ -339,7 +339,7 @@ static void screen_down(struct ite_softc
ba = (volatile struct gspregs *)ip->grf->g_regkva;
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
printf("screen_down %d %d %d ->",top,bottom,lines);
#endif
@@ -396,7 +396,7 @@ void ulowell_clear(struct ite_softc *ip,
u_int16_t cmd[7];
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
printf("ulowell_clear %d %d %d %d ->",sy,sx,h,w);
#endif
ba = (volatile struct gspregs *)ip->grf->g_regkva;
@@ -419,7 +419,7 @@ void ulowell_scroll(struct ite_softc *ip
ba = (volatile struct gspregs *)ip->grf->g_regkva;
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
printf("ulowell_scroll %d %d %d %d ->",sy,sx,count,dir);
#endif
@@ -452,7 +452,7 @@ void ulowell_scroll(struct ite_softc *ip
}
}
-#ifdef DEBUG_UL
+#ifdef UL_DEBUG
void
gsp_dump(u_int16_t *cmd,int len)
{
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: andvar Date: Mon Aug 28 09:22:26 UTC 2023 Modified Files: src/sys/arch/amiga/dev: grf_ul.c ite_ul.c Log Message: rename DEBUG_UL to UL_DEBUG for naming consistency. remove stray UL_DEBUG definition in grf_ul.c To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amiga/dev/grf_ul.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/ite_ul.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/amiga/dev
Module Name:src
Committed By: andvar
Date: Mon Aug 28 09:14:02 UTC 2023
Modified Files:
src/sys/arch/amiga/dev: ite_ul.c
Log Message:
fix format specifier from %lx to %hx, cmd has a type of u_int16_t.
fixes DEBUG_UL build for amiga (will be renamed to UL_DEBUG in next commit).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/ite_ul.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/amiga/dev/ite_ul.c
diff -u src/sys/arch/amiga/dev/ite_ul.c:1.15 src/sys/arch/amiga/dev/ite_ul.c:1.16
--- src/sys/arch/amiga/dev/ite_ul.c:1.15 Mon Sep 3 16:29:22 2018
+++ src/sys/arch/amiga/dev/ite_ul.c Mon Aug 28 09:14:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_ul.c,v 1.15 2018/09/03 16:29:22 riastradh Exp $ */
+/* $NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.15 2018/09/03 16:29:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_ul.c,v 1.16 2023/08/28 09:14:02 andvar Exp $");
#include "grful.h"
#if NGRFUL > 0
@@ -458,7 +458,7 @@ gsp_dump(u_int16_t *cmd,int len)
{
printf("gsp");
while (len-- > 0)
- printf(" %lx",*cmd++);
+ printf(" %hx",*cmd++);
printf("\n");
}
#endif
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: andvar Date: Mon Aug 28 09:14:02 UTC 2023 Modified Files: src/sys/arch/amiga/dev: ite_ul.c Log Message: fix format specifier from %lx to %hx, cmd has a type of u_int16_t. fixes DEBUG_UL build for amiga (will be renamed to UL_DEBUG in next commit). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/ite_ul.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
