CVS commit: src/include

2021-08-14 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Aug 15 00:36:11 UTC 2021

Modified Files:
src/include: utmpx.h

Log Message:
utmpx.h: fix comment missed in r. 1.10 _NETBSD_SOURCE changes


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/include/utmpx.h

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

Modified files:

Index: src/include/utmpx.h
diff -u src/include/utmpx.h:1.17 src/include/utmpx.h:1.18
--- src/include/utmpx.h:1.17	Sun Jan 11 19:09:29 2009
+++ src/include/utmpx.h	Sun Aug 15 00:36:11 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: utmpx.h,v 1.17 2009/01/11 19:09:29 christos Exp $	 */
+/*	$NetBSD: utmpx.h,v 1.18 2021/08/15 00:36:11 gutteridge Exp $	 */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@ struct lastlogx {
 	char ll_host[_UTX_HOSTSIZE];	/* host name */
 	struct sockaddr_storage ll_ss;	/* address where entry was made from */
 };
-#endif	/* !_XOPEN_SOURCE */
+#endif	/* _NETBSD_SOURCE */
 
 __BEGIN_DECLS
 



CVS commit: src/sys/arch/i386/stand/bootxx

2021-06-23 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Thu Jun 24 01:23:17 UTC 2021

Modified Files:
src/sys/arch/i386/stand/bootxx: boot1.c

Log Message:
boot1.c: remove a comment that's no longer relevant/correct

In r. 1.13, a check of the return value in fd was removed, and a comment
about this ("...so keep going") added. Then in r. 1.19, the fd return
value check was reinstated (as the true underlying errno could be masked
by the fstat() call), so there is no "keep going" happening anymore.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/stand/bootxx/boot1.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/i386/stand/bootxx/boot1.c
diff -u src/sys/arch/i386/stand/bootxx/boot1.c:1.20 src/sys/arch/i386/stand/bootxx/boot1.c:1.21
--- src/sys/arch/i386/stand/bootxx/boot1.c:1.20	Thu Jan  6 01:08:48 2011
+++ src/sys/arch/i386/stand/bootxx/boot1.c	Thu Jun 24 01:23:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot1.c,v 1.20 2011/01/06 01:08:48 jakllsch Exp $	*/
+/*	$NetBSD: boot1.c,v 1.21 2021/06/24 01:23:16 gutteridge Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: boot1.c,v 1.20 2011/01/06 01:08:48 jakllsch Exp $");
+__RCSID("$NetBSD: boot1.c,v 1.21 2021/06/24 01:23:16 gutteridge Exp $");
 
 #include 
 #include 
@@ -106,7 +106,6 @@ boot1(uint32_t biosdev, uint64_t *sector
 	fd = ob();
 
 done:
-	/* if we fail here, so will fstat, so keep going */
 	if (fd == -1 || fstat(fd, ) == -1)
 		return "Can't open /boot\r\n";
 



CVS commit: src/share/man/man8/man8.x86

2021-06-21 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Jun 22 03:39:21 UTC 2021

Modified Files:
src/share/man/man8/man8.x86: boot.8

Log Message:
boot.8: minor grammar tweaks


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/share/man/man8/man8.x86/boot.8

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/man8/man8.x86/boot.8
diff -u src/share/man/man8/man8.x86/boot.8:1.25 src/share/man/man8/man8.x86/boot.8:1.26
--- src/share/man/man8/man8.x86/boot.8:1.25	Sun May 30 06:05:24 2021
+++ src/share/man/man8/man8.x86/boot.8	Tue Jun 22 03:39:21 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot.8,v 1.25 2021/05/30 06:05:24 mlelstv Exp $
+.\"	$NetBSD: boot.8,v 1.26 2021/06/22 03:39:21 gutteridge Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -877,13 +877,13 @@ field of the
 disklabel (if it is a hard disk).
 .Pp
 .Tn UEFI
-implementation are supposed to support either
+implementations are supposed to support either
 .Xr x86/mbr 8
 or
 .Xr gpt 8
 partitioning, but some do not handle the latter.
 .Tn UEFI
-Booting
+booting
 from a
 .Xr gpt 8
 partitioned disk is still possible in this case, by adding



CVS commit: src/share/man/man8/man8.x86

2021-06-21 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Jun 22 03:30:06 UTC 2021

Modified Files:
src/share/man/man8/man8.x86: mbr.8

Log Message:
mbr.8: fix a typo


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man8/man8.x86/mbr.8

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/man8/man8.x86/mbr.8
diff -u src/share/man/man8/man8.x86/mbr.8:1.4 src/share/man/man8/man8.x86/mbr.8:1.5
--- src/share/man/man8/man8.x86/mbr.8:1.4	Mon Jul  3 21:31:01 2017
+++ src/share/man/man8/man8.x86/mbr.8	Tue Jun 22 03:30:06 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mbr.8,v 1.4 2017/07/03 21:31:01 wiz Exp $
+.\"	$NetBSD: mbr.8,v 1.5 2021/06/22 03:30:06 gutteridge Exp $
 .Dd February 17, 2017
 .Dt MBR 8 x86
 .Os
@@ -96,7 +96,7 @@ The
 key will cause the bootcode to find the active partition, and boot from it.
 If no key is pressed, the (configurable) default selection is picked.
 .Sh DIAGNOSTICS
-The following error are detected:
+The following errors are detected:
 .Bl -column Code "No active partition"
 .It Em Code Ta Em "Text message" Ta Em Explanation
 .It 1 Ta "No active partition" Ta



CVS commit: src/share/man/man4

2020-10-08 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Fri Oct  9 01:49:53 UTC 2020

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

Log Message:
options.4: add a basic entry for the CNMAGIC option


To generate a diff of this commit:
cvs rdiff -u -r1.516 -r1.517 src/share/man/man4/options.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/options.4
diff -u src/share/man/man4/options.4:1.516 src/share/man/man4/options.4:1.517
--- src/share/man/man4/options.4:1.516	Fri Aug 28 16:07:49 2020
+++ src/share/man/man4/options.4	Fri Oct  9 01:49:53 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.516 2020/08/28 16:07:49 fcambus Exp $
+.\"	$NetBSD: options.4,v 1.517 2020/10/09 01:49:53 gutteridge Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd August 25, 2020
+.Dd October 9, 2020
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -562,6 +562,10 @@ This option overrides using break to ent
 on the serial console.
 The value given is the ASCII value to be used instead.
 This is currently only supported by the com driver.
+.It Cd options CNMAGIC=string
+This option overrides the
+.Xr cnmagic 9
+string used to enter the kernel debugger.
 .It Cd options DDB_VERBOSE_HELP
 This option adds more verbose descriptions to the
 .Em help
@@ -2706,6 +2710,7 @@ support in the kernel.
 .Xr quotaon 8 ,
 .Xr rpc.rquotad 8 ,
 .Xr sysctl 8 ,
+.Xr cnmagic 9 ,
 .Xr in_getifa 9 ,
 .Xr kernhist 9
 .Sh HISTORY



CVS commit: src/etc/defaults

2020-08-09 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Aug  9 23:43:58 UTC 2020

Modified Files:
src/etc/defaults: npf.boot.conf

Log Message:
Fix minor typo, it's npf(7), not npf(4)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/etc/defaults/npf.boot.conf

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

Modified files:

Index: src/etc/defaults/npf.boot.conf
diff -u src/etc/defaults/npf.boot.conf:1.2 src/etc/defaults/npf.boot.conf:1.3
--- src/etc/defaults/npf.boot.conf:1.2	Sun Apr  7 02:08:08 2019
+++ src/etc/defaults/npf.boot.conf	Sun Aug  9 23:43:58 2020
@@ -1,7 +1,7 @@
-#	$NetBSD: npf.boot.conf,v 1.2 2019/04/07 02:08:08 sevan Exp $
+#	$NetBSD: npf.boot.conf,v 1.3 2020/08/09 23:43:58 gutteridge Exp $
 #
 # /etc/defaults/npf.boot.conf --
-#	initial configuration for npf(4)
+#	initial configuration for npf(7)
 #
 # DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
 # EDIT /etc/npf.boot.conf INSTEAD.



CVS commit: src/usr.bin/netstat

2020-07-20 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Jul 21 04:58:44 UTC 2020

Modified Files:
src/usr.bin/netstat: netstat.1

Log Message:
netstat.1: add various xrefs present in the body to "See Also"


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/netstat/netstat.1

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/netstat/netstat.1
diff -u src/usr.bin/netstat/netstat.1:1.73 src/usr.bin/netstat/netstat.1:1.74
--- src/usr.bin/netstat/netstat.1:1.73	Thu May 12 03:44:11 2016
+++ src/usr.bin/netstat/netstat.1	Tue Jul 21 04:58:43 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: netstat.1,v 1.73 2016/05/12 03:44:11 ozaki-r Exp $
+.\"	$NetBSD: netstat.1,v 1.74 2020/07/21 04:58:43 gutteridge Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
 .\"
-.Dd May 12, 2016
+.Dd July 21, 2020
 .Dt NETSTAT 1
 .Os
 .Sh NAME
@@ -432,12 +432,17 @@ And the fifth character shows the header
 .Xr sockstat 1 ,
 .Xr vmstat 1 ,
 .Xr inet 3 ,
+.Xr kvm 3 ,
+.Xr kvm_openfiles 3 ,
+.Xr sysctl 3 ,
 .Xr bpf 4 ,
+.Xr route 4 ,
 .Xr hosts 5 ,
 .Xr networks 5 ,
 .Xr protocols 5 ,
 .Xr services 5 ,
 .Xr iostat 8 ,
+.Xr route 8 ,
 .Xr trpt 8
 .Sh HISTORY
 The



CVS commit: src/include/arpa

2020-06-27 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Jun 28 02:16:19 UTC 2020

Modified Files:
src/include/arpa: nameser_compat.h

Log Message:
nameser_compat.h: correct preprocessor error syntax


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/include/arpa/nameser_compat.h

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

Modified files:

Index: src/include/arpa/nameser_compat.h
diff -u src/include/arpa/nameser_compat.h:1.6 src/include/arpa/nameser_compat.h:1.7
--- src/include/arpa/nameser_compat.h:1.6	Tue Feb 24 17:57:08 2015
+++ src/include/arpa/nameser_compat.h	Sun Jun 28 02:16:19 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nameser_compat.h,v 1.6 2015/02/24 17:57:08 christos Exp $	*/
+/*	$NetBSD: nameser_compat.h,v 1.7 2020/06/28 02:16:19 gutteridge Exp $	*/
 
 /* Copyright (c) 1983, 1989
  *The Regents of the University of California.  All rights reserved.
@@ -82,7 +82,7 @@
 	 * which will force your compiles to bomb until you fix
 	 * the above macros.
 	 */
