CVS commit: src/tools/gcc

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 01:44:14 UTC 2021

Modified Files:
src/tools/gcc: mknative-gcc mknative-gcc.old

Log Message:
make mknative-gcc.old for GCC 9.  begin to update mknative-gcc for GCC 10.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/tools/gcc/mknative-gcc
cvs rdiff -u -r1.9 -r1.10 src/tools/gcc/mknative-gcc.old

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

Modified files:

Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.112 src/tools/gcc/mknative-gcc:1.113
--- src/tools/gcc/mknative-gcc:1.112	Wed Sep  9 07:12:04 2020
+++ src/tools/gcc/mknative-gcc	Sun Apr 11 01:44:14 2021
@@ -1,10 +1,10 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.112 2020/09/09 07:12:04 mrg Exp $
+#	$NetBSD: mknative-gcc,v 1.113 2021/04/11 01:44:14 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
-# This version is for GCC 9.3
+# This version is for GCC 10.3
 
 # initialise
 
@@ -312,9 +312,11 @@ get_libsanitizer () {
 		getvars $_PLATFORM/libsanitizer/lsan/Makefile \
 			lsan_files
 		getvars $_PLATFORM/libsanitizer/tsan/Makefile \
-			tsan_plugin_files
+			tsan_files
 		getvars $_PLATFORM/libsanitizer/ubsan/Makefile \
-			ubsan_plugin_files
+			ubsan_files
+		getvars $_PLATFORM/libsanitizer/interception/Makefile \
+			interception_files
 
 	} | sanitise_includes \
 	  | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$_MACHINE_ARCH/defs.mk
@@ -491,8 +493,7 @@ gcc*)
 	get_gcc_libiberty gcc
 	get_libobjc libobjc
 	get_libstdcxx_v3 libstdc++-v3 gcc
-	# XXX not yet
-	# get_libsanitizer libsanitizer
+	get_libsanitizer libsanitizer
 	get_libdecnumber libdecnumber
 	get_libgomp libgomp
 	get_libbacktrace libbacktrace

Index: src/tools/gcc/mknative-gcc.old
diff -u src/tools/gcc/mknative-gcc.old:1.9 src/tools/gcc/mknative-gcc.old:1.10
--- src/tools/gcc/mknative-gcc.old:1.9	Sun Sep  6 02:24:38 2020
+++ src/tools/gcc/mknative-gcc.old	Sun Apr 11 01:44:14 2021
@@ -1,10 +1,10 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc.old,v 1.9 2020/09/06 02:24:38 mrg Exp $
+#	$NetBSD: mknative-gcc.old,v 1.10 2021/04/11 01:44:14 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
-# This version is for GCC 7.5
+# This version is for GCC 9.3
 
 # initialise
 
