CVS commit: src/sys/arch/sparc64/sparc64

2024-02-17 Thread Palle Lyckegaard
Module Name:src
Committed By:   palle
Date:   Sat Feb 17 19:36:07 UTC 2024

Modified Files:
src/sys/arch/sparc64/sparc64: locore.s

Log Message:
Ensure that the size of the stack is properly specified (2*USPACE) so it 
matches the allocation of stack pages done in pmap_bootstrap(). If this is not 
properly in sync, then the stack pointer may end up in the redzone right before 
the stack causing mmu faults. This issue has been observed on a T2000 (sun4v) 
system while probing the devices (pci/ebus/com) during bootstrap


To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 src/sys/arch/sparc64/sparc64/locore.s

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



CVS commit: src/sys/arch/sparc64/sparc64

2024-02-17 Thread Palle Lyckegaard
Module Name:src
Committed By:   palle
Date:   Sat Feb 17 19:36:07 UTC 2024

Modified Files:
src/sys/arch/sparc64/sparc64: locore.s

Log Message:
Ensure that the size of the stack is properly specified (2*USPACE) so it 
matches the allocation of stack pages done in pmap_bootstrap(). If this is not 
properly in sync, then the stack pointer may end up in the redzone right before 
the stack causing mmu faults. This issue has been observed on a T2000 (sun4v) 
system while probing the devices (pci/ebus/com) during bootstrap


To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 src/sys/arch/sparc64/sparc64/locore.s

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/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.433 src/sys/arch/sparc64/sparc64/locore.s:1.434
--- src/sys/arch/sparc64/sparc64/locore.s:1.433	Wed Mar  1 08:18:39 2023
+++ src/sys/arch/sparc64/sparc64/locore.s	Sat Feb 17 19:36:07 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.433 2023/03/01 08:18:39 riastradh Exp $	*/
+/*	$NetBSD: locore.s,v 1.434 2024/02/17 19:36:07 palle Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -5471,7 +5471,7 @@ ENTRY_NOPROFILE(cpu_initialize)	/* for c
 	!! and already accessible here)
 	flushw
 	LDPTR	[%l7 + CI_CPCB], %l0		! load PCB/uarea pointer
-	set	USPACE - TF_SIZE - CC64FSZ, %l1
+	set	2*USPACE - TF_SIZE - CC64FSZ, %l1
  	add	%l1, %l0, %l0
 #ifdef _LP64
 	andn	%l0, 0x0f, %l0			! Needs to be 16-byte aligned



CVS commit: src/doc

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:33:25 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new unbound


To generate a diff of this commit:
cvs rdiff -u -r1.1986 -r1.1987 src/doc/3RDPARTY
cvs rdiff -u -r1.3039 -r1.3040 src/doc/CHANGES

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.1986 src/doc/3RDPARTY:1.1987
--- src/doc/3RDPARTY:1.1986	Sat Feb 17 12:44:38 2024
+++ src/doc/3RDPARTY	Sat Feb 17 13:33:25 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1986 2024/02/17 17:44:38 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1987 2024/02/17 18:33:25 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -164,12 +164,12 @@ Location:	external/mit/libuv/dist
 Notes:
 
 Package:	unbound
-Version:	1.16.3
-Current Vers:	1.17.1
+Version:	1.19.1
+Current Vers:	1.19.1
 Maintainer:	Nlnetlabs
 Archive Site:	https://www.unbound.net/downloads/unbound-latest.tar.gz
 Home Page:	https://www.unbound.net/
-Date:		2023-06-21
+Date:		2024-02-17
 Mailing List:	https://unbound.nlnetlabs.nl/mailman/listinfo/unbound-users
 Responsible:	christos
 License:	BSD-like

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3039 src/doc/CHANGES:1.3040
--- src/doc/CHANGES:1.3039	Sat Feb 17 12:44:38 2024
+++ src/doc/CHANGES	Sat Feb 17 13:33:25 2024
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3039 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3040 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -281,3 +281,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 		[christos 20240213]
 	tzcode: Updated to 2024a. [christos 20240217]
 	nsd: Import 4.8.0. [christos 20240217]
+	unbound(8): Import 1.19.1. [christos 20240217]



CVS commit: src/doc

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:33:25 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new unbound


To generate a diff of this commit:
cvs rdiff -u -r1.1986 -r1.1987 src/doc/3RDPARTY
cvs rdiff -u -r1.3039 -r1.3040 src/doc/CHANGES

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

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:32:19 UTC 2024

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libunbound


To generate a diff of this commit:
cvs rdiff -u -r1.974 -r1.975 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.335 -r1.336 src/distrib/sets/lists/debug/shl.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/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.974 src/distrib/sets/lists/base/shl.mi:1.975
--- src/distrib/sets/lists/base/shl.mi:1.974	Mon Jan 22 10:19:38 2024
+++ src/distrib/sets/lists/base/shl.mi	Sat Feb 17 13:32:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.974 2024/01/22 15:19:38 kre Exp $
+# $NetBSD: shl.mi,v 1.975 2024/02/17 18:32:19 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -920,8 +920,8 @@
 ./usr/lib/libumem.so.0base-zfs-shlib		compatfile,zfs
 ./usr/lib/libumem.so.0.0			base-zfs-shlib		compatfile,zfs
 ./usr/lib/libunbound.sobase-sys-shlib		compatfile,unbound
-./usr/lib/libunbound.so.8			base-sys-shlib		compatfile,unbound
-./usr/lib/libunbound.so.8.0			base-sys-shlib		compatfile,unbound
+./usr/lib/libunbound.so.9			base-sys-shlib		compatfile,unbound
+./usr/lib/libunbound.so.9.0			base-sys-shlib		compatfile,unbound
 ./usr/lib/libusbhid.sobase-sys-shlib		compatfile
 ./usr/lib/libusbhid.so.1			base-sys-shlib		compatfile
 ./usr/lib/libusbhid.so.1.0			base-sys-shlib		compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.335 src/distrib/sets/lists/debug/shl.mi:1.336
--- src/distrib/sets/lists/debug/shl.mi:1.335	Mon Jan 22 10:19:39 2024
+++ src/distrib/sets/lists/debug/shl.mi	Sat Feb 17 13:32:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.335 2024/01/22 15:19:39 kre Exp $
+# $NetBSD: shl.mi,v 1.336 2024/02/17 18:32:19 christos Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -302,7 +302,7 @@
 ./usr/libdata/debug/usr/lib/libubsan.so.5.0.debug		comp-sys-debug	debug,compatfile,cxx,gcc=12
 ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug		comp-sys-debug	debug,compatfile,rump
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
-./usr/libdata/debug/usr/lib/libunbound.so.8.0.debug 		comp-net-debug	debug,compatfile,unbound
+./usr/libdata/debug/usr/lib/libunbound.so.9.0.debug 		comp-net-debug	debug,compatfile,unbound
 ./usr/libdata/debug/usr/lib/libusbhid.so.1.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libutil.so.7.24.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libuutil.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs



CVS commit: src/distrib/sets/lists

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:32:19 UTC 2024

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
bump libunbound


To generate a diff of this commit:
cvs rdiff -u -r1.974 -r1.975 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.335 -r1.336 src/distrib/sets/lists/debug/shl.mi

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



CVS commit: src/external/bsd/unbound

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:31:19 UTC 2024

Modified Files:
src/external/bsd/unbound/dist: config.guess config.sub
src/external/bsd/unbound/dist/libunbound: unbound.h
src/external/bsd/unbound/dist/services: authzone.c
src/external/bsd/unbound/dist/util: netevent.c
src/external/bsd/unbound/include: config.h
src/external/bsd/unbound/lib/libunbound: Makefile shlib_version
Removed Files:
src/external/bsd/unbound/dist/testcode: mini_tpkg.sh
src/external/bsd/unbound/dist/testdata: ede_cache_snoop_noth_auth.rpl
serve_expired_servfail.rpl subnet_prefetch_with_client_ecs.crpl
src/external/bsd/unbound/dist/testdata/dnscrypt_cert.tdir: precheck.sh
src/external/bsd/unbound/dist/testdata/dnscrypt_cert_chacha.tdir:
precheck.sh
src/external/bsd/unbound/dist/testdata/ede.tdir/bogus: clean.sh

Log Message:
merge differences between 1.16.3 and 1.19.1


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/unbound/dist/config.guess
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/unbound/dist/config.sub
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/unbound/dist/libunbound/unbound.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/dist/services/authzone.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testcode/mini_tpkg.sh
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/ede_cache_snoop_noth_auth.rpl \
src/external/bsd/unbound/dist/testdata/subnet_prefetch_with_client_ecs.crpl
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/unbound/dist/testdata/serve_expired_servfail.rpl
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/dnscrypt_cert.tdir/precheck.sh
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/precheck.sh
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/ede.tdir/bogus/clean.sh
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/unbound/dist/util/netevent.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/unbound/include/config.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/unbound/lib/libunbound/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/unbound/lib/libunbound/shlib_version

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

Modified files:

Index: src/external/bsd/unbound/dist/config.guess
diff -u src/external/bsd/unbound/dist/config.guess:1.7 src/external/bsd/unbound/dist/config.guess:1.8
--- src/external/bsd/unbound/dist/config.guess:1.7	Sat Sep 24 14:11:42 2022
+++ src/external/bsd/unbound/dist/config.guess	Sat Feb 17 13:31:17 2024
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-08-01'
+timestamp='2024-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
 usage="\
 Usage: $0 [OPTION]
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 
 Options:
   -h, --help print this help, then exit
@@ -60,13 +60,13 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -102,8 +102,8 @@ GUESS=
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
 
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
+# use 'HOST_CC' if defined, but it is deprecated.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
@@ -155,6 +155,9 @@ Linux|GNU|GNU/*)
 
 	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
+	#if defined(__ANDROID__)
+	LIBC=android
+	#else
 	#include 
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -162,6 +165,8 @@ Linux|GNU|GNU/*)
 	LIBC=dietlibc
 	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#elif defined(__LLVM_LIBC__)
+	LIBC=llvm
 	#else
 	#include 
 	/* First heuristic to detect musl libc.  */
