re: CVS commit: src/sys

2021-08-24 Thread matthew green
> - For alpha and sparc64, don't define MUTEX_CAS() in terms of their own
>   _lock_cas(), which has its own memory barriers; the call sites in
>   kern_mutex.c already have the appropriate memory barrier calls.  Thus,
>   alpha and sparc64 can use default definition.

this seems to leave _lock_cas() unused on both platforms, should
the backing code for _lock_cas() be removed now?

i didn't look closely at other ports (though sh3 looks OK as-is.)

thanks.


.mrg.


CVS commit: src/sys

2021-08-24 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Aug 25 04:13:42 UTC 2021

Modified Files:
src/sys/arch/alpha/include: mutex.h
src/sys/arch/arm/include: mutex.h
src/sys/arch/ia64/include: mutex.h
src/sys/arch/m68k/include: mutex.h
src/sys/arch/mips/include: mutex.h
src/sys/arch/or1k/include: mutex.h
src/sys/arch/riscv/include: mutex.h
src/sys/arch/sh3/include: mutex.h
src/sys/arch/sparc64/include: mutex.h
src/sys/arch/vax/include: mutex.h
src/sys/kern: kern_mutex.c

Log Message:
- In kern_mutex.c, if MUTEX_CAS() is not defined, define it in terms of
  atomic_cas_ulong().
- For arm, ia64, m68k, mips, or1k, riscv, vax: don't define our own
  MUTEX_CAS(), as they either use atomic_cas_ulong() or equivalent
  (atomic_cas_uint() on m68k).
- For alpha and sparc64, don't define MUTEX_CAS() in terms of their own
  _lock_cas(), which has its own memory barriers; the call sites in
  kern_mutex.c already have the appropriate memory barrier calls.  Thus,
  alpha and sparc64 can use default definition.
- For sh3, don't define MUTEX_CAS() in terms of its own _lock_cas();
  atomic_cas_ulong() is strong-aliased to _lock_cas(), therefore defining
  our own MUTEX_CAS() is redundant.

Per thread:
https://mail-index.netbsd.org/tech-kern/2021/07/25/msg027562.html


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/include/mutex.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/include/mutex.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/mutex.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/include/mutex.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/include/mutex.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/or1k/include/mutex.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/mutex.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sh3/include/mutex.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/include/mutex.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/include/mutex.h
cvs rdiff -u -r1.97 -r1.98 src/sys/kern/kern_mutex.c

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

Modified files:

Index: src/sys/arch/alpha/include/mutex.h
diff -u src/sys/arch/alpha/include/mutex.h:1.10 src/sys/arch/alpha/include/mutex.h:1.11
--- src/sys/arch/alpha/include/mutex.h:1.10	Wed Jul 14 02:18:10 2021
+++ src/sys/arch/alpha/include/mutex.h	Wed Aug 25 04:13:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.10 2021/07/14 02:18:10 thorpej Exp $	*/
+/*	$NetBSD: mutex.h,v 1.11 2021/08/25 04:13:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -61,10 +61,6 @@ struct kmutex {
 #define	__HAVE_MUTEX_STUBS		1
 /* XXX #define	__HAVE_SPIN_MUTEX_STUBS		1 XXX */
 
-#define	MUTEX_CAS(p, o, n)		_lock_cas((p), (o), (n))
-
-int	_lock_cas(volatile uintptr_t *, uintptr_t, uintptr_t);
-
 #endif	/* __MUTEX_PRIVATE */
 
 __CTASSERT(sizeof(struct kmutex) == sizeof(uintptr_t));

Index: src/sys/arch/arm/include/mutex.h
diff -u src/sys/arch/arm/include/mutex.h:1.25 src/sys/arch/arm/include/mutex.h:1.26
--- src/sys/arch/arm/include/mutex.h:1.25	Tue Dec  1 14:53:47 2020
+++ src/sys/arch/arm/include/mutex.h	Wed Aug 25 04:13:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.25 2020/12/01 14:53:47 skrll Exp $	*/
+/*	$NetBSD: mutex.h,v 1.26 2021/08/25 04:13:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -80,9 +80,6 @@ struct kmutex {
 #endif
 #define	__HAVE_SIMPLE_MUTEXES		1
 
-#define	MUTEX_CAS(p, o, n)		\
-(atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
-
 #endif	/* __MUTEX_PRIVATE */
 
 #endif /* _ARM_MUTEX_H_ */