@@ -226,12 +226,16 @@ get_libstdcxx_v3 () {
 	mkdir -p $_OUTDIR/lib/$_subdir/arch/$_MACHINE_ARCH
 
 	_build_headers="c++config.h cxxabi_tweaks.h"
-	_headers1="c_base_headers_extra_install"
-	_headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
+	_headers1="backward_headers c_base_headers_extra"
+	_headers1="$_headers1 c_base_headers_extra_install"
+	_headers1="$_headers1 tr1_headers tr2_headers"
+	_headers1="$_headers1 decimal_headers c_compatibility_headers_install"
 	_headers1="$_headers1 debug_headers parallel_headers"
-	_headers2="host_headers thread_host_headers"
-	_pf_headers="profile_headers profile_impl_headers"
-	_pb_headers="pb_headers1 pb_headers2 pb_headers3 pb_headers4 pb_headers5 pb_headers6 pb_headers7"
+	_headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
+	_headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
+	_headers1="$_headers1 bits_headers ext_headers host_headers"
+	_headers1="$_headers1 thread_host_headers pstl_headers"
+	_headers1="$_headers1 profile_headers profile_impl_headers"
 
 	# build files
 	for h in $_build_headers; do
@@ -248,6 +252,7 @@ get_libstdcxx_v3 () {
 		getvars $_PLATFORM/libstdc++-v3/Makefile \
 			port_specific_symbol_files
 		getvars $_PLATFORM/libstdc++-v3/src/Makefile \
+			cxx17_sources \
 			cxx11_sources \
 			cxx98_sources
 
@@ -264,6 +269,9 @@ get_libstdcxx_v3 () {
 		# src
 		getvars $_PLATFORM/libstdc++-v3/src/Makefile \
 			libstdc___la_SOURCES | sed 's/^G_libstdc___la_SOURCES=/G_SRC_SOURCES=/'
+		getvars $_PLATFORM/libstdc++-v3/src/c++17/Makefile \
+			libc__17convenience_la_SOURCES | \
+			sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
 		getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
 			libc__11convenience_la_SOURCES | \
 			sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/' \
@@ -282,19 +290,36 @@ get_libstdcxx_v3 () {
 
 		# includes
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
-			backward_headers c_base_headers_extra $_headers1 $_pb_headers | \
-sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g'
-		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
-			bits_headers ext_headers $_headers2 | \
-sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' -e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
-		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
-			$_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
+			$_headers1 | \
+sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' \
+-e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'

CVS commit: src/sys/dev/raidframe

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 01:41:13 UTC 2021

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
mark an extremely uncommon, but sometimes seen, log message
with the function name it comes with.


To generate a diff of this commit:
cvs rdiff -u -r1.390 -r1.391 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.390 src/sys/dev/raidframe/rf_netbsdkintf.c:1.391
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.390	Sun Sep 27 21:39:08 2020
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Sun Apr 11 01:41:12 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.390 2020/09/27 21:39:08 christos Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.391 2021/04/11 01:41:12 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.390 2020/09/27 21:39:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.391 2021/04/11 01:41:12 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -1986,7 +1986,7 @@ rf_DispatchKernelIO(RF_DiskQueue_t *queu
 		/* XXX need to do something extra here.. */
 		/* I'm leaving this in, as I've never actually seen it used,
 		 * and I'd like folks to report it... GO */
-		printf(("WAKEUP CALLED\n"));
+		printf("%s: WAKEUP CALLED\n", __func__);
 		queue->numOutstanding++;
 
 		bp->b_flags = 0;

CVS commit: src/external/gpl3/gcc/dist/libgomp

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 01:38:40 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/libgomp: configure

Log Message:
disable testsuite components.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/dist/libgomp/configure

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

Modified files:

Index: src/external/gpl3/gcc/dist/libgomp/configure
diff -u src/external/gpl3/gcc/dist/libgomp/configure:1.11 src/external/gpl3/gcc/dist/libgomp/configure:1.12
--- src/external/gpl3/gcc/dist/libgomp/configure:1.11	Sun Apr 11 00:02:20 2021
+++ src/external/gpl3/gcc/dist/libgomp/configure	Sun Apr 11 01:38:39 2021
@@ -17056,7 +17056,7 @@ ac_config_files="$ac_config_files Makefi
 
 #ac_config_files="$ac_config_files testsuite/libgomp-test-support.pt.exp:testsuite/libgomp-test-support.exp.in"
 
-ac_config_files="$ac_config_files testsuite/libgomp-site-extra.exp"
+#ac_config_files="$ac_config_files testsuite/libgomp-site-extra.exp"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure

CVS commit: src/external/gpl3/gcc/dist/gcc/config/vax

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 01:38:05 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc/config/vax: vax.md

Log Message:
revert a local change that i can't figure out how to port
makes vax-gcc10 tools build.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/vax/vax.md
diff -u src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.16 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.17
--- src/external/gpl3/gcc/dist/gcc/config/vax/vax.md:1.16	Sun Apr 11 00:02:15 2021
+++ src/external/gpl3/gcc/dist/gcc/config/vax/vax.md	Sun Apr 11 01:38:05 2021
@@ -216,27 +216,29 @@
   ""
   "
 {
+#if 0
   if (CONST_INT_P (operands[2]) && INTVAL (operands[2]) <= 48)
 {
-  emit_insn (gen_movmemsi1_2 (operands[0], operands[1], operands[2]));
+  emit_insn (gen_cpymemsi1_2 (operands[0], operands[1], operands[2]));
   DONE;
 }
+#endif
   emit_insn (gen_cpymemhi1 (operands[0], operands[1], operands[2]));
   DONE;
 }")
 
+;;(define_insn "cpymemsi1_2"
+;;  [(set (match_operand:BLK 0 "memory_operand" "=B")
+;;	(match_operand:BLK 1 "memory_operand" "B"))
+;;   (use (match_operand:SI 2 "const_int_operand" "g"))]
+;;  "INTVAL (operands[2]) <= 48"
+;;  "* return vax_output_cpymemsi (insn, operands);")
+
 ;; The definition of this insn does not really explain what it does,
 ;; but it should suffice
 ;; that anything generated as this insn will be recognized as one
 ;; and that it won't successfully combine with anything.
 
-(define_insn "movmemsi1_2"
-  [(set (match_operand:BLK 0 "memory_operand" "=B")
-	(match_operand:BLK 1 "memory_operand" "B"))
-   (use (match_operand:SI 2 "const_int_operand" "g"))]
-  "INTVAL (operands[2]) <= 48"
-  "* return vax_output_movmemsi (insn, operands);")
-
 (define_insn "cpymemhi1"
   [(set (match_operand:BLK 0 "memory_operand" "=o")
 	(match_operand:BLK 1 "memory_operand" "o"))

CVS commit: src/external/gpl3/gcc/dist/gcc

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 01:37:18 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc

Log Message:
reduce diffs to upstream slightly.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/external/gpl3/gcc/dist/gcc/config.gcc

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.66 src/external/gpl3/gcc/dist/gcc/config.gcc:1.67
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.66	Sun Apr 11 00:02:11 2021
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Sun Apr 11 01:37:18 2021
@@ -1272,8 +1272,8 @@ arm*-*-freebsd*)# ARM Fr
 	with_tls=${with_tls:-gnu}
 	;;
 arm*-*-netbsdelf*)
-	tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h"
 	tmake_file="${tmake_file} arm/t-arm"
+	tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h"
 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 	case ${target} in
 	arm*eb-*) tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" ;;

CVS commit: src/doc

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 01:37:02 UTC 2021

Modified Files:
src/doc: 3RDPARTY

Log Message:
note gcc 10.3 exists.


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

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1793 src/doc/3RDPARTY:1.1794
--- src/doc/3RDPARTY:1.1793	Sat Apr 10 20:12:47 2021
+++ src/doc/3RDPARTY	Sun Apr 11 01:37:02 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1793 2021/04/10 20:12:47 nia Exp $
+#	$NetBSD: 3RDPARTY,v 1.1794 2021/04/11 01:37:02 mrg Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -449,8 +449,8 @@ Notes:
 There is a flex2netbsd script to help newer imports.
 
 Package:	gcc
-Version:	8.4.0/9.3.0
-Current Vers:	8.4.0/9.3.0/10.1
+Version:	9.3.0
+Current Vers:	9.3.0/10.3.0
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gcc/
 Home Page:	http://www.gnu.org/software/gcc/

CVS commit: src/external/gpl3/gcc/dist/gcc

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 00:26:04 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist/gcc: Makefile.in

Log Message:
re-disable selftests


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/dist/gcc/Makefile.in

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/Makefile.in
diff -u src/external/gpl3/gcc/dist/gcc/Makefile.in:1.22 src/external/gpl3/gcc/dist/gcc/Makefile.in:1.23
--- src/external/gpl3/gcc/dist/gcc/Makefile.in:1.22	Sun Apr 11 00:02:11 2021
+++ src/external/gpl3/gcc/dist/gcc/Makefile.in	Sun Apr 11 00:26:04 2021
@@ -1733,7 +1733,7 @@ $(FULL_DRIVER_NAME): ./xgcc
 #
 # SELFTEST_DEPS need to be set before including language makefile fragments.
 # Otherwise $(SELFTEST_DEPS) is empty when used from /Make-lang.in.
-SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs $(srcdir)/testsuite/selftests
+SELFTEST_DEPS = $(GCC_PASSES) stmp-int-hdrs
 
 # Language makefile fragments.

CVS commit: src/external/gpl3/gcc/dist

2021-04-10 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Apr 11 00:02:27 UTC 2021

Modified Files:
src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS NEWS config.guess
config.sub configure configure.ac
src/external/gpl3/gcc/dist/INSTALL: binaries.html build.html
configure.html download.html finalinstall.html gfdl.html index.html
old.html prerequisites.html specific.html test.html
src/external/gpl3/gcc/dist/config: tls.m4
src/external/gpl3/gcc/dist/gcc: ChangeLog Makefile.in alias.c
auto-profile.c builtins.c cfgexpand.c common.opt config.gcc
config.host configure configure.ac cppbuiltin.c cppdefault.c
debug.h diagnostic.c dse.c dwarf2out.c except.c expr.c
file-prefix-map.c file-prefix-map.h final.c fold-const.c gcc.c
gcc.h genattrtab.c genemit.c genmultilib genrecog.c ggc-common.c
gimplify.c graphite-isl-ast-to-gimple.c graphite.h hwint.h
ipa-inline.c ira-color.c opts-global.c opts.c output.h reload.c
reload1.c rtlanal.c system.h target-def.h targhooks.c toplev.c
tree-cfg.c tree-ssa-ccp.c tree.c tree.h var-tracking.c varasm.c
src/external/gpl3/gcc/dist/gcc/c: Make-lang.in
src/external/gpl3/gcc/dist/gcc/c-family: c-cppbuiltin.c c-format.c
c-format.h c-opts.c c.opt
src/external/gpl3/gcc/dist/gcc/common/config/aarch64: aarch64-common.c
src/external/gpl3/gcc/dist/gcc/common/config/arm: arm-common.c
src/external/gpl3/gcc/dist/gcc/common/config/or1k: or1k-common.c
src/external/gpl3/gcc/dist/gcc/common/config/riscv: riscv-common.c
src/external/gpl3/gcc/dist/gcc/config: freebsd-spec.h host-netbsd.c
netbsd-elf.h netbsd-stdint.h netbsd.h t-linux t-netbsd
src/external/gpl3/gcc/dist/gcc/config/aarch64: driver-aarch64.c
t-aarch64
src/external/gpl3/gcc/dist/gcc/config/alpha: alpha.h elf.h netbsd.h
t-alpha
src/external/gpl3/gcc/dist/gcc/config/arc: arc-modes.def arc-protos.h
arc.c arc.h arc.md arc.opt t-arc
src/external/gpl3/gcc/dist/gcc/config/arm: arm.c arm.h arm.md bpabi.h
elf.h freebsd.h netbsd-elf.h t-arm t-rtems thumb2.md
src/external/gpl3/gcc/dist/gcc/config/i386: constraints.md cpuid.h
driver-i386.c i386-opts.h i386-protos.h i386.c i386.h i386.md
i386.opt netbsd-elf.h netbsd64.h pmm_malloc.h predicates.md
src/external/gpl3/gcc/dist/gcc/config/m68k: constraints.md m68k.c
m68k.md netbsd-elf.h
src/external/gpl3/gcc/dist/gcc/config/mips: mips.c netbsd.h t-mips
src/external/gpl3/gcc/dist/gcc/config/or1k: constraints.md elf.h
or1k-protos.h or1k.c or1k.h or1k.md or1k.opt predicates.md t-or1k
src/external/gpl3/gcc/dist/gcc/config/pa: pa.c pa.h
src/external/gpl3/gcc/dist/gcc/config/riscv: constraints.md elf.h
generic.md linux.h peephole.md predicates.md riscv-ftypes.def
riscv-modes.def riscv-protos.h riscv.c riscv.h riscv.md riscv.opt
sync.md
src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h ppc-asm.h
sysv4.h t-netbsd t-rs6000 vxworksae.h
src/external/gpl3/gcc/dist/gcc/config/sh: netbsd-elf.h sh.c t-sh
src/external/gpl3/gcc/dist/gcc/config/sparc: constraints.md
netbsd-elf.h predicates.md sparc.md sync.md
src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md constraints.md
elf.h netbsd-elf.h predicates.md vax-protos.h vax.c vax.h vax.md
src/external/gpl3/gcc/dist/gcc/cp: Make-lang.in cfns.gperf cfns.h
decl.c except.c
src/external/gpl3/gcc/dist/gcc/doc: cpp.1 cpp.info cpp.texi cppenv.texi
cppinternals.info cppopts.texi extend.texi fsf-funding.7 g++.1
gcc.1 gcc.info gccinstall.info gccint.info gcov-tool.1 gcov.1
gcov.texi gfdl.7 gfortran.1 gpl.7 invoke.texi
src/external/gpl3/gcc/dist/gcc/ginclude: stddef.h unwind-arm-common.h
src/external/gpl3/gcc/dist/gcc/objc: Make-lang.in
src/external/gpl3/gcc/dist/gcc/objcp: Make-lang.in
src/external/gpl3/gcc/dist/include: objalloc.h
src/external/gpl3/gcc/dist/intl: configure
src/external/gpl3/gcc/dist/libbacktrace: configure
src/external/gpl3/gcc/dist/libcpp: Makefile.in configure files.c init.c
internal.h lex.c macro.c
src/external/gpl3/gcc/dist/libcpp/include: cpplib.h
src/external/gpl3/gcc/dist/libgcc: Makefile.in config.host configure
gthr-posix.h unwind-compat.c unwind-dw2-fde-dip.c unwind-dw2-fde.c
unwind-dw2.c unwind-generic.h unwind-seh.c unwind-sjlj.c
src/external/gpl3/gcc/dist/libgcc/config/alpha: qrnnd.S
src/external/gpl3/gcc/dist/libgcc/config/arm: pr-support.c
src/external/gpl3/gcc/dist/libgcc/config/c6x: pr-support.c

CVS commit: src/usr.bin/xlint/lint1

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 23:51:37 UTC 2021

Modified Files:
src/usr.bin/xlint/lint1: Makefile.err-msgs-h

Log Message:
lint: fix build (missing include directory)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/xlint/lint1/Makefile.err-msgs-h

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

Modified files:

Index: src/usr.bin/xlint/lint1/Makefile.err-msgs-h
diff -u src/usr.bin/xlint/lint1/Makefile.err-msgs-h:1.2 src/usr.bin/xlint/lint1/Makefile.err-msgs-h:1.3
--- src/usr.bin/xlint/lint1/Makefile.err-msgs-h:1.2	Sun Jan  3 20:44:54 2021
+++ src/usr.bin/xlint/lint1/Makefile.err-msgs-h	Sat Apr 10 23:51:37 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.err-msgs-h,v 1.2 2021/01/03 20:44:54 rillig Exp $
+#	$NetBSD: Makefile.err-msgs-h,v 1.3 2021/04/10 23:51:37 rillig Exp $
 
 err-msgs.h: err.c Makefile.err-msgs-h
 	${_MKTARGET_CREATE}
@@ -9,5 +9,6 @@ err-msgs.h: err.c Makefile.err-msgs-h
 
 CLEANFILES+=	err-msgs.h
 DPSRCS+=	err-msgs.h
+CPPFLAGS+=	-I.
 
 externs1.h: err-msgs.h

CVS commit: src/external/bsd/pkg_install/dist/add

2021-04-10 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sat Apr 10 22:59:46 UTC 2021

Modified Files:
src/external/bsd/pkg_install/dist/add: main.c

Log Message:
Fix merge bug.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/main.c

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/pkg_install/dist/add/main.c
diff -u src/external/bsd/pkg_install/dist/add/main.c:1.3 src/external/bsd/pkg_install/dist/add/main.c:1.4
--- src/external/bsd/pkg_install/dist/add/main.c:1.3	Sat Apr 10 19:49:59 2021
+++ src/external/bsd/pkg_install/dist/add/main.c	Sat Apr 10 22:59:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.3 2021/04/10 19:49:59 nia Exp $	*/
+/*	$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include 
 #endif
-__RCSID("$NetBSD");
+__RCSID("$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $");
 
 /*
  *

CVS commit: src/usr.bin/make

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 22:40:34 UTC 2021

Modified Files:
src/usr.bin/make: var.c

Log Message:
make: fix out-of-bounds read in Var_Parse_FastLane (since 30 minutes)

This bug made the test varmod-edge.mk fail sometimes with varying error
messages, as can be expected for an out-of-bounds read.


To generate a diff of this commit:
cvs rdiff -u -r1.914 -r1.915 src/usr.bin/make/var.c

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

Modified files:

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.914 src/usr.bin/make/var.c:1.915
--- src/usr.bin/make/var.c:1.914	Sat Apr 10 22:35:02 2021
+++ src/usr.bin/make/var.c	Sat Apr 10 22:40:34 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.914 2021/04/10 22:35:02 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.915 2021/04/10 22:40:34 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.914 2021/04/10 22:35:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.915 2021/04/10 22:40:34 rillig Exp $");
 
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
@@ -4401,7 +4401,8 @@ Var_Parse_FastLane(const char **pp, VarE
 		return false;
 
 	p += 4;
-	while (*p != '$' && *p != '{' && *p != ':' && *p != '\\' && *p != '}')
+	while (*p != '$' && *p != '{' && *p != ':' && *p != '\\' &&
+	   *p != '}' && *p != '\0')
 		p++;
 	if (*p != '}')
 		return false;

CVS commit: src/usr.bin/make

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 22:35:02 UTC 2021

Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: vardebug.exp varname-empty.exp

Log Message:
make: reword debug log message for empty variable name

The function names did not match anymore, after one of the many
refactorings in the last few months.


To generate a diff of this commit:
cvs rdiff -u -r1.913 -r1.914 src/usr.bin/make/var.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/varname-empty.exp

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

Modified files:

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.913 src/usr.bin/make/var.c:1.914
--- src/usr.bin/make/var.c:1.913	Sat Apr 10 22:09:53 2021
+++ src/usr.bin/make/var.c	Sat Apr 10 22:35:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.913 2021/04/10 22:09:53 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.914 2021/04/10 22:35:02 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.913 2021/04/10 22:09:53 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.914 2021/04/10 22:35:02 rillig Exp $");
 
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
@@ -1040,8 +1040,9 @@ Var_SetExpandWithFlags(GNode *scope, con
 	}
 
 	if (varname.str[0] == '\0') {
-		DEBUG2(VAR, "Var_Set(\"%s\", \"%s\", ...) "
-			"name expands to empty string - ignored\n",
+		DEBUG2(VAR,
+		"Var_SetExpand: variable name \"%s\" expands "
+		"to empty string, with value \"%s\" - ignored\n",
 		unexpanded_name, val);
 	} else
 		Var_SetWithFlags(scope, varname.str, val, flags);
@@ -1165,9 +1166,9 @@ Var_AppendExpand(GNode *scope, const cha
 		/* TODO: handle errors */
 		xname = FStr_InitOwn(expanded);
 		if (expanded[0] == '\0') {
-			/* TODO: update function name in the debug message */
-			DEBUG2(VAR, "Var_Append(\"%s\", \"%s\", ...) "
-"name expands to empty string - ignored\n",
+			DEBUG2(VAR,
+			"Var_AppendExpand: variable name \"%s\" expands "
+			"to empty string, with value \"%s\" - ignored\n",
 			name, val);
 			FStr_Done();
 			return;

Index: src/usr.bin/make/unit-tests/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.25 src/usr.bin/make/unit-tests/vardebug.exp:1.26
--- src/usr.bin/make/unit-tests/vardebug.exp:1.25	Sat Apr 10 22:09:54 2021
+++ src/usr.bin/make/unit-tests/vardebug.exp	Sat Apr 10 22:35:02 2021
@@ -5,8 +5,8 @@ Global: VAR = added
 Global: VAR = overwritten
 Global:delete VAR
 Global:delete VAR (not found)
-Var_Set("${:U}", "empty name", ...) name expands to empty string - ignored
-Var_Append("${:U}", "empty name", ...) name expands to empty string - ignored
+Var_SetExpand: variable name "${:U}" expands to empty string, with value "empty name" - ignored
+Var_AppendExpand: variable name "${:U}" expands to empty string, with value "empty name" - ignored
 Global: FROM_CMDLINE = overwritten ignored!
 Global: VAR = 1
 Global: VAR = 1 2

Index: src/usr.bin/make/unit-tests/varname-empty.exp
diff -u src/usr.bin/make/unit-tests/varname-empty.exp:1.14 src/usr.bin/make/unit-tests/varname-empty.exp:1.15
--- src/usr.bin/make/unit-tests/varname-empty.exp:1.14	Sat Apr 10 22:09:54 2021
+++ src/usr.bin/make/unit-tests/varname-empty.exp	Sat Apr 10 22:35:02 2021
@@ -1,5 +1,5 @@
-Var_Set("${:U}", "cmdline-u", ...) name expands to empty string - ignored
-Var_Set("", "cmdline-plain", ...) name expands to empty string - ignored
+Var_SetExpand: variable name "${:U}" expands to empty string, with value "cmdline-u" - ignored
+Var_SetExpand: variable name "" expands to empty string, with value "cmdline-plain" - ignored
 Global: .CURDIR = 
 Var_Parse: ${MAKE_OBJDIR_CHECK_WRITABLE:U} (eval)
 Evaluating modifier ${MAKE_OBJDIR_CHECK_WRITABLE:U} on value "" (eval, undefined)
@@ -14,14 +14,14 @@ Global: .MAKE.MAKEFILES = varname-empty.
 Global: .PARSEFILE = varname-empty.mk
 Global:delete .INCLUDEDFROMDIR (not found)
 Global:delete .INCLUDEDFROMFILE (not found)
-Var_Set("", "default", ...) name expands to empty string - ignored
-Var_Set("", "assigned", ...) name expands to empty string - ignored
+Var_SetExpand: variable name "" expands to empty string, with value "default" - ignored
+Var_SetExpand: variable name "" expands to empty string, with value "assigned" - ignored
 SetVar: variable name is empty - ignored
-Var_Set("", "", ...) name expands to empty string - ignored
-Var_Set("", "subst", ...) name expands to empty string - ignored
-Var_Set("", "shell-output", ...) name expands to empty string - ignored
-Var_Set("${:U}", "assigned indirectly", ...) name expands to empty string - ignored
-Var_Append("${:U}", "appended indirectly", ...) name expands to empty string - ignored
+Var_SetExpand: variable name "" expands to empty

CVS commit: src/usr.bin/make

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 22:09:54 UTC 2021

Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: vardebug.exp varmod-indirect.exp
varmod-match-escape.exp varname-empty.exp varname.exp

Log Message:
make: reduce debug logging and memory allocation for ${:U...}

Expressions of the form ${:U...} are often generated by .for loops.
Since these expressions are not generated knowingly by the make user, do
not fill the debug log with them since that would interrupt the normal
reading flow of the -dv log for nested expressions.


To generate a diff of this commit:
cvs rdiff -u -r1.912 -r1.913 src/usr.bin/make/var.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/vardebug.exp
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/varmod-indirect.exp
cvs rdiff -u -r1.14 -r1.15 \
src/usr.bin/make/unit-tests/varmod-match-escape.exp
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varname-empty.exp
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/varname.exp

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

Modified files:

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.912 src/usr.bin/make/var.c:1.913
--- src/usr.bin/make/var.c:1.912	Tue Apr  6 01:38:39 2021
+++ src/usr.bin/make/var.c	Sat Apr 10 22:09:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.912 2021/04/06 01:38:39 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.913 2021/04/10 22:09:53 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.912 2021/04/06 01:38:39 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.913 2021/04/10 22:09:53 rillig Exp $");
 
 /*
  * Variables are defined using one of the VAR=value assignments.  Their
@@ -437,6 +437,11 @@ VarFind(const char *name, GNode *scope, 
 	if (var == NULL) {
 		char *env;
 
+		/*
+		 * TODO: try setting an environment variable with the empty
+		 *  name, which should be technically possible, just to see
+		 *  how make reacts.  All .for loops should be broken then.
+		 */
 		if ((env = getenv(name)) != NULL) {
 			char *varname = bmake_strdup(name);
 			return VarNew(FStr_InitOwn(varname), env, true, false);
@@ -4381,6 +4386,34 @@ Expr_Literal(const char *name, FStr valu
 #endif
 
 /*
+ * Expressions of the form ${:U...} with a trivial value are often generated
+ * by .for loops and are boring, therefore parse and evaluate them in a fast
+ * lane without debug logging.
+ */
+static bool
+Var_Parse_FastLane(const char **pp, VarEvalMode emode, FStr *out_value)
+{
+	const char *p;
+
+	p = *pp;
+	if (!(p[0] == '$' && p[1] == '{' && p[2] == ':' && p[3] == 'U'))
+		return false;
+
+	p += 4;
+	while (*p != '$' && *p != '{' && *p != ':' && *p != '\\' && *p != '}')
+		p++;
+	if (*p != '}')
+		return false;
+
+	if (emode == VARE_PARSE_ONLY)
+		*out_value = FStr_InitRefer("");
+	else
+		*out_value = FStr_InitOwn(bmake_strsedup(*pp + 4, p));
+	*pp = p + 1;
+	return true;
+}
+
+/*
  * Given the start of a variable expression (such as $v, $(VAR),
  * ${VAR:Mpattern}), extract the variable name and value, and the modifiers,
  * if any.  While doing that, apply the modifiers to the value of the
@@ -4439,6 +4472,9 @@ Var_Parse(const char **pp, GNode *scope,
 	Expr expr = Expr_Literal(NULL, FStr_InitRefer(NULL), emode,
 	scope, DEF_REGULAR);
 
+	if (Var_Parse_FastLane(pp, emode, out_val))
+		return VPR_OK;
+
 	DEBUG2(VAR, "Var_Parse: %s (%s)\n", start, VarEvalMode_Name[emode]);
 
 	*out_val = FStr_InitRefer(NULL);

Index: src/usr.bin/make/unit-tests/vardebug.exp
diff -u src/usr.bin/make/unit-tests/vardebug.exp:1.24 src/usr.bin/make/unit-tests/vardebug.exp:1.25
--- src/usr.bin/make/unit-tests/vardebug.exp:1.24	Tue Apr  6 01:38:39 2021
+++ src/usr.bin/make/unit-tests/vardebug.exp	Sat Apr 10 22:09:54 2021
@@ -5,13 +5,7 @@ Global: VAR = added
 Global: VAR = overwritten
 Global:delete VAR
 Global:delete VAR (not found)
-Var_Parse: ${:U} (eval)
-Evaluating modifier ${:U} on value "" (eval, undefined)
-Result of ${:U} is "" (eval, defined)
 Var_Set("${:U}", "empty name", ...) name expands to empty string - ignored
-Var_Parse: ${:U} (eval)
-Evaluating modifier ${:U} on value "" (eval, undefined)
-Result of ${:U} is "" (eval, defined)
 Var_Append("${:U}", "empty name", ...) name expands to empty string - ignored
 Global: FROM_CMDLINE = overwritten ignored!
 Global: VAR = 1
@@ -46,9 +40,6 @@ Result of ${VAR:Q} is "1\ 2\ 3"
 Var_Parse: ${:Uvalue:${:UM*e}:Mvalu[e]} (eval-defined)
 Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
 Result of ${:Uvalue} is "value" (eval-defined, defined)
-Var_Parse: ${:UM*e}:Mvalu[e]} (eval-defined)
-Evaluating modifier ${:U...} on value "" (eval-defined, undefined)
-Result of ${:UM*e} is "M*e" (eval-defined, defined)
 Indirect modifier "M*e" from "${:UM*e}"
 Evaluating modifier

CVS commit: src/doc

2021-04-10 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Apr 10 20:12:47 UTC 2021

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new pkg_install


To generate a diff of this commit:
cvs rdiff -u -r1.1792 -r1.1793 src/doc/3RDPARTY
cvs rdiff -u -r1.2794 -r1.2795 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.1792 src/doc/3RDPARTY:1.1793
--- src/doc/3RDPARTY:1.1792	Sat Apr 10 13:54:25 2021
+++ src/doc/3RDPARTY	Sat Apr 10 20:12:47 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1792 2021/04/10 13:54:25 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1793 2021/04/10 20:12:47 nia Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1192,8 +1192,8 @@ definition (files.pf).  userland code is
 reachover Makefiles are in src/usr.sbin/pf.
 
 Package:	pkg_install
-Version:	20201212
-Current Vers:	20201212
+Version:	20210410
+Current Vers:	20210410
 Maintainer:	The pkgsrc developers
 Home Page:	http://www.pkgsrc.org/
 Date:		2020-12-12

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2794 src/doc/CHANGES:1.2795
--- src/doc/CHANGES:1.2794	Fri Apr  9 19:12:37 2021
+++ src/doc/CHANGES	Sat Apr 10 20:12:47 2021
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2794 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2795 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -350,3 +350,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 	services(5), protocols(5): Pull iana-generated services and protocols.
 		[christos 20210408]
 	file(1): Upgraded to 5.40. [christos 20210409]
+	pkg_install: Updated to 20210410. This simplifes version checking for
+		NetBSD. [nia 20210410]

CVS commit: src/external/bsd/pkg_install/dist/add

2021-04-10 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Apr 10 20:07:57 UTC 2021

Modified Files:
src/external/bsd/pkg_install/dist/add: perform.c

Log Message:
fix build, sign comparison is an issue here


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/pkg_install/dist/add/perform.c

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/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.9 src/external/bsd/pkg_install/dist/add/perform.c:1.10
--- src/external/bsd/pkg_install/dist/add/perform.c:1.9	Sat Apr 10 19:49:59 2021
+++ src/external/bsd/pkg_install/dist/add/perform.c	Sat Apr 10 20:07:57 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia Exp $	*/
+/*	$NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -6,7 +6,7 @@
 #if HAVE_SYS_CDEFS_H
 #include 
 #endif
-__RCSID("$NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia Exp $");
+__RCSID("$NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie 
@@ -159,7 +159,7 @@ compatible_platform(const char *opsys, c
 		loc = strchr(host, '.');
 		if (loc != NULL) {
 			majorlen = loc - host;
-			if (majorlen != (strchr(package, '.') - package))
+			if (majorlen != (size_t)(strchr(package, '.') - package))
 return 0;
 			if (strncmp(host, package, majorlen) == 0)
 return 1;

CVS commit: src/external/bsd/pkg_install/dist

2021-04-10 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Apr 10 19:50:00 UTC 2021

Modified Files:
src/external/bsd/pkg_install/dist/add: add.h main.c perform.c pkg_add.1
src/external/bsd/pkg_install/dist/admin: audit-packages.8 audit.c
check.c download-vulnerability-list.8 pkg_admin.1
src/external/bsd/pkg_install/dist/create: build.c create.h main.c
perform.c pkg_create.1 pl.c
src/external/bsd/pkg_install/dist/delete: pkg_delete.1 pkg_delete.c
src/external/bsd/pkg_install/dist/info: info.h main.c perform.c
pkg_info.1 show.c
src/external/bsd/pkg_install/dist/lib: automatic.c conflicts.c defs.h
dewey.c dewey.h fexec.c file.c global.c gpgsig.c iterate.c lib.h
license.c lpkg.c opattern.c parse-config.c pkcs7.c
pkg_install.conf.5.in pkg_io.c pkg_signature.c pkg_summary.5
pkgdb.c pkgsrc.7 plist.c remove.c str.c var.c version.c version.h
vulnerabilities-file.c xwrapper.c
src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf pkgsrc.sh

Log Message:
merge pkg_install-20210410

- simplified version checking for netbsd, treat 9.0 and 9.1 as compatible
- minor man page updates


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/add/add.h \
src/external/bsd/pkg_install/dist/add/main.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/pkg_add.1
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/admin/audit-packages.8 \
src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/audit.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/admin/check.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/build.c \
src/external/bsd/pkg_install/dist/create/create.h \
src/external/bsd/pkg_install/dist/create/main.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/create/perform.c \
src/external/bsd/pkg_install/dist/create/pkg_create.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/create/pl.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.1
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/info.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/info/main.c \
src/external/bsd/pkg_install/dist/info/perform.c \
src/external/bsd/pkg_install/dist/info/pkg_info.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/info/show.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/automatic.c \
src/external/bsd/pkg_install/dist/lib/conflicts.c \
src/external/bsd/pkg_install/dist/lib/dewey.h \
src/external/bsd/pkg_install/dist/lib/fexec.c \
src/external/bsd/pkg_install/dist/lib/file.c \
src/external/bsd/pkg_install/dist/lib/global.c \
src/external/bsd/pkg_install/dist/lib/gpgsig.c \
src/external/bsd/pkg_install/dist/lib/lpkg.c \
src/external/bsd/pkg_install/dist/lib/opattern.c \
src/external/bsd/pkg_install/dist/lib/pkgsrc.7 \
src/external/bsd/pkg_install/dist/lib/remove.c \
src/external/bsd/pkg_install/dist/lib/str.c \
src/external/bsd/pkg_install/dist/lib/version.c \
src/external/bsd/pkg_install/dist/lib/xwrapper.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/defs.h \
src/external/bsd/pkg_install/dist/lib/pkg_summary.5 \
src/external/bsd/pkg_install/dist/lib/pkgdb.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/dewey.c \
src/external/bsd/pkg_install/dist/lib/parse-config.c \
src/external/bsd/pkg_install/dist/lib/pkcs7.c \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in \
src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/iterate.c \
src/external/bsd/pkg_install/dist/lib/pkg_io.c \
src/external/bsd/pkg_install/dist/lib/pkg_signature.c \
src/external/bsd/pkg_install/dist/lib/var.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/lib/plist.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf \
src/external/bsd/pkg_install/dist/x509/pkgsrc.sh

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/pkg_install/dist/add/add.h
diff -u src/external/bsd/pkg_install/dist/add/add.h:1.2 src/external/bsd/pkg_install/dist

CVS commit: src/external/bsd/libevent/dist/test

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 19:27:16 UTC 2021

Modified Files:
src/external/bsd/libevent/dist/test: regress_http.c

Log Message:
tests/libevent: fix Clang build

No idea why GCC did not complain about this as well.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libevent/dist/test/regress_http.c

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/libevent/dist/test/regress_http.c
diff -u src/external/bsd/libevent/dist/test/regress_http.c:1.9 src/external/bsd/libevent/dist/test/regress_http.c:1.10
--- src/external/bsd/libevent/dist/test/regress_http.c:1.9	Sat Apr 10 19:18:45 2021
+++ src/external/bsd/libevent/dist/test/regress_http.c	Sat Apr 10 19:27:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: regress_http.c,v 1.9 2021/04/10 19:18:45 rillig Exp $	*/
+/*	$NetBSD: regress_http.c,v 1.10 2021/04/10 19:27:16 rillig Exp $	*/
 
 /*
  * Copyright (c) 2003-2007 Niels Provos 
@@ -36,7 +36,7 @@
 
 #include "event2/event-config.h"
 #include 
-__RCSID("$NetBSD: regress_http.c,v 1.9 2021/04/10 19:18:45 rillig Exp $");
+__RCSID("$NetBSD: regress_http.c,v 1.10 2021/04/10 19:27:16 rillig Exp $");
 
 #include 
 #include 
@@ -4580,7 +4580,11 @@ http_request_own_test(void *arg)
 	test_ok = 1;
 }
 
-static void http_run_bev_request(struct event_base *base, int port,
+static void
+#ifdef __GNUC__
+	__attribute__((format(printf, 3, 4)))
+#endif
+http_run_bev_request(struct event_base *base, int port,
 	const char *fmt, ...)
 {
 	struct bufferevent *bev = NULL;

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

2021-04-10 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Apr 10 19:26:04 UTC 2021

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

Log Message:
pkg_install-20210410

Status:

Vendor Tag: PKGSRC
Release Tags:   pkg_install-20210410

C src/external/bsd/pkg_install/dist/add/perform.c
C src/external/bsd/pkg_install/dist/add/add.h
C src/external/bsd/pkg_install/dist/add/main.c
C src/external/bsd/pkg_install/dist/add/pkg_add.1
U src/external/bsd/pkg_install/dist/admin/admin.h
C src/external/bsd/pkg_install/dist/admin/audit-packages.8
U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in
C src/external/bsd/pkg_install/dist/admin/audit.c
C src/external/bsd/pkg_install/dist/admin/check.c
C src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in
C src/external/bsd/pkg_install/dist/admin/main.c
C src/external/bsd/pkg_install/dist/admin/pkg_admin.1
C src/external/bsd/pkg_install/dist/create/build.c
C src/external/bsd/pkg_install/dist/create/create.h
C src/external/bsd/pkg_install/dist/create/main.c
C src/external/bsd/pkg_install/dist/create/perform.c
C src/external/bsd/pkg_install/dist/create/pkg_create.1
C src/external/bsd/pkg_install/dist/create/pl.c
U src/external/bsd/pkg_install/dist/create/util.c
C src/external/bsd/pkg_install/dist/delete/pkg_delete.1
C src/external/bsd/pkg_install/dist/delete/pkg_delete.c
C src/external/bsd/pkg_install/dist/info/perform.c
C src/external/bsd/pkg_install/dist/info/info.h
C src/external/bsd/pkg_install/dist/info/main.c
C src/external/bsd/pkg_install/dist/info/pkg_info.1
C src/external/bsd/pkg_install/dist/info/show.c
C src/external/bsd/pkg_install/dist/lib/automatic.c
U src/external/bsd/pkg_install/dist/lib/config.h.in
C src/external/bsd/pkg_install/dist/lib/conflicts.c
C src/external/bsd/pkg_install/dist/lib/defs.h
C src/external/bsd/pkg_install/dist/lib/dewey.c
C src/external/bsd/pkg_install/dist/lib/dewey.h
C src/external/bsd/pkg_install/dist/lib/fexec.c
C src/external/bsd/pkg_install/dist/lib/file.c
C src/external/bsd/pkg_install/dist/lib/global.c
C src/external/bsd/pkg_install/dist/lib/gpgsig.c
C src/external/bsd/pkg_install/dist/lib/iterate.c
C src/external/bsd/pkg_install/dist/lib/lib.h
C src/external/bsd/pkg_install/dist/lib/license.c
C src/external/bsd/pkg_install/dist/lib/lpkg.c
C src/external/bsd/pkg_install/dist/lib/opattern.c
C src/external/bsd/pkg_install/dist/lib/parse-config.c
C src/external/bsd/pkg_install/dist/lib/pkcs7.c
C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
C src/external/bsd/pkg_install/dist/lib/pkg_io.c
C src/external/bsd/pkg_install/dist/lib/pkg_signature.c
C src/external/bsd/pkg_install/dist/lib/pkg_summary.5
C src/external/bsd/pkg_install/dist/lib/pkgdb.c
C src/external/bsd/pkg_install/dist/lib/pkgsrc.7
C src/external/bsd/pkg_install/dist/lib/plist.c
C src/external/bsd/pkg_install/dist/lib/remove.c
C src/external/bsd/pkg_install/dist/lib/str.c
C src/external/bsd/pkg_install/dist/lib/var.c
C src/external/bsd/pkg_install/dist/lib/version.c
C src/external/bsd/pkg_install/dist/lib/version.h
C src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
C src/external/bsd/pkg_install/dist/lib/xwrapper.c
C src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
C src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
U src/external/bsd/pkg_install/dist/x509/signing.txt

55 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jPKGSRC:yesterday -jPKGSRC 
src/external/bsd/pkg_install/dist

CVS commit: src/external/bsd/libevent/dist

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 19:18:45 UTC 2021

Modified Files:
src/external/bsd/libevent/dist: bufferevent_ratelim.c evdns.c
event-internal.h event_tagging.c evmap.c evthread-internal.h
ht-internal.h log-internal.h select.c util-internal.h
src/external/bsd/libevent/dist/include/event2: rpc.h
src/external/bsd/libevent/dist/test: regress_http.c tinytest_macros.h

Log Message:
libevent: remove remaining CONSTCOND comments

Since lint1/tree.c 1.202 from 2021-01-31, lint no longer needs the
/*CONSTCOND*/ for do-while-0 "loops".

The comments from this commit were in do-while-0 loops that do not
follow the canonical form, therefore the previous commit did not catch
them.  Some of them have a trailing semicolon (which defies the whole
purpose of the do-while-0 loop), some are missing the space between
'while (0)', some start in column 1 instead of 9.

This reduces the local modifications, compared to the upstream code.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/bufferevent_ratelim.c \
src/external/bsd/libevent/dist/event_tagging.c \
src/external/bsd/libevent/dist/evmap.c \
src/external/bsd/libevent/dist/evthread-internal.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libevent/dist/evdns.c \
src/external/bsd/libevent/dist/log-internal.h \
src/external/bsd/libevent/dist/util-internal.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/dist/event-internal.h \
src/external/bsd/libevent/dist/select.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/ht-internal.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/include/event2/rpc.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libevent/dist/test/regress_http.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/libevent/dist/test/tinytest_macros.h

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/libevent/dist/bufferevent_ratelim.c
diff -u src/external/bsd/libevent/dist/bufferevent_ratelim.c:1.5 src/external/bsd/libevent/dist/bufferevent_ratelim.c:1.6
--- src/external/bsd/libevent/dist/bufferevent_ratelim.c:1.5	Sat Apr 10 19:02:37 2021
+++ src/external/bsd/libevent/dist/bufferevent_ratelim.c	Sat Apr 10 19:18:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bufferevent_ratelim.c,v 1.5 2021/04/10 19:02:37 rillig Exp $	*/
+/*	$NetBSD: bufferevent_ratelim.c,v 1.6 2021/04/10 19:18:45 rillig Exp $	*/
 
 /*
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -213,7 +213,7 @@ bufferevent_get_rlim_max_(struct buffere
 	do {	\
 		if (max_so_far > (x))		\
 			max_so_far = (x);	\
-	} while (/*CONSTCOND*/0);
+	} while (0);
 
 	if (!bev->rate_limiting)
 		return max_so_far;
Index: src/external/bsd/libevent/dist/event_tagging.c
diff -u src/external/bsd/libevent/dist/event_tagging.c:1.5 src/external/bsd/libevent/dist/event_tagging.c:1.6
--- src/external/bsd/libevent/dist/event_tagging.c:1.5	Wed Apr  7 03:36:48 2021
+++ src/external/bsd/libevent/dist/event_tagging.c	Sat Apr 10 19:18:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: event_tagging.c,v 1.5 2021/04/07 03:36:48 christos Exp $	*/
+/*	$NetBSD: event_tagging.c,v 1.6 2021/04/10 19:18:45 rillig Exp $	*/
 
 /*
  * Copyright (c) 2003-2009 Niels Provos 
@@ -29,7 +29,7 @@
 
 #include "event2/event-config.h"
 #include 
-__RCSID("$NetBSD: event_tagging.c,v 1.5 2021/04/07 03:36:48 christos Exp $");
+__RCSID("$NetBSD: event_tagging.c,v 1.6 2021/04/10 19:18:45 rillig Exp $");
 #include "evconfig-private.h"
 
 #ifdef EVENT__HAVE_SYS_TYPES_H
@@ -143,7 +143,7 @@ evtag_init(void)
 	data[0] = (data[0] & 0x0f) | ((nibbles & 0x0f) << 4);		\
 	\
 	return ((off + 1) / 2);		\
-} while (/*CONSTCOND*/0)
+} while (0)
 
 static inline int
 encode_int_internal(ev_uint8_t *data, ev_uint32_t number)
@@ -355,7 +355,7 @@ do {	\
 	*pnumber = number;		\
 	\
 	return (int)(len);		\
-} while (/*CONSTCOND*/0)
+} while (0)
 
 /* Internal: decode an integer from an evbuffer, without draining it.
  *  Only integers up to 32-bits are supported.
Index: src/external/bsd/libevent/dist/evmap.c
diff -u src/external/bsd/libevent/dist/evmap.c:1.5 src/external/bsd/libevent/dist/evmap.c:1.6
--- src/external/bsd/libevent/dist/evmap.c:1.5	Sat Apr 10 19:02:37 2021
+++ src/external/bsd/libevent/dist/evmap.c	Sat Apr 10 19:18:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: evmap.c,v 1.5 2021/04/10 19:02:37 rillig Exp $	*/
+/*	$NetBSD: evmap.c,v 1.6 2021/04/10 19:18:45 rillig Exp $	*/
 
 /*
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -27,7 +27,7 @@
  */
 #include "event2/event-config.h"
 #include 
-__RCSID("$NetBSD: evmap.c,v 1.5 2021/04/10 19:02:37 rillig Exp $");
+__RCSID("$NetBSD: evmap.c,v 1.6 2021/04/10 19:18:45 rillig Exp $");
 #include "evconfig-private.h"
 
 #ifdef _WIN32
@@ -121,7 +121,7 @@ HT_GENERATE(event_io_map, event_map_entr
 		key_.fd =

CVS commit: src/external/bsd/libevent/dist

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 19:02:37 UTC 2021

Modified Files:
src/external/bsd/libevent/dist: bufferevent-internal.h bufferevent.c
bufferevent_ratelim.c evbuffer-internal.h evdns.c evmap.c
evthread-internal.h ratelim-internal.h util-internal.h
src/external/bsd/libevent/dist/test: regress.c regress.h
regress_buffer.c regress_http.c regress_util.c

Log Message:
libevent: remove unnecessary CONSTCOND comments

Since lint1/tree.c 1.202 from 2021-01-31, lint no longer needs the
/*CONSTCOND*/ for do-while-0 "loops".

This reduces the local modifications.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libevent/dist/bufferevent-internal.h \
src/external/bsd/libevent/dist/bufferevent_ratelim.c \
src/external/bsd/libevent/dist/evmap.c \
src/external/bsd/libevent/dist/evthread-internal.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/bufferevent.c \
src/external/bsd/libevent/dist/evbuffer-internal.h \
src/external/bsd/libevent/dist/evdns.c \
src/external/bsd/libevent/dist/util-internal.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/ratelim-internal.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/libevent/dist/test/regress.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libevent/dist/test/regress.h \
src/external/bsd/libevent/dist/test/regress_buffer.c \
src/external/bsd/libevent/dist/test/regress_http.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/dist/test/regress_util.c

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/libevent/dist/bufferevent-internal.h
diff -u src/external/bsd/libevent/dist/bufferevent-internal.h:1.4 src/external/bsd/libevent/dist/bufferevent-internal.h:1.5
--- src/external/bsd/libevent/dist/bufferevent-internal.h:1.4	Wed Apr  7 03:36:48 2021
+++ src/external/bsd/libevent/dist/bufferevent-internal.h	Sat Apr 10 19:02:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bufferevent-internal.h,v 1.4 2021/04/07 03:36:48 christos Exp $	*/
+/*	$NetBSD: bufferevent-internal.h,v 1.5 2021/04/10 19:02:37 rillig Exp $	*/
 
 /*
  * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson
@@ -461,14 +461,14 @@ bufferevent_socket_set_conn_address_(str
 	do {\
 		if (evutil_timerisset(&(bev)->timeout_read))		\
 			event_add(&(bev)->ev_read, &(bev)->timeout_read); \
-	} while (/*CONSTCOND*/0)
+	} while (0)
 /** Internal use: We have just successfully written data from an inbuf, so
  * reset the read timeout (if any). */
 #define BEV_RESET_GENERIC_WRITE_TIMEOUT(bev)\
 	do {\
 		if (evutil_timerisset(&(bev)->timeout_write))		\
 			event_add(&(bev)->ev_write, &(bev)->timeout_write); \
-	} while (/*CONSTCOND*/0)
+	} while (0)
 #define BEV_DEL_GENERIC_READ_TIMEOUT(bev)	\
 		event_del(&(bev)->ev_read)
 #define BEV_DEL_GENERIC_WRITE_TIMEOUT(bev)	\