@@ -169,6 +174,7 @@ Linux|GNU|GNU/*)
 	LIBC=musl
 	#endif
 	#endif
+	#endif
 	EOF
 	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	eval "$cc_set_libc"
@@ -459,7 +465,7 

CVS commit: src/external/bsd/unbound

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:31:19 UTC 2024

Modified Files:
src/external/bsd/unbound/dist: config.guess config.sub
src/external/bsd/unbound/dist/libunbound: unbound.h
src/external/bsd/unbound/dist/services: authzone.c
src/external/bsd/unbound/dist/util: netevent.c
src/external/bsd/unbound/include: config.h
src/external/bsd/unbound/lib/libunbound: Makefile shlib_version
Removed Files:
src/external/bsd/unbound/dist/testcode: mini_tpkg.sh
src/external/bsd/unbound/dist/testdata: ede_cache_snoop_noth_auth.rpl
serve_expired_servfail.rpl subnet_prefetch_with_client_ecs.crpl
src/external/bsd/unbound/dist/testdata/dnscrypt_cert.tdir: precheck.sh
src/external/bsd/unbound/dist/testdata/dnscrypt_cert_chacha.tdir:
precheck.sh
src/external/bsd/unbound/dist/testdata/ede.tdir/bogus: clean.sh

Log Message:
merge differences between 1.16.3 and 1.19.1


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/unbound/dist/config.guess
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/unbound/dist/config.sub
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/unbound/dist/libunbound/unbound.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/dist/services/authzone.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testcode/mini_tpkg.sh
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/ede_cache_snoop_noth_auth.rpl \
src/external/bsd/unbound/dist/testdata/subnet_prefetch_with_client_ecs.crpl
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/unbound/dist/testdata/serve_expired_servfail.rpl
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/dnscrypt_cert.tdir/precheck.sh
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/dnscrypt_cert_chacha.tdir/precheck.sh
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/ede.tdir/bogus/clean.sh
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/unbound/dist/util/netevent.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/unbound/include/config.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/unbound/lib/libunbound/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/unbound/lib/libunbound/shlib_version

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



CVS import: src/external/bsd/unbound/dist

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:07:38 UTC 2024

Update of /cvsroot/src/external/bsd/unbound/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18893

Log Message:
Import 1.19.1 (previous was 1.16.3)

2 November 2023: Wouter
- Set version number to 1.19.0.
- Tag for 1.19.0rc1 release.

1 November 2023: George
- Mention flex and bison in README.md when building from repository
  source.

1 November 2023: Wouter
- Fix SSL compile failure for definition in log_crypto_err_io_code_arg.
- Fix SSL compile failure for other missing definitions in
  log_crypto_err_io_code_arg.
- Fix compilation without openssl, remove unused function warning.

31 October 2023: George
- Fix #941: dnscrypt doesn't work after upgrade to 1.18 with
  suggestion by dukeartem to also fix the udp_ancil with dnscrypt.

30 October 2023: George
- Merge #930 from Stuart Henderson: add void to
  log_ident_revert_to_default declaration.

30 October 2023: Wouter
- autoconf.

24 October 2023: George
- Clearer configure text for missing protobuf-c development libraries.

20 October 2023: Wouter
- Merge #951: Cachedb no store. The cachedb-no-store: yes option is
  used to stop cachedb from writing messages to the backend storage.
  It reads messages when data is available from the backend. The
  default is no.

19 October 2023: Wouter
- Fix to print detailed errors when an SSL IO routine fails via
  SSL_get_error.

18 October 2023: George
- Mailing list patches from Daniel Gröber for DNS64 fallback to plain
   when no A record exists for synthesis, and minor DNS64 code
  refactoring for better readability.
- Fixes for the DNS64 patches.
- Update the dns64_lookup.rpl test for the DNS64 fallback patch.
- Merge #955 from buevsan: fix ipset wrong behavior.
- Update testdata/ipset.tdir test for ipset fix.

17 October 2023: Wouter
- Fix #954: Inconsistent RPZ handling for A record returned along with
  CNAME.

16 October 2023: George
- Expose the script filename in the Python module environment 'mod_env'
  instead of the config_file structure which includes the linked list
  of scripts in a multi Python module setup; fixes #79.
- Expose the configured listening and outgoing interfaces, if any, as
  a list of strings in the Python 'config_file' class instead of the
  current Swig object proxy; fixes #79.
- For multi Python module setups, clean previously parsed module
  functions in __main__'s dictionary, if any, so that only current
  module functions are registered.

13 October 2023: George
- Better fix for infinite loop when reading multiple lines of input on
  a broken remote control socket, by treating a zero byte line the
  same as transmission end. Addesses #947 and #948.

12 October 2023: Wouter
- Merge #944: Disable EDNS DO.
  Disable the EDNS DO flag in upstream requests. This can be helpful
  for devices that cannot handle DNSSEC information. But it should not
  be enabled otherwise, because that would stop DNSSEC validation. The
  DNSSEC validation would not work for Unbound itself, and also not
  for downstream users. Default is no. The option
  is disable-edns-do: no

11 October 2023: George
- Fix #850: [FR] Ability to use specific database in Redis, with new
  redis-logical-db configuration option.

11 October 2023: Wouter
- Fix #949: "could not create control compt".
- Fix that cachedb does not warn when serve-expired is disabled about
  use of serve-expired-reply-ttl and serve-expired-client-timeout.
- Fix for #949: Fix pythonmod/ubmodule-tst.py for Python 3.x.

10 October 2023: George
- Fix infinite loop when reading multiple lines of input on a broken
  remote control socket. Addesses #947 and #948.

9 October 2023: Wouter
- Fix edns subnet so that queries with a source prefix of zero cause
  the recursor send no edns subnet option to the upstream.
- Fix that printout of EDNS options shows the EDNS cookie option by
  name.

4 October 2023: Wouter
- Fix #946: Forwarder returns servfail on upstream response noerror no
  data.

3 October 2023: George
- Merge #881: Generalise the proxy protocol code.

2 October 2023: George
- Fix misplaced comment.

22 September 2023: Wouter
- Fix #942: 1.18.0 libunbound DNS regression when built without
  OpenSSL.

18 September 2023: Wouter
- Fix rpz tcp-only action with rpz triggers nsdname and nsip.

15 September 2023: Wouter
- Merge #936: Check for c99 with autoconf versions prior to 2.70.
- Fix to remove two c99 

CVS import: src/external/bsd/unbound/dist

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 18:07:38 UTC 2024

Update of /cvsroot/src/external/bsd/unbound/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18893

Log Message:
Import 1.19.1 (previous was 1.16.3)

2 November 2023: Wouter
- Set version number to 1.19.0.
- Tag for 1.19.0rc1 release.

1 November 2023: George
- Mention flex and bison in README.md when building from repository
  source.

1 November 2023: Wouter
- Fix SSL compile failure for definition in log_crypto_err_io_code_arg.
- Fix SSL compile failure for other missing definitions in
  log_crypto_err_io_code_arg.
- Fix compilation without openssl, remove unused function warning.

31 October 2023: George
- Fix #941: dnscrypt doesn't work after upgrade to 1.18 with
  suggestion by dukeartem to also fix the udp_ancil with dnscrypt.

30 October 2023: George
- Merge #930 from Stuart Henderson: add void to
  log_ident_revert_to_default declaration.

30 October 2023: Wouter
- autoconf.

24 October 2023: George
- Clearer configure text for missing protobuf-c development libraries.

20 October 2023: Wouter
- Merge #951: Cachedb no store. The cachedb-no-store: yes option is
  used to stop cachedb from writing messages to the backend storage.
  It reads messages when data is available from the backend. The
  default is no.

19 October 2023: Wouter
- Fix to print detailed errors when an SSL IO routine fails via
  SSL_get_error.

18 October 2023: George
- Mailing list patches from Daniel Gröber for DNS64 fallback to plain
   when no A record exists for synthesis, and minor DNS64 code
  refactoring for better readability.
- Fixes for the DNS64 patches.
- Update the dns64_lookup.rpl test for the DNS64 fallback patch.
- Merge #955 from buevsan: fix ipset wrong behavior.
- Update testdata/ipset.tdir test for ipset fix.

17 October 2023: Wouter
- Fix #954: Inconsistent RPZ handling for A record returned along with
  CNAME.

16 October 2023: George
- Expose the script filename in the Python module environment 'mod_env'
  instead of the config_file structure which includes the linked list
  of scripts in a multi Python module setup; fixes #79.
- Expose the configured listening and outgoing interfaces, if any, as
  a list of strings in the Python 'config_file' class instead of the
  current Swig object proxy; fixes #79.
- For multi Python module setups, clean previously parsed module
  functions in __main__'s dictionary, if any, so that only current
  module functions are registered.

13 October 2023: George
- Better fix for infinite loop when reading multiple lines of input on
  a broken remote control socket, by treating a zero byte line the
  same as transmission end. Addesses #947 and #948.

12 October 2023: Wouter
- Merge #944: Disable EDNS DO.
  Disable the EDNS DO flag in upstream requests. This can be helpful
  for devices that cannot handle DNSSEC information. But it should not
  be enabled otherwise, because that would stop DNSSEC validation. The
  DNSSEC validation would not work for Unbound itself, and also not
  for downstream users. Default is no. The option
  is disable-edns-do: no

11 October 2023: George
- Fix #850: [FR] Ability to use specific database in Redis, with new
  redis-logical-db configuration option.

11 October 2023: Wouter
- Fix #949: "could not create control compt".
- Fix that cachedb does not warn when serve-expired is disabled about
  use of serve-expired-reply-ttl and serve-expired-client-timeout.
- Fix for #949: Fix pythonmod/ubmodule-tst.py for Python 3.x.

10 October 2023: George
- Fix infinite loop when reading multiple lines of input on a broken
  remote control socket. Addesses #947 and #948.

9 October 2023: Wouter
- Fix edns subnet so that queries with a source prefix of zero cause
  the recursor send no edns subnet option to the upstream.
- Fix that printout of EDNS options shows the EDNS cookie option by
  name.

4 October 2023: Wouter
- Fix #946: Forwarder returns servfail on upstream response noerror no
  data.

3 October 2023: George
- Merge #881: Generalise the proxy protocol code.

2 October 2023: George
- Fix misplaced comment.

22 September 2023: Wouter
- Fix #942: 1.18.0 libunbound DNS regression when built without
  OpenSSL.

18 September 2023: Wouter
- Fix rpz tcp-only action with rpz triggers nsdname and nsip.

15 September 2023: Wouter
- Merge #936: Check for c99 with autoconf versions prior to 2.70.
- Fix to remove two c99 

CVS commit: src/doc

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 17:44:39 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new nsd


To generate a diff of this commit:
cvs rdiff -u -r1.1985 -r1.1986 src/doc/3RDPARTY
cvs rdiff -u -r1.3038 -r1.3039 src/doc/CHANGES

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.1985 src/doc/3RDPARTY:1.1986
--- src/doc/3RDPARTY:1.1985	Sat Feb 17 09:57:02 2024
+++ src/doc/3RDPARTY	Sat Feb 17 12:44:38 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1985 2024/02/17 14:57:02 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1986 2024/02/17 17:44:38 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -179,12 +179,12 @@ Use cleantags to import
 run configure and update config files in include
 
 Package:	nsd
-Version:	4.6.0
-Current Vers:	4.7.0
+Version:	4.8.0
+Current Vers:	4.8.0
 Maintainer:	Nlnetlabs
 Archive Site:	https://www.nlnetlabs.nl/svn/nsd/
 Home Page:	https://www.nlnetlabs.nl/projects/nsd/
-Date:		2023-06-21
+Date:		2024-02-17
 Mailing List:	https://open.nlnetlabs.nl/mailman/listinfo/nsd-users/
 Responsible:	christos
 License:	BSD-like

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3038 src/doc/CHANGES:1.3039
--- src/doc/CHANGES:1.3038	Sat Feb 17 09:57:02 2024
+++ src/doc/CHANGES	Sat Feb 17 12:44:38 2024
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3038 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3039 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -280,3 +280,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 		CVE-2023-5679 CVE-2023-6516 CVE-2023-50387 CVE-2023-50868
 		[christos 20240213]
 	tzcode: Updated to 2024a. [christos 20240217]
+	nsd: Import 4.8.0. [christos 20240217]



CVS commit: src/doc

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 17:44:39 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new nsd


To generate a diff of this commit:
cvs rdiff -u -r1.1985 -r1.1986 src/doc/3RDPARTY
cvs rdiff -u -r1.3038 -r1.3039 src/doc/CHANGES

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



CVS commit: src/external/bsd/nsd

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 17:43:21 UTC 2024

Modified Files:
src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h
configure configure.ac options.c server.c util.h zlexer.c
src/external/bsd/nsd/dist/doc: README
src/external/bsd/nsd/include: config.h
src/external/bsd/nsd/lib/libnsd: Makefile
Removed Files:
src/external/bsd/nsd/dist: udbradtree.c udbradtree.h udbzone.c
udbzone.h
src/external/bsd/nsd/dist/.github: FUNDING.yml
src/external/bsd/nsd/dist/contrib: nsd.socket

Log Message:
merge differences between nsd-4.6.0 and nsd-4.8.0


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/nsd/dist/configlexer.c \
src/external/bsd/nsd/dist/configparser.c \
src/external/bsd/nsd/dist/configparser.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/configure
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/dist/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/nsd/dist/options.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/nsd/dist/server.c \
src/external/bsd/nsd/dist/util.h src/external/bsd/nsd/dist/zlexer.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/nsd/dist/udbradtree.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/nsd/dist/udbradtree.h \
src/external/bsd/nsd/dist/udbzone.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/udbzone.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/.github/FUNDING.yml
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/nsd/dist/contrib/nsd.socket
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/dist/doc/README
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/nsd/include/config.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/nsd/lib/libnsd/Makefile

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



CVS commit: src/sys/arch/vax/vsa

2024-02-17 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 17 17:41:43 UTC 2024

Modified Files:
src/sys/arch/vax/vsa: ncr.c vsbus.c

Log Message:
Fix SCSI tranfer corruption on VAXstation 3100/m30 (KA420) on netboot.

See my post on port-vax@ for details:
 https://mail-index.netbsd.org/port-vax/2024/02/16/msg004866.html
and "go ahead!" from ragge@.  Should be pulled up to netbsd-10 and -9.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/vsa/ncr.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/vax/vsa/vsbus.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/vax/vsa/ncr.c
diff -u src/sys/arch/vax/vsa/ncr.c:1.51 src/sys/arch/vax/vsa/ncr.c:1.52
--- src/sys/arch/vax/vsa/ncr.c:1.51	Wed Dec 20 15:34:46 2023
+++ src/sys/arch/vax/vsa/ncr.c	Sat Feb 17 17:41:43 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.51 2023/12/20 15:34:46 thorpej Exp $	*/
+/*	$NetBSD: ncr.c,v 1.52 2024/02/17 17:41:43 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.51 2023/12/20 15:34:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.52 2024/02/17 17:41:43 tsutsui Exp $");
 
 #include 
 #include 
@@ -66,6 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: ncr.c,v 1.51
 #include 
 #include 
 #include 
+#include 
 
 #include "ioconf.h"
 
@@ -208,6 +209,16 @@ si_vsbus_attach(device_t parent, device_
 	else
 		target = (clk_page[0xbc/2] >> tweak) & 7;
 
+	/*
+	 * Explicitly enable upto 128KB "Big DMA" on KA420.
+	 * (It looks KA420 firmware doesn't enable it on network boot)
+	 */
+#define STC_MODE_OFF	(KA420_STC_MODE - KA420_SCS_BASE)
+	if (vax_boardtype == VAX_BTYP_420) {
+		bus_space_write_1(ncr_sc->sc_regt, ncr_sc->sc_regh,
+		STC_MODE_OFF, 1);
+	}
+
 	aprint_normal("\n");
 	aprint_normal_dev(self, "NCR5380, SCSI ID %d\n", target);
 

Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.68 src/sys/arch/vax/vsa/vsbus.c:1.69
--- src/sys/arch/vax/vsa/vsbus.c:1.68	Mon Dec 12 18:22:32 2022
+++ src/sys/arch/vax/vsa/vsbus.c	Sat Feb 17 17:41:43 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: vsbus.c,v 1.68 2022/12/12 18:22:32 jakllsch Exp $ */
+/*	$NetBSD: vsbus.c,v 1.69 2024/02/17 17:41:43 tsutsui Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.68 2022/12/12 18:22:32 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.69 2024/02/17 17:41:43 tsutsui Exp $");
 
 #include "opt_cputype.h"
 
@@ -146,7 +146,6 @@ vsbus_attach(device_t parent, device_t s
 		} else {
 			dbase = KA420_DMA_BASE;
 			dsize = KA420_DMA_SIZE;
-			*(volatile char *)(sc->sc_vsregs + 0xe0) = 1; /* Big DMA */
 		}
 		sc->sc_dmasize = dsize;
 		sc->sc_dmaaddr = uvm_km_alloc(kernel_map, dsize, 0,



CVS commit: src/sys/arch/vax/vsa

2024-02-17 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat Feb 17 17:41:43 UTC 2024

Modified Files:
src/sys/arch/vax/vsa: ncr.c vsbus.c

Log Message:
Fix SCSI tranfer corruption on VAXstation 3100/m30 (KA420) on netboot.

See my post on port-vax@ for details:
 https://mail-index.netbsd.org/port-vax/2024/02/16/msg004866.html
and "go ahead!" from ragge@.  Should be pulled up to netbsd-10 and -9.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/vax/vsa/ncr.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/vax/vsa/vsbus.c

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



CVS import: src/external/bsd/nsd/dist

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 17:31:34 UTC 2024

Update of /cvsroot/src/external/bsd/nsd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1728

Log Message:
Import 4.8.0 (previous was 4.6.0)

29 November 2023: Wouter
- Tag for 4.8.0rc1.

28 November 2023: Wouter
- Set up doc/RELNOTES for upcoming release.
- Fix unit test kill_from_pidfile function for nonexistent files
  because the argument is evaluated before the test expression.
- Fix rr-test to also convert the contents of the just written output
  file.
- Fix test set to remove -f nsd.db and rm nsd.db commands.
- Fix test set to remove difffile option.

27 November 2023: Jeroen
- Fix #14: Set timeout to 3s when servicing remaining TCP connections.
- Fix: Always instate write handler after reading queries from TCP.
- Answer first query on connections accepted just before reload.

27 November 2023: Wouter
- Merge #305: faster stats. Statistics can be gathered while a reload
  is in progress.

27 November 2023: Willem
- Merge #302: Test package fixes. Correct Auxfiles, kill_from_pidfile
  function and fix drop_updates, rr-test and xfr_update tests.

1 November 2023: Jeroen
- Remove on-disk database.

31 October 2023: Wouter
- Merge #301: improve the logging of ixfr fallbacks to axfr.

30 October 2023: Jeroen
- Fix processing of consolidated IXFRs.

30 October 2023: Wouter
- Fix for interprocess communication to set quit sync command from
  main process explicitly.

3 October 2023: Wouter
- Merge #281: Proxy protocol. An implementation of PROXYv2 for NSD.
  It can be configured with proxy-protocol-port: portnum with the
  port number of the interface on which proxy traffic is handled.
  The interface can support proxy traffic for UDP, TCP and TLS.

21 September 2023: Wouter
- Merge #295: Update e-mail addresses, add ref to support contracts

31 August 2023: Wouter
- Fix autoconf 2.69 warnings in configure.

14 July 2023: Wouter
- Merge #287: Update nsd.conf.5.in.

11 July 2023: Wouter
- Fix unused variable warning in unit test of udb.

22 June 2023: Wouter
- Fix #284: dnstap_collector.c: SOCK_NONBLOCK is not available on
  Mac/Darwin.

7 June 2023: Wouter
- Merge #282: Improve nsd.conf man page.
- Fix unused but set variable warning.
- Fix #283: Compile failure in remote.c when --disable-bind8-stats
  and --without-ssl are specified.

31 May 2023: Wouter
- Add missing items to doc/RELNOTES.
- Tag for 4.7.0rc1. It became release 4.7.0 on 7 june 2023. The code
  repository continues with 4.7.1.

30 May 2023: Jeroen
- Fix #240: Prefix messages originating from verifier.
- Fix #275: Drop unnecessary root server checks.

30 May 2023: Wouter
- Next version is 4.7.0, instead of 4.6.2, because of the added
  features, like TLS for DNSTAP.
- Fix unused variable warning in unit test, from clang compile.

24 May 2023: Wouter
- For #279: Note that autoreconf -fi creates the configure script
  and also the needed auxiliary files, for autoconf 2.69 and 2.71.

4 May 2023: Wouter
- Fix to remove unused whitespace from acx_nlnetlabs.m4 and config.h.

1 May 2023: Wouter
- make depend.
- Fix for build to run flex and bison before compiling code that needs
  the headers.

13 April 2023: Wouter
- Fix cirrus script for submit to coverity scan to libtoolize
  the configure script components config.guess and config.sub.
- Fix readme status badge links.

28 March 2023: Wouter
- Fix #273: Large TXT record breaks AXFR.
- Fix ixfr create from adding too many record types.

16 March 2023: Wouter
- Fix include brackets for ssl.h include statements, instead of quotes.
- Fix static analyzer warning about nsd_event_method initialization.

15 March 2023: Wouter
- Dnstap tls code fixes.

14 March 2023: Wouter
- Fix dnstap to not check socket path when using IP address.
- dnstap over TLS, default enabled. Configured with the
  options dnstap-tls, dnstap-tls-server-name, dnstap-tls-cert-bundle,
  dnstap-tls-client-key-file and dnstap-tls-client-cert-file.
- Fix to compile without ssl with dnstap-tls code.

9 March 2023: Wouter
- Fix #271: DNSTAP over TCP, with dnstap-ip: "127.0.0.1@".
- Fix to clean more memory on exit of dnstap collector.

23 February 2023: Wouter
- Fix #270: reserved identifier violation.

20 February 2023: Wouter
- Merge #269 from Fale: Add systemd service unit.

16 February 2023: Wouter
- Fix #266: Fix build with --without-ssl.
- Fix #267: Allow unencrypted local operation of nsd-control.
- 

CVS import: src/external/bsd/nsd/dist

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 17:31:34 UTC 2024

Update of /cvsroot/src/external/bsd/nsd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1728

Log Message:
Import 4.8.0 (previous was 4.6.0)

29 November 2023: Wouter
- Tag for 4.8.0rc1.

28 November 2023: Wouter
- Set up doc/RELNOTES for upcoming release.
- Fix unit test kill_from_pidfile function for nonexistent files
  because the argument is evaluated before the test expression.
- Fix rr-test to also convert the contents of the just written output
  file.
- Fix test set to remove -f nsd.db and rm nsd.db commands.
- Fix test set to remove difffile option.

27 November 2023: Jeroen
- Fix #14: Set timeout to 3s when servicing remaining TCP connections.
- Fix: Always instate write handler after reading queries from TCP.
- Answer first query on connections accepted just before reload.

27 November 2023: Wouter
- Merge #305: faster stats. Statistics can be gathered while a reload
  is in progress.

27 November 2023: Willem
- Merge #302: Test package fixes. Correct Auxfiles, kill_from_pidfile
  function and fix drop_updates, rr-test and xfr_update tests.

1 November 2023: Jeroen
- Remove on-disk database.

31 October 2023: Wouter
- Merge #301: improve the logging of ixfr fallbacks to axfr.

30 October 2023: Jeroen
- Fix processing of consolidated IXFRs.

30 October 2023: Wouter
- Fix for interprocess communication to set quit sync command from
  main process explicitly.

3 October 2023: Wouter
- Merge #281: Proxy protocol. An implementation of PROXYv2 for NSD.
  It can be configured with proxy-protocol-port: portnum with the
  port number of the interface on which proxy traffic is handled.
  The interface can support proxy traffic for UDP, TCP and TLS.

21 September 2023: Wouter
- Merge #295: Update e-mail addresses, add ref to support contracts

31 August 2023: Wouter
- Fix autoconf 2.69 warnings in configure.

14 July 2023: Wouter
- Merge #287: Update nsd.conf.5.in.

11 July 2023: Wouter
- Fix unused variable warning in unit test of udb.

22 June 2023: Wouter
- Fix #284: dnstap_collector.c: SOCK_NONBLOCK is not available on
  Mac/Darwin.

7 June 2023: Wouter
- Merge #282: Improve nsd.conf man page.
- Fix unused but set variable warning.
- Fix #283: Compile failure in remote.c when --disable-bind8-stats
  and --without-ssl are specified.

31 May 2023: Wouter
- Add missing items to doc/RELNOTES.
- Tag for 4.7.0rc1. It became release 4.7.0 on 7 june 2023. The code
  repository continues with 4.7.1.

30 May 2023: Jeroen
- Fix #240: Prefix messages originating from verifier.
- Fix #275: Drop unnecessary root server checks.

30 May 2023: Wouter
- Next version is 4.7.0, instead of 4.6.2, because of the added
  features, like TLS for DNSTAP.
- Fix unused variable warning in unit test, from clang compile.

24 May 2023: Wouter
- For #279: Note that autoreconf -fi creates the configure script
  and also the needed auxiliary files, for autoconf 2.69 and 2.71.

4 May 2023: Wouter
- Fix to remove unused whitespace from acx_nlnetlabs.m4 and config.h.

1 May 2023: Wouter
- make depend.
- Fix for build to run flex and bison before compiling code that needs
  the headers.

13 April 2023: Wouter
- Fix cirrus script for submit to coverity scan to libtoolize
  the configure script components config.guess and config.sub.
- Fix readme status badge links.

28 March 2023: Wouter
- Fix #273: Large TXT record breaks AXFR.
- Fix ixfr create from adding too many record types.

16 March 2023: Wouter
- Fix include brackets for ssl.h include statements, instead of quotes.
- Fix static analyzer warning about nsd_event_method initialization.

15 March 2023: Wouter
- Dnstap tls code fixes.

14 March 2023: Wouter
- Fix dnstap to not check socket path when using IP address.
- dnstap over TLS, default enabled. Configured with the
  options dnstap-tls, dnstap-tls-server-name, dnstap-tls-cert-bundle,
  dnstap-tls-client-key-file and dnstap-tls-client-cert-file.
- Fix to compile without ssl with dnstap-tls code.

9 March 2023: Wouter
- Fix #271: DNSTAP over TCP, with dnstap-ip: "127.0.0.1@".
- Fix to clean more memory on exit of dnstap collector.

23 February 2023: Wouter
- Fix #270: reserved identifier violation.

20 February 2023: Wouter
- Merge #269 from Fale: Add systemd service unit.

16 February 2023: Wouter
- Fix #266: Fix build with --without-ssl.
- Fix #267: Allow unencrypted local operation of nsd-control.
- 

CVS commit: [netbsd-9] src/doc

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:19:56 UTC 2024

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

Log Message:
Ticket #1798


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.128 -r1.1.2.129 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.128 src/doc/CHANGES-9.4:1.1.2.129
--- src/doc/CHANGES-9.4:1.1.2.128	Sat Feb 17 16:10:59 2024
+++ src/doc/CHANGES-9.4	Sat Feb 17 16:19:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.128 2024/02/17 16:10:59 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.129 2024/02/17 16:19:56 martin Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -4155,3 +4155,10 @@ libexec/utmp_update/utmp_update.c		1.14
 	utmp_update(8): check for non-printable characters in ut_host.
 	[shm, ticket #1797]
 
+sys/dev/dec/dzkbd.c1.32
+sys/dev/dec/lk201_ws.c1.11
+sys/dev/dec/lk201var.h1.8
+
+	vax: fix keyboard console in polled mode on some machines.
+	[tsutsui, ticket #1798]
+



CVS commit: [netbsd-9] src/doc

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:19:56 UTC 2024

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

Log Message:
Ticket #1798


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.128 -r1.1.2.129 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/sys/dev/dec

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:19:14 UTC 2024

Modified Files:
src/sys/dev/dec [netbsd-9]: dzkbd.c lk201_ws.c lk201var.h

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

sys/dev/dec/dzkbd.c: revision 1.32
sys/dev/dec/lk201var.h: revision 1.8
sys/dev/dec/lk201_ws.c: revision 1.11

Fix a fatal typo that causes dzkbd_cngetc() to stall.

Use proper macro for return values and remove #if 0'ed out block.
Mostly from OpenBSD/vax. No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.24.1 src/sys/dev/dec/dzkbd.c
cvs rdiff -u -r1.10 -r1.10.24.1 src/sys/dev/dec/lk201_ws.c
cvs rdiff -u -r1.7 -r1.7.24.1 src/sys/dev/dec/lk201var.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/dev/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.27 src/sys/dev/dec/dzkbd.c:1.27.24.1
--- src/sys/dev/dec/dzkbd.c:1.27	Fri Jan  2 21:32:26 2015
+++ src/sys/dev/dec/dzkbd.c	Sat Feb 17 16:19:14 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: dzkbd.c,v 1.27 2015/01/02 21:32:26 jklos Exp $	*/
+/*	$NetBSD: dzkbd.c,v 1.27.24.1 2024/02/17 16:19:14 martin Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.27 2015/01/02 21:32:26 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.27.24.1 2024/02/17 16:19:14 martin Exp $");
 
 #include 
 #include 
@@ -237,7 +237,7 @@ dzkbd_cngetc(void *v, u_int *type, int *
 
 	do {
 		c = dzgetc(dzi->dzi_ls);
-	} while (!lk201_decode(>dzi_ks, 0, c, type, data) == LKD_NODATA);
+	} while (lk201_decode(>dzi_ks, 0, c, type, data) == LKD_NODATA);
 }
 
 static void

Index: src/sys/dev/dec/lk201_ws.c
diff -u src/sys/dev/dec/lk201_ws.c:1.10 src/sys/dev/dec/lk201_ws.c:1.10.24.1
--- src/sys/dev/dec/lk201_ws.c:1.10	Mon Jul 11 10:55:35 2016
+++ src/sys/dev/dec/lk201_ws.c	Sat Feb 17 16:19:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $ */
+/* $NetBSD: lk201_ws.c,v 1.10.24.1 2024/02/17 16:19:14 martin Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10.24.1 2024/02/17 16:19:14 martin Exp $");
 
 #include 
 #include 
@@ -133,17 +133,10 @@ lk201_decode(struct lk201_state *lks, in
 	}
 
 	switch (datain) {
-#if 0
-	case LK_KEY_UP:
-		for (i = 0; i < LK_KLL; i++)
-			lks->down_keys_list[i] = -1;
-		*type = WSCONS_EVENT_ALL_KEYS_UP;
-		return (1);
-#endif
 	case LK_POWER_UP:
 		printf("lk201_decode: powerup detected\n");
 		lk201_init(lks);
-		return (0);
+		return LKD_NODATA;
 	case LK_KDOWN_ERROR:
 	case LK_POWER_ERROR:
 	case LK_OUTPUT_ERROR:
@@ -152,7 +145,7 @@ lk201_decode(struct lk201_state *lks, in
 		/* FALLTHRU */
 	case LK_KEY_REPEAT: /* autorepeat handled by wskbd */
 	case LK_MODE_CHANGE: /* ignore silently */
-		return (0);
+		return LKD_NODATA;
 	}
 
 
@@ -164,18 +157,18 @@ lk201_decode(struct lk201_state *lks, in
 	*dataout = lks->down_keys_list[i] -
 	MIN_LK201_KEY;
 	lks->down_keys_list[i] = -1;
-	return (LKD_MORE);
+	return LKD_MORE;
 }
-			return (LKD_NODATA);
+			return LKD_NODATA;
 		} else {
 			for (i = 0; i < LK_KLL; i++)
 lks->down_keys_list[i] = -1;
 			*type = WSCONS_EVENT_ALL_KEYS_UP;
-			return (LKD_COMPLETE);
+			return LKD_COMPLETE;
 		}
 	} else if (datain < MIN_LK201_KEY || datain > MAX_LK201_KEY) {
 		printf("lk201_decode: %x\n", datain);
-		return (0);
+		return LKD_NODATA;
 	}
 
 	*dataout = datain - MIN_LK201_KEY;