-  error "Undefined or invalid BYTE_ORDER";
+#error "Undefined or invalid BYTE_ORDER"
 #endif
 
 /*%



CVS commit: src/share/man/man5

2020-04-19 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Apr 19 19:20:32 UTC 2020

Modified Files:
src/share/man/man5: fstab.5

Log Message:
fstab.5: note the first field is a placeholder for some FSes

Addresses PR misc/52607. (I suppose something about this could also be
added to the man pages for the mount commands for each applicable file
system, but I think this should suffice.)


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/share/man/man5/fstab.5

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/man5/fstab.5
diff -u src/share/man/man5/fstab.5:1.46 src/share/man/man5/fstab.5:1.47
--- src/share/man/man5/fstab.5:1.46	Sat Apr  4 15:32:42 2020
+++ src/share/man/man5/fstab.5	Sun Apr 19 19:20:32 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: fstab.5,v 1.46 2020/04/04 15:32:42 jdolecek Exp $
+.\"	$NetBSD: fstab.5,v 1.47 2020/04/19 19:20:32 gutteridge Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" @(#)fstab.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd September 15, 2019
+.Dd April 19, 2020
 .Dt FSTAB 5
 .Os
 .Sh NAME
@@ -78,10 +78,17 @@ and not the character special file name.
 If a program needs the character special file name,
 the program must create it by appending a
 .Dq r
-after the
-last
+after the last
 .Dq /
 in the special file name.
+(Note that for some file systems, e.g.,
+.Em kernfs ,
+.Em procfs ,
+and
+.Em tmpfs ,
+this field has no applicable use, and any string may be supplied as a
+placeholder.
+It is present simply for consistency of argument number and order.)
 .Pp
 If the first field is of the form
 .Dq NAME=



CVS commit: src/usr.bin/audio/play

2020-04-10 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Fri Apr 10 21:33:27 UTC 2020

Modified Files:
src/usr.bin/audio/play: audioplay.1

Log Message:
audioplay.1: generalize a reference to web browsers


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/audio/play/audioplay.1

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/audio/play/audioplay.1
diff -u src/usr.bin/audio/play/audioplay.1:1.29 src/usr.bin/audio/play/audioplay.1:1.30
--- src/usr.bin/audio/play/audioplay.1:1.29	Tue Nov 12 12:50:30 2019
+++ src/usr.bin/audio/play/audioplay.1	Fri Apr 10 21:33:27 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: audioplay.1,v 1.29 2019/11/12 12:50:30 wiz Exp $
+.\"	$NetBSD: audioplay.1,v 1.30 2020/04/10 21:33:27 gutteridge Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2002, 2010, 2019 Matthew R. Green
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 8, 2019
+.Dd April 10, 2020
 .Dt AUDIOPLAY 1
 .Os
 .Sh NAME
@@ -169,9 +169,8 @@ program can be used to show the availabl
 .Nm
 can be used to play Sun/NeXT audio files, and also RIFF WAVE audio files.
 .Nm
-can be configured in the
-.Dq Netscape
-web browser as the program to use when playing audio files.
+can be configured in a web browser as the program to use when playing audio
+files.
 .Pp
 In addition to the audio driver encodings list in the EXAMPLES section,
 .Nm



CVS commit: src/sbin/mount_portal/examples

2020-03-22 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Mar 22 23:24:08 UTC 2020

Modified Files:
src/sbin/mount_portal/examples: rfilter.2

Log Message:
rfilter.2: fix a typo

Reported by Andrius V in PR kern/54889.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_portal/examples/rfilter.2

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

Modified files:

Index: src/sbin/mount_portal/examples/rfilter.2
diff -u src/sbin/mount_portal/examples/rfilter.2:1.3 src/sbin/mount_portal/examples/rfilter.2:1.4
--- src/sbin/mount_portal/examples/rfilter.2:1.3	Tue May  9 23:26:49 2017
+++ src/sbin/mount_portal/examples/rfilter.2	Sun Mar 22 23:24:08 2020
@@ -1,4 +1,4 @@
-$NetBSD: rfilter.2,v 1.3 2017/05/09 23:26:49 kamil Exp $
+$NetBSD: rfilter.2,v 1.4 2020/03/22 23:24:08 gutteridge Exp $
 
 Advanced rfilter usage:  the strip key, and cmd:// notation
 
@@ -79,7 +79,7 @@ a file from ftp://...:
 
 The problem is, when tar sees a file of the form A:B, it assumes
 A is a hostname.  In this case, A is "portal/ftp", which is
-obviosly not a hostname.
+obviously not a hostname.
 
 If we want to avoid this problem, there are at least two
 solutions:



CVS commit: src/bin/echo

2020-02-25 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed Feb 26 02:09:46 UTC 2020

Modified Files:
src/bin/echo: echo.1

Log Message:
echo.1: add a note about other echo implementations

The other BSDs all have a note reminding that many shells have their
own internal echo implementations which may vary from this utility, so
add one. (Much of the wording is borrowed from FreeBSD's man page.)

(The other BSDs also have notes about the -n option not really being
portable, and printf[1] being preferable, we might want to add
something about that, too.)


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/bin/echo/echo.1

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

Modified files:

Index: src/bin/echo/echo.1
diff -u src/bin/echo/echo.1:1.17 src/bin/echo/echo.1:1.18
--- src/bin/echo/echo.1:1.17	Tue Jul  4 06:48:41 2017
+++ src/bin/echo/echo.1	Wed Feb 26 02:09:46 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: echo.1,v 1.17 2017/07/04 06:48:41 wiz Exp $
+.\"	$NetBSD: echo.1,v 1.18 2020/02/26 02:09:46 gutteridge Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
 .\"
-.Dd August 14, 2016
+.Dd February 26, 2020
 .Dt ECHO 1
 .Os
 .Sh NAME
@@ -54,9 +54,20 @@ The following option is available:
 .It Fl n
 Do not print the trailing newline character.
 .El
+.Pp
+Note that many shells (e.g.,
+.Xr csh 1
+and
+.Xr ksh 1 )
+provide a built-in
+.Nm
+command which tends to differ from this utility in the treatment of options
+and backslashes.
 .Sh EXIT STATUS
 .Ex -std echo
 .Sh SEE ALSO
+.Xr csh 1
+.Xr ksh 1
 .Xr printf 1
 .Sh STANDARDS
 The



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

2020-02-16 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Feb 16 22:20:31 UTC 2020

Modified Files:
src/external/bsd/tcpdump/dist: tcpdump.1.in

Log Message:
tcpdump.1.in: fix stray line from merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/tcpdump/dist/tcpdump.1.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/bsd/tcpdump/dist/tcpdump.1.in
diff -u src/external/bsd/tcpdump/dist/tcpdump.1.in:1.14 src/external/bsd/tcpdump/dist/tcpdump.1.in:1.15
--- src/external/bsd/tcpdump/dist/tcpdump.1.in:1.14	Tue Oct  1 16:06:16 2019
+++ src/external/bsd/tcpdump/dist/tcpdump.1.in	Sun Feb 16 22:20:31 2020
@@ -1,4 +1,4 @@
-.\"	NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp 
+.\"	$NetBSD: tcpdump.1.in,v 1.15 2020/02/16 22:20:31 gutteridge Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"	The Regents of the University of California.  All rights reserved.
@@ -20,7 +20,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.TH TCPDUMP 8  "2 February 2017"
+.TH TCPDUMP 8  "16 February 2020"
 .SH NAME
 tcpdump \- dump traffic on a network
 .SH SYNOPSIS
@@ -213,7 +213,7 @@ your ``status'' character, typically con
 \" .BR stty (1)
 \" in order to use it) and will continue capturing packets. On platforms that
 \" do not support the SIGINFO signal, the same can be achieved by using the
-SIGUSR1 signal.
+\" SIGUSR1 signal.
 and will continue capturing packets.
 .LP
 Reading packets from a network interface may require that you have



CVS commit: src/sys/dev/pci

2019-12-27 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat Dec 28 03:09:18 UTC 2019

Modified Files:
src/sys/dev/pci: mlyreg.h

Log Message:
Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/mlyreg.h

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

Modified files:

Index: src/sys/dev/pci/mlyreg.h
diff -u src/sys/dev/pci/mlyreg.h:1.6 src/sys/dev/pci/mlyreg.h:1.7
--- src/sys/dev/pci/mlyreg.h:1.6	Tue Nov 21 10:55:23 2017
+++ src/sys/dev/pci/mlyreg.h	Sat Dec 28 03:09:18 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: mlyreg.h,v 1.6 2017/11/21 10:55:23 maxv Exp $	*/
+/*	$NetBSD: mlyreg.h,v 1.7 2019/12/28 03:09:18 gutteridge Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -724,7 +724,7 @@ struct mly_ioctl_getlogdevinfovalid {
 	u_int8_t	ar5_algo;
 	u_int16_t	logical_device_number;
 	u_int16_t	bios_control;
-	/* erorr counters */
+	/* error counters */
 	u_int16_t	soft_errors;/* N/A */
 	u_int16_t	commands_failed;			/* N/A */
 	u_int16_t	host_command_aborts;			/* N/A */



CVS commit: src/sys/dev/marvell

2019-12-27 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat Dec 28 03:07:18 UTC 2019

Modified Files:
src/sys/dev/marvell: if_mvxpe.c