@@ -487,13 +487,13 @@ bufferevent_socket_set_conn_address_(str
 #define BEV_LOCK(b) do {		\
 		struct bufferevent_private *locking =  BEV_UPCAST(b);	\
 		EVLOCK_LOCK(locking->lock, 0);\
-	} while (/*CONSTCOND*/0)
+	} while (0)
 
 /** Internal: Release the lock (if any) on a bufferevent */
 #define BEV_UNLOCK(b) do {		\
 		struct bufferevent_private *locking =  BEV_UPCAST(b);	\
 		EVLOCK_UNLOCK(locking->lock, 0);			\
-	} while (/*CONSTCOND*/0)
+	} while (0)
 #endif
 
 
Index: src/external/bsd/libevent/dist/bufferevent_ratelim.c
diff -u src/external/bsd/libevent/dist/bufferevent_ratelim.c:1.4 src/external/bsd/libevent/dist/bufferevent_ratelim.c:1.5
--- src/external/bsd/libevent/dist/bufferevent_ratelim.c:1.4	Wed Apr  7 03:36:48 2021
+++ src/external/bsd/libevent/dist/bufferevent_ratelim.c	Sat Apr 10 19:02:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bufferevent_ratelim.c,v 1.4 2021/04/07 03:36:48 christos Exp $	*/
+/*	$NetBSD: bufferevent_ratelim.c,v 1.5 2021/04/10 19:02:37 rillig Exp $	*/
 
 /*
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -484,7 +484,7 @@ bev_group_random_element_(struct buffere
 		bev = LIST_NEXT(bev, rate_limiting->next_in_group)) { \
 			block ;		\
 		}			\
-	} while (/*CONSTCOND*/0)
+	} while (0)
 
 static void
 bev_group_unsuspend_reading_(struct bufferevent_rate_limit_group *g)