@@ -185,7 +178,7 @@ lk201_decode(struct lk201_state *lks, in
 		if (lks->down_keys_list[i] == datain) {
 			*type = WSCONS_EVENT_KEY_UP;
 			lks->down_keys_list[i] = -1;
-			return (1);
+			return LKD_COMPLETE;
 		}
 		if (lks->down_keys_list[i] == -1 && freeslot == -1)
 			freeslot = i;
@@ -193,12 +186,12 @@ lk201_decode(struct lk201_state *lks, in
 
 	if (freeslot == -1) {
 		printf("lk201_decode: down(%d) no free slot\n", datain);
-		return (0);
+		return LKD_NODATA;
 	}
 
 	*type = WSCONS_EVENT_KEY_DOWN;
 	lks->down_keys_list[freeslot] = datain;
-	return (1);
+	return LKD_COMPLETE;
 }
 
 void

Index: src/sys/dev/dec/lk201var.h
diff -u src/sys/dev/dec/lk201var.h:1.7 src/sys/dev/dec/lk201var.h:1.7.24.1
--- src/sys/dev/dec/lk201var.h:1.7	Fri Jan  2 21:32:26 2015
+++ src/sys/dev/dec/lk201var.h	Sat Feb 17 16:19:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201var.h,v 1.7 2015/01/02 21:32:26 jklos Exp $ */
+/* $NetBSD: lk201var.h,v 1.7.24.1 2024/02/17 16:19:14 martin Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -54,7 +54,7 @@ void lk201_bell(struct lk201_state *, st
 void lk201_set_leds(struct lk201_state *, int);
 void lk201_set_keyclick(struct lk201_state *, int);
 
+/* Values returned by lk201_decode */
 #define LKD_NODATA	0x00
 #define LKD_COMPLETE	0x01
 #define 

CVS commit: [netbsd-9] src/sys/dev/dec

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:19:14 UTC 2024

Modified Files:
src/sys/dev/dec [netbsd-9]: dzkbd.c lk201_ws.c lk201var.h

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

sys/dev/dec/dzkbd.c: revision 1.32
sys/dev/dec/lk201var.h: revision 1.8
sys/dev/dec/lk201_ws.c: revision 1.11

Fix a fatal typo that causes dzkbd_cngetc() to stall.

Use proper macro for return values and remove #if 0'ed out block.
Mostly from OpenBSD/vax. No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.24.1 src/sys/dev/dec/dzkbd.c
cvs rdiff -u -r1.10 -r1.10.24.1 src/sys/dev/dec/lk201_ws.c
cvs rdiff -u -r1.7 -r1.7.24.1 src/sys/dev/dec/lk201var.h

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



CVS commit: [netbsd-10] src/sys/dev/dec

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:17:17 UTC 2024

Modified Files:
src/sys/dev/dec [netbsd-10]: dzkbd.c lk201_ws.c lk201var.h

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

sys/dev/dec/dzkbd.c: revision 1.32
sys/dev/dec/lk201var.h: revision 1.8
sys/dev/dec/lk201_ws.c: revision 1.11

Fix a fatal typo that causes dzkbd_cngetc() to stall.

Use proper macro for return values and remove #if 0'ed out block.
Mostly from OpenBSD/vax. No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.6.1 src/sys/dev/dec/dzkbd.c
cvs rdiff -u -r1.10 -r1.10.50.1 src/sys/dev/dec/lk201_ws.c
cvs rdiff -u -r1.7 -r1.7.50.1 src/sys/dev/dec/lk201var.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/dev/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.30 src/sys/dev/dec/dzkbd.c:1.30.6.1
--- src/sys/dev/dec/dzkbd.c:1.30	Sat Aug  7 16:19:10 2021
+++ src/sys/dev/dec/dzkbd.c	Sat Feb 17 16:17:17 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: dzkbd.c,v 1.30 2021/08/07 16:19:10 thorpej Exp $	*/
+/*	$NetBSD: dzkbd.c,v 1.30.6.1 2024/02/17 16:17:17 martin Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.30 2021/08/07 16:19:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.30.6.1 2024/02/17 16:17:17 martin Exp $");
 
 #include 
 #include 
@@ -237,7 +237,7 @@ dzkbd_cngetc(void *v, u_int *type, int *
 
 	do {
 		c = dzgetc(dzi->dzi_ls);
-	} while (!lk201_decode(>dzi_ks, 0, c, type, data) == LKD_NODATA);
+	} while (lk201_decode(>dzi_ks, 0, c, type, data) == LKD_NODATA);
 }
 
 static void

Index: src/sys/dev/dec/lk201_ws.c
diff -u src/sys/dev/dec/lk201_ws.c:1.10 src/sys/dev/dec/lk201_ws.c:1.10.50.1
--- src/sys/dev/dec/lk201_ws.c:1.10	Mon Jul 11 10:55:35 2016
+++ src/sys/dev/dec/lk201_ws.c	Sat Feb 17 16:17:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $ */
+/* $NetBSD: lk201_ws.c,v 1.10.50.1 2024/02/17 16:17:17 martin Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10 2016/07/11 10:55:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.10.50.1 2024/02/17 16:17:17 martin Exp $");
 
 #include 
 #include 
@@ -133,17 +133,10 @@ lk201_decode(struct lk201_state *lks, in
 	}
 
 	switch (datain) {
-#if 0
-	case LK_KEY_UP:
-		for (i = 0; i < LK_KLL; i++)
-			lks->down_keys_list[i] = -1;
-		*type = WSCONS_EVENT_ALL_KEYS_UP;
-		return (1);
-#endif
 	case LK_POWER_UP:
 		printf("lk201_decode: powerup detected\n");
 		lk201_init(lks);
-		return (0);
+		return LKD_NODATA;
 	case LK_KDOWN_ERROR:
 	case LK_POWER_ERROR:
 	case LK_OUTPUT_ERROR:
@@ -152,7 +145,7 @@ lk201_decode(struct lk201_state *lks, in
 		/* FALLTHRU */
 	case LK_KEY_REPEAT: /* autorepeat handled by wskbd */
 	case LK_MODE_CHANGE: /* ignore silently */
-		return (0);
+		return LKD_NODATA;
 	}
 
 
@@ -164,18 +157,18 @@ lk201_decode(struct lk201_state *lks, in
 	*dataout = lks->down_keys_list[i] -
 	MIN_LK201_KEY;
 	lks->down_keys_list[i] = -1;
-	return (LKD_MORE);
+	return LKD_MORE;
 }
-			return (LKD_NODATA);
+			return LKD_NODATA;
 		} else {
 			for (i = 0; i < LK_KLL; i++)
 lks->down_keys_list[i] = -1;
 			*type = WSCONS_EVENT_ALL_KEYS_UP;
-			return (LKD_COMPLETE);
+			return LKD_COMPLETE;
 		}
 	} else if (datain < MIN_LK201_KEY || datain > MAX_LK201_KEY) {
 		printf("lk201_decode: %x\n", datain);
-		return (0);
+		return LKD_NODATA;
 	}
 
 	*dataout = datain - MIN_LK201_KEY;