Log Message:
Fix typos in messages.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/marvell/if_mvxpe.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/marvell/if_mvxpe.c
diff -u src/sys/dev/marvell/if_mvxpe.c:1.30 src/sys/dev/marvell/if_mvxpe.c:1.31
--- src/sys/dev/marvell/if_mvxpe.c:1.30	Tue Oct 15 00:13:53 2019
+++ src/sys/dev/marvell/if_mvxpe.c	Sat Dec 28 03:07:18 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mvxpe.c,v 1.30 2019/10/15 00:13:53 chs Exp $	*/
+/*	$NetBSD: if_mvxpe.c,v 1.31 2019/12/28 03:07:18 gutteridge Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.30 2019/10/15 00:13:53 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.31 2019/12/28 03:07:18 gutteridge Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -558,11 +558,11 @@ mvxpe_evcnt_attach(struct mvxpe_softc *s
 	evcnt_attach_dynamic(>sc_ev.ev_misc_srse, EVCNT_TYPE_INTR,
 	NULL, device_xname(sc->sc_dev), "MISC SERDES sync error");
 	evcnt_attach_dynamic(>sc_ev.ev_misc_txreq, EVCNT_TYPE_INTR,
-	NULL, device_xname(sc->sc_dev), "MISC Tx resource erorr");
+	NULL, device_xname(sc->sc_dev), "MISC Tx resource error");
 
 	/* RxTx Interrupt */
 	evcnt_attach_dynamic(>sc_ev.ev_rxtx_rreq, EVCNT_TYPE_INTR,
-	NULL, device_xname(sc->sc_dev), "RxTx Rx resource erorr");
+	NULL, device_xname(sc->sc_dev), "RxTx Rx resource error");
 	evcnt_attach_dynamic(>sc_ev.ev_rxtx_rpq, EVCNT_TYPE_INTR,
 	NULL, device_xname(sc->sc_dev), "RxTx Rx packet");
 	evcnt_attach_dynamic(>sc_ev.ev_rxtx_tbrq, EVCNT_TYPE_INTR,
@@ -600,7 +600,7 @@ mvxpe_evcnt_attach(struct mvxpe_softc *s
 	evcnt_attach_dynamic(>sc_ev.ev_txd_ur, EVCNT_TYPE_MISC,
 	NULL, device_xname(sc->sc_dev), "Tx FIFO underrun counter");
 	evcnt_attach_dynamic(>sc_ev.ev_txd_oth, EVCNT_TYPE_MISC,
-	NULL, device_xname(sc->sc_dev), "Tx unkonwn erorr counter");
+	NULL, device_xname(sc->sc_dev), "Tx unknown error counter");
 
 	/* Status Registers */
 	evcnt_attach_dynamic(>sc_ev.ev_reg_pdfc, EVCNT_TYPE_MISC,
@@ -610,7 +610,7 @@ mvxpe_evcnt_attach(struct mvxpe_softc *s
 	evcnt_attach_dynamic(>sc_ev.ev_reg_txbadfcs, EVCNT_TYPE_MISC,
 	NULL, device_xname(sc->sc_dev), "Tx bad FCS counter");
 	evcnt_attach_dynamic(>sc_ev.ev_reg_txdropped, EVCNT_TYPE_MISC,
-	NULL, device_xname(sc->sc_dev), "Tx dorpped counter");
+	NULL, device_xname(sc->sc_dev), "Tx dropped counter");
 	evcnt_attach_dynamic(>sc_ev.ev_reg_lpic, EVCNT_TYPE_MISC,
 	NULL, device_xname(sc->sc_dev), "LP_IDLE counter");
 



CVS commit: src/sys/arch/mips/cavium/dev

2019-12-27 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat Dec 28 02:58:59 UTC 2019

Modified Files:
src/sys/arch/mips/cavium/dev: if_cnmac.c

Log Message:
Fix typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/cavium/dev/if_cnmac.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/mips/cavium/dev/if_cnmac.c
diff -u src/sys/arch/mips/cavium/dev/if_cnmac.c:1.14 src/sys/arch/mips/cavium/dev/if_cnmac.c:1.15
--- src/sys/arch/mips/cavium/dev/if_cnmac.c:1.14	Fri Jun  7 07:41:22 2019
+++ src/sys/arch/mips/cavium/dev/if_cnmac.c	Sat Dec 28 02:58:59 2019
@@ -1,8 +1,8 @@
-/*	$NetBSD: if_cnmac.c,v 1.14 2019/06/07 07:41:22 martin Exp $	*/
+/*	$NetBSD: if_cnmac.c,v 1.15 2019/12/28 02:58:59 gutteridge Exp $	*/
 
 #include 
 #if 0
-__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.14 2019/06/07 07:41:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.15 2019/12/28 02:58:59 gutteridge Exp $");
 #endif
 
 #include "opt_octeon.h"
@@ -20,7 +20,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v
 #endif
 
 /*
- * If no free send buffer is available, free all the sent buffer and bail out.
+ * If no free send buffer is available, free all the sent buffers and bail out.
  */
 #define OCTEON_ETH_SEND_QUEUE_CHECK
 
@@ -1099,7 +1099,7 @@ octeon_eth_start(struct ifnet *ifp)
 
 	/*
 	 * Performance tuning
-	 * presend iobdma request
+	 * pre-send iobdma request
 	 */
 	octeon_eth_send_queue_flush_prefetch(sc);
 
@@ -1131,7 +1131,7 @@ octeon_eth_start(struct ifnet *ifp)
 
 		/*
 		 * If no free send buffer is available, free all the sent
-		 * buffer and bail out.
+		 * buffers and bail out.
 		 */
 		if (octeon_eth_send_queue_is_full(sc)) {
 			SET(ifp->if_flags, IFF_OACTIVE);
@@ -1421,7 +1421,7 @@ octeon_eth_recv_check(struct octeon_eth_
 		return 1;
 	}
 
-#if 0 /* XXX Performance tunig (Jumbo-frame is not supported yet!) */
+#if 0 /* XXX Performance tuning (Jumbo-frame is not supported yet!) */
 	if (__predict_false(octeon_eth_recv_check_jumbo(sc, word2)) != 0) {
 		/* XXX jumbo frame */
 		if (ratecheck(>sc_rate_recv_check_jumbo_last,
@@ -1438,10 +1438,10 @@ octeon_eth_recv_check(struct octeon_eth_
 		if ((word2 & PIP_WQE_WORD2_NOIP_OPECODE) ==
 PIP_WQE_WORD2_RE_OPCODE_LENGTH) {
 			/* No logging */
-			/* XXX inclement special error count */
+			/* XXX increment special error count */
 		} else if ((word2 & PIP_WQE_WORD2_NOIP_OPECODE) ==
 PIP_WQE_WORD2_RE_OPCODE_PARTIAL) {
-			/* Not an erorr. it's because of overload */
+			/* Not an error, it's because of overload */
 		} else {
 
 			if (ratecheck(>sc_rate_recv_check_code_last,
@@ -1469,7 +1469,7 @@ octeon_eth_recv(struct octeon_eth_softc 
 	/* XXX XXX XXX */
 	/*
 	 * Performance tuning
-	 * presend iobdma request
+	 * pre-send iobdma request
 	 */
 	if (sc->sc_soft_req_cnt > sc->sc_soft_req_thresh) {
 		octeon_eth_send_queue_flush_prefetch(sc);



CVS commit: src/external/gpl2/xcvs/dist/doc

2019-04-30 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed May  1 02:15:07 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add various small corrections

Add various corrections mostly sourced from upstream's cvs.texinfo,
e.g., note NetBSD's local change to log admin commands in history
(subsequently added on upstream's HEAD, since it was noted in
r. 1.689), add some references to rannotate and rlog (from r. 1.686),
some amendments concerning rdiff (from r. 1.687), and miscellaneous
typo fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.9 src/external/gpl2/xcvs/dist/doc/cvs.1:1.10
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.9	Sun Apr 28 07:13:16 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Wed May  1 02:15:07 2019
@@ -1098,7 +1098,7 @@ acceptable for \fIstate\fR.  A useful se
 stable), and \fBRel\fR (for released).  By default,
 the state of a new revision is set to \fBExp\fR when
 it is created.  The state is visible in the output from
-\fIcvs log\fR (see node `log\(aq in the CVS manual), and in the
+\fIcvs log\fR (see node `log & rlog\(aq in the CVS manual), and in the
 \fB$\fP\fPLog$\fR and \fB$\fP\fPState$\fR keywords
 (see node `Keyword substitution\(aq in the CVS manual).  Note that \fBcvs\fR
 uses the \fBdead\fR state for its own purposes (see node `Attic\(aq in the CVS manual); to
@@ -1113,7 +1113,7 @@ Useful with \fBcvs\fR.  Write descriptiv
 contents of the named \fIfile\fR into the RCS file,
 deleting the existing text.  The \fIfile\fR pathname
 may not begin with \fB-\fR.  The descriptive text can be seen in the
-output from \fBcvs log\fR (see node `log\(aq in the CVS manual).
+output from \fBcvs log\fR (see node `log & rlog\(aq in the CVS manual).
 There can be no space between \fB-t\fR and its argument.
 .SP
 If \fIfile\fR is omitted,
@@ -1171,9 +1171,10 @@ files.  However, \fBcvs\fR has always re
 this option has never done anything useful.
 .SP
 .SP
-.SH "annotate"
+.SH "annotate & rannotate"
 .SS "What revision modified each line of a file?"
 .IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: annotate [options] files\&...
@@ -1225,6 +1226,8 @@ existed on \fIdate\fR.  See see node `Co
 Annotate file as of specified date.
 .SP
 .SH "annotate example"
+.IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
 .SP
 For example:
 .SP
@@ -1511,6 +1514,7 @@ $ cvs checkout -D yesterday tc
 .SH "commit"
 .SS "Check files into the repository"
 .IX "commit (subcommand)"
+.IX "ci (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: commit [-lnRf] [-m \(aqlog_message\(aq |
@@ -1550,7 +1554,7 @@ enter a log message that will be written
 logging programs (see node `modules\(aq in the CVS manual, and see node `loginfo\(aq in the CVS manual)
 and placed in the \fBrcs\fR file inside the
 repository.  This log message can be retrieved with the
-\fBlog\fR command; see see node `log\(aq in the CVS manual.  You can specify the
+\fBlog\fR command (see node `log & rlog\(aq in the CVS manual).  You can specify the
 log message on the command line with the \fB-m
 \fImessage\fB\fR option, and thus avoid the editor invocation,
 or use the \fB-F \fIfile\fB\fR option to specify
@@ -1559,8 +1563,8 @@ that the argument file contains the log 
 At \fBcommit\fR, a unique commitid is placed in the \fBrcs\fR
 file inside the repository. All files committed at once
 get the same commitid. The commitid can be retrieved with
-the \fBlog\fR and \fBstatus\fR command; see see node `log\(aq in the CVS manual,
-see node `File status\(aq in the CVS manual.
+the \fBlog\fR and \fBstatus\fR command (see node `log & rlog\(aq in the CVS manual,
+see node `File status\(aq in the CVS manual).
 .SP
 .SH "commit options"
 .SP
@@ -2821,6 +2825,12 @@ A file was modified.
 .IP "" 4
 A file was removed.
 .SP
+One record type results from the admin command:
+.IP "" 2
+\fBX\fR
+.IP "" 4
+The admin command.
+.SP
 The options shown as \fB-flags\fR constrain or expand
 the report without requiring option arguments:
 .SP
@@ -3117,9 +3127,10 @@ $ cvs -d /usr/local/cvsroot init
 .PD
 .IP "" 0
 .SP
-.SH "log"
+.SH "log & rlog"
 .SS "Print out log information for files"
 .IX "log (subcommand)"
+.IX "rlog (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: log [options] [files\&...]
@@ -3488,7 +3499,7 @@ verifymsg
 .IX "rdiff (subcommand)"
 .SP
 .IP "\(bu" 2
-rdiff [-flags] [-V vn] (-r tag1[:date1] | -D date1) [-r tag2[:date2] | -D date2] modules\&...
+rdiff [options] {-r tag1[:date1] | -D date1} [-r tag2[:date2] | -D date2] modules\&...
 .IP "\(bu" 2
 Requires: repository.
 .IP "\(bu" 2
@@ -3499,10 +3510,7 @@ 

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-04-28 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Apr 28 07:13:16 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add a missing section documenting the "tag" and
"rtag" commands. This is taken mostly from the upstream project's
cvs.texinfo revisions 1.686 and 1.687. Additionally, I've reflected
NetBSD's local changes to log "tag" as well as "rtag" in history, and
to require admin privileges for destructive tagging commands. This
addresses PR bin/33877.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.8 src/external/gpl2/xcvs/dist/doc/cvs.1:1.9
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.8	Sun Mar  3 21:11:54 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sun Apr 28 07:13:16 2019
@@ -2779,7 +2779,7 @@ export
 .IP "" 2
 \fBT\fR
 .IP "" 4
-rtag
+tag and rtag
 .SP
 One of five record types may result from an update:
 .SP
@@ -3925,6 +3925,154 @@ Load configuration from \fIpath\fR rathe
 \fB/etc/cvs.conf\fR or prefixed by \fB/etc/cvs/\fR.  This option is
 supported beginning with \fBcvs\fR release 1.12.13.
 .SP
+.SH "tag & rtag"
+.SS "Mark project snapshot for later retrieval."
+.IX "tag (subcommand)"
+.IX "freeze (subcommand)"
+.IX "rtag (subcommand)"
+.IX "rfreeze (subcommand)"
+.SP
+.IP "\(bu" 2
+tag [-bBcdFflR] [-r tag] [-D date] new_tag [files\&...]
+.IP "\(bu" 2
+Requires: working directory, repository.
+.IP "\(bu" 2
+Changes: repository.
+.IP "\(bu" 2
+Synonym: ta, freeze
+.SP
+and
+.SP
+.IP "\(bu" 2
+rtag [-abBdFflnR] [-r tag | -D date] new_tag module\&...
+.IP "\(bu" 2
+Requires: repository.
+.IP "\(bu" 2
+Changes: repository.
+.IP "\(bu" 2
+Synonym: rt, rfreeze
+.SP
+Use \fBtag\fR to assign symbolic tags to the revisions of files
+checked out into your sandbox.  The tags are applied immediately
+to the repository, with the revision numbers to attach the tag
+to supplied implicitly by the \fBcvs\fR records of your working files.
+.SP
+\fBrtag\fR works similarly, but does not need a sandbox to operate
+in, requiring an explicitly supplied tag or date instead (or assuming
+the tip of the trunk when one is not supplied explicitly).  \fBcvs\fR
+uses this preexisting tag or date to determine which revisions of
+files in the repository to attach the new symbolic tag to.
+.SP
+The symbolic tags are meant to permanently record which
+revisions of which files were used for some purpose.  The \fBcheckout\fR
+and \fBupdate\fR commands allow you to extract an exact
+copy of a tagged release at any time in the future,
+regardless of whether files have been changed, added,
+or removed on the trunk or other branches since the release was tagged.
+For more, see node `Branching and merging\(aq in the CVS manual.
+.SP
+These commands may also be used to delete a symbolic tag,
+or to create a branch.  See the options section below.
+.SP
+Note if you wish to run destructive commands such as tag deletion, you may
+need to be a member of the group \fBcvsadmin\fR to do this.
+.SP
+If you attempt to create a tag that already exists,
+CVS will complain and not overwrite that tag.  Use
+the \fB-F\fR option to move the tag to a new set of
+revisions.
+.SP
+These standard options are supported by \fBtag\fR or \fBrtag\fR
+(see node `Common options\(aq in the CVS manual, for a complete description of them):
+.SP
+.IP "" 0
+\fB-D \fIdate\fB\fR
+.IP "" 2
+Tag the most recent revision no later than \fIdate\fR.  This option is
+not valid when deleting tags (see \fB-d\fR option, below).
+.SP
+.IP "" 0
+\fB-l\fR
+.IP "" 2
+Local; run only in current working directory.  see node `Recursive behavior\(aq in the CVS manual.
+.SP
+.IP "" 0
+\fB-R\fR
+.IP "" 2
+Update directories recursively (default).  see node `Recursive behavior\(aq in the CVS manual.
+.SP
+.IP "" 0
+\fB-r \fItag\fB[:\fIdate\fB]\fR
+.IP "" 2
+Tag the revisions specified by \fItag\fR or, when \fIdate\fR is specified
+and \fItag\fR is a branch tag, the version from the branch \fItag\fR as it
+existed on \fIdate\fR.  This option is not valid when deleting tags
+(see \fB-d\fR option, below).
+.SP
+Several tag specific options are also available.  When an option is only
+available with one of \fBtag\fR or \fBrtag\fR, it is noted below:
+.SP
+.IP "" 0
+\fB-a\fR
+.IP "" 2
+Clear \fInew_tag\fR from removed files that would not otherwise be tagged
+(\fBrtag\fR only).
+.SP
+.IP "" 0
+\fB-B\fR
+.IP "" 2
+Allows \fB-d\fR or \fB-F\fR to delete or move branch tags.
+.SP
+\fBWARNING: Recovering the information stored by branch tags is
+a very hard problem, more so than regular tags.  Be absolutely sure you
+understand what you are doing before using this 

CVS commit: src/sys/dev/pci

2019-04-19 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Fri Apr 19 19:37:31 UTC 2019

Modified Files:
src/sys/dev/pci: if_iwn.c

Log Message:
if_iwn.c: add a comment noting which PCI IDs are covered by an else
statement that loads a specific firmware variant. While here, also
amend the formatting of two other comments.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pci/if_iwn.c

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

Modified files:

Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.90 src/sys/dev/pci/if_iwn.c:1.91
--- src/sys/dev/pci/if_iwn.c:1.90	Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_iwn.c	Fri Apr 19 19:37:31 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iwn.c,v 1.90 2018/06/26 06:48:01 msaitoh Exp $	*/
+/*	$NetBSD: if_iwn.c,v 1.91 2019/04/19 19:37:31 gutteridge Exp $	*/
 /*	$OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.90 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.91 2019/04/19 19:37:31 gutteridge Exp $");
 
 #define IWN_USE_RBUF	/* Use local storage for RX */
 #undef IWN_HWCRYPTO	/* XXX does not even compile yet */
@@ -523,9 +523,11 @@ iwn_attach(device_t parent __unused, dev
 	ic->ic_opmode = IEEE80211_M_STA;	/* default to BSS mode */
 	ic->ic_state = IEEE80211_S_INIT;
 
-	/* Set device capabilities. */
-	/* XXX OpenBSD has IEEE80211_C_WEP, IEEE80211_C_RSN,
-	 * and IEEE80211_C_PMGT too. */
+	/*
+	 * Set device capabilities.
+	 * XXX OpenBSD has IEEE80211_C_WEP, IEEE80211_C_RSN, and
+	 * IEEE80211_C_PMGT too.
+	 */
 	ic->ic_caps =
 	IEEE80211_C_IBSS |		/* IBSS mode support */
 	IEEE80211_C_WPA |		/* 802.11i */
@@ -622,7 +624,7 @@ iwn_attach(device_t parent __unused, dev
 	/*
 	 * XXX for NetBSD, OpenBSD timeout_set replaced by
 	 * callout_init and callout_setfunc, above.
-	*/
+	 */
 
 	if (pmf_device_register(self, NULL, iwn_resume))
 		pmf_class_network_register(self, ifp);
@@ -780,6 +782,11 @@ iwn5000_attach(struct iwn_softc *sc, pci
 			sc->fwname = "iwlwifi-6000g2b-6.ucode";
 			ops->config_bt_coex = iwn_config_bt_coex_adv1;
 		}
+		/*
+		 * This covers:
+		 * PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1
+		 * PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2
+		 */
 		else
 			sc->fwname = "iwlwifi-6000g2a-5.ucode";
 		break;



CVS commit: src/usr.sbin/cpuctl

2019-04-15 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Mon Apr 15 22:37:13 UTC 2019

Modified Files:
src/usr.sbin/cpuctl: cpuctl.8

Log Message:
cpuctl.8: update the URL for AMD microcode, the previous site listed is
apparently defunct.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/cpuctl/cpuctl.8

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

Modified files:

Index: src/usr.sbin/cpuctl/cpuctl.8
diff -u src/usr.sbin/cpuctl/cpuctl.8:1.18 src/usr.sbin/cpuctl/cpuctl.8:1.19
--- src/usr.sbin/cpuctl/cpuctl.8:1.18	Sun Jan 14 00:45:54 2018
+++ src/usr.sbin/cpuctl/cpuctl.8	Mon Apr 15 22:37:13 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cpuctl.8,v 1.18 2018/01/14 00:45:54 mrg Exp $
+.\"	$NetBSD: cpuctl.8,v 1.19 2019/04/15 22:37:13 gutteridge Exp $
 .\"
 .\" Copyright (c) 2007, 2008, 2012, 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 13, 2018
+.Dd April 15, 2019
 .Dt CPUCTL 8
 .Os
 .Sh NAME
@@ -113,7 +113,7 @@ where
 .Dv XX
 is the CPU family starting with 15 (hex).
 Get it from
-.Lk http://www.amd64.org/microcode.html
+.Lk https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/amd-ucode
 .El
 .Sh EXAMPLES
 Run



CVS commit: src/bin/pax

2019-03-19 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed Mar 20 03:13:39 UTC 2019

Modified Files:
src/bin/pax: file_subs.c tar.c

Log Message:
pax: fix typos in comments in file_subs.c & tar.c

Stamp out "greengrocers' apostrophes" in various places (arguably there
are still more present, but style guides vary on that, and my energies
spent corralling wayward punctuation marks could be spent elsewhere).


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/bin/pax/file_subs.c
cvs rdiff -u -r1.74 -r1.75 src/bin/pax/tar.c

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

Modified files:

Index: src/bin/pax/file_subs.c
diff -u src/bin/pax/file_subs.c:1.63 src/bin/pax/file_subs.c:1.64
--- src/bin/pax/file_subs.c:1.63	Mon Jul 29 17:46:36 2013
+++ src/bin/pax/file_subs.c	Wed Mar 20 03:13:39 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: file_subs.c,v 1.63 2013/07/29 17:46:36 christos Exp $	*/
+/*	$NetBSD: file_subs.c,v 1.64 2019/03/20 03:13:39 gutteridge Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: file_subs.c,v 1.63 2013/07/29 17:46:36 christos Exp $");
+__RCSID("$NetBSD: file_subs.c,v 1.64 2019/03/20 03:13:39 gutteridge Exp $");
 #endif
 #endif /* not lint */
 
@@ -895,7 +895,7 @@ set_chflags(char *fnm, u_int32_t flags)
  *	actual storage is quite small (the files are sparse). The problem is
  *	the holes read as all zeros so are probably stored on the archive that
  *	way (there is no way to determine if the file block is really a hole,
- *	we only know that a file block of all zero's can be a hole).
+ *	we only know that a file block of all zeros can be a hole).
  *	At this writing, no major archive format knows how to archive files
  *	with holes. However, on extraction (or during copy, -rw) we have to
  *	deal with these files. Without detecting the holes, the files can
@@ -968,7 +968,7 @@ file_write(int fd, char *str, int cnt, i
 		if (*isempt) {
 			/*
 			 * have not written to this block yet, so we keep
-			 * looking for zero's
+			 * looking for zeros
 			 */
 			pt = st;
 			end = st + wcnt;

Index: src/bin/pax/tar.c
diff -u src/bin/pax/tar.c:1.74 src/bin/pax/tar.c:1.75
--- src/bin/pax/tar.c:1.74	Fri Nov 30 00:53:11 2018
+++ src/bin/pax/tar.c	Wed Mar 20 03:13:39 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: tar.c,v 1.74 2018/11/30 00:53:11 christos Exp $	*/
+/*	$NetBSD: tar.c,v 1.75 2019/03/20 03:13:39 gutteridge Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: tar.c,v 1.74 2018/11/30 00:53:11 christos Exp $");
+__RCSID("$NetBSD: tar.c,v 1.75 2019/03/20 03:13:39 gutteridge Exp $");
 #endif
 #endif /* not lint */
 
@@ -351,7 +351,7 @@ tar_chksm(char *blk, int len)
 	 * checksum field as the sum of 8 blanks (which is pre-computed as
 	 * BLNKSUM).
 	 * ASSUMED: len is greater than CHK_OFFSET. (len is where our 0 padding
-	 * starts, no point in summing zero's)
+	 * starts, no point in summing zeros)
 	 */
 	pt += CHK_LEN;
 	stop = blk + len;
@@ -368,7 +368,7 @@ tar_chksm(char *blk, int len)
  * tar_id()
  *	determine if a block given to us is a valid tar header (and not a USTAR
  *	header). We have to be on the lookout for those pesky blocks of	all
- *	zero's.
+ *	zeros.
  * Return:
  *	0 if a tar header, -1 otherwise
  */
@@ -386,7 +386,7 @@ tar_id(char *blk, int size)
 	uhd = (HD_USTAR *)blk;
 
 	/*
-	 * check for block of zero's first, a simple and fast test, then make
+	 * check for block of zeros first, a simple and fast test, then make
 	 * sure this is not a ustar header by looking for the ustar magic
 	 * cookie. We should use TMAGLEN, but some USTAR archive programs are
 	 * wrong and create archives missing the \0. Last we check the
@@ -769,7 +769,7 @@ ustar_stwr(void)
 /*
  * ustar_id()
  *	determine if a block given to us is a valid ustar header. We have to
- *	be on the lookout for those pesky blocks of all zero's
+ *	be on the lookout for those pesky blocks of all zeros
  * Return:
  *	0 if a ustar header, -1 otherwise
  */
@@ -784,7 +784,7 @@ ustar_id(char *blk, int size)
 	hd = (HD_USTAR *)blk;
 
 	/*
-	 * check for block of zero's first, a simple and fast test then check
+	 * check for block of zeros first, a simple and fast test then check
 	 * ustar magic cookie. We should use TMAGLEN, but some USTAR archive
 	 * programs are fouled up and create archives missing the \0. Last we
 	 * check the checksum. If ok we have to assume it is a valid header.
@@ -1379,7 +1379,7 @@ tar_gnutar_exclude_one(const char *line,
 }
 
 /*
- * deal with GNU tar -X/--exclude-from & --exclude switchs.  basically,
+ * deal with GNU tar -X/--exclude-from & --exclude switches.  basically,
  * we go through each line of the file, building a string from the "glob"
  * lines in the file into RE lines, of 

CVS commit: src/bin/pax

2019-03-19 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed Mar 20 02:50:50 UTC 2019

Modified Files:
src/bin/pax: pat_rep.c

Log Message:
pax: minor adjustments to comments in pat_rep.c

Amend several comments to match present reality (the functionality was
added back in 2007).


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/bin/pax/pat_rep.c

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

Modified files:

Index: src/bin/pax/pat_rep.c
diff -u src/bin/pax/pat_rep.c:1.30 src/bin/pax/pat_rep.c:1.31
--- src/bin/pax/pat_rep.c:1.30	Wed Jun 13 15:14:40 2018
+++ src/bin/pax/pat_rep.c	Wed Mar 20 02:50:50 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pat_rep.c,v 1.30 2018/06/13 15:14:40 christos Exp $	*/
+/*	$NetBSD: pat_rep.c,v 1.31 2019/03/20 02:50:50 gutteridge Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: pat_rep.c,v 1.30 2018/06/13 15:14:40 christos Exp $");
+__RCSID("$NetBSD: pat_rep.c,v 1.31 2019/03/20 02:50:50 gutteridge Exp $");
 #endif
 #endif /* not lint */
 
@@ -85,12 +85,13 @@ static int resub(regex_t *, regmatch_t *
  *	parses the -s replacement string; compiles the regular expression
  *	and stores the compiled value and its replacement string together in
  *	replacement string list. Input to this function is of the form:
- *		/old/new/pg
+ *		/old/new/gps
  *	The first char in the string specifies the delimiter used by this
  *	replacement string. "Old" is a regular expression in "ed" format which
  *	is compiled by regcomp() and is applied to filenames. "new" is the
- *	substitution string; p and g are options flags for printing and global
- *	replacement (over the single filename)
+ *	substitution string; g, p, and s are options flags for global
+ *	replacement (over the single filename), printing, and preventing
+ *	substitutions on symbolic link destinations.
  * Return:
  *	0 if a proper replacement string and regular expression was added to
  *	the list of replacement patterns; -1 otherwise.
@@ -895,7 +896,7 @@ fix_path( char *or_name, int *or_len, ch
  *	namelen the size of the name buffer.
  *	nlen is the length of this name (and is modified to hold the length of
  *	the final string).
- *	prnt is a flag that says whether to print the final result.
+ *	flags contains various options to control behavior.
  * Return:
  *	0 if substitution was successful, 1 if we are to skip the file (the name
  *	ended up empty)



CVS commit: src/bin/pax

2019-03-18 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Mar 19 00:36:14 UTC 2019

Modified Files:
src/bin/pax: pax.1 tar.1

Log Message:
pax.1 & tar.1: add a minor clarification about "-s"

As a somewhat pedantic clarification, "-s" does not accept backslashes
as delimiters. (While here, also make the macro use of an expression
shared between pax.1 and tar.1 consistent.)


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/bin/pax/pax.1
cvs rdiff -u -r1.37 -r1.38 src/bin/pax/tar.1

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

Modified files:

Index: src/bin/pax/pax.1
diff -u src/bin/pax/pax.1:1.70 src/bin/pax/pax.1:1.71
--- src/bin/pax/pax.1:1.70	Tue Mar 19 00:12:08 2019
+++ src/bin/pax/pax.1	Tue Mar 19 00:36:14 2019
@@ -1,4 +1,4 @@
-.\"$NetBSD: pax.1,v 1.70 2019/03/19 00:12:08 gutteridge Exp $
+.\"$NetBSD: pax.1,v 1.71 2019/03/19 00:36:14 gutteridge Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
 .\" Copyright (c) 1992, 1993
@@ -585,7 +585,8 @@ The
 string may also contain
 .Aq Dv newline
 characters.
-Any non-null character can be used as a delimiter (/ is shown here).
+Any non-null character except a backslash (\\) can be used as a delimiter
+(/ is shown here).
 Multiple
 .Fl s
 expressions can be specified.

Index: src/bin/pax/tar.1
diff -u src/bin/pax/tar.1:1.37 src/bin/pax/tar.1:1.38
--- src/bin/pax/tar.1:1.37	Mon Jul  3 21:33:23 2017
+++ src/bin/pax/tar.1	Tue Mar 19 00:36:14 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: tar.1,v 1.37 2017/07/03 21:33:23 wiz Exp $
+.\" $NetBSD: tar.1,v 1.38 2019/03/19 00:36:14 gutteridge Exp $
 .\"
 .\" Copyright (c) 1996 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\"
 .\"	OpenBSD: tar.1,v 1.28 2000/11/09 23:58:56 aaron Exp
 .\"
-.Dd December 19, 2015
+.Dd March 19, 2019
 .Dt TAR 1
 .Os
 .Sh NAME
@@ -177,7 +177,8 @@ The
 string may also contain
 .Aq Dv newline
 characters.
-Any non-null character can be used as a delimiter (/ is shown here).
+Any non-null character except a backslash (\\) can be used as a delimiter
+(/ is shown here).
 Multiple
 .Fl s
 expressions can be specified.
@@ -196,7 +197,7 @@ The optional trailing
 will cause the final result of a successful substitution to be written to
 .Dv standard error
 in the following format:
-.Dl  >> 
+.Dl Ao "original pathname" Ac >> Ao "new pathname" Ac
 File or archive member names that substitute to the empty string
 are not selected and will be skipped.
 The substitutions are applied by default to the destination hard and symbolic



CVS commit: src/bin/pax

2019-03-18 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Mar 19 00:12:08 UTC 2019

Modified Files:
src/bin/pax: pax.1

Log Message:
pax.1: document the "s" flag of the "s" option

Note the "s" option has an "s" flag that "prevents substitutions from
being performed on symbolic link destinations". Carry over r. 1.25 from
christos@ and part of r. 1.26 from wiz@ from tar.1, since this
functionality is available in pax as well as tar.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/bin/pax/pax.1

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

Modified files:

Index: src/bin/pax/pax.1
diff -u src/bin/pax/pax.1:1.69 src/bin/pax/pax.1:1.70
--- src/bin/pax/pax.1:1.69	Mon Jul  3 21:33:23 2017
+++ src/bin/pax/pax.1	Tue Mar 19 00:12:08 2019
@@ -1,4 +1,4 @@
-.\"$NetBSD: pax.1,v 1.69 2017/07/03 21:33:23 wiz Exp $
+.\"$NetBSD: pax.1,v 1.70 2019/03/19 00:12:08 gutteridge Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
 .\" Copyright (c) 1992, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
 .\"
-.Dd August 12, 2016
+.Dd March 19, 2019
 .Dt PAX 1
 .Os
 .Sh NAME
@@ -572,7 +572,7 @@ using the syntax of the
 .Xr ed 1
 utility regular expressions.
 The format of these regular expressions are:
-.Dl /old/new/[gp]
+.Dl /old/new/[gps]
 As in
 .Xr ed 1 ,
 .Cm old
@@ -607,6 +607,11 @@ in the following format:
 .Dl Ao "original pathname" Ac >> Ao "new pathname" Ac
 File or archive member names that substitute to the empty string
 are not selected and will be skipped.
+The substitutions are applied by default to the destination hard and symbolic
+links.
+The optional trailing
+.Cm s
+prevents the substitutions from being performed on symbolic link destinations.
 .It Fl t
 Reset the access times of any file or directory read or accessed by
 .Nm



CVS commit: src/external/gpl2/xcvs/dist/doc

2019-03-03 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Mar  3 21:26:18 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo

Log Message:
cvs.texinfo: add minor formatting fix for Texinfo >5.0

Pull over a tiny fix from pkgsrc's devel/scmcvs patch-ab to support
generating info files with newer versions of Texinfo than what's
shipped in base presently. (Should base be updated at some point, or
for those using an external toolchain here.)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.9
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8	Sun Mar  3 21:11:54 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sun Mar  3 21:26:18 2019
@@ -111,9 +111,9 @@ approved by the Free Software Foundation
 @sp 4
 @comment The title is printed in a large font.
 @center @titlefont{Version Management}
-@sp
+@sp 1
 @center @titlefont{with}
-@sp
+@sp 1
 @center @titlefont{CVS}
 @sp 2
 @center for @sc{cvs} @value{VERSION}



CVS commit: src/external/gpl2/xcvs/dist/doc

2019-03-03 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Mar  3 21:11:54 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: minor amendments and cvs.1 regen

Put a cross-reference to "init" back in "Creating a Repository" and
other minor formatting tweaks, and regenerate cvs.1 to reflect the
previous changes by christos@ in cvs.texinfo r. 1.7.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl2/xcvs/dist/doc/cvs.1 \
src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.7 src/external/gpl2/xcvs/dist/doc/cvs.1:1.8
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.7	Sat Mar  2 21:30:40 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sun Mar  3 21:11:54 2019
@@ -3086,7 +3086,7 @@ See see node `Tracking sources\(aq in th
 .IX "init (subcommand)"
 .SP
 .IP "\(bu" 2
-init
+Synopsis: init
 .IP "\(bu" 2
 Requires: working directory.
 .IP "\(bu" 2
@@ -3096,10 +3096,16 @@ The \fBinit\fR command initializes a rep
 \fBCVSROOT\fR subdirectory and some default control files. You must
 use this command or initialize the repository in some other way before
 you can use it. Specify the root of the repository with the general
-\fB-d\fR option.
+\fB-d\fR option.  This will set up an empty repository in the
+\fBcvs\fR root specified in the usual way (see node `Repository\(aq in the CVS manual).
+.SP
+\fBinit\fR is careful to never overwrite any existing files in the
+repository, so no harm is done if you run \fBinit\fR on an already
+set-up repository. Note you may need to be a member of the group
+\fBcvsadmin\fR to do this.
 .SP
 Note \fBinit\fR will enable history logging; if you don\(aqt want that,
-remove the history file after running \fBinit\fR.
+remove the history file after running \fBinit\fR (see node `history file\(aq in the CVS manual).
 .SP
 .SH "init examples"
 .SP
Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7	Sun Mar  3 02:21:07 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sun Mar  3 21:11:54 2019
@@ -1939,6 +1939,9 @@ possible to use @sc{cvs} to read from a 
 which one only has read access to; @sc{cvs} needs to be
 able to create lock files (@pxref{Concurrency}).
 
+To create a repository, run the @code{cvs init} 	 
+command (@pxref{init}).
+
 @node Backing up
 @section Backing up a repository
 @cindex Repository, backing up
@@ -10868,21 +10871,20 @@ use this command or initialize the repos
 you can use it. Specify the root of the repository with the general
 @code{-d} option.  This will set up an empty repository in the
 @sc{cvs} root specified in the usual way (@pxref{Repository}).
-For example,
 
-@code{cvs init} is careful to never overwrite any
-existing files in the repository, so no harm is done if
-you run @code{cvs init} on an already set-up
-repository. Note you may need to be a member of the
-group @code{cvsadmin} to do this.
+@code{init} is careful to never overwrite any existing files in the
+repository, so no harm is done if you run @code{init} on an already
+set-up repository. Note you may need to be a member of the group
+@code{cvsadmin} to do this.
 
 Note @code{init} will enable history logging; if you don't want that,
-remove the history file after running @code{init}.  @xref{history file}.
+remove the history file after running @code{init} (@pxref{history file}).
 
 @menu
 * init examples:  init examples
 @end menu
 
+@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 @node init examples
 @appendixsubsec init examples
 



CVS commit: src/external/gpl2/xcvs/dist/doc

2019-03-02 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat Mar  2 21:30:40 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add details about "init"

Add a section about the "init" command that has been missing all this
time. Part of the basic description is resurrected from r. 1.20 of
cvs.1 (in its prior incarnation in the CVS project tree under /man
rather than /doc), contributed by Tom Lees back in 1999. The caveat
about the history file is copied from elsewhere in the current
cvs.texinfo file. Additional fragments written by me. Addresses the
PR bin/45446.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.6 src/external/gpl2/xcvs/dist/doc/cvs.1:1.7
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.6	Tue Feb 12 01:32:08 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sat Mar  2 21:30:40 2019
@@ -3081,6 +3081,36 @@ see node `modules\(aq in the CVS manual.
 .SP
 See see node `Tracking sources\(aq in the CVS manual, and see node `From files\(aq in the CVS manual.
 .SP
+.SH "init"
+.SS "Initialize a repository"
+.IX "init (subcommand)"
+.SP
+.IP "\(bu" 2
+init
+.IP "\(bu" 2
+Requires: working directory.
+.IP "\(bu" 2
+Changes: repository, working directory.
+.SP
+The \fBinit\fR command initializes a repository by adding the
+\fBCVSROOT\fR subdirectory and some default control files. You must
+use this command or initialize the repository in some other way before
+you can use it. Specify the root of the repository with the general
+\fB-d\fR option.
+.SP
+Note \fBinit\fR will enable history logging; if you don\(aqt want that,
+remove the history file after running \fBinit\fR.
+.SP
+.SH "init examples"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ cvs -d /usr/local/cvsroot init
+
+.PD
+.IP "" 0
+.SP
 .SH "log"
 .SS "Print out log information for files"
 .IX "log (subcommand)"

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.6
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5	Tue Feb 12 01:32:08 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sat Mar  2 21:30:40 2019
@@ -1952,7 +1952,8 @@ cvs -d /usr/local/cvsroot init
 @code{cvs init} is careful to never overwrite any
 existing files in the repository, so no harm is done if
 you run @code{cvs init} on an already set-up
-repository.
+repository. Note you may need to be a member of the
+group @code{cvsadmin} to do this.
 
 @code{cvs init} will enable history logging; if you
 don't want that, remove the history file after running
@@ -8126,6 +8127,7 @@ reference to @sc{cvs} commands, @pxref{I
 * export::  Export sources from CVS, similar to checkout
 * history:: Show status of files and users
 * import::  Import sources into CVS, using vendor branches
+* init::Initialize a repository
 * log:: Show log messages for files
 * ls & rls::List files in the repository
 * rdiff::   'patch' format diffs between releases
@@ -10867,6 +10869,37 @@ to recreate symbolic links on checkout, 
 See @ref{Tracking sources}, and @ref{From files}.
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+@node init
+@appendixsec init---Initialize a repository
+@cindex init (subcommand)
+
+@itemize @bullet
+@item
+init
+@item
+Requires: working directory.
+@item
+Changes: repository, working directory.
+@end itemize
+
+The @code{init} command initializes a repository by adding the
+@file{CVSROOT} subdirectory and some default control files. You must
+use this command or initialize the repository in some other way before
+you can use it. Specify the root of the repository with the general
+@code{-d} option.
+
+Note @code{init} will enable history logging; if you don't want that,
+remove the history file after running @code{init}.
+
+@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+@node init examples
+@appendixsubsec init examples
+
+@example
+$ cvs -d /usr/local/cvsroot init
+@end example
+
+@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 @node log
 @appendixsec log---Print out log information for files
 @cindex log (subcommand)



CVS commit: src/usr.sbin/ifwatchd

2019-02-17 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Feb 17 20:50:25 UTC 2019

Modified Files:
src/usr.sbin/ifwatchd: ifwatchd.8

Log Message:
ifwatchd(8): remove lingering references to dhclient(8). In this case,
its replacement handles carrier detection itself. Addresses part of
PR misc/53669.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/ifwatchd/ifwatchd.8

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

Modified files:

Index: src/usr.sbin/ifwatchd/ifwatchd.8
diff -u src/usr.sbin/ifwatchd/ifwatchd.8:1.28 src/usr.sbin/ifwatchd/ifwatchd.8:1.29
--- src/usr.sbin/ifwatchd/ifwatchd.8:1.28	Sun Sep 23 07:24:20 2018
+++ src/usr.sbin/ifwatchd/ifwatchd.8	Sun Feb 17 20:50:25 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifwatchd.8,v 1.28 2018/09/23 07:24:20 maxv Exp $
+.\" $NetBSD: ifwatchd.8,v 1.29 2019/02/17 20:50:25 gutteridge Exp $
 .\"
 .\" Copyright (c) 2001-2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 22, 2018
+.Dd February 17, 2019
 .Dt IFWATCHD 8
 .Os
 .Sh NAME
@@ -163,33 +163,6 @@ Use
 in your
 .Pa /etc/ifconfig.pppoe0
 file in the on-demand case.
-.Pp
-The next example is for dhclient users.
-.Bd -literal -offset indent
-# ifwatchd -i -c /etc/dhcp/carrier-detect tlp0
-.Ed
-.Pp
-With the above command, the carrier-detect script will be invoked when
-a carrier is detected on the interface
-.Ar tlp0 .
-Note that the
-.Fl i
-flag prevents any action based on the initial state.
-A script like the following should work for most users, although it
-will not work for machines with multiple interfaces running
-.Cm dhclient .
-.Bd -literal -offset indent
-#! /bin/sh
-# Arguments:  ifname tty speed address destination
-# If there is a dhclient already running, kill it.
-# (This step could be put in a distinct no-carrier script,
-# if desired.)
-if [ -f /var/run/dhclient.pid ]; then
-   /bin/kill `/bin/cat /var/run/dhclient.pid`
-fi
-# Start dhclient again on this interface
-/sbin/dhclient $1
-.Ed
 .Sh PARAMETERS PASSED TO SCRIPTS
 The invoked scripts get passed these parameters:
 .Bl -tag -width destination



CVS commit: src/usr.sbin/pf/etc/defaults

2019-02-17 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Feb 17 20:45:47 UTC 2019

Modified Files:
src/usr.sbin/pf/etc/defaults: pf.boot.conf

Log Message:
pf.boot.conf: remove lingering references to dhclient(8), and while
here, capitalize acronyms. Addresses part of PR misc/53669.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/pf/etc/defaults/pf.boot.conf

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

Modified files:

Index: src/usr.sbin/pf/etc/defaults/pf.boot.conf
diff -u src/usr.sbin/pf/etc/defaults/pf.boot.conf:1.4 src/usr.sbin/pf/etc/defaults/pf.boot.conf:1.5
--- src/usr.sbin/pf/etc/defaults/pf.boot.conf:1.4	Fri May 26 15:40:27 2017
+++ src/usr.sbin/pf/etc/defaults/pf.boot.conf	Sun Feb 17 20:45:47 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: pf.boot.conf,v 1.4 2017/05/26 15:40:27 hauke Exp $
+#	$NetBSD: pf.boot.conf,v 1.5 2019/02/17 20:45:47 gutteridge Exp $
 #
 # /etc/defaults/pf.boot.conf --
 #	initial configuration for pf(4)
@@ -15,12 +15,12 @@ block all
 # Don't block loopback.
 pass on lo0
 
-# Allow outgoing dns, needed by pfctl to resolve names.
+# Allow outgoing DNS, needed by pfctl to resolve names.
 pass out proto { tcp, udp } from any to any port 53 keep state
 
-# Allow outgoing ping request, might be needed by dhclient to validate
-# old (but valid) leases in /var/db/dhclient.leases in case it needs to
-# fall back to such a lease (the dhcp server can be down or not responding).
+# Allow outgoing ping request, might be used by a DHCP client to validate
+# old (but valid) leases in case it needs to fall back to such a lease
+# (the DHCP server can be down or not responding).
 pass out inet proto icmp all icmp-type echoreq keep state
 
 # Allow IPv6 router/neighbor solicitation and advertisement.
@@ -29,5 +29,5 @@ pass in inet6 proto ipv6-icmp all icmp6-
 pass out inet6 proto ipv6-icmp all icmp6-type routersol
 pass in inet6 proto ipv6-icmp all icmp6-type routeradv
 
-# Enable carp, to avoid spurious failovers.
+# Enable CARP, to avoid spurious failovers.
 pass proto carp



CVS commit: src/usr.bin/make

2019-02-15 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat Feb 16 07:41:13 UTC 2019

Modified Files:
src/usr.bin/make: make.1

Log Message:
make(1): minor grammar fixes in BUGS section


To generate a diff of this commit:
cvs rdiff -u -r1.273 -r1.274 src/usr.bin/make/make.1

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/make.1
diff -u src/usr.bin/make/make.1:1.273 src/usr.bin/make/make.1:1.274
--- src/usr.bin/make/make.1:1.273	Sun May 27 01:14:51 2018
+++ src/usr.bin/make/make.1	Sat Feb 16 07:41:12 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.273 2018/05/27 01:14:51 christos Exp $
+.\"	$NetBSD: make.1,v 1.274 2019/02/16 07:41:12 gutteridge Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd May 26, 2018
+.Dd February 16, 2019
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -2403,9 +2403,9 @@ file).
 .Sh BUGS
 The
 .Nm
-syntax is difficult to parse without actually acting of the data.
-For instance finding the end of a variable use should involve scanning each
-the modifiers using the correct terminator for each field.
+syntax is difficult to parse without actually acting on the data.
+For instance, finding the end of a variable's use should involve scanning
+each of the modifiers, using the correct terminator for each field.
 In many places
 .Nm
 just counts {} and () in order to find the end of a variable expansion.



CVS commit: src/external/gpl2/xcvs/dist/doc

2019-02-11 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Feb 12 01:32:08 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add information about the "update" command's "-t"
flag to cvs.texinfo, so the installed man and info documentation match
here. This makes cvs.1 auto-generable from cvs.texinfo again, which I
plan to leverage with further additions later.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.5 src/external/gpl2/xcvs/dist/doc/cvs.1:1.6
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.5	Sun Feb 10 22:36:27 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Tue Feb 12 01:32:08 2019
@@ -3900,7 +3900,7 @@ Requires: repository, working directory.
 .IP "\(bu" 2
 Changes: working directory.
 .SP
-After you\(aqve run checkout to create your private copy
+After you\(aqve run \fBcheckout\fR to create your private copy
 of source from the common repository, other developers
 will continue changing the central source.  From time
 to time, when it is convenient in your development
@@ -3954,19 +3954,6 @@ Local; run only in current working direc
 Prune empty directories.  See see node `Moving directories\(aq in the CVS manual.
 .SP
 .IP "" 0
-\fB-t\fR
-.IP "" 2
-Preserve source timestamps.  Unlike \fBcheckout\fR where files are created
-using the original timestamp of the file in the repository, \fBupdate\fR
-updates files using the current time of the machine.  This is convenient
-because updated files appear newer than any other files on the system so
-.BR make ( 1 )
-knows that are their corresponding built artifacts are out of date and
-they will get rebuilt.  The \fB-t\fR flag instead preserves the timestamps
-of the original repository files, behaving exactly like \fBcheckout\fR.
-This is useful for maintaining a tree in the original checked-out state.
-.SP
-.IP "" 0
 \fB-p\fR
 .IP "" 2
 Pipe files to the standard output.
@@ -3986,6 +3973,18 @@ existed on \fIdate\fR.  This option is s
 See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates. Also
 see see node `Common options\(aq in the CVS manual.
 .SP
+.IP "" 0
+\fB-t\fR
+.IP "" 2
+Preserve source timestamps.  Unlike \fBcheckout\fR, where files are created
+using the original timestamp of the file in the repository, \fBupdate\fR
+updates files using the current time of the machine.  This is convenient
+because updated files appear newer than any other files on the system so
+\fBmake(1)\fR knows that their corresponding built artifacts are out of date
+and they will get rebuilt.  The \fB-t\fR flag instead preserves the timestamps
+of the original repository files, behaving exactly like \fBcheckout\fR.
+This is useful for maintaining a tree in the original checked-out state.
+.SP
 These special options are also available with
 \fBupdate\fR.
 .SP

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.4 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.4	Sun Feb 10 22:36:27 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Tue Feb 12 01:32:08 2019
@@ -11595,14 +11595,14 @@ supported beginning with @sc{cvs} releas
 
 @itemize @bullet
 @item
-update [-ACdflPpR] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files@dots{}
+update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files@dots{}
 @item
 Requires: repository, working directory.
 @item
 Changes: working directory.
 @end itemize
 
-After you've run checkout to create your private copy
+After you've run @code{checkout} to create your private copy
 of source from the common repository, other developers
 will continue changing the central source.  From time
 to time, when it is convenient in your development
@@ -11666,6 +11666,16 @@ and @var{tag} is a branch tag, the versi
 existed on @var{date}.  This option is sticky, and implies @samp{-P}.
 See @ref{Sticky tags}, for more information on sticky tags/dates. Also
 see @ref{Common options}.
+
+@item -t
+Preserve source timestamps.  Unlike @code{checkout}, where files are created
+using the original timestamp of the file in the repository, @code{update}
+updates files using the current time of the machine.  This is convenient
+because updated files appear newer than any other files on the system so
+@code{make(1)} knows that their corresponding built artifacts are out of date
+and they will get rebuilt.  The @samp{-t} flag instead preserves the timestamps
+of the original repository files, behaving exactly like @code{checkout}.
+This is useful 

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-02-10 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Feb 10 22:36:27 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add missing sections documenting the "add" and
"remove" commands. These were never present upstream on the branch
NetBSD imported, but were subsequently added on other branches (against
upstream's HEAD: cvs.1: r. 1.53 & cvs.texinfo: r. 1.697).

XXX While cvs.texinfo is supposed to be used to auto-generate cvs.1,
that isn't safe at present, because content has been added direct to
cvs.1 in NetBSD's tree.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.4 src/external/gpl2/xcvs/dist/doc/cvs.1:1.5
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.4	Fri Jan 20 16:54:11 2017
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sun Feb 10 22:36:27 2019
@@ -674,6 +674,111 @@ Available with the following commands: \
 and \fBupdate\fR.
 .SP
 .SP
+.SH "add"
+.SS "Add files and directories to the repository"
+.IX "add (subcommand)"
+.SP
+.IP "\(bu" 2
+Synopsis: add [-k rcs-kflag] [-m message] files...
+.IP "\(bu" 2
+Requires: repository, working directory.
+.IP "\(bu" 2
+Changes: repository, working directory.
+.SP
+The \fBadd\fR command is used to present new files
+and directories for addition into the \fBcvs\fR
+repository.  When \fBadd\fR is used on a directory,
+a new directory is created in the repository
+immediately.  When used on a file, only the working
+directory is updated.  Changes to the repository are
+not made until the \fBcommit\fR command is used on
+the newly added file. 
+.SP
+The \fBadd\fR command also resurrects files that
+have been previously removed.  This can be done
+before or after the \fBcommit\fR command is used
+to finalize the removal of files.  Resurrected files
+are restored into the working directory at the time
+the \fBadd\fR command is executed.
+.SP
+.SH "add options"
+.SP
+These standard options are supported by \fBadd\fR
+(see node `Common options\(aq in the CVS manual, for a complete description of
+them):
+.SP
+.IP "" 0
+\fB-k \fIkflag\fB\fR
+.IP "" 2
+Process keywords according to \fIkflag\fR.  See
+see node `Keyword substitution\(aq in the CVS manual.
+This option is sticky; future updates of
+this file in this working directory will use the same
+\fIkflag\fR.  The \fBstatus\fR command can be viewed
+to see the sticky options.  For more information on
+the \fBstatus\fR command, see node `Invoking CVS\(aq in the CVS manual.
+.SP
+.IP "" 0
+\fB-m \fImessage\fB\fR
+.IP "" 2
+Use \fImessage\fR as the log message, instead of
+invoking an editor.
+.SP
+.SH "add examples"
+.SP
+.SS "Adding a directory"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ mkdir doc
+.IP "" 2
+$ cvs add doc
+.IP "" 2
+Directory /path/to/repository/doc added to the repository
+
+.PD
+.IP "" 0
+.SP
+.SS "Adding a file"
+.SP
+.PD 0
+.SP
+.SP
+.IP "" 2
+$ >TODO
+.IP "" 2
+$ cvs add TODO
+.IP "" 2
+cvs add: scheduling file \`TODO\(aq for addition
+.IP "" 2
+cvs add: use \(aqcvs commit\(aq to add this file permanently
+
+.PD
+.IP "" 0
+.SP
+.SS "Undoing a \fBremove\fR command"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ rm -f makefile
+.IP "" 2
+$ cvs remove makefile
+.IP "" 2
+cvs remove: scheduling \`makefile\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+.IP "" 2
+$ cvs add makefile
+.IP "" 2
+U makefile
+.IP "" 2
+cvs add: makefile, version 1.2, resurrected
+
+.PD
+.IP "" 0
+.SP
 .SH "admin"
 .SS "Administration"
 .IX "Admin (subcommand)"
@@ -3624,6 +3729,131 @@ $
 .PD
 .IP "" 0
 .SP
+.SH "remove"
+.SS "Remove files from active use"
+.IX "remove (subcommand)"
+.SP
+.IP "\(bu" 2
+Synopsis: remove [-flR] [files...]
+.IP "\(bu" 2
+Requires: repository, working directory.
+.IP "\(bu" 2
+Changes: working directory.
+.SP
+The \fBremove\fR command is used to remove unwanted
+files from active use.  The user normally deletes the
+files from the working directory prior to invocation
+of the \fBremove\fR command.  Only the working
+directory is updated.  Changes to the repository are
+not made until the \fBcommit\fR command is run.
+.SP
+The \fBremove\fR command does not delete files from
+from the repository.  \fBcvs\fR keeps all historical
+data in the repository so that it is possible to
+reconstruct previous states of the projects under
+revision control.
+.SP
+To undo \fBcvs\fR \fBremove\fR or to resurrect files
+that were previously removed, see node `add\(aq in the CVS manual.
+.SP
+.SH "remove options"
+.SP
+These standard options are supported by \fBremove\fR
+(see node `Common options\(aq in the CVS manual for a complete description of
+them):
+.SP
+.IP "" 0
+\fB-l\fR

CVS commit: src/sys/arch/evbppc/obs405

2019-01-29 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Jan 29 22:59:03 UTC 2019

Modified Files:
src/sys/arch/evbppc/obs405: rbus_machdep.c

Log Message:
Fix typo in error message.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/obs405/rbus_machdep.c

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

Modified files:

Index: src/sys/arch/evbppc/obs405/rbus_machdep.c
diff -u src/sys/arch/evbppc/obs405/rbus_machdep.c:1.9 src/sys/arch/evbppc/obs405/rbus_machdep.c:1.10
--- src/sys/arch/evbppc/obs405/rbus_machdep.c:1.9	Mon Apr  9 14:44:01 2012
+++ src/sys/arch/evbppc/obs405/rbus_machdep.c	Tue Jan 29 22:59:03 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: rbus_machdep.c,v 1.9 2012/04/09 14:44:01 kiyohara Exp $	*/
+/*	$NetBSD: rbus_machdep.c,v 1.10 2019/01/29 22:59:03 gutteridge Exp $	*/
 
 /*
  * Copyright (c) 2003
@@ -45,7 +45,7 @@
 #include "opt_pci.h"
 
 #ifndef PCI_NETBSD_CONFIGURE
-#error requird macro PCI_NETBSD_CONFIGURE
+#error requires macro PCI_NETBSD_CONFIGURE
 #endif
 
 #ifdef RBUS_DEBUG



CVS commit: src/share/man/man8

2019-01-16 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Thu Jan 17 07:05:25 UTC 2019

Modified Files:
src/share/man/man8: compat_netbsd32.8

Log Message:
compat_netbsd32(8): brief adjustments concerning ARM binary support.
At present, aarch64 doesn't actually offer OABI compatibility. Also
note that this provides OABI vs. EABI compatibility for 32-bit ARM
ports. Addresses the remainder of PR misc/48968.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man8/compat_netbsd32.8

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/man8/compat_netbsd32.8
diff -u src/share/man/man8/compat_netbsd32.8:1.12 src/share/man/man8/compat_netbsd32.8:1.13
--- src/share/man/man8/compat_netbsd32.8:1.12	Mon Jan 14 15:55:35 2019
+++ src/share/man/man8/compat_netbsd32.8	Thu Jan 17 07:05:24 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: compat_netbsd32.8,v 1.12 2019/01/14 15:55:35 wiz Exp $
+.\"	$NetBSD: compat_netbsd32.8,v 1.13 2019/01/17 07:05:24 gutteridge Exp $
 .\"
 .\" Copyright (c) 2001, 2019 Matthew R. Green
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 13, 2019
+.Dd January 17, 2019
 .Dt COMPAT_NETBSD32 8
 .Os
 .Sh NAME
@@ -56,6 +56,9 @@ the default userland is N32 which is a h
 .Nm
 framework, and 64-bit binaries are handled similarly to the setup
 for 32-bit compatibility.
+It also provides compatibility between OABI and EABI binaries on 32-bit
+.Nx Ns Tn /arm
+ports.
 .Pp
 To use
 .Nm ,
@@ -96,7 +99,6 @@ needs to be found in
 .It Li mips64 Ta N64 Ta /usr/libexec/ld.elf_so-64
 .It Li powerpc64 Ta powerpc Ta /usr/libexec/ld.elf_so-powerpc
 .It Li arm64 Ta eabi Ta /usr/libexec/ld.elf_so-eabi
-.It Li arm64 Ta oabi Ta /usr/libexec/ld.elf_so-oabi
 .El
 .Pp
 Note that the kernel handles rewriting the builting ELF interpreter



CVS commit: src/usr.sbin/btpand

2019-01-16 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Thu Jan 17 05:52:22 UTC 2019

Modified Files:
src/usr.sbin/btpand: btpand.8

Log Message:
btpand(8): replace dhclient(8) references with dhcpcd(8)

Addresses part of PR misc/53669.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/btpand/btpand.8

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

Modified files:

Index: src/usr.sbin/btpand/btpand.8
diff -u src/usr.sbin/btpand/btpand.8:1.6 src/usr.sbin/btpand/btpand.8:1.7
--- src/usr.sbin/btpand/btpand.8:1.6	Thu Mar 15 22:35:03 2012
+++ src/usr.sbin/btpand/btpand.8	Thu Jan 17 05:52:21 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: btpand.8,v 1.6 2012/03/15 22:35:03 njoly Exp $
+.\" $NetBSD: btpand.8,v 1.7 2019/01/17 05:52:21 gutteridge Exp $
 .\"
 .\" Copyright (c) 2008 Iain Hibbert
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 17, 2008
+.Dd January 17, 2019
 .Dt BTPAND 8
 .Os
 .Sh NAME
@@ -190,7 +190,7 @@ interface, it will create a pid file and
 .Sh EXAMPLES
 .Dl ifconfig tap1 create
 .Dl btpand -a host -d ubt0 -s NAP -m encrypt -i tap1
-.Dl dhclient -q -o -w -nw tap1
+.Dl dhcpcd -q -b tap1
 .Pp
 Will create an encrypted connection to the NAP on
 .Ar host ,
@@ -209,7 +209,7 @@ the GN service with the local SDP server
 .Xr tap 4 ,
 .Xr brconfig 8 ,
 .Xr btconfig 8 ,
-.Xr dhclient 8 ,
+.Xr dhcpcd 8 ,
 .Xr dhcpd 8 ,
 .Xr ifconfig 8 ,
 .Xr sdpd 8



CVS commit: src/share/man/man4

2019-01-09 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed Jan  9 23:43:13 UTC 2019

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

Log Message:
wd(4): police my grammar police


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/wd.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/wd.4
diff -u src/share/man/man4/wd.4:1.19 src/share/man/man4/wd.4:1.20
--- src/share/man/man4/wd.4:1.19	Wed Jan  9 23:23:41 2019
+++ src/share/man/man4/wd.4	Wed Jan  9 23:43:13 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wd.4,v 1.19 2019/01/09 23:23:41 gutteridge Exp $
+.\"	$NetBSD: wd.4,v 1.20 2019/01/09 23:43:13 gutteridge Exp $
 .\"
 .\"
 .\" Copyright (c) 1994 James A. Jegers
@@ -61,8 +61,8 @@ A user interface is provided by
 Unlike the (historical) mechanisms provided by
 .Xr bad144 8
 and
-.Xr badsect 8
-the software list neither supports sector replacement nor is saved
+.Xr badsect 8 ,
+the software list supports neither sector replacement nor retention
 across reboots.
 .Sh NOTES
 Certain



CVS commit: src/share/man/man4

2019-01-09 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed Jan  9 23:23:41 UTC 2019

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

Log Message:
wd(4): minor grammatical improvement


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/wd.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/wd.4
diff -u src/share/man/man4/wd.4:1.18 src/share/man/man4/wd.4:1.19
--- src/share/man/man4/wd.4:1.18	Mon Apr 24 10:04:38 2017
+++ src/share/man/man4/wd.4	Wed Jan  9 23:23:41 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wd.4,v 1.18 2017/04/24 10:04:38 wiz Exp $
+.\"	$NetBSD: wd.4,v 1.19 2019/01/09 23:23:41 gutteridge Exp $
 .\"
 .\"
 .\" Copyright (c) 1994 James A. Jegers
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 24, 2017
+.Dd January 9, 2019
 .Dt WD 4
 .Os
 .Sh NAME
@@ -62,7 +62,7 @@ Unlike the (historical) mechanisms provi
 .Xr bad144 8
 and
 .Xr badsect 8
-the software list does neither support sector replacement nor is it saved
+the software list neither supports sector replacement nor is saved
 across reboots.
 .Sh NOTES
 Certain



CVS commit: src/usr.sbin/veriexecgen

2019-01-07 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Jan  8 01:31:49 UTC 2019

Modified Files:
src/usr.sbin/veriexecgen: veriexecgen.8

Log Message:
veriexecgen(8): improve example for appending /etc to the signatures
database. From Edgar Pettijohn in PR misc/53839.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/veriexecgen/veriexecgen.8

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

Modified files:

Index: src/usr.sbin/veriexecgen/veriexecgen.8
diff -u src/usr.sbin/veriexecgen/veriexecgen.8:1.19 src/usr.sbin/veriexecgen/veriexecgen.8:1.20
--- src/usr.sbin/veriexecgen/veriexecgen.8:1.19	Sun Sep 10 10:13:47 2017
+++ src/usr.sbin/veriexecgen/veriexecgen.8	Tue Jan  8 01:31:49 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexecgen.8,v 1.19 2017/09/10 10:13:47 wiz Exp $
+.\" $NetBSD: veriexecgen.8,v 1.20 2019/01/08 01:31:49 gutteridge Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 9, 2017
+.Dd January 8, 2019
 .Dt VERIEXECGEN 8
 .Os
 .Sh NAME
@@ -139,7 +139,7 @@ Fingerprint files in
 .Pa /etc ,
 appending to the default fingerprint database:
 .Bd -literal -offset indent
-# veriexecgen -A -d /etc
+# veriexecgen -A -a -d /etc
 .Ed
 .Pp
 Fingerprint files in



CVS commit: src/usr.sbin/npf/npfctl

2019-01-07 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Tue Jan  8 01:19:16 UTC 2019

Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5

Log Message:
npf.conf(5): add a minor clarification about table types that can't
accept masks on IP addresses. Prompted by Rob Hunter in PR bin/51900.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.sbin/npf/npfctl/npf.conf.5

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

Modified files:

Index: src/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.79 src/usr.sbin/npf/npfctl/npf.conf.5:1.80
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.79	Fri Sep 21 10:59:11 2018
+++ src/usr.sbin/npf/npfctl/npf.conf.5	Tue Jan  8 01:19:16 2019
@@ -1,4 +1,4 @@
-.\"$NetBSD: npf.conf.5,v 1.79 2018/09/21 10:59:11 uwe Exp $
+.\"$NetBSD: npf.conf.5,v 1.80 2019/01/08 01:19:16 gutteridge Exp $
 .\"
 .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 21, 2018
+.Dd January 8, 2019
 .Dt NPF.CONF 5
 .Os
 .Sh NAME
@@ -102,7 +102,7 @@ Tables of type
 .Dq hash
 and
 .Dq cdb
-can only contain IP addresses.
+can only contain IP addresses, without masks.
 Only static data can be used with a storage type of
 .Dq cdb .
 .Pp



CVS commit: src/external/bsd/ipf/dist/man

2018-12-29 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sat Dec 29 23:06:42 UTC 2018

Modified Files:
src/external/bsd/ipf/dist/man: ipfstat.8

Log Message:
ipfstat(8): note -o option applicability, and remove redundant words.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/man/ipfstat.8

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/ipf/dist/man/ipfstat.8
diff -u src/external/bsd/ipf/dist/man/ipfstat.8:1.3 src/external/bsd/ipf/dist/man/ipfstat.8:1.4
--- src/external/bsd/ipf/dist/man/ipfstat.8:1.3	Sun Jul 22 14:27:51 2012
+++ src/external/bsd/ipf/dist/man/ipfstat.8	Sat Dec 29 23:06:42 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipfstat.8,v 1.3 2012/07/22 14:27:51 darrenr Exp $
+.\"	$NetBSD: ipfstat.8,v 1.4 2018/12/29 23:06:42 gutteridge Exp $
 .\"
 .TH IPFSTAT 8
 .SH NAME
@@ -32,8 +32,8 @@ To run and work, it needs to be able to 
 kernel itself.  The kernel name defaults to \fB/netbsd\fP.
 .PP
 The default behaviour of \fBipfstat\fP
-is to retrieve and display the accumulated statistics which have been
-accumulated over time as the kernel has put packets through the filter.
+is to retrieve and display the statistics which have been
+accumulated as the kernel has put packets through the filter.
 .SH OPTIONS
 .TP
 .B \-6
@@ -71,14 +71,14 @@ Show groups currently configured (both a
 .TP
 .B \-h
 Show per-rule the number of times each one scores a "hit".  For use in
-combination with \fB\-i\fP.
+combination with \fB\-i\fP or \fB\-o\fP.
 .TP
 .B \-i
 Display the filter list used for the input side of the kernel IP processing.
 .TP
 .B \-I
 Swap between retrieving "inactive"/"active" filter list details.  For use
-in combination with \fB\-i\fP.
+in combination with \fB\-i\fP or \fB\-o\fP.
 .TP
 .B \-n
 Show the "rule number" for each rule as it is printed.



CVS commit: src/usr.sbin/screenblank

2018-12-28 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Fri Dec 28 23:53:35 UTC 2018

Modified Files:
src/usr.sbin/screenblank: screenblank.1

Log Message:
Add caveats section to the screenblank(1) man page to note issues will
arise if /dev is on a file system mounted with noatime or nodevmtime.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/screenblank/screenblank.1

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

Modified files:

Index: src/usr.sbin/screenblank/screenblank.1
diff -u src/usr.sbin/screenblank/screenblank.1:1.15 src/usr.sbin/screenblank/screenblank.1:1.16
--- src/usr.sbin/screenblank/screenblank.1:1.15	Wed Apr 30 13:11:02 2008
+++ src/usr.sbin/screenblank/screenblank.1	Fri Dec 28 23:53:35 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: screenblank.1,v 1.15 2008/04/30 13:11:02 martin Exp $
+.\"	$NetBSD: screenblank.1,v 1.16 2018/12/28 23:53:35 gutteridge Exp $
 .\"
 .\" Copyright (c) 1996-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 23, 2006
+.Dd December 28, 2018
 .Dt SCREENBLANK 1
 .Os
 .Sh NAME
@@ -116,3 +116,12 @@ The console device for wscons machines.
 File containing the pid of
 .Nm .
 .El
+.Sh CAVEATS
+.Nm
+checks the access and modification times of the devices it is
+monitoring to determine activity. If the devices are on a file system
+mounted with the
+.Cm noatime
+and/or
+.Cm nodevmtime
+options, it will not function as expected.



CVS commit: src/bin/cp

2018-12-22 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Sun Dec 23 01:29:23 UTC 2018

Modified Files:
src/bin/cp: cp.1

Log Message:
Clarify a sentence about the error handling of cp(1)'s -p option.
Addresses PR bin/40336.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/bin/cp/cp.1

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

Modified files:

Index: src/bin/cp/cp.1
diff -u src/bin/cp/cp.1:1.45 src/bin/cp/cp.1:1.46
--- src/bin/cp/cp.1:1.45	Thu Aug 11 00:17:23 2016
+++ src/bin/cp/cp.1	Sun Dec 23 01:29:23 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cp.1,v 1.45 2016/08/11 00:17:23 sevan Exp $
+.\"	$NetBSD: cp.1,v 1.46 2018/12/23 01:29:23 gutteridge Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
 .\"
-.Dd August 11, 2016
+.Dd December 22, 2018
 .Dt CP 1
 .Os
 .Sh NAME
@@ -120,8 +120,9 @@ to preserve in the copy as many of the m
 file flags, file mode, user ID, group ID, and extended attributes,
 as allowed by permissions.
 .Pp
-If the user ID and group ID cannot be preserved, no error message
-is displayed and the exit value is not altered.
+If the user ID and group ID cannot be preserved due to insufficient
+permissions, no error message is displayed and the exit value is not
+altered.
 .Pp
 If the source file has its set user ID bit on and the user ID cannot
 be preserved, the set user ID bit is not preserved