Index: src/external/bsd/libevent/dist/evmap.c
diff -u src/external/bsd/libevent/dist/evmap.c:1.4 src/external/bsd/libevent/dist/evmap.c:1.5
--- src/external/bsd/libevent/dist/evmap.c:1.4	Wed Apr  7 03:36:48 2021
+++ src/external/bsd/libevent/dist/evmap.c	Sat Apr 10 19:02:37 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: evmap.c,v 1.4 2021/04/07 03:36:48 christos Exp $	*/
+/*	$NetBSD: evmap.c,v 1.5 2021/04/10 19:02:37 rillig Exp $	*/
 
 /*
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -27,7 +27,7 @@
  */
 #include "event2/event-config.h"
 #include 
-__RCSID("$NetBSD: evmap.c,v 1.4 2021/04/07 03:36:48 christos Exp $");

CVS import: external/bsd/pkg_install/dist

2021-04-10 Thread Nia Alarie 
Module Name:external
Committed By:   nia
Date:   Sat Apr 10 19:00:12 UTC 2021

Update of /cvsroot/external/bsd/pkg_install/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13146

Log Message:
pkg_install-20210410

Status:

Vendor Tag: PKGSRC
Release Tags:   pkg_install-20210410

N external/bsd/pkg_install/dist/add/add.h
N external/bsd/pkg_install/dist/add/main.c
N external/bsd/pkg_install/dist/add/perform.c
N external/bsd/pkg_install/dist/add/pkg_add.1
N external/bsd/pkg_install/dist/admin/admin.h
N external/bsd/pkg_install/dist/admin/audit-packages.8
N external/bsd/pkg_install/dist/admin/audit-packages.sh.in
N external/bsd/pkg_install/dist/admin/audit.c
N external/bsd/pkg_install/dist/admin/check.c
N external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
N external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in
N external/bsd/pkg_install/dist/admin/main.c
N external/bsd/pkg_install/dist/admin/pkg_admin.1
N external/bsd/pkg_install/dist/create/build.c
N external/bsd/pkg_install/dist/create/create.h
N external/bsd/pkg_install/dist/create/main.c
N external/bsd/pkg_install/dist/create/perform.c
N external/bsd/pkg_install/dist/create/pkg_create.1
N external/bsd/pkg_install/dist/create/pl.c
N external/bsd/pkg_install/dist/create/util.c
N external/bsd/pkg_install/dist/delete/pkg_delete.1
N external/bsd/pkg_install/dist/delete/pkg_delete.c
N external/bsd/pkg_install/dist/info/info.h
N external/bsd/pkg_install/dist/info/main.c
N external/bsd/pkg_install/dist/info/perform.c
N external/bsd/pkg_install/dist/info/pkg_info.1
N external/bsd/pkg_install/dist/info/show.c
N external/bsd/pkg_install/dist/lib/automatic.c
N external/bsd/pkg_install/dist/lib/config.h.in
N external/bsd/pkg_install/dist/lib/conflicts.c
N external/bsd/pkg_install/dist/lib/defs.h
N external/bsd/pkg_install/dist/lib/dewey.c
N external/bsd/pkg_install/dist/lib/dewey.h
N external/bsd/pkg_install/dist/lib/fexec.c
N external/bsd/pkg_install/dist/lib/file.c
N external/bsd/pkg_install/dist/lib/global.c
N external/bsd/pkg_install/dist/lib/gpgsig.c
N external/bsd/pkg_install/dist/lib/iterate.c
N external/bsd/pkg_install/dist/lib/lib.h
N external/bsd/pkg_install/dist/lib/license.c
N external/bsd/pkg_install/dist/lib/lpkg.c
N external/bsd/pkg_install/dist/lib/opattern.c
N external/bsd/pkg_install/dist/lib/parse-config.c
N external/bsd/pkg_install/dist/lib/pkcs7.c
N external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
N external/bsd/pkg_install/dist/lib/pkg_io.c
N external/bsd/pkg_install/dist/lib/pkg_signature.c
N external/bsd/pkg_install/dist/lib/pkg_summary.5
N external/bsd/pkg_install/dist/lib/pkgdb.c
N external/bsd/pkg_install/dist/lib/pkgsrc.7
N external/bsd/pkg_install/dist/lib/plist.c
N external/bsd/pkg_install/dist/lib/remove.c
N external/bsd/pkg_install/dist/lib/str.c
N external/bsd/pkg_install/dist/lib/var.c
N external/bsd/pkg_install/dist/lib/version.c
N external/bsd/pkg_install/dist/lib/version.h
N external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
N external/bsd/pkg_install/dist/lib/xwrapper.c
N external/bsd/pkg_install/dist/x509/pkgsrc.cnf
N external/bsd/pkg_install/dist/x509/pkgsrc.sh
N external/bsd/pkg_install/dist/x509/signing.txt