@@ -185,7 +178,7 @@ lk201_decode(struct lk201_state *lks, in
 		if (lks->down_keys_list[i] == datain) {
 			*type = WSCONS_EVENT_KEY_UP;
 			lks->down_keys_list[i] = -1;
-			return (1);
+			return LKD_COMPLETE;
 		}
 		if (lks->down_keys_list[i] == -1 && freeslot == -1)
 			freeslot = i;
@@ -193,12 +186,12 @@ lk201_decode(struct lk201_state *lks, in
 
 	if (freeslot == -1) {
 		printf("lk201_decode: down(%d) no free slot\n", datain);
-		return (0);
+		return LKD_NODATA;
 	}
 
 	*type = WSCONS_EVENT_KEY_DOWN;
 	lks->down_keys_list[freeslot] = datain;
-	return (1);
+	return LKD_COMPLETE;
 }
 
 void

Index: src/sys/dev/dec/lk201var.h
diff -u src/sys/dev/dec/lk201var.h:1.7 src/sys/dev/dec/lk201var.h:1.7.50.1
--- src/sys/dev/dec/lk201var.h:1.7	Fri Jan  2 21:32:26 2015
+++ src/sys/dev/dec/lk201var.h	Sat Feb 17 16:17:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201var.h,v 1.7 2015/01/02 21:32:26 jklos Exp $ */
+/* $NetBSD: lk201var.h,v 1.7.50.1 2024/02/17 16:17:17 martin Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -54,7 +54,7 @@ void lk201_bell(struct lk201_state *, st
 void lk201_set_leds(struct lk201_state *, int);
 void lk201_set_keyclick(struct lk201_state *, int);
 
+/* Values returned by lk201_decode */
 #define LKD_NODATA	0x00
 #define LKD_COMPLETE	0x01
 #define 

CVS commit: [netbsd-10] src/sys/dev/dec

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:17:17 UTC 2024

Modified Files:
src/sys/dev/dec [netbsd-10]: dzkbd.c lk201_ws.c lk201var.h

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

sys/dev/dec/dzkbd.c: revision 1.32
sys/dev/dec/lk201var.h: revision 1.8
sys/dev/dec/lk201_ws.c: revision 1.11

Fix a fatal typo that causes dzkbd_cngetc() to stall.

Use proper macro for return values and remove #if 0'ed out block.
Mostly from OpenBSD/vax. No binary changes.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.6.1 src/sys/dev/dec/dzkbd.c
cvs rdiff -u -r1.10 -r1.10.50.1 src/sys/dev/dec/lk201_ws.c
cvs rdiff -u -r1.7 -r1.7.50.1 src/sys/dev/dec/lk201var.h

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



CVS commit: [netbsd-8] src/doc

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:14:05 UTC 2024

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Tickets #1935 and #1936


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.218 -r1.1.2.219 src/doc/CHANGES-8.3

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-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.218 src/doc/CHANGES-8.3:1.1.2.219
--- src/doc/CHANGES-8.3:1.1.2.218	Sat Feb  3 14:28:16 2024
+++ src/doc/CHANGES-8.3	Sat Feb 17 16:14:05 2024
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-8.3,v 1.1.2.218 2024/02/03 14:28:16 martin Exp $
+$NetBSD: CHANGES-8.3,v 1.1.2.219 2024/02/17 16:14:05 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -4246,3 +4246,31 @@ sys/dev/hdaudio/hdafg.c1.29
 	hdaudio(4): PR 57890: fix crash on shutdown with record-only devices.
 	[riastradh, ticket #1934]
 
+external/public-domain/tz/dist/Makefile up to 1.1.1.38
+external/public-domain/tz/dist/NEWS up to 1.1.1.45
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.37
+external/public-domain/tz/dist/africa   up to 1.1.1.33
+external/public-domain/tz/dist/asia up to 1.12
+external/public-domain/tz/dist/australasia  up to 1.9
+external/public-domain/tz/dist/checknow.awk up to 1.1.1.2
+external/public-domain/tz/dist/etcetera up to 1.1.1.8
+external/public-domain/tz/dist/europe   up to 1.1.1.39
+external/public-domain/tz/dist/leap-seconds.list up to 1.7
+external/public-domain/tz/dist/leapseconds  up to 1.7
+external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.14
+external/public-domain/tz/dist/northamerica up to 1.1.1.35
+external/public-domain/tz/dist/southamerica up to 1.1.1.25
+external/public-domain/tz/dist/theory.html  up to 1.1.1.19
+external/public-domain/tz/dist/version  up to 1.12
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9
+external/public-domain/tz/dist/zonenow.tab  up to 1.1.1.2
+doc/3RDPARTY	apply patch
+
+	Updated tzdata to 2024a.
+	[kre, ticket #1935]
+
+libexec/utmp_update/utmp_update.c		1.14
+
+	utmp_update(8): check for non-printable characters in ut_host.
+	[shm, ticket #1936]
+



CVS commit: [netbsd-8] src/doc

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:14:05 UTC 2024

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Tickets #1935 and #1936


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.218 -r1.1.2.219 src/doc/CHANGES-8.3

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



CVS commit: [netbsd-8] src/libexec/utmp_update

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:11:46 UTC 2024

Modified Files:
src/libexec/utmp_update [netbsd-8]: utmp_update.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #1936):

libexec/utmp_update/utmp_update.c: revision 1.14

Check for non-printable characters in ut_host.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.8.1 src/libexec/utmp_update/utmp_update.c

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

Modified files:

Index: src/libexec/utmp_update/utmp_update.c
diff -u src/libexec/utmp_update/utmp_update.c:1.13 src/libexec/utmp_update/utmp_update.c:1.13.8.1
--- src/libexec/utmp_update/utmp_update.c:1.13	Sun Apr 26 08:56:19 2015
+++ src/libexec/utmp_update/utmp_update.c	Sat Feb 17 16:11:46 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $	 */
+/*	$NetBSD: utmp_update.c,v 1.13.8.1 2024/02/17 16:11:46 martin Exp $	 */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 #include 
 
-__RCSID("$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $");
+__RCSID("$NetBSD: utmp_update.c,v 1.13.8.1 2024/02/17 16:11:46 martin Exp $");
 
 #include 
 #include 
@@ -41,6 +41,7 @@ __RCSID("$NetBSD: utmp_update.c,v 1.13 2
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -80,6 +81,7 @@ main(int argc, char *argv[])
 	int res;
 	uid_t euid, ruid;
 	char tty[MAXPATHLEN];
+	const char *p, *ep;
 
 	euid = geteuid();
 	ruid = getuid();
@@ -115,6 +117,12 @@ main(int argc, char *argv[])
 		logerr(0, "Invalid utmpx type %d", (int)utx->ut_type);
 	}
 
+	p = utx->ut_host;
+	ep = p + sizeof(utx->ut_host);
+	for (; p < ep && *p; p++)
+		if (!isprint((unsigned char)*p))
+			logerr(0, "Non-printable characters in hostname");
+
 	if (ruid != 0) {
 		if ((pwd = getpwuid(ruid)) == NULL)
 			logerr(0, "User %ld does not exist in password"



CVS commit: [netbsd-8] src/libexec/utmp_update

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:11:46 UTC 2024

Modified Files:
src/libexec/utmp_update [netbsd-8]: utmp_update.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #1936):

libexec/utmp_update/utmp_update.c: revision 1.14

Check for non-printable characters in ut_host.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.8.1 src/libexec/utmp_update/utmp_update.c

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-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:10:59 UTC 2024

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

Log Message:
Tickets #1796 and #1797


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.127 -r1.1.2.128 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.127 src/doc/CHANGES-9.4:1.1.2.128
--- src/doc/CHANGES-9.4:1.1.2.127	Sat Feb  3 14:26:27 2024
+++ src/doc/CHANGES-9.4	Sat Feb 17 16:10:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.127 2024/02/03 14:26:27 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.128 2024/02/17 16:10:59 martin Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -4127,3 +4127,31 @@ sys/dev/hdaudio/hdafg.c1.29
 	hdaudio(4): PR 57890: fix crash on shutdown with record-only devices.
 	[riastradh, ticket #1795]
 
+external/public-domain/tz/dist/Makefile up to 1.1.1.38
+external/public-domain/tz/dist/NEWS up to 1.1.1.45
+external/public-domain/tz/dist/TZDATA_VERSION   up to 1.37
+external/public-domain/tz/dist/africa   up to 1.1.1.33
+external/public-domain/tz/dist/asia up to 1.12
+external/public-domain/tz/dist/australasia  up to 1.9
+external/public-domain/tz/dist/checknow.awk up to 1.1.1.2
+external/public-domain/tz/dist/etcetera up to 1.1.1.8
+external/public-domain/tz/dist/europe   up to 1.1.1.39
+external/public-domain/tz/dist/leap-seconds.list up to 1.7
+external/public-domain/tz/dist/leapseconds  up to 1.7
+external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.14
+external/public-domain/tz/dist/northamerica up to 1.1.1.35
+external/public-domain/tz/dist/southamerica up to 1.1.1.25
+external/public-domain/tz/dist/theory.html  up to 1.1.1.19
+external/public-domain/tz/dist/version  up to 1.12
+external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9
+external/public-domain/tz/dist/zonenow.tab  up to 1.1.1.2
+doc/3RDPARTY	apply patch
+
+	Updated tzdata to 2024a.
+	[kre, ticket #1796]
+
+libexec/utmp_update/utmp_update.c		1.14
+
+	utmp_update(8): check for non-printable characters in ut_host.
+	[shm, ticket #1797]
+



CVS commit: [netbsd-9] src/doc

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:10:59 UTC 2024

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

Log Message:
Tickets #1796 and #1797


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.127 -r1.1.2.128 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/libexec/utmp_update

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:09:23 UTC 2024

Modified Files:
src/libexec/utmp_update [netbsd-9]: utmp_update.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #1797):

libexec/utmp_update/utmp_update.c: revision 1.14

Check for non-printable characters in ut_host.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.18.1 src/libexec/utmp_update/utmp_update.c

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

Modified files:

Index: src/libexec/utmp_update/utmp_update.c
diff -u src/libexec/utmp_update/utmp_update.c:1.13 src/libexec/utmp_update/utmp_update.c:1.13.18.1
--- src/libexec/utmp_update/utmp_update.c:1.13	Sun Apr 26 08:56:19 2015
+++ src/libexec/utmp_update/utmp_update.c	Sat Feb 17 16:09:23 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $	 */
+/*	$NetBSD: utmp_update.c,v 1.13.18.1 2024/02/17 16:09:23 martin Exp $	 */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 #include 
 
-__RCSID("$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $");
+__RCSID("$NetBSD: utmp_update.c,v 1.13.18.1 2024/02/17 16:09:23 martin Exp $");
 
 #include 
 #include 
@@ -41,6 +41,7 @@ __RCSID("$NetBSD: utmp_update.c,v 1.13 2
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -80,6 +81,7 @@ main(int argc, char *argv[])
 	int res;
 	uid_t euid, ruid;
 	char tty[MAXPATHLEN];
+	const char *p, *ep;
 
 	euid = geteuid();
 	ruid = getuid();
@@ -115,6 +117,12 @@ main(int argc, char *argv[])
 		logerr(0, "Invalid utmpx type %d", (int)utx->ut_type);
 	}
 
+	p = utx->ut_host;
+	ep = p + sizeof(utx->ut_host);
+	for (; p < ep && *p; p++)
+		if (!isprint((unsigned char)*p))
+			logerr(0, "Non-printable characters in hostname");
+
 	if (ruid != 0) {
 		if ((pwd = getpwuid(ruid)) == NULL)
 			logerr(0, "User %ld does not exist in password"



CVS commit: [netbsd-9] src/libexec/utmp_update

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:09:23 UTC 2024

Modified Files:
src/libexec/utmp_update [netbsd-9]: utmp_update.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #1797):

libexec/utmp_update/utmp_update.c: revision 1.14

Check for non-printable characters in ut_host.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.18.1 src/libexec/utmp_update/utmp_update.c

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



CVS commit: [netbsd-10] src/libexec/utmp_update

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:07:38 UTC 2024

Modified Files:
src/libexec/utmp_update [netbsd-10]: utmp_update.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #595):

libexec/utmp_update/utmp_update.c: revision 1.14

Check for non-printable characters in ut_host.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.26.1 src/libexec/utmp_update/utmp_update.c

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

Modified files:

Index: src/libexec/utmp_update/utmp_update.c
diff -u src/libexec/utmp_update/utmp_update.c:1.13 src/libexec/utmp_update/utmp_update.c:1.13.26.1
--- src/libexec/utmp_update/utmp_update.c:1.13	Sun Apr 26 08:56:19 2015
+++ src/libexec/utmp_update/utmp_update.c	Sat Feb 17 16:07:38 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $	 */
+/*	$NetBSD: utmp_update.c,v 1.13.26.1 2024/02/17 16:07:38 martin Exp $	 */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 #include 
 
-__RCSID("$NetBSD: utmp_update.c,v 1.13 2015/04/26 08:56:19 mlelstv Exp $");
+__RCSID("$NetBSD: utmp_update.c,v 1.13.26.1 2024/02/17 16:07:38 martin Exp $");
 
 #include 
 #include 
@@ -41,6 +41,7 @@ __RCSID("$NetBSD: utmp_update.c,v 1.13 2
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -80,6 +81,7 @@ main(int argc, char *argv[])
 	int res;
 	uid_t euid, ruid;
 	char tty[MAXPATHLEN];
+	const char *p, *ep;
 
 	euid = geteuid();
 	ruid = getuid();
@@ -115,6 +117,12 @@ main(int argc, char *argv[])
 		logerr(0, "Invalid utmpx type %d", (int)utx->ut_type);
 	}
 
+	p = utx->ut_host;
+	ep = p + sizeof(utx->ut_host);
+	for (; p < ep && *p; p++)
+		if (!isprint((unsigned char)*p))
+			logerr(0, "Non-printable characters in hostname");
+
 	if (ruid != 0) {
 		if ((pwd = getpwuid(ruid)) == NULL)
 			logerr(0, "User %ld does not exist in password"



CVS commit: [netbsd-10] src/libexec/utmp_update

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:07:38 UTC 2024

Modified Files:
src/libexec/utmp_update [netbsd-10]: utmp_update.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #595):

libexec/utmp_update/utmp_update.c: revision 1.14

Check for non-printable characters in ut_host.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.26.1 src/libexec/utmp_update/utmp_update.c

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



CVS commit: [netbsd-10] src/sys/dev/ic

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:05:32 UTC 2024

Modified Files:
src/sys/dev/ic [netbsd-10]: sti.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #593):

sys/dev/ic/sti.c: revision 1.32

Make this work properly on PCI Visualize EG:
- use bus_space_*_stream() for all register accesses in order to avoid
  byte order conversion on PCI devices
- when switching to framebuffer mode, request as many text planes as STI allows
- request access to both text and non-text planes in fb mode

With this and the bus_space commit a few days ago I have usable X on my C360
and a PCI Visualize EG.

This needs testing on quite literally everything else.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.6.1 src/sys/dev/ic/sti.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/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.31 src/sys/dev/ic/sti.c:1.31.6.1
--- src/sys/dev/ic/sti.c:1.31	Sat Aug  7 16:19:12 2021
+++ src/sys/dev/ic/sti.c	Sat Feb 17 16:05:32 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sti.c,v 1.31 2021/08/07 16:19:12 thorpej Exp $	*/
+/*	$NetBSD: sti.c,v 1.31.6.1 2024/02/17 16:05:32 martin Exp $	*/
 
 /*	$OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $	*/
 
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.31 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.31.6.1 2024/02/17 16:05:32 martin Exp $");
 
 #include "wsdisplay.h"
 
@@ -926,17 +926,30 @@ sti_init(struct sti_screen *scr, int mod
 	KASSERT(rom != NULL);
 	memset(, 0, sizeof(a));
 
-	a.flags.flags = STI_INITF_WAIT | STI_INITF_EBET;
+	a.flags.flags = STI_INITF_WAIT | STI_INITF_PBET | STI_INITF_PBETI;
 	if ((mode & STI_TEXTMODE) != 0) {
 		a.flags.flags |= STI_INITF_TEXT | STI_INITF_CMB |
 		STI_INITF_PBET | STI_INITF_PBETI | STI_INITF_ICMT;
+		a.in.text_planes = 1;
 	} else {
-		a.flags.flags |= STI_INITF_NTEXT;
+		a.flags.flags |= STI_INITF_TEXT | STI_INITF_NTEXT;
+		/* 
+		 * Request as many text palnes as STI will allow. 
+		 * The reason to do this - when switching to framebuffer mode
+		 * for X we need access to all planes. In theory STI should do
+		 * just that when we request access to both text and non-text
+		 * planes as above.
+		 * In reality though, at least on my PCI Visualize EG, some
+		 * planes and/or colour registers remain inaccessible if we
+		 * request only one text plane.
+		 * Clearly we're missing a register write or two here, but so
+		 * far I haven't found it.
+		 */
+		a.in.text_planes = 3;
 	}
 	if ((mode & STI_CLEARSCR) != 0)
 		a.flags.flags |= STI_INITF_CLEAR;
 
-	a.in.text_planes = 1;
 	a.in.ext_in = 
 
 	DPRINTF(("%s: init,%p(%x, %p, %p, %p)\n",
@@ -1060,7 +1073,7 @@ sti_ioctl(void *v, void *vs, u_long cmd,
 			break;
 		case WSDISPLAYIO_MODE_DUMBFB:
 			if (scr->scr_wsmode != WSDISPLAYIO_MODE_DUMBFB) {
-sti_init(scr, 0);
+ret = sti_init(scr, 0);
 if (scr->setupfb != NULL)
 	scr->setupfb(scr);
 else
@@ -1487,7 +1500,7 @@ void	ngle_setup_attr_planes(struct sti_s
 void	ngle_setup_bt458(struct sti_screen *scr);
 
 #define	ngle_bt458_write(memt, memh, r, v) \
-	bus_space_write_4(memt, memh, NGLE_REG_RAMDAC + ((r) << 2), (v) << 24)
+	bus_space_write_stream_4(memt, memh, NGLE_REG_RAMDAC + ((r) << 2), (v) << 24)
 
 void
 ngle_artist_setupfb(struct sti_screen *scr)
@@ -1504,10 +1517,10 @@ ngle_artist_setupfb(struct sti_screen *s
 	ngle_setup_attr_planes(scr);
 
 	ngle_setup_hw(memt, memh);
-	bus_space_write_4(memt, memh, NGLE_REG_21,
-	bus_space_read_4(memt, memh, NGLE_REG_21) | 0x0a00);
-	bus_space_write_4(memt, memh, NGLE_REG_27,
-	bus_space_read_4(memt, memh, NGLE_REG_27) | 0x0080);
+	bus_space_write_stream_4(memt, memh, NGLE_REG_21,
+	bus_space_read_stream_4(memt, memh, NGLE_REG_21) | 0x0a00);
+	bus_space_write_stream_4(memt, memh, NGLE_REG_27,
+	bus_space_read_stream_4(memt, memh, NGLE_REG_27) | 0x0080);
 }
 
 void
@@ -1566,19 +1579,19 @@ ngle_setup_attr_planes(struct sti_screen
 	bus_space_handle_t memh = rom->regh[2];
 
 	ngle_setup_hw(memt, memh);
-	bus_space_write_4(memt, memh, NGLE_REG_11, 0x2ea0d000);
-	bus_space_write_4(memt, memh, NGLE_REG_14, 0x23000302);
-	bus_space_write_4(memt, memh, NGLE_REG_12, scr->reg12_value);
-	bus_space_write_4(memt, memh, NGLE_REG_8, 0x);
+	bus_space_write_stream_4(memt, memh, NGLE_REG_11, 0x2ea0d000);
+	bus_space_write_stream_4(memt, memh, NGLE_REG_14, 0x23000302);
+	bus_space_write_stream_4(memt, memh, NGLE_REG_12, scr->reg12_value);
+	bus_space_write_stream_4(memt, memh, NGLE_REG_8, 0x);
 
-	bus_space_write_4(memt, memh, NGLE_REG_6, 0x);
-	bus_space_write_4(memt, memh, NGLE_REG_9,
+	bus_space_write_stream_4(memt, memh, NGLE_REG_6, 0x);
+	bus_space_write_stream_4(memt, memh, NGLE_REG_9,
 	(scr->scr_cfg.scr_width << 16) | scr->scr_cfg.scr_height);
-	

CVS commit: [netbsd-10] src/sys/dev/ic

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:05:32 UTC 2024

Modified Files:
src/sys/dev/ic [netbsd-10]: sti.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #593):

sys/dev/ic/sti.c: revision 1.32

Make this work properly on PCI Visualize EG:
- use bus_space_*_stream() for all register accesses in order to avoid
  byte order conversion on PCI devices
- when switching to framebuffer mode, request as many text planes as STI allows
- request access to both text and non-text planes in fb mode

With this and the bus_space commit a few days ago I have usable X on my C360
and a PCI Visualize EG.

This needs testing on quite literally everything else.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.6.1 src/sys/dev/ic/sti.c

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



CVS commit: [netbsd-10] src/sys/arch/hppa

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:02:23 UTC 2024

Modified Files:
src/sys/arch/hppa/dev [netbsd-10]: dino.c elroy.c
src/sys/arch/hppa/hppa [netbsd-10]: mainbus.c
src/sys/arch/hppa/include [netbsd-10]: bus_defs.h bus_funcs.h

Log Message:
Pull up following revision(s) (requested by macallan in ticket #592):

sys/arch/hppa/hppa/mainbus.c: revision 1.13
sys/arch/hppa/dev/elroy.c: revision 1.7
sys/arch/hppa/dev/dino.c: revision 1.17
sys/arch/hppa/include/bus_funcs.h: revision 1.2
sys/arch/hppa/include/bus_defs.h: revision 1.3

add missing bus_space_*_stream() methods instead of quietly aliasing them
to their potentially byte-swapping regular counterparts

ok skrll@


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/hppa/dev/elroy.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/arch/hppa/hppa/mainbus.c
cvs rdiff -u -r1.2 -r1.2.26.1 src/sys/arch/hppa/include/bus_defs.h
cvs rdiff -u -r1.1 -r1.1.66.1 src/sys/arch/hppa/include/bus_funcs.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/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.16 src/sys/arch/hppa/dev/dino.c:1.16.4.1
--- src/sys/arch/hppa/dev/dino.c:1.16	Thu Sep 29 06:39:58 2022
+++ src/sys/arch/hppa/dev/dino.c	Sat Feb 17 16:02:22 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: dino.c,v 1.16 2022/09/29 06:39:58 skrll Exp $ */
+/*	$NetBSD: dino.c,v 1.16.4.1 2024/02/17 16:02:22 martin Exp $ */
 
 /*	$OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.16 2022/09/29 06:39:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.16.4.1 2024/02/17 16:02:22 martin Exp $");
 
 /* #include "cardbus.h" */
 
@@ -177,10 +177,16 @@ uint8_t dino_r1(void *, bus_space_handle
 uint16_t dino_r2(void *, bus_space_handle_t, bus_size_t);
 uint32_t dino_r4(void *, bus_space_handle_t, bus_size_t);
 uint64_t dino_r8(void *, bus_space_handle_t, bus_size_t);
+uint16_t dino_rs2(void *, bus_space_handle_t, bus_size_t);
+uint32_t dino_rs4(void *, bus_space_handle_t, bus_size_t);
+uint64_t dino_rs8(void *, bus_space_handle_t, bus_size_t);
 void dino_w1(void *, bus_space_handle_t, bus_size_t, uint8_t);
 void dino_w2(void *, bus_space_handle_t, bus_size_t, uint16_t);
 void dino_w4(void *, bus_space_handle_t, bus_size_t, uint32_t);
 void dino_w8(void *, bus_space_handle_t, bus_size_t, uint64_t);
+void dino_ws2(void *, bus_space_handle_t, bus_size_t, uint16_t);
+void dino_ws4(void *, bus_space_handle_t, bus_size_t, uint32_t);
+void dino_ws8(void *, bus_space_handle_t, bus_size_t, uint64_t);
 void dino_rm_1(void *, bus_space_handle_t, bus_size_t, uint8_t *, bus_size_t);
 void dino_rm_2(void *, bus_space_handle_t, bus_size_t, uint16_t *, bus_size_t);
 void dino_rm_4(void *, bus_space_handle_t, bus_size_t, uint32_t *, bus_size_t);
@@ -413,7 +419,7 @@ dino_intr_map(const struct pci_attach_ar
 	if (line == 0xff)
 		return 1;
 
-	*ihp = line;
+	*ihp = line ;
 
 	return 0;
 }
@@ -695,6 +701,59 @@ dino_r8(void *v, bus_space_handle_t h, b
 	return le64toh(data);
 }
 
+uint16_t
+dino_rs2(void *v, bus_space_handle_t h, bus_size_t o)
+{
+	volatile uint16_t *p;
+
+	h += o;
+	if (h & HPPA_IOSPACE)
+		p = (volatile uint16_t *)h;
+	else {
+		struct dino_softc *sc = v;
+		volatile struct dino_regs *r = sc->sc_regs;
+
+		r->pci_addr = h;
+		p = (volatile uint16_t *)>pci_io_data;
+		if (h & 2)
+			p++;
+	}
+	return *p;
+}
+
+uint32_t
+dino_rs4(void *v, bus_space_handle_t h, bus_size_t o)
+{
+	uint32_t data;
+
+	h += o;
+	if (h & HPPA_IOSPACE)
+		data = *(volatile uint32_t *)h;
+	else {
+		struct dino_softc *sc = v;
+		volatile struct dino_regs *r = sc->sc_regs;
+
+		r->pci_addr = h;
+		data = r->pci_io_data;
+	}
+
+	return data;
+}
+
+uint64_t
+dino_rs8(void *v, bus_space_handle_t h, bus_size_t o)
+{
+	uint64_t data;
+
+	h += o;
+	if (h & HPPA_IOSPACE)
+		data = *(volatile uint64_t *)h;
+	else
+		panic("dino_r8: not implemented");
+
+	return data;
+}
+
 void
 dino_w1(void *v, bus_space_handle_t h, bus_size_t o, uint8_t vv)
 {
@@ -757,6 +816,51 @@ dino_w8(void *v, bus_space_handle_t h, b
 		panic("dino_w8: not implemented");
 }
 
+void
+dino_ws2(void *v, bus_space_handle_t h, bus_size_t o, uint16_t vv)
+{
+	volatile uint16_t *p;
+
+	h += o;
+	if (h & HPPA_IOSPACE)
+		p = (volatile uint16_t *)h;
+	else {
+		struct dino_softc *sc = v;
+		volatile struct dino_regs *r = sc->sc_regs;
+
+		r->pci_addr = h;
+		p = (volatile uint16_t *)>pci_io_data;
+		if (h & 2)
+			p++;
+	}
+
+	*p = vv;
+}
+
+void
+dino_ws4(void *v, bus_space_handle_t h, bus_size_t o, uint32_t vv)
+{
+	h += o;
+	if (h & HPPA_IOSPACE)
+		*(volatile uint32_t *)h = vv;
+	else {
+		struct dino_softc *sc = v;
+		volatile struct dino_regs *r = sc->sc_regs;
+
+		r->pci_addr = h;
+		r->pci_io_data = 

CVS commit: [netbsd-10] src/sys/arch/hppa

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 16:02:23 UTC 2024

Modified Files:
src/sys/arch/hppa/dev [netbsd-10]: dino.c elroy.c
src/sys/arch/hppa/hppa [netbsd-10]: mainbus.c
src/sys/arch/hppa/include [netbsd-10]: bus_defs.h bus_funcs.h

Log Message:
Pull up following revision(s) (requested by macallan in ticket #592):

sys/arch/hppa/hppa/mainbus.c: revision 1.13
sys/arch/hppa/dev/elroy.c: revision 1.7
sys/arch/hppa/dev/dino.c: revision 1.17
sys/arch/hppa/include/bus_funcs.h: revision 1.2
sys/arch/hppa/include/bus_defs.h: revision 1.3

add missing bus_space_*_stream() methods instead of quietly aliasing them
to their potentially byte-swapping regular counterparts

ok skrll@


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/hppa/dev/elroy.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/arch/hppa/hppa/mainbus.c
cvs rdiff -u -r1.2 -r1.2.26.1 src/sys/arch/hppa/include/bus_defs.h
cvs rdiff -u -r1.1 -r1.1.66.1 src/sys/arch/hppa/include/bus_funcs.h

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



CVS commit: [netbsd-10] src/external/bsd/blocklist

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:59:55 UTC 2024

Modified Files:
src/external/bsd/blocklist/bin [netbsd-10]: blocklistd.conf.5 conf.c
src/external/bsd/blocklist/etc [netbsd-10]: blocklistd.conf

Log Message:
Pull up following revision(s) (requested by markd in ticket #591):

external/bsd/blocklist/bin/blocklistd.conf.5: revision 1.3
external/bsd/blocklist/bin/conf.c: revision 1.4
external/bsd/blocklist/bin/conf.c: revision 1.5
external/bsd/blocklist/bin/conf.c: revision 1.6
external/bsd/blocklist/etc/blocklistd.conf: revision 1.3

PR/57905: Mark Davies: blocklistd fails to parse ipv6 addresses.
fix typo

PR/57905: Mark Davies: handle empty string.

add an IPv6 example to blocklistd.conf(5)

add an IPv6 example to blocklistd.conf example file


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/blocklist/bin/blocklistd.conf.5
cvs rdiff -u -r1.3 -r1.3.2.1 src/external/bsd/blocklist/bin/conf.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/blocklist/etc/blocklistd.conf

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

Modified files:

Index: src/external/bsd/blocklist/bin/blocklistd.conf.5
diff -u src/external/bsd/blocklist/bin/blocklistd.conf.5:1.2 src/external/bsd/blocklist/bin/blocklistd.conf.5:1.2.6.1
--- src/external/bsd/blocklist/bin/blocklistd.conf.5:1.2	Mon Jun 15 02:29:44 2020
+++ src/external/bsd/blocklist/bin/blocklistd.conf.5	Sat Feb 17 15:59:55 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistd.conf.5,v 1.2 2020/06/15 02:29:44 christos Exp $
+.\" $NetBSD: blocklistd.conf.5,v 1.2.6.1 2024/02/17 15:59:55 martin Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd May 18, 2020
+.Dd February 9, 2024
 .Dt BLOCKLISTD.CONF 5
 .Os
 .Sh NAME
@@ -209,6 +209,8 @@ bnx0:ssh	*	*	*	*	3	6h
 [remote]
 # Never block 1.2.3.4
 1.2.3.4:ssh	*	*	*	*	*	*
+# Never block the example IPv6 subnet either
+[2001:db8::]/32:ssh	*	*	*	*	*	*
 # For addresses coming from 8.8.0.0/16 block class C networks instead
 # individual hosts, but keep the rest of the blocking parameters the same.
 8.8.0.0/16:ssh	*	*	*	/24	=	=

Index: src/external/bsd/blocklist/bin/conf.c
diff -u src/external/bsd/blocklist/bin/conf.c:1.3 src/external/bsd/blocklist/bin/conf.c:1.3.2.1
--- src/external/bsd/blocklist/bin/conf.c:1.3	Fri Nov 18 16:01:00 2022
+++ src/external/bsd/blocklist/bin/conf.c	Sat Feb 17 15:59:55 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.3 2022/11/18 16:01:00 christos Exp $	*/
+/*	$NetBSD: conf.c,v 1.3.2.1 2024/02/17 15:59:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: conf.c,v 1.3 2022/11/18 16:01:00 christos Exp $");
+__RCSID("$NetBSD: conf.c,v 1.3.2.1 2024/02/17 15:59:55 martin Exp $");
 
 #include 
 #ifdef HAVE_LIBUTIL_H
@@ -261,7 +261,7 @@ conf_gethostport(const char *f, size_t l
 		if (debug)
 			(*lfun)(LOG_DEBUG, "%s: host6 %s", __func__, p);
 		if (strcmp(p, "*") != 0) {
-			if (inet_pton(AF_INET6, p, >sin6_addr) == -1)
+			if (inet_pton(AF_INET6, p, >sin6_addr) != 1)
 goto out;
 			sin6->sin6_family = AF_INET6;
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
@@ -269,6 +269,8 @@ conf_gethostport(const char *f, size_t l
 #endif
 			port = >sin6_port;
 		}
+		if (!*pstr)
+			pstr = "*";
 	} else if (pstr != p || strchr(p, '.') || conf_is_interface(p)) {
 		if (pstr == p)
 			pstr = "*";
@@ -311,7 +313,7 @@ conf_gethostport(const char *f, size_t l
 		*port = htons((in_port_t)c->c_port);
 	return 0;
 out:
-	(*lfun)(LOG_ERR, "%s: %s, %zu: Bad address [%s]", __func__, f, l, pstr);
+	(*lfun)(LOG_ERR, "%s: %s, %zu: Bad address [%s]", __func__, f, l, p);
 	return -1;
 out1:
 	(*lfun)(LOG_ERR, "%s: %s, %zu: Can't specify mask %d with "
@@ -1172,7 +1174,7 @@ conf_parse(const char *f)
 		return;
 	}
 
-	lineno = 1;
+	lineno = 0;
 
 	confset_init();
 	confset_init();

Index: src/external/bsd/blocklist/etc/blocklistd.conf
diff -u src/external/bsd/blocklist/etc/blocklistd.conf:1.2 src/external/bsd/blocklist/etc/blocklistd.conf:1.2.6.1
--- src/external/bsd/blocklist/etc/blocklistd.conf:1.2	Mon Jun 15 21:27:57 2020
+++ src/external/bsd/blocklist/etc/blocklistd.conf	Sat Feb 17 15:59:55 2024
@@ -10,5 +10,6 @@ domain		*	*	named		*	3	12h
 # adr/mask:port	type	proto	owner		name	nfail	disable
 [remote]
 #129.168.0.0/16	*	*	*		=	*	*
+#[2001:db8::]/32:ssh	*	*	*		=	*	*
 #6161		=	=	=		=/24	=	=
 #*		stream	tcp	*		=	=	=



CVS commit: [netbsd-10] src/external/bsd/blocklist

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:59:55 UTC 2024

Modified Files:
src/external/bsd/blocklist/bin [netbsd-10]: blocklistd.conf.5 conf.c
src/external/bsd/blocklist/etc [netbsd-10]: blocklistd.conf

Log Message:
Pull up following revision(s) (requested by markd in ticket #591):

external/bsd/blocklist/bin/blocklistd.conf.5: revision 1.3
external/bsd/blocklist/bin/conf.c: revision 1.4
external/bsd/blocklist/bin/conf.c: revision 1.5
external/bsd/blocklist/bin/conf.c: revision 1.6
external/bsd/blocklist/etc/blocklistd.conf: revision 1.3

PR/57905: Mark Davies: blocklistd fails to parse ipv6 addresses.
fix typo

PR/57905: Mark Davies: handle empty string.

add an IPv6 example to blocklistd.conf(5)

add an IPv6 example to blocklistd.conf example file


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/blocklist/bin/blocklistd.conf.5
cvs rdiff -u -r1.3 -r1.3.2.1 src/external/bsd/blocklist/bin/conf.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/blocklist/etc/blocklistd.conf

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



CVS commit: [netbsd-8] src

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:55:09 UTC 2024

Modified Files:
src/doc [netbsd-8]: 3RDPARTY
src/external/public-domain/tz/dist [netbsd-8]: Makefile NEWS
TZDATA_VERSION africa asia australasia checknow.awk etcetera europe
leap-seconds.list leapseconds leapseconds.awk northamerica
southamerica theory.html version zishrink.awk zonenow.tab

Log Message:
Pull up the following, requested by kre in ticket #1935:

external/public-domain/tz/dist/Makefile up to 1.1.1.38
external/public-domain/tz/dist/NEWS up to 1.1.1.45
external/public-domain/tz/dist/TZDATA_VERSION   up to 1.37
external/public-domain/tz/dist/africa   up to 1.1.1.33
external/public-domain/tz/dist/asia up to 1.12
external/public-domain/tz/dist/australasia  up to 1.9
external/public-domain/tz/dist/checknow.awk up to 1.1.1.2
external/public-domain/tz/dist/etcetera up to 1.1.1.8
external/public-domain/tz/dist/europe   up to 1.1.1.39
external/public-domain/tz/dist/leap-seconds.list up to 1.7
external/public-domain/tz/dist/leapseconds  up to 1.7
external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.14
external/public-domain/tz/dist/northamerica up to 1.1.1.35
external/public-domain/tz/dist/southamerica up to 1.1.1.25
external/public-domain/tz/dist/theory.html  up to 1.1.1.19
external/public-domain/tz/dist/version  up to 1.12
external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9
external/public-domain/tz/dist/zonenow.tab  up to 1.1.1.2
doc/3RDPARTYapply patch

Updated tzdata to 2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1444.2.28 -r1.1444.2.29 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.17.4.10 -r1.1.1.17.4.11 \
src/external/public-domain/tz/dist/Makefile \
src/external/public-domain/tz/dist/europe
cvs rdiff -u -r1.1.1.18.4.11 -r1.1.1.18.4.12 \
src/external/public-domain/tz/dist/NEWS
cvs rdiff -u -r1.8.4.11 -r1.8.4.12 \
src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.1.1.11.4.11 -r1.1.1.11.4.12 \
src/external/public-domain/tz/dist/africa
cvs rdiff -u -r1.1.1.16.4.10 -r1.1.1.16.4.11 \
src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/northamerica
cvs rdiff -u -r1.1.1.11.4.10 -r1.1.1.11.4.11 \
src/external/public-domain/tz/dist/australasia
cvs rdiff -u -r1.1.1.1.6.2 -r1.1.1.1.6.3 \
src/external/public-domain/tz/dist/checknow.awk \
src/external/public-domain/tz/dist/zonenow.tab
cvs rdiff -u -r1.1.1.2.6.5 -r1.1.1.2.6.6 \
src/external/public-domain/tz/dist/etcetera
cvs rdiff -u -r1.1.1.7.4.7 -r1.1.1.7.4.8 \
src/external/public-domain/tz/dist/leap-seconds.list
cvs rdiff -u -r1.1.1.8.4.8 -r1.1.1.8.4.9 \
src/external/public-domain/tz/dist/leapseconds
cvs rdiff -u -r1.1.1.5.8.6 -r1.1.1.5.8.7 \
src/external/public-domain/tz/dist/leapseconds.awk
cvs rdiff -u -r1.1.1.11.4.7 -r1.1.1.11.4.8 \
src/external/public-domain/tz/dist/southamerica
cvs rdiff -u -r1.1.1.1.2.12 -r1.1.1.1.2.13 \
src/external/public-domain/tz/dist/theory.html
cvs rdiff -u -r1.1.1.5.4.11 -r1.1.1.5.4.12 \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \
src/external/public-domain/tz/dist/zishrink.awk

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.1444.2.28 src/doc/3RDPARTY:1.1444.2.29
--- src/doc/3RDPARTY:1.1444.2.28	Sat Dec 30 19:00:31 2023
+++ src/doc/3RDPARTY	Sat Feb 17 15:55:08 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1444.2.28 2023/12/30 19:00:31 martin Exp $
+#	$NetBSD: 3RDPARTY,v 1.1444.2.29 2024/02/17 15:55:08 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1411,8 +1411,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2017b / tzdata2023dgtz
-Current Vers:	tzcode2023d / tzdata2023d
+Version:	tzcode2017b / tzdata2024agtz
+Current Vers:	tzcode2024a / tzdata2024a
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/external/public-domain/tz/dist/Makefile
diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.10 src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.11
--- src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.10	Sat Dec 30 19:00:32 2023
+++ src/external/public-domain/tz/dist/Makefile	Sat Feb 17 15:55:08 2024
@@ -53,7 +53,7 @@ DATAFORM=		main
 
 LOCALTIME=	Factory
 
-# The POSIXRULES macro controls interpretation of POSIX-like TZ
+# The POSIXRULES macro controls interpretation of 

CVS commit: [netbsd-8] src

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:55:09 UTC 2024

Modified Files:
src/doc [netbsd-8]: 3RDPARTY
src/external/public-domain/tz/dist [netbsd-8]: Makefile NEWS
TZDATA_VERSION africa asia australasia checknow.awk etcetera europe
leap-seconds.list leapseconds leapseconds.awk northamerica
southamerica theory.html version zishrink.awk zonenow.tab

Log Message:
Pull up the following, requested by kre in ticket #1935:

external/public-domain/tz/dist/Makefile up to 1.1.1.38
external/public-domain/tz/dist/NEWS up to 1.1.1.45
external/public-domain/tz/dist/TZDATA_VERSION   up to 1.37
external/public-domain/tz/dist/africa   up to 1.1.1.33
external/public-domain/tz/dist/asia up to 1.12
external/public-domain/tz/dist/australasia  up to 1.9
external/public-domain/tz/dist/checknow.awk up to 1.1.1.2
external/public-domain/tz/dist/etcetera up to 1.1.1.8
external/public-domain/tz/dist/europe   up to 1.1.1.39
external/public-domain/tz/dist/leap-seconds.list up to 1.7
external/public-domain/tz/dist/leapseconds  up to 1.7
external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.14
external/public-domain/tz/dist/northamerica up to 1.1.1.35
external/public-domain/tz/dist/southamerica up to 1.1.1.25
external/public-domain/tz/dist/theory.html  up to 1.1.1.19
external/public-domain/tz/dist/version  up to 1.12
external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9
external/public-domain/tz/dist/zonenow.tab  up to 1.1.1.2
doc/3RDPARTYapply patch

Updated tzdata to 2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1444.2.28 -r1.1444.2.29 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.17.4.10 -r1.1.1.17.4.11 \
src/external/public-domain/tz/dist/Makefile \
src/external/public-domain/tz/dist/europe
cvs rdiff -u -r1.1.1.18.4.11 -r1.1.1.18.4.12 \
src/external/public-domain/tz/dist/NEWS
cvs rdiff -u -r1.8.4.11 -r1.8.4.12 \
src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.1.1.11.4.11 -r1.1.1.11.4.12 \
src/external/public-domain/tz/dist/africa
cvs rdiff -u -r1.1.1.16.4.10 -r1.1.1.16.4.11 \
src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/northamerica
cvs rdiff -u -r1.1.1.11.4.10 -r1.1.1.11.4.11 \
src/external/public-domain/tz/dist/australasia
cvs rdiff -u -r1.1.1.1.6.2 -r1.1.1.1.6.3 \
src/external/public-domain/tz/dist/checknow.awk \
src/external/public-domain/tz/dist/zonenow.tab
cvs rdiff -u -r1.1.1.2.6.5 -r1.1.1.2.6.6 \
src/external/public-domain/tz/dist/etcetera
cvs rdiff -u -r1.1.1.7.4.7 -r1.1.1.7.4.8 \
src/external/public-domain/tz/dist/leap-seconds.list
cvs rdiff -u -r1.1.1.8.4.8 -r1.1.1.8.4.9 \
src/external/public-domain/tz/dist/leapseconds
cvs rdiff -u -r1.1.1.5.8.6 -r1.1.1.5.8.7 \
src/external/public-domain/tz/dist/leapseconds.awk
cvs rdiff -u -r1.1.1.11.4.7 -r1.1.1.11.4.8 \
src/external/public-domain/tz/dist/southamerica
cvs rdiff -u -r1.1.1.1.2.12 -r1.1.1.1.2.13 \
src/external/public-domain/tz/dist/theory.html
cvs rdiff -u -r1.1.1.5.4.11 -r1.1.1.5.4.12 \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.1.1.1.2.8 -r1.1.1.1.2.9 \
src/external/public-domain/tz/dist/zishrink.awk

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



CVS commit: [netbsd-10] src/sys/arch/vax/vax

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:50:20 UTC 2024

Modified Files:
src/sys/arch/vax/vax [netbsd-10]: machdep.c

Log Message:
Pull up following revision(s) (requested by hans in ticket #590):

sys/arch/vax/vax/machdep.c: revision 1.197

Include leds.h to make /dev/leds work.


To generate a diff of this commit:
cvs rdiff -u -r1.196.20.1 -r1.196.20.2 src/sys/arch/vax/vax/machdep.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/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.196.20.1 src/sys/arch/vax/vax/machdep.c:1.196.20.2
--- src/sys/arch/vax/vax/machdep.c:1.196.20.1	Sun Jan 14 18:05:57 2024
+++ src/sys/arch/vax/vax/machdep.c	Sat Feb 17 15:50:20 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.196.20.1 2024/01/14 18:05:57 martin Exp $	 */
+/* $NetBSD: machdep.c,v 1.196.20.2 2024/02/17 15:50:20 martin Exp $	 */
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196.20.1 2024/01/14 18:05:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196.20.2 2024/02/17 15:50:20 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -130,6 +130,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
 #include 
 #endif
 
+#include "leds.h"
 #include "smg.h"
 #include "ksyms.h"
 



CVS commit: [netbsd-10] src/sys/arch/vax/vax

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:50:20 UTC 2024

Modified Files:
src/sys/arch/vax/vax [netbsd-10]: machdep.c

Log Message:
Pull up following revision(s) (requested by hans in ticket #590):

sys/arch/vax/vax/machdep.c: revision 1.197

Include leds.h to make /dev/leds work.


To generate a diff of this commit:
cvs rdiff -u -r1.196.20.1 -r1.196.20.2 src/sys/arch/vax/vax/machdep.c

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



CVS commit: src/sys/net

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:47:39 UTC 2024

Modified Files:
src/sys/net: if_spppsubr.c

Log Message:
PR 57941: remove duplciate declaration (copy+pasto)


To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/net/if_spppsubr.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/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.267 src/sys/net/if_spppsubr.c:1.268
--- src/sys/net/if_spppsubr.c:1.267	Sat Mar 25 21:35:49 2023
+++ src/sys/net/if_spppsubr.c	Sat Feb 17 15:47:39 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.267 2023/03/25 21:35:49 andvar Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.268 2024/02/17 15:47:39 martin Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.267 2023/03/25 21:35:49 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.268 2024/02/17 15:47:39 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -445,7 +445,6 @@ static void sppp_pap_input(struct sppp *
 static void sppp_pap_init(struct sppp *);
 static void sppp_pap_tlu(struct sppp *);
 static void sppp_pap_scr(struct sppp *);
-static void sppp_pap_scr(struct sppp *);
 
 static void sppp_chap_input(struct sppp *, struct mbuf *);
 static void sppp_chap_init(struct sppp *);



CVS commit: src/sys/net

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 15:47:39 UTC 2024

Modified Files:
src/sys/net: if_spppsubr.c

Log Message:
PR 57941: remove duplciate declaration (copy+pasto)


To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/net/if_spppsubr.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/evbarm/conf

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 15:08:32 UTC 2024

Modified Files:
src/sys/arch/evbarm/conf: mk.altera mk.bcm53xx mk.generic mk.generic64
mk.gumstix mk.integrator_cp mk.kobo mk.marvell mk.mv2120 mk.ti

Log Message:
Fix MKREPRO build (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.altera
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/mk.bcm53xx \
src/sys/arch/evbarm/conf/mk.generic64
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/mk.generic
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/mk.gumstix
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.integrator_cp
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.kobo \
src/sys/arch/evbarm/conf/mk.mv2120
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.marvell
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.ti

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/evbarm/conf/mk.altera
diff -u src/sys/arch/evbarm/conf/mk.altera:1.3 src/sys/arch/evbarm/conf/mk.altera:1.4
--- src/sys/arch/evbarm/conf/mk.altera:1.3	Thu Oct 18 05:01:54 2018
+++ src/sys/arch/evbarm/conf/mk.altera	Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.altera,v 1.3 2018/10/18 09:01:54 skrll Exp $
+#	$NetBSD: mk.altera,v 1.4 2024/02/17 15:08:32 christos Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -14,6 +14,9 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+=	-t "${MKREPRO_TIMESTAMP}"
+.endif
 MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 

Index: src/sys/arch/evbarm/conf/mk.bcm53xx
diff -u src/sys/arch/evbarm/conf/mk.bcm53xx:1.6 src/sys/arch/evbarm/conf/mk.bcm53xx:1.7
--- src/sys/arch/evbarm/conf/mk.bcm53xx:1.6	Mon Jan 21 02:26:14 2019
+++ src/sys/arch/evbarm/conf/mk.bcm53xx	Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.bcm53xx,v 1.6 2019/01/21 07:26:14 skrll Exp $
+#	$NetBSD: mk.bcm53xx,v 1.7 2024/02/17 15:08:32 christos Exp $
 CPPFLAGS+= -mcpu=cortex-a9 -mfpu=neon
 
 .if !empty(MACHINE_ARCH:M*eb)
@@ -13,6 +13,9 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(LOADADDRESS) -e $(LOADADDRESS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+=	-t "${MKREPRO_TIMESTAMP}"
+.endif
 MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
Index: src/sys/arch/evbarm/conf/mk.generic64
diff -u src/sys/arch/evbarm/conf/mk.generic64:1.6 src/sys/arch/evbarm/conf/mk.generic64:1.7
--- src/sys/arch/evbarm/conf/mk.generic64:1.6	Thu Sep  3 22:21:49 2020
+++ src/sys/arch/evbarm/conf/mk.generic64	Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.generic64,v 1.6 2020/09/04 02:21:49 jakllsch Exp $
+#	$NetBSD: mk.generic64,v 1.7 2024/02/17 15:08:32 christos Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	-EB
@@ -12,6 +12,9 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 BOARDTYPE=		evbarm64
 
 MKUBOOTIMAGEARGS=	-f arm64 -u -a 0x20
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+=	-t "${MKREPRO_TIMESTAMP}"
+.endif
 
 SYSTEM_LD_TAIL_EXTRA+= && \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin && \

Index: src/sys/arch/evbarm/conf/mk.generic
diff -u src/sys/arch/evbarm/conf/mk.generic:1.10 src/sys/arch/evbarm/conf/mk.generic:1.11
--- src/sys/arch/evbarm/conf/mk.generic:1.10	Sat Aug 29 15:06:18 2020
+++ src/sys/arch/evbarm/conf/mk.generic	Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.generic,v 1.10 2020/08/29 19:06:18 jakllsch Exp $
+#	$NetBSD: mk.generic,v 1.11 2024/02/17 15:08:32 christos Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -14,6 +14,9 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 MKUBOOTIMAGEARGS=	-A arm -T kernel_noload -O linux -C none
 MKUBOOTIMAGEARGS+=	-e 0
 MKUBOOTIMAGEARGS+=	-n "NetBSD/${BOARDTYPE:U${MACHINE_ARCH}} ${_OSRELEASE}"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+=	-t "${MKREPRO_TIMESTAMP}"
+.endif
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.img; \

Index: src/sys/arch/evbarm/conf/mk.gumstix
diff -u src/sys/arch/evbarm/conf/mk.gumstix:1.7 src/sys/arch/evbarm/conf/mk.gumstix:1.8
--- src/sys/arch/evbarm/conf/mk.gumstix:1.7	Sat May 18 04:49:23 2019
+++ src/sys/arch/evbarm/conf/mk.gumstix	Sat Feb 17 10:08:32 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.gumstix,v 1.7 2019/05/18 08:49:23 skrll Exp $
+#	$NetBSD: mk.gumstix,v 1.8 2024/02/17 15:08:32 christos Exp $
 
 .if ${BOARDTYPE} == "gumstix"
 SYSTEM_FIRST_OBJ=	gumstix_start.o
@@ -21,6 +21,9 @@ KERNEL_BASE_VIRT=$(LOADADDRESS)
 

CVS commit: src/sys/arch/evbarm/conf

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 15:08:32 UTC 2024

Modified Files:
src/sys/arch/evbarm/conf: mk.altera mk.bcm53xx mk.generic mk.generic64
mk.gumstix mk.integrator_cp mk.kobo mk.marvell mk.mv2120 mk.ti

Log Message:
Fix MKREPRO build (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.altera
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/mk.bcm53xx \
src/sys/arch/evbarm/conf/mk.generic64
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/mk.generic
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/mk.gumstix
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.integrator_cp
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/mk.kobo \
src/sys/arch/evbarm/conf/mk.mv2120
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.marvell
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.ti

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



CVS commit: src/distrib

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 15:07:04 UTC 2024

Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
src/distrib/utils/embedded/conf: arm64.conf arm64mbr.conf

Log Message:
Fix MKREPRO build (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/evbarm/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/arm64.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/arm64mbr.conf

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

Modified files:

Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.20 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.21
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.20	Mon Nov 16 06:38:29 2020
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile	Sat Feb 17 10:07:04 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2020/11/16 11:38:29 rin Exp $
+#	$NetBSD: Makefile,v 1.21 2024/02/17 15:07:04 christos Exp $
 
 .include 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -34,6 +34,10 @@ UBOOT_IMAGE_ARCH=	arm64
 UBOOT_IMAGE_ARCH=	arm
 .endif
 
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS=	-t "${MKREPRO_TIMESTAMP}"
+.endif
+
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=	${DISTRIBDIR}/utils/libhack
 .include	"${HACKSRC}/Makefile.inc"
@@ -50,7 +54,7 @@ release:	${IMAGE}
 	${INSTALL} -d -m 755 ${RAMDISKDIR}
 	${RELEASE_INSTALL} ${IMAGE}  ${RAMDISKDIR}
 	${TOOL_MKUBOOTIMAGE} -A ${UBOOT_IMAGE_ARCH} -C none -O linux \
-	-T ramdisk -a 0 -n "NetBSD/${MACHINE_ARCH} ramdisk" ${IMAGE} \
-	${RAMDISKDIR}/${IMAGE:S/.fs/.ub/}
+	-T ramdisk -a 0 -n "NetBSD/${MACHINE_ARCH} ramdisk" \
+	${MKUBOOTIMAGEARGS} ${IMAGE} ${RAMDISKDIR}/${IMAGE:S/.fs/.ub/}
 
 .include 

Index: src/distrib/utils/embedded/conf/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.15 src/distrib/utils/embedded/conf/arm64.conf:1.16
--- src/distrib/utils/embedded/conf/arm64.conf:1.15	Sat Oct 15 14:32:30 2022
+++ src/distrib/utils/embedded/conf/arm64.conf	Sat Feb 17 10:07:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.15 2022/10/15 18:32:30 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.16 2024/02/17 15:07:03 christos Exp $
 # ARM64 customization script used by mkimage
 #
 board=arm64
@@ -51,7 +51,7 @@ populate_common() {
 	cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
 
 	# Install kernel to root of the FFS partition
-	${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
+	${GZIP_CMD} -dnc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
 	echo "./netbsd type=file uname=root gname=wheel mode=0755" \
 	>> "$tmp/selected_sets"
 }
@@ -102,7 +102,7 @@ populate() {
 		echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
 		case "${k}" in
 		*.gz)
-			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+			${GZIP_CMD} -dnc "${k}" > "${mnt}/boot/${tgt}"
 			;;
 		*)
 			cp "${k}" "${mnt}/boot/${tgt}"

Index: src/distrib/utils/embedded/conf/arm64mbr.conf
diff -u src/distrib/utils/embedded/conf/arm64mbr.conf:1.2 src/distrib/utils/embedded/conf/arm64mbr.conf:1.3
--- src/distrib/utils/embedded/conf/arm64mbr.conf:1.2	Thu Jul  1 13:31:21 2021
+++ src/distrib/utils/embedded/conf/arm64mbr.conf	Sat Feb 17 10:07:03 2024
@@ -1,4 +1,4 @@
-# $NetBSD: arm64mbr.conf,v 1.2 2021/07/01 17:31:21 jmcneill Exp $
+# $NetBSD: arm64mbr.conf,v 1.3 2024/02/17 15:07:03 christos Exp $
 # ARM64 (MBR partitioning) customization script used by mkimage
 #
 board=arm64mbr
@@ -36,7 +36,7 @@ populate_common() {
 	cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
 
 	# Install kernel to root of the FFS partition
-	${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
+	${GZIP_CMD} -dnc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
 	echo "./netbsd type=file uname=root gname=wheel mode=0755" \
 	>> "$tmp/selected_sets"
 }
@@ -87,7 +87,7 @@ populate() {
 		echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
 		case "${k}" in
 		*.gz)
-			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+			${GZIP_CMD} -dnc "${k}" > "${mnt}/boot/${tgt}"
 			;;
 		*)
 			cp "${k}" "${mnt}/boot/${tgt}"



CVS commit: src/distrib

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 15:07:04 UTC 2024

Modified Files:
src/distrib/evbarm/instkernel/ramdisk: Makefile
src/distrib/utils/embedded/conf: arm64.conf arm64mbr.conf

Log Message:
Fix MKREPRO build (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/evbarm/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.15 -r1.16 src/distrib/utils/embedded/conf/arm64.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/arm64mbr.conf

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



CVS commit: src/doc

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 14:57:02 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Mention tzcode2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1984 -r1.1985 src/doc/3RDPARTY
cvs rdiff -u -r1.3037 -r1.3038 src/doc/CHANGES

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



CVS commit: src/doc

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 14:57:02 UTC 2024

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Mention tzcode2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1984 -r1.1985 src/doc/3RDPARTY
cvs rdiff -u -r1.3037 -r1.3038 src/doc/CHANGES

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.1984 src/doc/3RDPARTY:1.1985
--- src/doc/3RDPARTY:1.1984	Wed Feb  7 04:18:19 2024
+++ src/doc/3RDPARTY	Sat Feb 17 09:57:02 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1984 2024/02/07 09:18:19 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1985 2024/02/17 14:57:02 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1429,14 +1429,14 @@ Location:	external/bsd/tradcpp
 Notes:
 
 Package:	tz
-Version:	tzcode2023d / tzdata2024agtz
+Version:	tzcode2024a / tzdata2024agtz
 Current Vers:	tzcode2024a / tzdata2024a
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
 Old Archive Site:	ftp://elsie.nci.nih.gov/pub/
 Home Page:	http://www.iana.org/time-zones
-Date:		2023-12-23
+Date:		2024-02-17
 Mailing List:	t...@iana.org
 Responsible:	kleink, christos, kre
 License:	Public domain

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3037 src/doc/CHANGES:1.3038
--- src/doc/CHANGES:1.3037	Wed Feb 14 14:20:29 2024
+++ src/doc/CHANGES	Sat Feb 17 09:57:02 2024
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3037 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3038 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -279,3 +279,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 	bind: Apply bind security patches: CVE-2023-4408 CVE-2023-5517
 		CVE-2023-5679 CVE-2023-6516 CVE-2023-50387 CVE-2023-50868
 		[christos 20240213]
+	tzcode: Updated to 2024a. [christos 20240217]



CVS commit: src

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 14:54:47 UTC 2024

Modified Files:
src/include: tzfile.h
src/lib/libc/time: Makefile NEWS localtime.c private.h strftime.c
theory.html tz-art.html tz-link.html tzfile.5 tzselect.ksh version
zic.8 zic.c

Log Message:
Sync with tzcode2024a:
Release 2024a - 2024-02-01 09:28:56 -0800

  Changes to code

The FROM and TO columns of Rule lines can no longer be "minimum"
or an abbreviation of "minimum", because TZif files do not support
DST rules that extend into the indefinite past - although these
rules were supported when TZif files had only 32-bit data, this
stopped working when 64-bit TZif files were introduced in 1995.
This should not be a problem for realistic data, since DST was
first used in the 20th century.  As a transition aid, FROM columns
like "minimum" are now diagnosed and then treated as if they were
the year 1900; this should suffice for TZif files on old systems
with only 32-bit time_t, and it is more compatible with bugs in
2023c-and-earlier localtime.c.  (Problem reported by Yoshito
Umaoka.)

localtime and related functions no longer mishandle some
timestamps that occur about 400 years after a switch to a time
zone with a DST schedule.  In 2023d data this problem was visible
for some timestamps in November 2422, November 2822, etc. in
America/Ciudad_Juarez.  (Problem reported by Gilmore Davidson.)

strftime %s now uses tm_gmtoff if available.  (Problem and draft
patch reported by Dag-Erling Smørgrav.)

  Changes to build procedure

The leap-seconds.list file is now copied from the IERS instead of
from its downstream counterpart at NIST, as the IERS version is
now in the public domain too and tends to be more up-to-date.
(Thanks to Martin Burnicki for liaisoning with the IERS.)

  Changes to documentation

The strftime man page documents which struct tm members affect
which conversion specs, and that tzset is called.  (Problems
reported by Robert Elz and Steve Summit.)


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/include/tzfile.h
cvs rdiff -u -r1.56 -r1.57 src/lib/libc/time/Makefile
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/time/NEWS
cvs rdiff -u -r1.140 -r1.141 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.68 -r1.69 src/lib/libc/time/private.h
cvs rdiff -u -r1.53 -r1.54 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/time/theory.html
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/time/tz-art.html
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/tz-link.html
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/time/tzfile.5
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/time/tzselect.ksh
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/time/version
cvs rdiff -u -r1.49 -r1.50 src/lib/libc/time/zic.8
cvs rdiff -u -r1.90 -r1.91 src/lib/libc/time/zic.c

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

Modified files:

Index: src/include/tzfile.h
diff -u src/include/tzfile.h:1.12 src/include/tzfile.h:1.13
--- src/include/tzfile.h:1.12	Sat Sep 16 14:19:30 2023
+++ src/include/tzfile.h	Sat Feb 17 09:54:47 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: tzfile.h,v 1.12 2023/09/16 18:19:30 christos Exp $	*/
+/*	$NetBSD: tzfile.h,v 1.13 2024/02/17 14:54:47 christos Exp $	*/
 
 #ifndef _TZFILE_H_
 #define _TZFILE_H_
@@ -85,11 +85,11 @@ struct tzhead {
 ** time uses 8 rather than 4 chars,
 ** then a POSIX-TZ-environment-variable-style string for use in handling
 ** instants after the last transition time stored in the file
-** (with nothing between the newlines if there is no POSIX representation for
-** such instants).
+** (with nothing between the newlines if there is no POSIX.1-2017
+** representation for such instants).
 **
 ** If tz_version is '3' or greater, the above is extended as follows.
-** First, the POSIX TZ string's hour offset may range from -167
+** First, the TZ string's hour offset may range from -167
 ** through 167 as compared to the POSIX-required 0 through 24.
 ** Second, its DST start time may be January 1 at 00:00 and its stop
 ** time December 31 at 24:00 plus the difference between DST and
@@ -132,6 +132,7 @@ struct tzhead {
 #define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
 #define SECSPERDAY	((int_fast32_t) SECSPERHOUR * HOURSPERDAY)
 #define MONSPERYEAR	12
+#define YEARSPERREPEAT	400
 
 #define TM_SUNDAY	0
 #define TM_MONDAY	1

Index: src/lib/libc/time/Makefile
diff -u src/lib/libc/time/Makefile:1.56 src/lib/libc/time/Makefile:1.57
--- src/lib/libc/time/Makefile:1.56	Sat Dec 23 15:48:38 2023
+++ src/lib/libc/time/Makefile	Sat Feb 17 09:54:47 2024
@@ -53,7 +53,7 @@ DATAFORM=		main
 
 LOCALTIME=	Factory
 
-# The POSIXRULES macro controls interpretation of POSIX-like TZ
+# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ
 # settings like TZ='EET-2EEST' that lack DST transition rules.
 # If 

CVS commit: src

2024-02-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Feb 17 14:54:47 UTC 2024

Modified Files:
src/include: tzfile.h
src/lib/libc/time: Makefile NEWS localtime.c private.h strftime.c
theory.html tz-art.html tz-link.html tzfile.5 tzselect.ksh version
zic.8 zic.c

Log Message:
Sync with tzcode2024a:
Release 2024a - 2024-02-01 09:28:56 -0800

  Changes to code

The FROM and TO columns of Rule lines can no longer be "minimum"
or an abbreviation of "minimum", because TZif files do not support
DST rules that extend into the indefinite past - although these
rules were supported when TZif files had only 32-bit data, this
stopped working when 64-bit TZif files were introduced in 1995.
This should not be a problem for realistic data, since DST was
first used in the 20th century.  As a transition aid, FROM columns
like "minimum" are now diagnosed and then treated as if they were
the year 1900; this should suffice for TZif files on old systems
with only 32-bit time_t, and it is more compatible with bugs in
2023c-and-earlier localtime.c.  (Problem reported by Yoshito
Umaoka.)

localtime and related functions no longer mishandle some
timestamps that occur about 400 years after a switch to a time
zone with a DST schedule.  In 2023d data this problem was visible
for some timestamps in November 2422, November 2822, etc. in
America/Ciudad_Juarez.  (Problem reported by Gilmore Davidson.)

strftime %s now uses tm_gmtoff if available.  (Problem and draft
patch reported by Dag-Erling Smørgrav.)

  Changes to build procedure

The leap-seconds.list file is now copied from the IERS instead of
from its downstream counterpart at NIST, as the IERS version is
now in the public domain too and tends to be more up-to-date.
(Thanks to Martin Burnicki for liaisoning with the IERS.)

  Changes to documentation

The strftime man page documents which struct tm members affect
which conversion specs, and that tzset is called.  (Problems
reported by Robert Elz and Steve Summit.)


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/include/tzfile.h
cvs rdiff -u -r1.56 -r1.57 src/lib/libc/time/Makefile
cvs rdiff -u -r1.43 -r1.44 src/lib/libc/time/NEWS
cvs rdiff -u -r1.140 -r1.141 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.68 -r1.69 src/lib/libc/time/private.h
cvs rdiff -u -r1.53 -r1.54 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/time/theory.html
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/time/tz-art.html
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/tz-link.html
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/time/tzfile.5
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/time/tzselect.ksh
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/time/version
cvs rdiff -u -r1.49 -r1.50 src/lib/libc/time/zic.8
cvs rdiff -u -r1.90 -r1.91 src/lib/libc/time/zic.c

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



CVS commit: [netbsd-9] src

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 11:32:20 UTC 2024

Modified Files:
src/doc [netbsd-9]: 3RDPARTY
src/external/public-domain/tz/dist [netbsd-9]: Makefile NEWS
TZDATA_VERSION africa asia australasia checknow.awk etcetera europe
leap-seconds.list leapseconds leapseconds.awk northamerica
southamerica theory.html version zishrink.awk zonenow.tab

Log Message:
Pullup the following, requested by kre in ticket #1796:

external/public-domain/tz/dist/Makefile up to 1.1.1.38
external/public-domain/tz/dist/NEWS up to 1.1.1.45
external/public-domain/tz/dist/TZDATA_VERSION   up to 1.37
external/public-domain/tz/dist/africa   up to 1.1.1.33
external/public-domain/tz/dist/asia up to 1.12
external/public-domain/tz/dist/australasia  up to 1.9
external/public-domain/tz/dist/checknow.awk up to 1.1.1.2
external/public-domain/tz/dist/etcetera up to 1.1.1.8
external/public-domain/tz/dist/europe   up to 1.1.1.39
external/public-domain/tz/dist/leap-seconds.list up to 1.7
external/public-domain/tz/dist/leapseconds  up to 1.7
external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.14
external/public-domain/tz/dist/northamerica up to 1.1.1.35
external/public-domain/tz/dist/southamerica up to 1.1.1.25
external/public-domain/tz/dist/theory.html  up to 1.1.1.19
external/public-domain/tz/dist/version  up to 1.12
external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9
external/public-domain/tz/dist/zonenow.tab  up to 1.1.1.2
doc/3RDPARTYapply patch

Updated tzdata to 2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1640.2.29 -r1.1640.2.30 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.24.2.8 -r1.1.1.24.2.9 \
src/external/public-domain/tz/dist/Makefile \
src/external/public-domain/tz/dist/europe
cvs rdiff -u -r1.1.1.27.2.8 -r1.1.1.27.2.9 \
src/external/public-domain/tz/dist/NEWS
cvs rdiff -u -r1.17.2.8 -r1.17.2.9 \
src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.1.1.20.2.6 -r1.1.1.20.2.7 \
src/external/public-domain/tz/dist/africa
cvs rdiff -u -r1.1.1.23.2.7 -r1.1.1.23.2.8 \
src/external/public-domain/tz/dist/asia
cvs rdiff -u -r1.1.1.17.2.6 -r1.1.1.17.2.7 \
src/external/public-domain/tz/dist/australasia
cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \
src/external/public-domain/tz/dist/checknow.awk \
src/external/public-domain/tz/dist/zonenow.tab
cvs rdiff -u -r1.1.1.4.2.3 -r1.1.1.4.2.4 \
src/external/public-domain/tz/dist/etcetera
cvs rdiff -u -r1.1.1.11.2.6 -r1.1.1.11.2.7 \
src/external/public-domain/tz/dist/leap-seconds.list
cvs rdiff -u -r1.1.1.13.2.6 -r1.1.1.13.2.7 \
src/external/public-domain/tz/dist/leapseconds
cvs rdiff -u -r1.1.1.8.2.5 -r1.1.1.8.2.6 \
src/external/public-domain/tz/dist/leapseconds.awk
cvs rdiff -u -r1.1.1.23.2.6 -r1.1.1.23.2.7 \
src/external/public-domain/tz/dist/northamerica
cvs rdiff -u -r1.1.1.15.2.4 -r1.1.1.15.2.5 \
src/external/public-domain/tz/dist/southamerica
cvs rdiff -u -r1.1.1.8.2.6 -r1.1.1.8.2.7 \
src/external/public-domain/tz/dist/theory.html
cvs rdiff -u -r1.1.1.14.2.8 -r1.1.1.14.2.9 \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.1.1.5.2.3 -r1.1.1.5.2.4 \
src/external/public-domain/tz/dist/zishrink.awk

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.1640.2.29 src/doc/3RDPARTY:1.1640.2.30
--- src/doc/3RDPARTY:1.1640.2.29	Sat Dec 30 18:35:31 2023
+++ src/doc/3RDPARTY	Sat Feb 17 11:32:19 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1640.2.29 2023/12/30 18:35:31 martin Exp $
+#	$NetBSD: 3RDPARTY,v 1.1640.2.30 2024/02/17 11:32:19 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1398,8 +1398,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2019b / tzdata2023dgtz
-Current Vers:	tzcode2023d / tzdata2023d
+Version:	tzcode2019b / tzdata2024agtz
+Current Vers:	tzcode2024a / tzdata2024a
 Maintainer:	Paul Eggert 
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/external/public-domain/tz/dist/Makefile
diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.8 src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.9
--- src/external/public-domain/tz/dist/Makefile:1.1.1.24.2.8	Sat Dec 30 18:35:31 2023
+++ src/external/public-domain/tz/dist/Makefile	Sat Feb 17 11:32:19 2024
@@ -53,7 +53,7 @@ DATAFORM=		main
 
 LOCALTIME=	Factory
 
-# The POSIXRULES macro controls interpretation of POSIX-like TZ
+# The POSIXRULES macro 

CVS commit: [netbsd-9] src

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 11:32:20 UTC 2024

Modified Files:
src/doc [netbsd-9]: 3RDPARTY
src/external/public-domain/tz/dist [netbsd-9]: Makefile NEWS
TZDATA_VERSION africa asia australasia checknow.awk etcetera europe
leap-seconds.list leapseconds leapseconds.awk northamerica
southamerica theory.html version zishrink.awk zonenow.tab

Log Message:
Pullup the following, requested by kre in ticket #1796:

external/public-domain/tz/dist/Makefile up to 1.1.1.38
external/public-domain/tz/dist/NEWS up to 1.1.1.45
external/public-domain/tz/dist/TZDATA_VERSION   up to 1.37
external/public-domain/tz/dist/africa   up to 1.1.1.33
external/public-domain/tz/dist/asia up to 1.12
external/public-domain/tz/dist/australasia  up to 1.9
external/public-domain/tz/dist/checknow.awk up to 1.1.1.2
external/public-domain/tz/dist/etcetera up to 1.1.1.8
external/public-domain/tz/dist/europe   up to 1.1.1.39
external/public-domain/tz/dist/leap-seconds.list up to 1.7
external/public-domain/tz/dist/leapseconds  up to 1.7
external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.14
external/public-domain/tz/dist/northamerica up to 1.1.1.35
external/public-domain/tz/dist/southamerica up to 1.1.1.25
external/public-domain/tz/dist/theory.html  up to 1.1.1.19
external/public-domain/tz/dist/version  up to 1.12
external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9
external/public-domain/tz/dist/zonenow.tab  up to 1.1.1.2
doc/3RDPARTYapply patch

Updated tzdata to 2024a


To generate a diff of this commit:
cvs rdiff -u -r1.1640.2.29 -r1.1640.2.30 src/doc/3RDPARTY
cvs rdiff -u -r1.1.1.24.2.8 -r1.1.1.24.2.9 \
src/external/public-domain/tz/dist/Makefile \
src/external/public-domain/tz/dist/europe
cvs rdiff -u -r1.1.1.27.2.8 -r1.1.1.27.2.9 \
src/external/public-domain/tz/dist/NEWS
cvs rdiff -u -r1.17.2.8 -r1.17.2.9 \
src/external/public-domain/tz/dist/TZDATA_VERSION
cvs rdiff -u -r1.1.1.20.2.6 -r1.1.1.20.2.7 \
src/external/public-domain/tz/dist/africa
cvs rdiff -u -r1.1.1.23.2.7 -r1.1.1.23.2.8 \
src/external/public-domain/tz/dist/asia
cvs rdiff -u -r1.1.1.17.2.6 -r1.1.1.17.2.7 \
src/external/public-domain/tz/dist/australasia
cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \
src/external/public-domain/tz/dist/checknow.awk \
src/external/public-domain/tz/dist/zonenow.tab
cvs rdiff -u -r1.1.1.4.2.3 -r1.1.1.4.2.4 \
src/external/public-domain/tz/dist/etcetera
cvs rdiff -u -r1.1.1.11.2.6 -r1.1.1.11.2.7 \
src/external/public-domain/tz/dist/leap-seconds.list
cvs rdiff -u -r1.1.1.13.2.6 -r1.1.1.13.2.7 \
src/external/public-domain/tz/dist/leapseconds
cvs rdiff -u -r1.1.1.8.2.5 -r1.1.1.8.2.6 \
src/external/public-domain/tz/dist/leapseconds.awk
cvs rdiff -u -r1.1.1.23.2.6 -r1.1.1.23.2.7 \
src/external/public-domain/tz/dist/northamerica
cvs rdiff -u -r1.1.1.15.2.4 -r1.1.1.15.2.5 \
src/external/public-domain/tz/dist/southamerica
cvs rdiff -u -r1.1.1.8.2.6 -r1.1.1.8.2.7 \
src/external/public-domain/tz/dist/theory.html
cvs rdiff -u -r1.1.1.14.2.8 -r1.1.1.14.2.9 \
src/external/public-domain/tz/dist/version
cvs rdiff -u -r1.1.1.5.2.3 -r1.1.1.5.2.4 \
src/external/public-domain/tz/dist/zishrink.awk

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



CVS commit: [netbsd-10] src/sys/dev/usb

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 11:27:30 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-10]: ehci.c ehcireg.h

Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #589):

sys/dev/usb/ehci.c: revision 1.322
sys/dev/usb/ehcireg.h: revision 1.39

avoid different struct type problem.


To generate a diff of this commit:
cvs rdiff -u -r1.315.2.3 -r1.315.2.4 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.37.50.1 -r1.37.50.2 src/sys/dev/usb/ehcireg.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/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.315.2.3 src/sys/dev/usb/ehci.c:1.315.2.4
--- src/sys/dev/usb/ehci.c:1.315.2.3	Tue Feb  6 12:18:55 2024
+++ src/sys/dev/usb/ehci.c	Sat Feb 17 11:27:30 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.315.2.3 2024/02/06 12:18:55 martin Exp $ */
+/*	$NetBSD: ehci.c,v 1.315.2.4 2024/02/17 11:27:30 martin Exp $ */
 
 /*
  * Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315.2.3 2024/02/06 12:18:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315.2.4 2024/02/17 11:27:30 martin Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -289,6 +289,7 @@ void			ehci_dump(void);
 Static void		ehci_dump_regs(ehci_softc_t *);
 Static void		ehci_dump_sqtds(ehci_soft_qtd_t *);
 Static void		ehci_dump_sqtd(ehci_soft_qtd_t *);
+Static void		ehci_dump_qh_qtd(struct ehci_qh_qtd_t *);
 Static void		ehci_dump_qtd(ehci_qtd_t *);
 Static void		ehci_dump_sqh(ehci_soft_qh_t *);
 Static void		ehci_dump_sitd(struct ehci_soft_itd *);
@@ -1750,6 +1751,24 @@ ehci_dump_sqtd(ehci_soft_qtd_t *sqtd)
 }
 
 Static void
+ehci_dump_qh_qtd(struct ehci_qh_qtd_t *qh_qtd)
+{
+	ehci_qtd_t qtd = {
+		.qtd_next = qh_qtd->qtd_next,
+		.qtd_altnext = qh_qtd->qtd_altnext,
+		.qtd_status = qh_qtd->qtd_status,
+	};
+
+	/* Manually memcpy(), because of volatile. */
+	for (unsigned i = 0; i < EHCI_QTD_NBUFFERS; i++) {
+		qtd.qtd_buffer[i] = qh_qtd->qtd_buffer[i];
+		qtd.qtd_buffer_hi[i] = qh_qtd->qtd_buffer_hi[i];
+	}
+
+	ehci_dump_qtd();
+}
+
+Static void
 ehci_dump_qtd(ehci_qtd_t *qtd)
 {
 	EHCIHIST_FUNC();	EHCIHIST_CALLED();
@@ -1825,7 +1844,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh)
 	link = le32toh(qh->qh_curqtd);
 	ehci_dump_link(link, false);
 	DPRINTFN(10, "Overlay qTD:", 0, 0, 0, 0);
-	ehci_dump_qtd(>qh_qtd);
+	ehci_dump_qh_qtd(>qh_qtd);
 
 	usb_syncmem(>dma, sqh->offs, sizeof(sqh->qh),
 	BUS_DMASYNC_PREREAD);

Index: src/sys/dev/usb/ehcireg.h
diff -u src/sys/dev/usb/ehcireg.h:1.37.50.1 src/sys/dev/usb/ehcireg.h:1.37.50.2
--- src/sys/dev/usb/ehcireg.h:1.37.50.1	Tue Feb  6 12:18:55 2024
+++ src/sys/dev/usb/ehcireg.h	Sat Feb 17 11:27:30 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehcireg.h,v 1.37.50.1 2024/02/06 12:18:55 martin Exp $	*/
+/*	$NetBSD: ehcireg.h,v 1.37.50.2 2024/02/17 11:27:30 martin Exp $	*/
 
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -394,7 +394,7 @@ typedef struct {
 	 * 32-byte aligned, so declare the fields instead of embedding
 	 * a ehci_qtd_t directly.
 	 */
-	struct {
+	struct ehci_qh_qtd_t {
 		volatile ehci_link_t	qtd_next;
 		volatile ehci_link_t	qtd_altnext;
 		volatile uint32_t	qtd_status;



CVS commit: [netbsd-10] src/sys/dev/usb

2024-02-17 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sat Feb 17 11:27:30 UTC 2024

Modified Files:
src/sys/dev/usb [netbsd-10]: ehci.c ehcireg.h

Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #589):

sys/dev/usb/ehci.c: revision 1.322
sys/dev/usb/ehcireg.h: revision 1.39

avoid different struct type problem.


To generate a diff of this commit:
cvs rdiff -u -r1.315.2.3 -r1.315.2.4 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.37.50.1 -r1.37.50.2 src/sys/dev/usb/ehcireg.h

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



CVS commit: src/common/lib/libutil

2024-02-17 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 17 10:23:30 UTC 2024

Modified Files:
src/common/lib/libutil: snprintb.c

Log Message:
snprintb: convert macros to local functions

Let the compiler decide whether to inline the functions; allow stepping
through the code in a debugger.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/common/lib/libutil/snprintb.c

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

Modified files:

Index: src/common/lib/libutil/snprintb.c
diff -u src/common/lib/libutil/snprintb.c:1.34 src/common/lib/libutil/snprintb.c:1.35
--- src/common/lib/libutil/snprintb.c:1.34	Fri Feb 16 21:25:46 2024
+++ src/common/lib/libutil/snprintb.c	Sat Feb 17 10:23:30 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: snprintb.c,v 1.34 2024/02/16 21:25:46 rillig Exp $	*/
+/*	$NetBSD: snprintb.c,v 1.35 2024/02/17 10:23:30 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #  include 
 #  if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: snprintb.c,v 1.34 2024/02/16 21:25:46 rillig Exp $");
+__RCSID("$NetBSD: snprintb.c,v 1.35 2024/02/17 10:23:30 rillig Exp $");
 #  endif
 
 #  include 
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: snprintb.c,v 1.34 2024
 #  include 
 # else /* ! _KERNEL */
 #  include 
-__KERNEL_RCSID(0, "$NetBSD: snprintb.c,v 1.34 2024/02/16 21:25:46 rillig Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snprintb.c,v 1.35 2024/02/17 10:23:30 rillig Exp $");
 #  include 
 #  include 
 #  include 
@@ -59,14 +59,204 @@ __KERNEL_RCSID(0, "$NetBSD: snprintb.c,v
 # endif /* ! _KERNEL */
 
 # ifndef HAVE_SNPRINTB_M
+typedef struct {
+	char *const buf;
+	size_t const bufsize;
+	const char *bitfmt;
+	uint64_t const val;
+	size_t const line_max;
+
+	const char *const num_fmt;
+	unsigned const val_len;
+	unsigned total_len;
+	unsigned line_len;
+
+	const char *cur_bitfmt;
+	int restart;
+
+	const char *sep_bitfmt;
+	unsigned sep_line_len;
+	char sep;
+} state;
+
+static void
+store(state *s, char c)
+{
+	if (s->total_len < s->bufsize)
+		s->buf[s->total_len] = c;
+	s->total_len++;
+	s->line_len++;
+}
+
+static void
+backup(state *s)
+{
+	if (s->sep_line_len > 0) {
+		s->total_len -= s->line_len - s->sep_line_len;
+		s->sep_line_len = 0;
+		s->restart = 1;
+		s->bitfmt = s->sep_bitfmt;
+	}
+	store(s, '>');
+	store(s, '\0');
+	if (s->total_len < s->bufsize)
+		snprintf(s->buf + s->total_len, s->bufsize - s->total_len,
+		s->num_fmt, (uintmax_t)s->val);
+	s->total_len += s->val_len;
+	s->line_len = s->val_len;
+}
+
+static void
+put_sep(state *s)
+{
+	if (s->line_max > 0 && s->line_len >= s->line_max) {
+		backup(s);
+		store(s, '<');
+	} else {
+		if (s->line_max > 0 && s->sep != '<') {
+			s->sep_line_len = s->line_len;
+			s->sep_bitfmt = s->cur_bitfmt;
+		}
+		store(s, s->sep);
+		s->restart = 0;
+	}
+}
+
+static void
+put_chr(state *s, char c)
+{
+	if (s->line_max > 0 && s->line_len >= s->line_max - 1) {
+		backup(s);
+		if (s->restart == 0)
+			store(s, c);
+		else
+			s->sep = '<';
+	} else {
+		store(s, c);
+		s->restart = 0;
+	}
+}
+
+static void
+put_bitfmt(state *s)
+{
+	while (*s->bitfmt++ != 0) {
+		put_chr(s, s->bitfmt[-1]);
+		if (s->restart)
+			break;
+	}
+}
+
+static int
+put_num(state *s, const char *fmt, uintmax_t v)
+{
+	char *bp = s->total_len < s->bufsize ? s->buf + s->total_len : NULL;
+	size_t n = s->total_len < s->bufsize ? s->bufsize - s->total_len : 0;
+	int fmt_len = snprintf(bp, n, fmt, v);
+	if (fmt_len >= 0) {
+		s->total_len += fmt_len;
+		s->line_len += fmt_len;
+	}
+	return fmt_len;
+}
+
+static void
+old_style(state *s)
+{
+	for (uint8_t bit; (bit = *s->bitfmt) != 0;) {
+		s->cur_bitfmt = s->bitfmt++;
+		if (s->val & (1U << (bit - 1))) {
+			put_sep(s);
+			if (s->restart)
+continue;
+			s->sep = ',';
+			for (; *s->bitfmt > ' '; ++s->bitfmt) {
+put_chr(s, *s->bitfmt);
+if (s->restart)
+	break;
+			}
+		} else
+			for (; *s->bitfmt > ' '; ++s->bitfmt)
+continue;
+	}
+}
+
+static int
+new_style(state *s)
+{
+	uint64_t field = s->val;
+	int matched = 1;
+	while (*s->bitfmt != '\0') {
+		uint8_t kind = *s->bitfmt++;
+		uint8_t bit = *s->bitfmt++;
+		switch (kind) {
+		case 'b':
+			if (((s->val >> bit) & 1) == 0)
+goto skip;
+			s->cur_bitfmt = s->bitfmt - 2;
+			put_sep(s);
+			if (s->restart)
+break;
+			put_bitfmt(s);
+			if (s->restart == 0)
+s->sep = ',';
+			break;
+		case 'f':
+		case 'F':
+			matched = 0;
+			s->cur_bitfmt = s->bitfmt - 2;
+			uint8_t field_width = *s->bitfmt++;
+			field = (s->val >> bit) &
+			(((uint64_t)1 << field_width) - 1);
+			put_sep(s);
+			if (s->restart == 0)
+s->sep = ',';
+			if (kind == 'F')
+goto skip;
+			if (s->restart == 0)
+put_bitfmt(s);
+			if (s->restart == 0)
+put_chr(s, '=');
+			if (s->restart == 0) {
+if (put_num(s, s->num_fmt, field) < 0)
+	return -1;
+if (s->line_max > 0
+&& s->line_len > s->line_max)
+	

CVS commit: src/common/lib/libutil

2024-02-17 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Feb 17 10:23:30 UTC 2024

Modified Files:
src/common/lib/libutil: snprintb.c

Log Message:
snprintb: convert macros to local functions

Let the compiler decide whether to inline the functions; allow stepping
through the code in a debugger.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/common/lib/libutil/snprintb.c

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



CVS commit: src/sys/ufs/lfs

2024-02-17 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 17 09:08:21 UTC 2024

Modified Files:
src/sys/ufs/lfs: ulfs_inode.h

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/ufs/lfs/ulfs_inode.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/ufs/lfs/ulfs_inode.h
diff -u src/sys/ufs/lfs/ulfs_inode.h:1.24 src/sys/ufs/lfs/ulfs_inode.h:1.25
--- src/sys/ufs/lfs/ulfs_inode.h:1.24	Sat Jun 10 05:29:36 2017
+++ src/sys/ufs/lfs/ulfs_inode.h	Sat Feb 17 09:08:21 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulfs_inode.h,v 1.24 2017/06/10 05:29:36 maya Exp $	*/
+/*	$NetBSD: ulfs_inode.h,v 1.25 2024/02/17 09:08:21 mlelstv Exp $	*/
 /*  from NetBSD: inode.h,v 1.72 2016/06/03 15:36:03 christos Exp  */
 
 /*
@@ -147,7 +147,7 @@ struct ulfs_ufid {
 	uint16_t ufid_len;	/* Length of structure. */
 	uint16_t ufid_pad;	/* Force 32-bit alignment. */
 	uint32_t ufid_ino;	/* File number (ino). XXX should be 64 */
-	int32_t	  ufid_gen;	/* Generation number. */
+	int32_t  ufid_gen;	/* Generation number. */
 };
 /* Filehandle structure for exported LFSes */
 struct lfid {



CVS commit: src/sys/ufs/lfs

2024-02-17 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Sat Feb 17 09:08:21 UTC 2024

Modified Files:
src/sys/ufs/lfs: ulfs_inode.h

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/ufs/lfs/ulfs_inode.h

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



CVS commit: src/share/man/man9

2024-02-17 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Feb 17 08:27:46 UTC 2024

Modified Files:
src/share/man/man9: bus_dma.9

Log Message:
Steal the sync operation descriptions from FreeBSD and improve other
wording in this area.

Inspired by jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/share/man/man9/bus_dma.9

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



CVS commit: src/share/man/man9

2024-02-17 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Feb 17 08:27:46 UTC 2024

Modified Files:
src/share/man/man9: bus_dma.9

Log Message:
Steal the sync operation descriptions from FreeBSD and improve other
wording in this area.

Inspired by jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/share/man/man9/bus_dma.9

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

Modified files:

Index: src/share/man/man9/bus_dma.9
diff -u src/share/man/man9/bus_dma.9:1.67 src/share/man/man9/bus_dma.9:1.68
--- src/share/man/man9/bus_dma.9:1.67	Sat Jan 22 15:16:37 2022
+++ src/share/man/man9/bus_dma.9	Sat Feb 17 08:27:46 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: bus_dma.9,v 1.67 2022/01/22 15:16:37 skrll Exp $
+.\" $NetBSD: bus_dma.9,v 1.68 2024/02/17 08:27:46 skrll Exp $
 .\"
 .\" Copyright (c) 1996, 1997, 1998, 2001, 2005, 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 22, 2022
+.Dd February 17, 2024
 .Dt BUS_DMA 9
 .Os
 .Sh NAME
@@ -436,14 +436,19 @@ One or more synchronization operation to
 The following DMA synchronization operations are defined:
 .Bl -tag -width BUS_DMASYNC_POSTWRITE -compact
 .It Dv BUS_DMASYNC_PREREAD
-Perform any pre-read DMA cache and/or bounce operations.
+Perform any synchronization required prior to an update of host memory by the
+device.
 .It Dv BUS_DMASYNC_POSTREAD
-Perform any post-read DMA cache and/or bounce operations.
+Perform any synchronization required after an update of host memory by the
+device and prior to CPU access to host memory.
 .It Dv BUS_DMASYNC_PREWRITE
-Perform any pre-write DMA cache and/or bounce operations.
+Perform any synchronization required after an update of host memory by the CPU
+and prior to device access to host memory.
 .It Dv BUS_DMASYNC_POSTWRITE
-Perform any post-write DMA cache and/or bounce operations.
+Perform any synchronization required after device access to host memory.
 .El
+where each operation may involve cache flush/invalidation, bounce buffer
+copying, and/or memory barriers.
 .Pp
 More than one operation may performed in a given synchronization call.
 Mixing of