Index: src/sys/arch/ia64/include/mutex.h
diff -u src/sys/arch/ia64/include/mutex.h:1.5 src/sys/arch/ia64/include/mutex.h:1.6
--- src/sys/arch/ia64/include/mutex.h:1.5	Fri Nov 29 22:55:33 2019
+++ src/sys/arch/ia64/include/mutex.h	Wed Aug 25 04:13:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.5 2019/11/29 22:55:33 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.6 2021/08/25 04:13:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -56,9 +56,6 @@ struct kmutex {
 */
 #define	__HAVE_SIMPLE_MUTEXES		1
 
-#define	MUTEX_CAS(ptr, old, new)		\
-(atomic_cas_ulong((volatile unsigned long *)(ptr), (old), (new)) == (old))
-
 #endif	/* __MUTEX_PRIVATE */
 
 #endif	/* _IA64_MUTEX_H_ */

Index: src/sys/arch/m68k/include/mutex.h
diff -u src/sys/arch/m68k/include/mutex.h:1.10 src/sys/arch/m68k/include/mutex.h:1.11
--- src/sys/arch/m68k/include/mutex.h:1.10	Sun Mar  8 06:12:01 2020
+++ src/sys/arch/m68k/include/mutex.h	Wed Aug 25 04:13:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: mutex.h,v 1.10 2020/03/08 06:12:01 rin Exp $	*/
+/*	$NetBSD: mutex.h,v 1.11 2021/08/25 04:13:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -64,8 +64,6 @@ struct kmutex {
 #define	__HAVE_MUTEX_STUBS		1
 #endif
 
-#define	MUTEX_CAS(p, o, n)		

CVS commit: src/sys

2021-08-24 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Aug 25 04:13:42 UTC 2021

Modified Files:
src/sys/arch/alpha/include: mutex.h
src/sys/arch/arm/include: mutex.h
src/sys/arch/ia64/include: mutex.h
src/sys/arch/m68k/include: mutex.h
src/sys/arch/mips/include: mutex.h
src/sys/arch/or1k/include: mutex.h
src/sys/arch/riscv/include: mutex.h
src/sys/arch/sh3/include: mutex.h
src/sys/arch/sparc64/include: mutex.h
src/sys/arch/vax/include: mutex.h
src/sys/kern: kern_mutex.c

Log Message:
- In kern_mutex.c, if MUTEX_CAS() is not defined, define it in terms of
  atomic_cas_ulong().
- For arm, ia64, m68k, mips, or1k, riscv, vax: don't define our own
  MUTEX_CAS(), as they either use atomic_cas_ulong() or equivalent
  (atomic_cas_uint() on m68k).
- For alpha and sparc64, don't define MUTEX_CAS() in terms of their own
  _lock_cas(), which has its own memory barriers; the call sites in
  kern_mutex.c already have the appropriate memory barrier calls.  Thus,
  alpha and sparc64 can use default definition.
- For sh3, don't define MUTEX_CAS() in terms of its own _lock_cas();
  atomic_cas_ulong() is strong-aliased to _lock_cas(), therefore defining
  our own MUTEX_CAS() is redundant.

Per thread:
https://mail-index.netbsd.org/tech-kern/2021/07/25/msg027562.html


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/include/mutex.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/include/mutex.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/mutex.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/m68k/include/mutex.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/include/mutex.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/or1k/include/mutex.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/mutex.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sh3/include/mutex.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/include/mutex.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/include/mutex.h
cvs rdiff -u -r1.97 -r1.98 src/sys/kern/kern_mutex.c

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



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:52:07 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in configure tnftp_config.h.in

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.57 -r1.58 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/tnftp_config.h.in

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



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:48:47 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: use --option-name in feature display

Use the appropriate option name in the feature display.
Sort the options.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 othersrc/usr.bin/tnftp/configure.ac

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

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.42 othersrc/usr.bin/tnftp/configure.ac:1.43
--- othersrc/usr.bin/tnftp/configure.ac:1.42	Wed Aug 25 01:24:10 2021
+++ othersrc/usr.bin/tnftp/configure.ac	Wed Aug 25 01:48:47 2021
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.42 2021/08/25 01:24:10 lukem Exp $
+#   $NetBSD: configure.ac,v 1.43 2021/08/25 01:48:47 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.42 $])
+AC_REVISION([$Revision: 1.43 $])
 
 AS_SHELL_SANITIZE()
 
@@ -497,9 +497,9 @@ AC_OUTPUT()
 AC_MSG_NOTICE([ === Configuration results ===])
 AC_MSG_NOTICE([Package:   $PACKAGE_STRING])
 AC_MSG_NOTICE([Prefix:$prefix])
-AC_MSG_NOTICE([Command-line editing:  $opt_editcomplete])
-AC_MSG_NOTICE([Local libedit: $with_local_libedit])
-AC_MSG_NOTICE([IPv6 support:  $opt_ipv6])
-AC_MSG_NOTICE([SOCKS5 proxy support:  $with_socks])
-AC_MSG_NOTICE([SSL:   $with_ssl])
+AC_MSG_NOTICE([--enable-editcomplete  $opt_editcomplete])
+AC_MSG_NOTICE([--enable-ipv6  $opt_ipv6])
+AC_MSG_NOTICE([--enable-ssl   $with_ssl])
+AC_MSG_NOTICE([--with-local-libedit   $with_local_libedit])
+AC_MSG_NOTICE([--with-socks   $with_socks])
 AC_MSG_NOTICE([ =])



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:48:47 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: use --option-name in feature display

Use the appropriate option name in the feature display.
Sort the options.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 othersrc/usr.bin/tnftp/configure.ac

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



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:24:10 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: enable AC_USE_SYSTEM_EXTENSIONS()

We use various POSIX extensions, so enable them.
This reduces compile warnings on some platforms (e.g. RHEL 8).


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 othersrc/usr.bin/tnftp/configure.ac

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

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.41 othersrc/usr.bin/tnftp/configure.ac:1.42
--- othersrc/usr.bin/tnftp/configure.ac:1.41	Wed Aug 25 00:58:53 2021
+++ othersrc/usr.bin/tnftp/configure.ac	Wed Aug 25 01:24:10 2021
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.41 2021/08/25 00:58:53 lukem Exp $
+#   $NetBSD: configure.ac,v 1.42 2021/08/25 01:24:10 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.41 $])
+AC_REVISION([$Revision: 1.42 $])
 
 AS_SHELL_SANITIZE()
 
@@ -19,6 +19,8 @@ AC_CONFIG_MACRO_DIR([buildaux])
 AC_CONFIG_HEADERS([tnftp_config.h])
 AC_CONFIG_LIBOBJ_DIR([libnetbsd])
 
+AC_USE_SYSTEM_EXTENSIONS()
+
 AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
 AM_MAINTAINER_MODE()
 



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:24:10 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: enable AC_USE_SYSTEM_EXTENSIONS()

We use various POSIX extensions, so enable them.
This reduces compile warnings on some platforms (e.g. RHEL 8).


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 othersrc/usr.bin/tnftp/configure.ac

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



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:04:40 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in aclocal.m4 configure
tnftp_config.h.in
othersrc/usr.bin/tnftp/buildaux: config.guess config.sub depcomp
install-sh libtool.m4 ltmain.sh ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4 missing
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in

Log Message:
regen with automake 1.16.1, libtool 2.4.6


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/aclocal.m4
cvs rdiff -u -r1.56 -r1.57 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/buildaux/config.guess \
othersrc/usr.bin/tnftp/buildaux/config.sub
cvs rdiff -u -r1.2 -r1.3 othersrc/usr.bin/tnftp/buildaux/depcomp \
othersrc/usr.bin/tnftp/buildaux/ltmain.sh \
othersrc/usr.bin/tnftp/buildaux/missing
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/buildaux/install-sh
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/buildaux/libtool.m4 \
othersrc/usr.bin/tnftp/buildaux/ltoptions.m4 \
othersrc/usr.bin/tnftp/buildaux/ltsugar.m4 \
othersrc/usr.bin/tnftp/buildaux/ltversion.m4 \
othersrc/usr.bin/tnftp/buildaux/lt~obsolete.m4
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/Makefile.in

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

diffs are larger than 1MB and have been omitted


CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:04:40 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in aclocal.m4 configure
tnftp_config.h.in
othersrc/usr.bin/tnftp/buildaux: config.guess config.sub depcomp
install-sh libtool.m4 ltmain.sh ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4 missing
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in

Log Message:
regen with automake 1.16.1, libtool 2.4.6


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/aclocal.m4
cvs rdiff -u -r1.56 -r1.57 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/buildaux/config.guess \
othersrc/usr.bin/tnftp/buildaux/config.sub
cvs rdiff -u -r1.2 -r1.3 othersrc/usr.bin/tnftp/buildaux/depcomp \
othersrc/usr.bin/tnftp/buildaux/ltmain.sh \
othersrc/usr.bin/tnftp/buildaux/missing
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/buildaux/install-sh
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/buildaux/libtool.m4 \
othersrc/usr.bin/tnftp/buildaux/ltoptions.m4 \
othersrc/usr.bin/tnftp/buildaux/ltsugar.m4 \
othersrc/usr.bin/tnftp/buildaux/ltversion.m4 \
othersrc/usr.bin/tnftp/buildaux/lt~obsolete.m4
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/Makefile.in

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



CVS commit: othersrc/usr.bin/tnftp/libnetbsd

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:59:48 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: Makefile.am

Log Message:
libnetbsd: use AM_CPPFLAGS not CPPFLAGS

Use AM_CPPFLAGS because CPPFLAGS is for user override


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libnetbsd/Makefile.am

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

Modified files:

Index: othersrc/usr.bin/tnftp/libnetbsd/Makefile.am
diff -u othersrc/usr.bin/tnftp/libnetbsd/Makefile.am:1.3 othersrc/usr.bin/tnftp/libnetbsd/Makefile.am:1.4
--- othersrc/usr.bin/tnftp/libnetbsd/Makefile.am:1.3	Sun Jul  5 11:11:10 2020
+++ othersrc/usr.bin/tnftp/libnetbsd/Makefile.am	Wed Aug 25 00:59:48 2021
@@ -1,10 +1,10 @@
-## $NetBSD: Makefile.am,v 1.3 2020/07/05 11:11:10 lukem Exp $
+## $NetBSD: Makefile.am,v 1.4 2021/08/25 00:59:48 lukem Exp $
 
 noinst_LTLIBRARIES = libnetbsd.la
 
 libnetbsd_la_SOURCES = libnetbsd.c
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
 	-I$(srcdir) \
 	-I$(top_srcdir) \
 	-I$(top_builddir)



CVS commit: othersrc/usr.bin/tnftp/libnetbsd

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:59:48 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: Makefile.am

Log Message:
libnetbsd: use AM_CPPFLAGS not CPPFLAGS

Use AM_CPPFLAGS because CPPFLAGS is for user override


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libnetbsd/Makefile.am

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



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:58:53 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: add AM_PROG_AR()

required by newer automake


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 othersrc/usr.bin/tnftp/configure.ac

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

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.40 othersrc/usr.bin/tnftp/configure.ac:1.41
--- othersrc/usr.bin/tnftp/configure.ac:1.40	Sun Apr 25 09:40:34 2021
+++ othersrc/usr.bin/tnftp/configure.ac	Wed Aug 25 00:58:53 2021
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.40 2021/04/25 09:40:34 lukem Exp $
+#   $NetBSD: configure.ac,v 1.41 2021/08/25 00:58:53 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.40 $])
+AC_REVISION([$Revision: 1.41 $])
 
 AS_SHELL_SANITIZE()
 
@@ -89,6 +89,7 @@ AH_TEMPLATE([WITH_SSL],
 #
 AC_PROG_CC()
 AC_PROG_AWK()
+AM_PROG_AR()
 AC_PROG_LIBTOOL()
 
 #



CVS commit: othersrc/usr.bin/tnftp

2021-08-24 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:58:53 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: add AM_PROG_AR()

required by newer automake


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 othersrc/usr.bin/tnftp/configure.ac

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



CVS commit: src/tests/usr.bin/xlint/lint2

2021-08-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Aug 24 23:38:51 UTC 2021

Modified Files:
src/tests/usr.bin/xlint/lint2: emit.exp-ln emit.ln emit_lp64.exp-ln
emit_lp64.ln msg_000.ln msg_001.ln msg_002.ln msg_003.ln msg_004.ln
msg_005.ln msg_006.ln msg_008.ln msg_009.ln msg_010.ln msg_011.ln
msg_012.ln read.ln read_lp64.ln read_printf.ln

Log Message:
tests/lint: normalize whitespace in lint2 tests

Found a typo in read.ln, f124, which had just 'F' instead of the
intended 'F0'.  Other than that, only whitespace changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint2/emit.exp-ln \
src/tests/usr.bin/xlint/lint2/emit.ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.ln \
src/tests/usr.bin/xlint/lint2/msg_000.ln \
src/tests/usr.bin/xlint/lint2/read.ln \
src/tests/usr.bin/xlint/lint2/read_lp64.ln
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint2/msg_001.ln
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint2/msg_002.ln \
src/tests/usr.bin/xlint/lint2/msg_003.ln \
src/tests/usr.bin/xlint/lint2/msg_004.ln \
src/tests/usr.bin/xlint/lint2/msg_005.ln \
src/tests/usr.bin/xlint/lint2/msg_006.ln \
src/tests/usr.bin/xlint/lint2/msg_008.ln \
src/tests/usr.bin/xlint/lint2/msg_009.ln \
src/tests/usr.bin/xlint/lint2/msg_010.ln \
src/tests/usr.bin/xlint/lint2/msg_011.ln \
src/tests/usr.bin/xlint/lint2/msg_012.ln \
src/tests/usr.bin/xlint/lint2/read_printf.ln

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

Modified files:

Index: src/tests/usr.bin/xlint/lint2/emit.exp-ln
diff -u src/tests/usr.bin/xlint/lint2/emit.exp-ln:1.1 src/tests/usr.bin/xlint/lint2/emit.exp-ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit.exp-ln:1.1	Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit.exp-ln	Tue Aug 24 23:38:51 2021
@@ -1,7 +1,7 @@
-# $NetBSD: emit.exp-ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit.exp-ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
 
 S llib-lemit.ln
-0s llib-lemit.ln
+0 s llib-lemit.ln
 
 # Normally, it does not matter in which filename a particular symbol is
 # defined. Only in cases where a file defines an anonymous tag type (struct,
Index: src/tests/usr.bin/xlint/lint2/emit.ln
diff -u src/tests/usr.bin/xlint/lint2/emit.ln:1.1 src/tests/usr.bin/xlint/lint2/emit.ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit.ln:1.1	Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit.ln	Tue Aug 24 23:38:51 2021
@@ -1,9 +1,9 @@
-# $NetBSD: emit.ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit.ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
 #
 # Test emitting a lint library file.
 
 # Extracted from ../lint1/emit.exp-ln.
-0s emit.c
+0 s emit.c
 S emit.c
 
 # Global variables that are declared using 'extern' are not part of a
@@ -23,17 +23,17 @@ S emit.c
 # library's interface, therefore they are omitted from the output.
 121 d 0.121 e 30return_void_unknown_parameters F V
 122 d 0.122 e 38return_implicit_int_unknown_parameters F I
-125 d 0.125 e 32extern_return_void_no_parameters F 0 V
+125 d 0.125 e 32extern_return_void_no_parameters F0 V
 
 # Function calls are not part of a library's interface, therefore they are
 # omitted from the output.
-161 c 0.161 s2 "%" i 9my_printf f2 PcC PC V
+161 c 0.161 s2"%" i 9my_printf f2 PcC PC V
 
 # Function definitions are copied to the output.
 159 d 0.159 d 14cover_outqchar F0 V
 
 # Taken from ../lint1/expr_promote.exp-ln.
-0s expr_promote.c
+0 s expr_promote.c
 S expr_promote.c
 
 10 d 0.10 e 4sink F2 PcC E V
Index: src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln
diff -u src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln:1.1 src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln:1.1	Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln	Tue Aug 24 23:38:51 2021
@@ -1,7 +1,7 @@
-# $NetBSD: emit_lp64.exp-ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit_lp64.exp-ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
 
 S llib-lemit_lp64.ln
-0s llib-lemit_lp64.ln
+0 s llib-lemit_lp64.ln
 
 0 d 0.0 du 16uint128_function F0 uJ
 0 d 0.0 tu 15int128_variable J
Index: src/tests/usr.bin/xlint/lint2/emit_lp64.ln
diff -u src/tests/usr.bin/xlint/lint2/emit_lp64.ln:1.1 src/tests/usr.bin/xlint/lint2/emit_lp64.ln:1.2
--- src/tests/usr.bin/xlint/lint2/emit_lp64.ln:1.1	Tue Aug 24 21:30:52 2021
+++ src/tests/usr.bin/xlint/lint2/emit_lp64.ln	Tue Aug 24 23:38:51 2021
@@ -1,11 +1,11 @@
-# $NetBSD: emit_lp64.ln,v 1.1 2021/08/24 21:30:52 rillig Exp $
+# $NetBSD: emit_lp64.ln,v 1.2 2021/08/24 23:38:51 rillig Exp $
 #
 # Test emitting a lint library file on an LP64 platform.
 
-0s first-file.c
+0 s first-file.c
 S first-file.c
 10 d 0.10 t 15int128_variable J
 
-0s second-file.c
+0 s second-file.c
 S second-file.c
 20 d 0.20 d 16uint128_function F0 uJ

CVS commit: src/tests/usr.bin/xlint/lint2

2021-08-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Aug 24 23:38:51 UTC 2021

Modified Files:
src/tests/usr.bin/xlint/lint2: emit.exp-ln emit.ln emit_lp64.exp-ln
emit_lp64.ln msg_000.ln msg_001.ln msg_002.ln msg_003.ln msg_004.ln
msg_005.ln msg_006.ln msg_008.ln msg_009.ln msg_010.ln msg_011.ln
msg_012.ln read.ln read_lp64.ln read_printf.ln

Log Message:
tests/lint: normalize whitespace in lint2 tests

Found a typo in read.ln, f124, which had just 'F' instead of the
intended 'F0'.  Other than that, only whitespace changes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint2/emit.exp-ln \
src/tests/usr.bin/xlint/lint2/emit.ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.ln \
src/tests/usr.bin/xlint/lint2/msg_000.ln \
src/tests/usr.bin/xlint/lint2/read.ln \
src/tests/usr.bin/xlint/lint2/read_lp64.ln
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint2/msg_001.ln
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint2/msg_002.ln \
src/tests/usr.bin/xlint/lint2/msg_003.ln \
src/tests/usr.bin/xlint/lint2/msg_004.ln \
src/tests/usr.bin/xlint/lint2/msg_005.ln \
src/tests/usr.bin/xlint/lint2/msg_006.ln \
src/tests/usr.bin/xlint/lint2/msg_008.ln \
src/tests/usr.bin/xlint/lint2/msg_009.ln \
src/tests/usr.bin/xlint/lint2/msg_010.ln \
src/tests/usr.bin/xlint/lint2/msg_011.ln \
src/tests/usr.bin/xlint/lint2/msg_012.ln \
src/tests/usr.bin/xlint/lint2/read_printf.ln

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



CVS commit: src

2021-08-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Aug 24 21:30:52 UTC 2021

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint2: Makefile t_lint2.sh
src/usr.bin/xlint/lint2: emit2.c
Added Files:
src/tests/usr.bin/xlint/lint2: emit.exp-ln emit.ln emit_lp64.exp-ln
emit_lp64.ln

Log Message:
lint: allow libraries to use 128-bit integer types


To generate a diff of this commit:
cvs rdiff -u -r1.1115 -r1.1116 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint2/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint2/emit.exp-ln \
src/tests/usr.bin/xlint/lint2/emit.ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.ln
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint2/t_lint2.sh
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/xlint/lint2/emit2.c

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1115 src/distrib/sets/lists/tests/mi:1.1116
--- src/distrib/sets/lists/tests/mi:1.1115	Tue Aug 24 20:23:38 2021
+++ src/distrib/sets/lists/tests/mi	Tue Aug 24 21:30:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1115 2021/08/24 20:23:38 rillig Exp $
+# $NetBSD: mi,v 1.1116 2021/08/24 21:30:52 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7039,6 +7039,10 @@
 ./usr/tests/usr.bin/xlint/lint2	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint2/Atffile			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint2/Kyuafile		tests-usr.bin-tests	compattestfile,atf,kyua
+./usr/tests/usr.bin/xlint/lint2/emit.exp-ln		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint2/emit.ln			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln	tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint2/emit_lp64.ln		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint2/msg_000.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint2/msg_000.ln		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint2/msg_001.exp		tests-usr.bin-tests	compattestfile,atf

Index: src/tests/usr.bin/xlint/lint2/Makefile
diff -u src/tests/usr.bin/xlint/lint2/Makefile:1.6 src/tests/usr.bin/xlint/lint2/Makefile:1.7
--- src/tests/usr.bin/xlint/lint2/Makefile:1.6	Sun Aug  8 16:35:15 2021
+++ src/tests/usr.bin/xlint/lint2/Makefile	Tue Aug 24 21:30:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/08/08 16:35:15 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2021/08/24 21:30:52 rillig Exp $
 
 NOMAN=		yes
 
@@ -10,6 +10,8 @@ TESTS_SH=	t_lint2
 
 FILESDIR=	${TESTSDIR}
 
+TESTS+=		emit
+TESTS+=		emit_lp64
 .for msg in \
 000 001 002 003 004 005 006 007 008 009 \
 010 011 012 013 014 015 016 017 018
@@ -19,7 +21,9 @@ TESTS+=		read
 TESTS+=		read_lp64
 TESTS+=		read_printf
 
-FILES+=		${TESTS:=.ln} ${TESTS:=.exp}
+FILES+=		${TESTS:=.ln}
+FILES+=		${TESTS:Nemit*:=.exp}
+FILES+=		${TESTS:Memit*:=.exp-ln}
 
 # Note: only works for adding tests.
 # To remove a test, the $$mi file must be edited manually.

Index: src/tests/usr.bin/xlint/lint2/t_lint2.sh
diff -u src/tests/usr.bin/xlint/lint2/t_lint2.sh:1.5 src/tests/usr.bin/xlint/lint2/t_lint2.sh:1.6
--- src/tests/usr.bin/xlint/lint2/t_lint2.sh:1.5	Sun Aug  8 16:35:15 2021
+++ src/tests/usr.bin/xlint/lint2/t_lint2.sh	Tue Aug 24 21:30:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_lint2.sh,v 1.5 2021/08/08 16:35:15 rillig Exp $
+# $NetBSD: t_lint2.sh,v 1.6 2021/08/24 21:30:52 rillig Exp $
 #
 # Copyright (c) 2021 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -46,8 +46,40 @@ std_body()
 	"$lint2" -h -p -x "$1.ln"
 }
 
+std_emit_body()
+{
+	# shellcheck disable=SC2155
+	local srcdir="$(atf_get_srcdir)"
+
+	# remove comments and whitespace from the .ln files
+	sed -e '/^#/d' -e '/^$/d' -e 's,#.*,,' -e 's,[[:space:]],,g' \
+	< "$srcdir/$1.ln" \
+	> "$1.ln"
+	sed -e '/^#/d' -e '/^$/d' -e 's,#.*,,' -e 's,[[:space:]],,g' \
+	< "$srcdir/$1.exp-ln" \
+	> "$1.exp-ln"
+
+	atf_check \
+	"$lint2" -h -p -x -C "$1" "$1.ln"
+
+	atf_check -o "file:$1.exp-ln" \
+	cat "llib-l$1.ln"
+}
+
+emit_body()
+{
+	std_emit_body 'emit'
+}
+
+emit_lp64_body()
+{
+	std_emit_body 'emit_lp64'
+}
+
 atf_init_test_cases()
 {
+	local i
+
 	# shellcheck disable=SC2013
 	for i in $(cd "$(atf_get_srcdir)" && echo *.ln); do
 		i=${i%.ln}
@@ -60,8 +92,10 @@ atf_init_test_cases()
 			esac
 		esac
 
-		eval "${i}_head() { std_head; }"
-		eval "${i}_body() { std_body '$i'; }"
+		type "${i}_head" 1>/dev/null 2>&1 \
+		|| eval "${i}_head() { std_head; }"
+		type "${i}_body" 1>/dev/null 2>&1 \
+		|| eval "${i}_body() { std_body '$i'; }"
 		atf_add_test_case "$i"
 	done
 }

Index: src/usr.bin/xlint/lint2/emit2.c
diff 

CVS commit: src

2021-08-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Aug 24 21:30:52 UTC 2021

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint2: Makefile t_lint2.sh
src/usr.bin/xlint/lint2: emit2.c
Added Files:
src/tests/usr.bin/xlint/lint2: emit.exp-ln emit.ln emit_lp64.exp-ln
emit_lp64.ln

Log Message:
lint: allow libraries to use 128-bit integer types


To generate a diff of this commit:
cvs rdiff -u -r1.1115 -r1.1116 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint2/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint2/emit.exp-ln \
src/tests/usr.bin/xlint/lint2/emit.ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.exp-ln \
src/tests/usr.bin/xlint/lint2/emit_lp64.ln
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint2/t_lint2.sh
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/xlint/lint2/emit2.c

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/tests

2021-08-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Aug 24 20:23:39 UTC 2021

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

Log Message:
tests/lint2: reduce indentation for mi files


To generate a diff of this commit:
cvs rdiff -u -r1.1114 -r1.1115 src/distrib/sets/lists/tests/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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1114 src/distrib/sets/lists/tests/mi:1.1115
--- src/distrib/sets/lists/tests/mi:1.1114	Sun Aug 22 20:56:51 2021
+++ src/distrib/sets/lists/tests/mi	Tue Aug 24 20:23:38 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1114 2021/08/22 20:56:51 rillig Exp $
+# $NetBSD: mi,v 1.1115 2021/08/24 20:23:38 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7037,53 +7037,53 @@
 ./usr/tests/usr.bin/xlint/lint1/stmt_if.exp			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/t_integration			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint2	tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/Atffiletests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/Kyuafile			tests-usr.bin-tests	compattestfile,atf,kyua
-./usr/tests/usr.bin/xlint/lint2/msg_000.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_000.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_001.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_001.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_002.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_002.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_003.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_003.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_004.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_004.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_005.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_005.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_006.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_006.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_007.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_007.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_008.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_008.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_009.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_009.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_010.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_010.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_011.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_011.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_012.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_012.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_013.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_013.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_014.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_014.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_015.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_015.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_016.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_016.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_017.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_017.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_018.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/msg_018.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/read.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/read.lntests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/read_lp64.exp			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/read_lp64.ln			tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/xlint/lint2/read_printf.exp			

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

2021-08-24 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Aug 24 20:23:39 UTC 2021

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

Log Message:
tests/lint2: reduce indentation for mi files


To generate a diff of this commit:
cvs rdiff -u -r1.1114 -r1.1115 src/distrib/sets/lists/tests/mi

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



CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:53:26 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES ssl-bozo.c

Log Message:
extend the list of available ciphers to include most of the
openssl "HIGH" with some additional disables.  retain the current
list of bad options.  should deal with PR#51278.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/ssl-bozo.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/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.50 src/libexec/httpd/CHANGES:1.51
--- src/libexec/httpd/CHANGES:1.50	Tue Aug 24 09:47:36 2021
+++ src/libexec/httpd/CHANGES	Tue Aug 24 09:53:26 2021
@@ -1,8 +1,11 @@
-$NetBSD: CHANGES,v 1.50 2021/08/24 09:47:36 mrg Exp $
+$NetBSD: CHANGES,v 1.51 2021/08/24 09:53:26 mrg Exp $
 
 changes in bozohttpd 20210824:
 	o  new "-m tlsversion" option to set the minimum TLS version
 	   available.  partially from .
+	o  extend the list of available ciphers to include most of the
+	   openssl "HIGH" with some additional disables.  retain the current
+	   list of bad options.  should deal with PR#51278.
 
 changes in bozohttpd 20210504:
 	o  don't assume host BUFSIZ is sufficent.  small BUFSIZ leads to

Index: src/libexec/httpd/ssl-bozo.c
diff -u src/libexec/httpd/ssl-bozo.c:1.30 src/libexec/httpd/ssl-bozo.c:1.31
--- src/libexec/httpd/ssl-bozo.c:1.30	Tue Aug 24 09:47:36 2021
+++ src/libexec/httpd/ssl-bozo.c	Tue Aug 24 09:53:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssl-bozo.c,v 1.30 2021/08/24 09:47:36 mrg Exp $	*/
+/*	$NetBSD: ssl-bozo.c,v 1.31 2021/08/24 09:53:26 mrg Exp $	*/
 
 /*	$eterna: ssl-bozo.c,v 1.15 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -51,10 +51,15 @@
 
 #ifndef BOZO_SSL_CIPHERS
 #define BOZO_SSL_CIPHERS 	\
-	"AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:"		\
-	"AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:"		\
-	"AES:"			\
-	"-SHA:"			\
+	"HIGH:"			\
+	"-SHA:-ADH:"		\
+	"-PSK-AES128-CCM:-PSK-AES256-CCM:"			\
+	"-DHE-PSK-AES128-CCM8:-DHE-PSK-AES256-CCM8:"		\
+	"-AES128-CCM8:-AES256-CCM8:"\
+	"-DHE-RSA-AES128-CCM8:-DHE-RSA-AES256-CCM8:"		\
+	"-PSK-AES128-CCM8:-PSK-AES256-CCM8:"			\
+	"-CAMELLIA128:-CAMELLIA256:"\
+	"-RSA-PSK-CHACHA20-POLY1305:"\
 	"!aNULL:!eNULL:"	\
 	"!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:"			\
 	"!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:"		\



CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:53:26 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES ssl-bozo.c

Log Message:
extend the list of available ciphers to include most of the
openssl "HIGH" with some additional disables.  retain the current
list of bad options.  should deal with PR#51278.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/ssl-bozo.c

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



CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:47:36 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c bozohttpd.h main.c
ssl-bozo.c

Log Message:
implement tls minimum version setting.

mostly from su...@nimmagadda.net in PR#55830, though i moved the
member into the main http structure, so that it doesn't trigger
sslinfo being allocated via command line without the rest of the
ssl being setup (which then leads to crashes.)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.88 -r1.89 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.135 -r1.136 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.69 -r1.70 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.28 -r1.29 src/libexec/httpd/main.c
cvs rdiff -u -r1.29 -r1.30 src/libexec/httpd/ssl-bozo.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/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.49 src/libexec/httpd/CHANGES:1.50
--- src/libexec/httpd/CHANGES:1.49	Wed May  5 07:41:48 2021
+++ src/libexec/httpd/CHANGES	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,8 @@
-$NetBSD: CHANGES,v 1.49 2021/05/05 07:41:48 mrg Exp $
+$NetBSD: CHANGES,v 1.50 2021/08/24 09:47:36 mrg Exp $
+
+changes in bozohttpd 20210824:
+	o  new "-m tlsversion" option to set the minimum TLS version
+	   available.  partially from .
 
 changes in bozohttpd 20210504:
 	o  don't assume host BUFSIZ is sufficent.  small BUFSIZ leads to

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.88 src/libexec/httpd/bozohttpd.8:1.89
--- src/libexec/httpd/bozohttpd.8:1.88	Sun Feb 28 05:19:52 2021
+++ src/libexec/httpd/bozohttpd.8	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bozohttpd.8,v 1.88 2021/02/28 05:19:52 mrg Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.89 2021/08/24 09:47:36 mrg Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 27, 2021
+.Dd August 24, 2021
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -39,6 +39,7 @@
 .Op Fl I Ar port
 .Op Fl L Ar prefix script
 .Op Fl M Ar suffix type encoding encoding11
+.Op Fl m Ar version
 .Op Fl P Ar pidfile
 .Op Fl R Ar readme
 .Op Fl S Ar version
@@ -221,6 +222,18 @@ the empty string is used instead.
 Multiple
 .Fl M
 options may be passed.
+.It Fl m Ar version
+Set the minimum supported SSL protocol
+.Ar version .
+The valid values of
+.Ar version
+are
+.Dq TLSv1.1 ,
+.Dq TLSv1.2 ,
+and
+.Dq TLSv1.3 .
+The default version is
+.Dq TLSv1.1 .
 .It Fl n
 Stops
 .Nm
@@ -646,7 +659,7 @@ The focus has always been simplicity and
 and regular code audits.
 This manual documents
 .Nm
-version 20210227.
+version 20210824.
 .Sh AUTHORS
 .An -nosplit
 .Nm
@@ -769,6 +782,10 @@ option (pidfile support) and provided so
 provided many various fixes, including cgi-bin fixes and enhancements,
 HTTP basic authorization support and much code clean up
 .It
+.An Sunil Nimmagadda
+.Aq Mt su...@nimmagadda.net
+provided runtime TLS version control
+.It
 .An Rajeev V. Pillai
 .Aq Mt rajeev_v_pil...@yahoo.com
 provided several fixes for virtual hosting and directory indexing and
@@ -819,7 +836,6 @@ provided http authorization fixes
 .It
 .Aq Mt x...@kittenz.org
 provided chroot and change-to-user support, and other various fixes
-
 .It
 .An S.P.Zeidler
 .Aq Mt s...@netbsd.org

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.135 src/libexec/httpd/bozohttpd.c:1.136
--- src/libexec/httpd/bozohttpd.c:1.135	Tue Aug 24 05:39:39 2021
+++ src/libexec/httpd/bozohttpd.c	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.c,v 1.135 2021/08/24 05:39:39 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.136 2021/08/24 09:47:36 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -108,7 +108,7 @@
 #define INDEX_HTML		"index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE		"bozohttpd/20210504"
+#define SERVER_SOFTWARE		"bozohttpd/20210824"
 #endif
 #ifndef PUBLIC_HTML
 #define PUBLIC_HTML		"public_html"

Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.69 src/libexec/httpd/bozohttpd.h:1.70
--- src/libexec/httpd/bozohttpd.h:1.69	Wed May  5 07:41:48 2021
+++ src/libexec/httpd/bozohttpd.h	Tue Aug 24 09:47:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.h,v 1.69 2021/05/05 07:41:48 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.70 2021/08/24 09:47:36 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -130,6 +130,7 @@ typedef struct bozohttpd_t {
 	unsigned	initial_timeout;/* first line timeout */
 	unsigned	header_timeout;	/* header lines timeout */
 	unsigned	request_timeout;/* total session timeout

CVS commit: src/libexec/httpd

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 09:47:36 UTC 2021

Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c bozohttpd.h main.c
ssl-bozo.c

Log Message:
implement tls minimum version setting.

mostly from su...@nimmagadda.net in PR#55830, though i moved the
member into the main http structure, so that it doesn't trigger
sslinfo being allocated via command line without the rest of the
ssl being setup (which then leads to crashes.)


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.88 -r1.89 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.135 -r1.136 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.69 -r1.70 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.28 -r1.29 src/libexec/httpd/main.c
cvs rdiff -u -r1.29 -r1.30 src/libexec/httpd/ssl-bozo.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/arm/footbridge

2021-08-24 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 24 08:39:50 UTC 2021

Modified Files:
src/sys/arch/arm/footbridge: dc21285mem.h

Log Message:
lower case for hex numbers.
consistent #define
same binary before and after.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/footbridge/dc21285mem.h

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



CVS commit: src/sys/arch/arm/footbridge

2021-08-24 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 24 08:39:50 UTC 2021

Modified Files:
src/sys/arch/arm/footbridge: dc21285mem.h

Log Message:
lower case for hex numbers.
consistent #define
same binary before and after.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/footbridge/dc21285mem.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/arm/footbridge/dc21285mem.h
diff -u src/sys/arch/arm/footbridge/dc21285mem.h:1.2 src/sys/arch/arm/footbridge/dc21285mem.h:1.3
--- src/sys/arch/arm/footbridge/dc21285mem.h:1.2	Sat Jun  9 10:44:11 2001
+++ src/sys/arch/arm/footbridge/dc21285mem.h	Tue Aug 24 08:39:50 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: dc21285mem.h,v 1.2 2001/06/09 10:44:11 chris Exp $	*/
+/*	$NetBSD: dc21285mem.h,v 1.3 2021/08/24 08:39:50 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -39,51 +39,51 @@
  */
 
 #define	DC21285_SDRAM_BASE		0x
-#define DC21285_SDRAM_SIZE		0x1000	/* 256 MB */
+#define	DC21285_SDRAM_SIZE		0x1000	/* 256 MB */
 
 #define	DC21285_SDRAM_A0MR		0x4000
 #define	DC21285_SDRAM_A1MR		0x40004000
 #define	DC21285_SDRAM_A2MR		0x40008000
-#define	DC21285_SDRAM_A3MR		0x4000C000
+#define	DC21285_SDRAM_A3MR		0x4000c000
 
 #define	DC21285_XBUS_XCS0		0x4001
 #define	DC21285_XBUS_XCS1		0x40011000
 #define	DC21285_XBUS_XCS2		0x40012000
 #define	DC21285_XBUS_NOCS		0x40013000
 
-#define DC21285_ROM_BASE		0x4100
-#define DC21285_ROM_SIZE		0x0100	/* 16MB */
+#define	DC21285_ROM_BASE		0x4100
+#define	DC21285_ROM_SIZE		0x0100	/* 16MB */
 
-#define DC21285_ARMCSR_BASE		0x4200
-#define DC21285_ARMCSR_SIZE		0x0010	/* 1MB */
+#define	DC21285_ARMCSR_BASE		0x4200
+#define	DC21285_ARMCSR_SIZE		0x0010	/* 1MB */
 
-#define DC21285_SA_CACHE_FLUSH_BASE	0x5000
-#define DC21285_SA_CACHE_FLUSH_SIZE	0x0100	/* 16MB */
+#define	DC21285_SA_CACHE_FLUSH_BASE	0x5000
+#define	DC21285_SA_CACHE_FLUSH_SIZE	0x0100	/* 16MB */
 
-#define DC21285_OUTBOUND_WRITE_FLUSH	0x7800
-
-#define DC21285_PCI_IACK_SPECIAL	0x7900
-#define DC21285_PCI_TYPE_1_CONFIG	0x7A00
-#define DC21285_PCI_TYPE_0_CONFIG	0x7B00
-#define DC21285_PCI_IO_BASE		0x7C00
-#define DC21285_PCI_IO_SIZE		0x0001	/* 64K */
-#define DC21285_PCI_MEM_BASE		0x8000
-#define DC21285_PCI_MEM_SIZE		0x8000	/* 2GB */
+#define	DC21285_OUTBOUND_WRITE_FLUSH	0x7800
+
+#define	DC21285_PCI_IACK_SPECIAL	0x7900
+#define	DC21285_PCI_TYPE_1_CONFIG	0x7a00
+#define	DC21285_PCI_TYPE_0_CONFIG	0x7b00
+#define	DC21285_PCI_IO_BASE		0x7c00
+#define	DC21285_PCI_IO_SIZE		0x0001	/* 64K */
+#define	DC21285_PCI_MEM_BASE		0x8000
+#define	DC21285_PCI_MEM_SIZE		0x8000	/* 2GB */
 
 /*
  * Standard Virtual memory map used for the DC21285 'Footbridge'
  */
-#define DC21285_ARMCSR_VBASE		0xFD00
-#define	DC21285_ARMCSR_VSIZE		0x0010	/* 1MB */
-#define	DC21285_CACHE_FLUSH_VBASE	0xFD10
+#define	DC21285_ARMCSR_VBASE		0xfd00
+#define	DC21285_ARMCSR_VSIZE		0x0010	/* 1mB */
+#define	DC21285_CACHE_FLUSH_VBASE	0xfd10
 #define	DC21285_CACHE_FLUSH_VSIZE	0x0010	/* 1MB */
-#define	DC21285_PCI_IO_VBASE		0xFD20
-#define	DC21285_PCI_IO_VSIZE		0x0010	/* 1MB */
-#define	DC21285_PCI_IACK_VBASE		0xFD30
+#define	DC21285_PCI_IO_VBASE		0xfd20
+#define	DC21285_PCI_IO_VSIZE		0x0010	/* 1mB */
+#define	DC21285_PCI_IACK_VBASE		0xfd30
 #define	DC21285_PCI_IACK_VSIZE		0x0010	/* 1MB */
-#define	DC21285_PCI_ISA_MEM_VBASE	0xFD40
+#define	DC21285_PCI_ISA_MEM_VBASE	0xfd40
 #define	DC21285_PCI_ISA_MEM_VSIZE	0x0010	/* 1MB */
-#define	DC21285_PCI_TYPE_1_CONFIG_VBASE	0xFE00
+#define	DC21285_PCI_TYPE_1_CONFIG_VBASE	0xfe00
 #define	DC21285_PCI_TYPE_1_CONFIG_VSIZE	0x0100	/* 16MB */
-#define	DC21285_PCI_TYPE_0_CONFIG_VBASE	0xFF00
+#define	DC21285_PCI_TYPE_0_CONFIG_VBASE	0xff00
 #define	DC21285_PCI_TYPE_0_CONFIG_VSIZE	0x0100	/* 16MB */



CVS commit: src/sys/arch/arm/arm32

2021-08-24 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 24 07:32:31 UTC 2021

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Remove '\n' from UVMHIST format


To generate a diff of this commit:
cvs rdiff -u -r1.428 -r1.429 src/sys/arch/arm/arm32/pmap.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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.428 src/sys/arch/arm/arm32/pmap.c:1.429
--- src/sys/arch/arm/arm32/pmap.c:1.428	Tue Mar 23 10:21:49 2021
+++ src/sys/arch/arm/arm32/pmap.c	Tue Aug 24 07:32:31 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.428 2021/03/23 10:21:49 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.429 2021/08/24 07:32:31 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -192,7 +192,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.428 2021/03/23 10:21:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.429 2021/08/24 07:32:31 skrll Exp $");
 
 #include 
 #include 
@@ -5979,7 +5979,7 @@ vaddr_t
 pmap_growkernel(vaddr_t maxkvaddr)
 {
 	UVMHIST_FUNC(__func__);
-	UVMHIST_CALLARGS(maphist, "growing kernel from %#jx to %#jx\n",
+	UVMHIST_CALLARGS(maphist, "growing kernel from %#jx to %#jx",
 	pmap_curmaxkvaddr, maxkvaddr, 0, 0);
 
 	pmap_t kpm = pmap_kernel();



CVS commit: src/sys/arch/arm/arm32

2021-08-24 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Aug 24 07:32:31 UTC 2021

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Remove '\n' from UVMHIST format


To generate a diff of this commit:
cvs rdiff -u -r1.428 -r1.429 src/sys/arch/arm/arm32/pmap.c

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



CVS commit: src/share/mk

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 06:29:18 UTC 2021

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
xorg-server is now at 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/share/mk/bsd.x11.mk

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

Modified files:

Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.140 src/share/mk/bsd.x11.mk:1.141
--- src/share/mk/bsd.x11.mk:1.140	Sun Jul 11 00:13:49 2021
+++ src/share/mk/bsd.x11.mk	Tue Aug 24 06:29:18 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.140 2021/07/11 00:13:49 mrg Exp $
+#	$NetBSD: bsd.x11.mk,v 1.141 2021/08/24 06:29:18 mrg Exp $
 
 .include 
 
@@ -133,7 +133,7 @@ XORG_SERVER_MINOR=	10
 XORG_SERVER_TEENY=	6
 .else
 XORG_SERVER_MINOR=	20
-XORG_SERVER_TEENY=	12
+XORG_SERVER_TEENY=	13
 .endif
 
 XVENDORNAMESHORT=	'"X.Org"'



CVS commit: src/share/mk

2021-08-24 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Aug 24 06:29:18 UTC 2021

Modified Files:
src/share/mk: bsd.x11.mk

Log Message:
xorg-server is now at 1.20.13.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/share/mk/bsd.x11.mk

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



CVS commit: xsrc/external/mit/xf86-video-amdgpu/include

2021-08-24 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 06:28:25 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/include: config.h

Log Message:
update for new amdgpu.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-amdgpu/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-amdgpu/include/config.h
diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.10 xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.11
--- xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.10	Sun Feb 23 06:33:19 2020
+++ xsrc/external/mit/xf86-video-amdgpu/include/config.h	Tue Aug 24 06:28:25 2021
@@ -88,7 +88,7 @@
 #define PACKAGE_NAME "xf86-video-amdgpu"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-amdgpu 19.1.0"
+#define PACKAGE_STRING "xf86-video-amdgpu 21.0.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xf86-video-amdgpu"
@@ -97,13 +97,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "19.1.0"
+#define PACKAGE_VERSION "21.0.0"
 
 /* Major version of this package */
-#define PACKAGE_VERSION_MAJOR 19
+#define PACKAGE_VERSION_MAJOR 21
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 1
+#define PACKAGE_VERSION_MINOR 0
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -118,7 +118,7 @@
 #define USE_SYS_ENDIAN_H 1
 
 /* Version number of package */
-#define VERSION "19.1.0"
+#define VERSION "21.0.0"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE



CVS commit: xsrc/external/mit/xf86-video-amdgpu/include

2021-08-24 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 24 06:28:25 UTC 2021

Modified Files:
xsrc/external/mit/xf86-video-amdgpu/include: config.h

Log Message:
update for new amdgpu.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-amdgpu/include/config.h

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