No conflicts created by this import

CVS commit: src/usr.bin/xlint

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 18:36:28 UTC 2021

Modified Files:
src/usr.bin/xlint/common: lint.h tyname.c
src/usr.bin/xlint/lint1: Makefile lint1.h
src/usr.bin/xlint/lint2: Makefile lint2.h

Log Message:
lint: use distinct struct tags for type_t in lint1 and lint2

Having two similar but still different definitions of 'struct type' is
unnecessarily confusing.  Exchange this confusion for 8 lines of
straight-forward preprocessing code.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/common/lint.h
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/xlint/common/tyname.c
cvs rdiff -u -r1.66 -r1.67 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.93 -r1.94 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/xlint/lint2/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/xlint/lint2/lint2.h

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

Modified files:

Index: src/usr.bin/xlint/common/lint.h
diff -u src/usr.bin/xlint/common/lint.h:1.26 src/usr.bin/xlint/common/lint.h:1.27
--- src/usr.bin/xlint/common/lint.h:1.26	Sun Feb 28 18:51:51 2021
+++ src/usr.bin/xlint/common/lint.h	Sat Apr 10 18:36:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lint.h,v 1.26 2021/02/28 18:51:51 rillig Exp $	*/
+/*	$NetBSD: lint.h,v 1.27 2021/04/10 18:36:27 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -135,7 +135,11 @@ typedef	struct	ob {
 	char	*o_next;	/* next free byte in buffer */
 } ob_t;
 
-typedef struct type type_t;
+#if defined(IS_LINT1)
+typedef struct lint1_type type_t;
+#else
+typedef struct lint2_type type_t;
+#endif
 
 #include "externs.h"
 

Index: src/usr.bin/xlint/common/tyname.c
diff -u src/usr.bin/xlint/common/tyname.c:1.38 src/usr.bin/xlint/common/tyname.c:1.39
--- src/usr.bin/xlint/common/tyname.c:1.38	Fri Apr  9 19:37:39 2021
+++ src/usr.bin/xlint/common/tyname.c	Sat Apr 10 18:36:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tyname.c,v 1.38 2021/04/09 19:37:39 rillig Exp $	*/
+/*	$NetBSD: tyname.c,v 1.39 2021/04/10 18:36:27 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tyname.c,v 1.38 2021/04/09 19:37:39 rillig Exp $");
+__RCSID("$NetBSD: tyname.c,v 1.39 2021/04/10 18:36:27 rillig Exp $");
 #endif
 
 #include 
@@ -43,7 +43,11 @@ __RCSID("$NetBSD: tyname.c,v 1.38 2021/0
 #include 
 #include 
 
-#include PASS
+#if defined(IS_LINT1)
+#include "lint1.h"
+#else
+#include "lint2.h"
+#endif
 
 #ifndef INTERNAL_ERROR
 #define INTERNAL_ERROR(fmt, args...) \

Index: src/usr.bin/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.66 src/usr.bin/xlint/lint1/Makefile:1.67
--- src/usr.bin/xlint/lint1/Makefile:1.66	Tue Apr  6 13:17:04 2021
+++ src/usr.bin/xlint/lint1/Makefile	Sat Apr 10 18:36:27 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.66 2021/04/06 13:17:04 rillig Exp $
+#	$NetBSD: Makefile,v 1.67 2021/04/10 18:36:27 rillig Exp $
 
 .include 
 
@@ -18,7 +18,8 @@ YHEADER=
 CWARNFLAGS.clang+=	-Wno-error=implicit-int-float-conversion
 LINTFLAGS+=		-T
 
-CPPFLAGS+=	-I${.CURDIR} -I. -DPASS=\"${PROG}.h\"
+CPPFLAGS+=	-DIS_LINT1
+CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	${DEBUG:D-DDEBUG}
 
 BINDIR=		/usr/libexec

Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.93 src/usr.bin/xlint/lint1/lint1.h:1.94
--- src/usr.bin/xlint/lint1/lint1.h:1.93	Sat Apr 10 18:06:53 2021
+++ src/usr.bin/xlint/lint1/lint1.h	Sat Apr 10 18:36:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.93 2021/04/10 18:06:53 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.94 2021/04/10 18:36:27 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -148,7 +148,7 @@ typedef	struct {
  * The type of an expression or object. Complex types are formed via t_subt
  * (for arrays, pointers and functions), as well as t_str.
  */
-struct type {
+struct lint1_type {
 	tspec_t	t_tspec;	/* type specifier */
 	bool	t_incomplete_array : 1;
 	bool	t_const : 1;	/* const modifier */
@@ -169,8 +169,9 @@ struct type {
 		u_int	_t_flen : 8;	/* length of bit-field */
 		u_int	_t_foffs : 24;	/* offset of bit-field */
 	} t_b;
-	struct	type *t_subt;	/* element type (arrays), return value
-   (functions), or type pointer points to */
+	struct	lint1_type *t_subt; /* element type (if ARRAY),
+ * return value (if FUNC),
+ * target type (if PTR) */
 };
 
 #define	t_dim	t_u._t_dim

Index: src/usr.bin/xlint/lint2/Makefile
diff -u src/usr.bin/xlint/lint2/Makefile:1.18 src/usr.bin/xlint/lint2/Makefile:1.19
--- src/usr.bin/xlint/lint2/Makefile:1.18	Sat Jan 16 00:09:28 2021
+++ src/usr.bin/xlint/lint2/Makefile	Sat Apr 10 18:36:27 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2021/01/16 00:09:28 rillig Exp $
+#	$NetBSD: Makefile,v 1.19 2021/04/10 18:36:27 rillig Exp $
 
 NOMAN=		# defined
 
@@ -6,6 +6,6 @@ PROG=		lint2
 SRCS=		main2.c

CVS commit: src/usr.bin/xlint/lint1

2021-04-10 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Apr 10 18:06:53 UTC 2021

Modified Files:
src/usr.bin/xlint/lint1: decl.c func.c lint1.h tree.c

Log Message:
lint: prepare renaming of 'struct type'

It's confusing to have the same struct tag in both lint1 and lint2, with
mostly the same members, but also some differences.  Before actually
changing this, I reviewed all occurrences of the word 'type' in the
code.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/xlint/lint1/func.c
cvs rdiff -u -r1.92 -r1.93 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.275 -r1.276 src/usr.bin/xlint/lint1/tree.c

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

Modified files:

Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.171 src/usr.bin/xlint/lint1/decl.c:1.172
--- src/usr.bin/xlint/lint1/decl.c:1.171	Fri Apr  9 20:12:00 2021
+++ src/usr.bin/xlint/lint1/decl.c	Sat Apr 10 18:06:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.171 2021/04/09 20:12:00 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.172 2021/04/10 18:06:53 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.171 2021/04/09 20:12:00 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.172 2021/04/10 18:06:53 rillig Exp $");
 #endif
 
 #include 
@@ -141,6 +141,7 @@ type_t *
 gettyp(tspec_t t)
 {
 
+	/* TODO: make the return type 'const' */
 	return [t];
 }
 

Index: src/usr.bin/xlint/lint1/func.c
diff -u src/usr.bin/xlint/lint1/func.c:1.102 src/usr.bin/xlint/lint1/func.c:1.103
--- src/usr.bin/xlint/lint1/func.c:1.102	Fri Apr  2 15:06:35 2021
+++ src/usr.bin/xlint/lint1/func.c	Sat Apr 10 18:06:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: func.c,v 1.102 2021/04/02 15:06:35 rillig Exp $	*/
+/*	$NetBSD: func.c,v 1.103 2021/04/10 18:06:53 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.102 2021/04/02 15:06:35 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.103 2021/04/10 18:06:53 rillig Exp $");
 #endif
 
 #include 
@@ -519,10 +519,7 @@ check_case_label(tnode_t *tn, cstk_t *ci
 	} else {
 		check_getopt_case_label(nv.v_quad);
 
-		/*
-		 * append the value to the list of
-		 * case values
-		 */
+		/* append the value to the list of case values */
 		cl = xcalloc(1, sizeof(*cl));
 		cl->cl_val = nv;
 		cl->cl_next = ci->c_case_labels;

Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.92 src/usr.bin/xlint/lint1/lint1.h:1.93
--- src/usr.bin/xlint/lint1/lint1.h:1.92	Fri Apr  2 22:05:43 2021
+++ src/usr.bin/xlint/lint1/lint1.h	Sat Apr 10 18:06:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lint1.h,v 1.92 2021/04/02 22:05:43 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.93 2021/04/10 18:06:53 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -145,8 +145,8 @@ typedef	struct {
 } enumeration;
 
 /*
- * Types are represented by concatenation of structures of type type_t
- * via t_subt.
+ * The type of an expression or object. Complex types are formed via t_subt
+ * (for arrays, pointers and functions), as well as t_str.
  */
 struct type {
 	tspec_t	t_tspec;	/* type specifier */
@@ -371,7 +371,8 @@ typedef	struct pqinf {
 } pqinf_t;
 
 /*
- * Case values are stored in a list of type case_label_t.
+ * The values of the 'case' labels, linked via cl_next in reverse order of
+ * appearance in the code, that is from bottom to top.
  */
 typedef	struct case_label {
 	val_t	cl_val;

Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.275 src/usr.bin/xlint/lint1/tree.c:1.276
--- src/usr.bin/xlint/lint1/tree.c:1.275	Fri Apr  9 21:42:12 2021
+++ src/usr.bin/xlint/lint1/tree.c	Sat Apr 10 18:06:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.275 2021/04/09 21:42:12 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.276 2021/04/10 18:06:53 rillig Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.275 2021/04/09 21:42:12 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.276 2021/04/10 18:06:53 rillig Exp $");
 #endif
 
 #include 
@@ -2111,6 +2111,10 @@ convert_constant(op_t op, int arg, const
 	int64_t	xmask, xmsk1;
 	int	osz, nsz;
 
+	/*
+	 * TODO: make 'v' const; the name of this function does not suggest
+	 *  that it modifies 'v'.
+	 */
 	ot = v->v_tspec;
 	nt = nv->v_tspec = tp->t_tspec;
 	rchk = false;

CVS commit: src/sys/modules/dtrace

2021-04-10 Thread Simon Burge 
Module Name:src
Committed By:   simonb
Date:   Sat Apr 10 15:34:05 UTC 2021

Modified Files:
src/sys/modules/dtrace: Makefile

Log Message:
Build the netbsd32_syscall module if mips64.
Don't build the linux_syscall module if mips*


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/dtrace/Makefile

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

Modified files:

Index: src/sys/modules/dtrace/Makefile
diff -u src/sys/modules/dtrace/Makefile:1.8 src/sys/modules/dtrace/Makefile:1.9
--- src/sys/modules/dtrace/Makefile:1.8	Wed Dec  4 10:12:47 2019
+++ src/sys/modules/dtrace/Makefile	Sat Apr 10 15:34:05 2021
@@ -1,16 +1,19 @@
-#	$NetBSD: Makefile,v 1.8 2019/12/04 10:12:47 martin Exp $
+#	$NetBSD: Makefile,v 1.9 2021/04/10 15:34:05 simonb Exp $
 # $FreeBSD: src/sys/modules/dtrace/Makefile,v 1.6.2.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include 
 
 SUBDIR=		dtrace sdt fbt lockstat profile syscall
 
-.if ${MACHINE_ARCH} != "aarch64"
+.if ${MACHINE_ARCH} == "x86_64" || !empty(MACHINE_ARCH:Mmips64*)
+SUBDIR+=	netbsd32_syscall
+.endif
+
+.if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_CPU} != "mips"
 SUBDIR+=	linux_syscall
 .endif
 
 .if ${MACHINE_ARCH} == "x86_64"
-SUBDIR+=	netbsd32_syscall
 SUBDIR+=	linux32_syscall
 .endif

CVS commit: src/doc

2021-04-10 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Apr 10 13:54:25 UTC 2021

Modified Files:
src/doc: 3RDPARTY

Log Message:
update gdtoa info


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

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1791 src/doc/3RDPARTY:1.1792
--- src/doc/3RDPARTY:1.1791	Fri Apr  9 15:12:37 2021
+++ src/doc/3RDPARTY	Sat Apr 10 09:54:25 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1791 2021/04/09 19:12:37 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1792 2021/04/10 13:54:25 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -526,11 +526,11 @@ It is not part of the regular build.
 
 Package:	gdtoa
 Version:	2016-02-19
-Current Vers:	$(date)
+Current Vers:	2018-06-18
 Maintainer:	David M. Gay 
 Archive Site:	http://www.netlib.org/fp/
 Home Page:	http://www.netlib.org/fp/
-Date:		2019-01-09
+Date:		2021-04-10
 Mailing List:	none
 Responsible:	kleink
 License:	BSD-like

CVS commit: src/external/bsd/atf/dist/tools

2021-04-10 Thread Andreas Gustafsson 
Module Name:src
Committed By:   gson
Date:   Sat Apr 10 10:32:57 UTC 2021

Modified Files:
src/external/bsd/atf/dist/tools: atf-run.1 atf-run.cpp

Log Message:
Add support for running individual test cases under isolation.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-run.1
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/tools/atf-run.cpp

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/atf/dist/tools/atf-run.1
diff -u src/external/bsd/atf/dist/tools/atf-run.1:1.4 src/external/bsd/atf/dist/tools/atf-run.1:1.5
--- src/external/bsd/atf/dist/tools/atf-run.1:1.4	Sat Feb  8 19:13:44 2014
+++ src/external/bsd/atf/dist/tools/atf-run.1	Sat Apr 10 10:32:57 2021
@@ -26,23 +26,22 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 1, 2010
+.Dd April 10, 2021
 .Dt ATF-RUN 1
 .Os
 .Sh NAME
 .Nm atf-run
-.Nd executes a collection of test programs
+.Nd executes a collection of tests
 .Sh SYNOPSIS
 .Nm
 .Op Fl v Ar var1=value1 Op .. Fl v Ar varN=valueN
-.Op Ar test_program1 Op Ar .. test_programN
+.Op Ar test1 Op Ar .. testN
 .Nm
 .Fl h
 .Sh DESCRIPTION
 .Nm
-executes a collection of test programs or, in other words, a complete
-test suite.
-The results of each test program are collected by the tool, and are then
+executes a collection of test cases, test programs, or a complete test suite.
+The results of each test are collected by the tool, and are then
 multiplexed into a single machine-parseable report; see
 .Xr atf-formats 5
 for more details.
@@ -70,8 +69,14 @@ In the first synopsis form,
 parses the
 .Pa Atffile
 in the current directory and runs all the test programs specified in it.
-If any test program names are given as part of the command line, those are
-the ones executed instead of the complete list.
+If any
+.Ar test
+arguments are given as part of the command line, those tests are
+executed instead of the complete list.  Each
+.Ar test
+argument can be either the name of a test program, or a string of the form
+.Ar test_program:test_case
+to execute a single test case.
 .Pp
 In the second synopsis form,
 .Nm

Index: src/external/bsd/atf/dist/tools/atf-run.cpp
diff -u src/external/bsd/atf/dist/tools/atf-run.cpp:1.5 src/external/bsd/atf/dist/tools/atf-run.cpp:1.6
--- src/external/bsd/atf/dist/tools/atf-run.cpp:1.5	Tue Feb 11 18:13:45 2014
+++ src/external/bsd/atf/dist/tools/atf-run.cpp	Sat Apr 10 10:32:57 2021
@@ -81,11 +81,13 @@ class atf_run : public tools::applicatio
 
 size_t count_tps(std::vector< std::string >) const;
 
-int run_test(const tools::fs::path&, tools::test_program::atf_tps_writer&,
+int run_test(const tools::fs::path&, const std::string &,
+ tools::test_program::atf_tps_writer&,
  const vars_map&);
 int run_test_directory(const tools::fs::path&,
tools::test_program::atf_tps_writer&);
 int run_test_program(const tools::fs::path&,
+ const std::string tc,
  tools::test_program::atf_tps_writer&,
  const vars_map&);
 
@@ -179,7 +181,7 @@ std::string
 atf_run::specific_args(void)
 const
 {
-return "[test-program1 .. test-programN]";
+return "[test1 .. testN]";
 }
 
 atf_run::options_set
@@ -214,6 +216,7 @@ atf_run::parse_vflag(const std::string& 
 
 int
 atf_run::run_test(const tools::fs::path& tp,
+  const std::string ,
   tools::test_program::atf_tps_writer& w,
   const vars_map& config)
 {
@@ -226,7 +229,7 @@ atf_run::run_test(const tools::fs::path&
 const vars_map effective_config =
 tools::config_file::merge_configs(config, m_cmdline_vars);
 
-errcode = run_test_program(tp, w, effective_config);
+errcode = run_test_program(tp, tc, w, effective_config);
 }
 return errcode;
 }
@@ -247,7 +250,7 @@ atf_run::run_test_directory(const tools:
 bool ok = true;
 for (std::vector< std::string >::const_iterator iter = af.tps().begin();
  iter != af.tps().end(); iter++) {
-const bool result = run_test(tp / *iter, w,
+const bool result = run_test(tp / *iter, "", w,
 tools::config_file::merge_configs(af.conf(), test_suite_vars));
 ok &= (result == EXIT_SUCCESS);
 }
@@ -362,6 +365,7 @@ atf_run::get_test_case_result(const std:
 
 int
 atf_run::run_test_program(const tools::fs::path& tp,
+  const std::string tc,
   tools::test_program::atf_tps_writer& w,
   const vars_map& config)
 {
@@ -394,6 +398,9 @@ atf_run::run_test_program(const tools::f
 const std::string& tcname = (*iter).first;
 const vars_map& tcmd = (*iter).second;
 
+

CVS commit: src/share/man/man4

2021-04-10 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Apr 10 08:01:21 UTC 2021

Modified Files:
src/share/man/man4: hdaudio.4

Log Message:
'no merit' is a strong statement


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/hdaudio.4

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/man4/hdaudio.4
diff -u src/share/man/man4/hdaudio.4:1.20 src/share/man/man4/hdaudio.4:1.21
--- src/share/man/man4/hdaudio.4:1.20	Sat Apr 10 04:10:21 2021
+++ src/share/man/man4/hdaudio.4	Sat Apr 10 08:01:21 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hdaudio.4,v 1.20 2021/04/10 04:10:21 isaki Exp $
+.\"	$NetBSD: hdaudio.4,v 1.21 2021/04/10 08:01:21 nia Exp $
 .\"
 .\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -133,8 +133,8 @@ Handle unsolicited RIRB messages
 .It
 Modem function groups
 .It
-Hardware formats higher than 16 bits precision.
+24-bit and 20-bit hardware formats cannot yet be used.
 Since the machine-independent audio layer converts all input from
-the userland and the hardware layer to 16 bits precision for processing,
-so there is no (or few) merit to support them.
+userland and the hardware layer to 16-bit precision for processing,
+there would currently be no advantage in using them.
 .El