CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: nia Date: Sun Aug 15 08:57:01 UTC 2021 Modified Files: src/games/fortune/datfiles: netbsd-tips Log Message: Capitalization police. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/games/fortune/datfiles/netbsd-tips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/netbsd-tips diff -u src/games/fortune/datfiles/netbsd-tips:1.10 src/games/fortune/datfiles/netbsd-tips:1.11 --- src/games/fortune/datfiles/netbsd-tips:1.10 Fri Jun 4 11:18:31 2021 +++ src/games/fortune/datfiles/netbsd-tips Sun Aug 15 08:57:01 2021 @@ -120,7 +120,7 @@ and "systat netstat" commands. Visit the NetBSD Security website to keep track of advisories: http://www.NetBSD.org/support/security/ Or join the security-announce mailing list for alerts: - http://www.netbsd.org/mailinglists/#security-announce + http://www.NetBSD.org/mailinglists/#security-announce % Here's an example of finding what package a file belongs to:
CVS commit: src/usr.sbin/perfused
Module Name:src
Committed By: nia
Date: Sun Aug 8 20:56:54 UTC 2021
Modified Files:
src/usr.sbin/perfused: perfused.c
Log Message:
perfused: use SOL_LOCAL
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/perfused/perfused.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/perfused/perfused.c
diff -u src/usr.sbin/perfused/perfused.c:1.25 src/usr.sbin/perfused/perfused.c:1.26
--- src/usr.sbin/perfused/perfused.c:1.25 Fri Dec 12 09:58:39 2014
+++ src/usr.sbin/perfused/perfused.c Sun Aug 8 20:56:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: perfused.c,v 1.25 2014/12/12 09:58:39 manu Exp $ */
+/* $NetBSD: perfused.c,v 1.26 2021/08/08 20:56:54 nia Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -125,7 +125,7 @@ get_mount_info(int fd, struct perfuse_mo
* We do not need peer creds beyond this point
*/
opt = 0;
- if (setsockopt(fd, 0, LOCAL_CREDS, , sizeof(opt)) != 0)
+ if (setsockopt(fd, SOL_LOCAL, LOCAL_CREDS, , sizeof(opt)) != 0)
DWARN("%s: setsockopt LOCAL_CREDS failed", __func__);
#ifdef PERFUSE_DEBUG
CVS commit: src
Module Name:src
Committed By: nia
Date: Sun Aug 8 20:54:49 UTC 2021
Modified Files:
src/lib/libc/net: getpeereid.c
src/lib/libc/rpc: svc_vc.c
src/lib/libc/sys: getsockopt.2
src/lib/libperfuse: perfuse.c
src/regress/sys/kern/unfdpass: unfdpass.c
src/share/man/man4: unix.4
src/sys/kern: uipc_usrreq.c
src/sys/sys: un.h
src/tests/net/net: t_unix.c
src/usr.sbin/perfused: msg.c
src/usr.sbin/sdpd: server.c
Log Message:
introduce a SOL_LOCAL for unix-domain socket level socket options
as an alias of the current 0 used for these options, as in FreeBSD.
reviewed by many.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/net/getpeereid.c
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/rpc/svc_vc.c
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/sys/getsockopt.2
cvs rdiff -u -r1.42 -r1.43 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.11 -r1.12 src/regress/sys/kern/unfdpass/unfdpass.c
cvs rdiff -u -r1.26 -r1.27 src/share/man/man4/unix.4
cvs rdiff -u -r1.200 -r1.201 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/un.h
cvs rdiff -u -r1.24 -r1.25 src/tests/net/net/t_unix.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/perfused/msg.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sdpd/server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getpeereid.c
diff -u src/lib/libc/net/getpeereid.c:1.3 src/lib/libc/net/getpeereid.c:1.4
--- src/lib/libc/net/getpeereid.c:1.3 Fri Feb 16 19:21:49 2018
+++ src/lib/libc/net/getpeereid.c Sun Aug 8 20:54:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: getpeereid.c,v 1.3 2018/02/16 19:21:49 christos Exp $ */
+/* $NetBSD: getpeereid.c,v 1.4 2021/08/08 20:54:48 nia Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getpeereid.c,v 1.3 2018/02/16 19:21:49 christos Exp $");
+__RCSID("$NetBSD: getpeereid.c,v 1.4 2021/08/08 20:54:48 nia Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -57,7 +57,7 @@ getpeereid(int s, uid_t *euid, gid_t *eg
}
len = sizeof(cred);
- if (getsockopt(s, 0, LOCAL_PEEREID, , ) == -1)
+ if (getsockopt(s, SOL_LOCAL, LOCAL_PEEREID, , ) == -1)
return -1;
if (euid != NULL)
Index: src/lib/libc/rpc/svc_vc.c
diff -u src/lib/libc/rpc/svc_vc.c:1.34 src/lib/libc/rpc/svc_vc.c:1.35
--- src/lib/libc/rpc/svc_vc.c:1.34 Tue Nov 10 20:56:20 2015
+++ src/lib/libc/rpc/svc_vc.c Sun Aug 8 20:54:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_vc.c,v 1.34 2015/11/10 20:56:20 christos Exp $ */
+/* $NetBSD: svc_vc.c,v 1.35 2021/08/08 20:54:48 nia Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -37,7 +37,7 @@
static char *sccsid = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: svc_vc.c,v 1.34 2015/11/10 20:56:20 christos Exp $");
+__RCSID("$NetBSD: svc_vc.c,v 1.35 2021/08/08 20:54:48 nia Exp $");
#endif
#endif
@@ -178,8 +178,8 @@ svc_vc_create(int fd, u_int sendsize, u_
* We want to be able to check credentials on local sockets.
*/
if (sslocal.ss_family == AF_LOCAL)
- if (setsockopt(fd, 0, LOCAL_CREDS, , (socklen_t)sizeof one)
- == -1)
+ if (setsockopt(fd, SOL_LOCAL, LOCAL_CREDS, ,
+ (socklen_t)sizeof one) == -1)
goto cleanup_svc_vc_create;
xprt->xp_ltaddr.maxlen = xprt->xp_ltaddr.len = sslocal.ss_len;
Index: src/lib/libc/sys/getsockopt.2
diff -u src/lib/libc/sys/getsockopt.2:1.41 src/lib/libc/sys/getsockopt.2:1.42
--- src/lib/libc/sys/getsockopt.2:1.41 Thu May 9 09:09:38 2019
+++ src/lib/libc/sys/getsockopt.2 Sun Aug 8 20:54:48 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: getsockopt.2,v 1.41 2019/05/09 09:09:38 wiz Exp $
+.\" $NetBSD: getsockopt.2,v 1.42 2021/08/08 20:54:48 nia Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95
.\"
-.Dd May 8, 2019
+.Dd August 7, 2021
.Dt GETSOCKOPT 2
.Os
.Sh NAME
@@ -55,10 +55,6 @@ and
manipulate the
.Em options
associated with a socket.
-Options may exist at multiple
-protocol levels; they are always present at the uppermost
-.Dq socket
-level.
.Pp
When manipulating socket options the level at which the
option resides and the name of the option must be specified.
@@ -69,6 +65,7 @@ is specified as
To manipulate options at any
other level the protocol number of the appropriate protocol
controlling the option is supplied.
+Options may exist at multiple protocol levels.
For example, to indicate that an option is to be interpreted by the
.Tn TCP
protocol,
Index: src/lib/libperfuse/perfuse.c
diff -u src/lib/libperfuse/perfuse.c:1.42 src/lib/libperfuse/perfuse.c:1.43
--- src/lib/libperfuse/perfuse.c:1.42 Wed Apr 17 12:30:51 2019
+++
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed Aug 4 13:50:47 UTC 2021 Modified Files: src/doc: TODO.smpnet Log Message: doc: more MPSAFE interfaces To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.42 src/doc/TODO.smpnet:1.43 --- src/doc/TODO.smpnet:1.42 Tue Aug 3 01:44:10 2021 +++ src/doc/TODO.smpnet Wed Aug 4 13:50:47 2021 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.42 2021/08/03 01:44:10 msaitoh Exp $ +$NetBSD: TODO.smpnet,v 1.43 2021/08/04 13:50:47 nia Exp $ MP-safe components == @@ -43,13 +43,16 @@ kernel option. Some components scale up - Layer 3 - All except for items in the below section - Interfaces + - canloop(4) - gif(4) - ipsecif(4) - l2tp(4) + - lagg(4) - pppoe(4) - if_spppsubr.c - tap(4) - tun(4) + - vether(4) - vlan(4) - Packet filters - npf(7)
CVS commit: src/lib/libcurses
Module Name:src Committed By: nia Date: Tue Aug 3 07:58:50 UTC 2021 Modified Files: src/lib/libcurses: curses_attributes.3 curses_standout.3 Log Message: curses: clarify standout as the "best" _supported_ highlighting mode of the current terminal To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/curses_attributes.3 cvs rdiff -u -r1.9 -r1.10 src/lib/libcurses/curses_standout.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_attributes.3 diff -u src/lib/libcurses/curses_attributes.3:1.10 src/lib/libcurses/curses_attributes.3:1.11 --- src/lib/libcurses/curses_attributes.3:1.10 Mon Aug 2 11:11:20 2021 +++ src/lib/libcurses/curses_attributes.3 Tue Aug 3 07:58:50 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_attributes.3,v 1.10 2021/08/02 11:11:20 nia Exp $ +.\" $NetBSD: curses_attributes.3,v 1.11 2021/08/03 07:58:50 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -102,7 +102,8 @@ The attributes that can be manipulated a .It A_NORMAL no special attributes are applied .It A_STANDOUT -characters are displayed in the "best" highlighting mode of the terminal +characters are displayed in the "best" supported highlighting mode of the +terminal .It A_UNDERLINE characters are displayed underlined .It A_REVERSE @@ -193,7 +194,8 @@ The additional wide attributes that can .Pp .Bl -tag -width "COLOR_PAIR(n)" -compact -offset indent .It WA_STANDOUT -characters are displayed in the "best" highlighting mode of the terminal +characters are displayed in the "best" supported highlighting mode of the +terminal .It WA_UNDERLINE characters are displayed underlined .It WA_REVERSE Index: src/lib/libcurses/curses_standout.3 diff -u src/lib/libcurses/curses_standout.3:1.9 src/lib/libcurses/curses_standout.3:1.10 --- src/lib/libcurses/curses_standout.3:1.9 Mon Aug 2 11:11:20 2021 +++ src/lib/libcurses/curses_standout.3 Tue Aug 3 07:58:50 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_standout.3,v 1.9 2021/08/02 11:11:20 nia Exp $ +.\" $NetBSD: curses_standout.3,v 1.10 2021/08/03 07:58:50 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -55,7 +55,7 @@ These functions manipulate the standout attribute on .Dv stdscr or on the specified window. -The standout attribute applies the "best highlighting mode" +The standout attribute applies the "best" supported highlighting mode supported by the current terminal, which may be an alias of other attributes. .Pp
CVS commit: src/lib/libcurses
Module Name:src Committed By: nia Date: Mon Aug 2 11:11:20 UTC 2021 Modified Files: src/lib/libcurses: curses_attributes.3 curses_standout.3 Log Message: curses: clarify documentation regarding the standout attribute To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libcurses/curses_attributes.3 cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/curses_standout.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_attributes.3 diff -u src/lib/libcurses/curses_attributes.3:1.9 src/lib/libcurses/curses_attributes.3:1.10 --- src/lib/libcurses/curses_attributes.3:1.9 Thu Oct 25 10:36:56 2018 +++ src/lib/libcurses/curses_attributes.3 Mon Aug 2 11:11:20 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_attributes.3,v 1.9 2018/10/25 10:36:56 uwe Exp $ +.\" $NetBSD: curses_attributes.3,v 1.10 2021/08/02 11:11:20 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 25, 2018 +.Dd July 27, 2021 .Dt CURSES_ATTRIBUTES 3 .Os .Sh NAME @@ -102,7 +102,7 @@ The attributes that can be manipulated a .It A_NORMAL no special attributes are applied .It A_STANDOUT -characters are displayed in standout mode +characters are displayed in the "best" highlighting mode of the terminal .It A_UNDERLINE characters are displayed underlined .It A_REVERSE @@ -193,7 +193,7 @@ The additional wide attributes that can .Pp .Bl -tag -width "COLOR_PAIR(n)" -compact -offset indent .It WA_STANDOUT -characters are displayed in standout mode +characters are displayed in the "best" highlighting mode of the terminal .It WA_UNDERLINE characters are displayed underlined .It WA_REVERSE @@ -336,7 +336,10 @@ extension. .Sh HISTORY These functions first appeared in .Nx 1.5 . -.Sh BUGS +.Sh CAVEATS Some terminals do not support characters with both color and other attributes set. In this case, the other attribute is displayed instead of the color attribute. +.Pp +The standout attribute is a higher level alias and should not be mixed with +other attributes. Index: src/lib/libcurses/curses_standout.3 diff -u src/lib/libcurses/curses_standout.3:1.8 src/lib/libcurses/curses_standout.3:1.9 --- src/lib/libcurses/curses_standout.3:1.8 Mon Jul 26 20:17:09 2021 +++ src/lib/libcurses/curses_standout.3 Mon Aug 2 11:11:20 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_standout.3,v 1.8 2021/07/26 20:17:09 nia Exp $ +.\" $NetBSD: curses_standout.3,v 1.9 2021/08/02 11:11:20 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 26, 2021 +.Dd July 27, 2021 .Dt CURSES_STANDOUT 3 .Os .Sh NAME @@ -55,6 +55,9 @@ These functions manipulate the standout attribute on .Dv stdscr or on the specified window. +The standout attribute applies the "best highlighting mode" +supported by the current terminal, which may be an alias of +other attributes. .Pp The .Fn standout @@ -101,3 +104,9 @@ Single Unix Specification. .Sh HISTORY The Curses package appeared in .Bx 4.0 . +.Sh CAVEATS +On some terminals, characters with standout set may have the same appearance +as characters with the reverse video or bold attribute set. +However, on legacy terminals, standout may be the only attribute that can be +used to emphasize characters. +The standout attribute should not be mixed with other attributes.
CVS commit: src/lib/libcurses
Module Name:src Committed By: nia Date: Mon Jul 26 20:17:10 UTC 2021 Modified Files: src/lib/libcurses: curses_standout.3 Log Message: The BUGS sections is incorrect again for "modern" terminals. For example, wscons and xterm both display standout differently to bold. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/curses_standout.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_standout.3 diff -u src/lib/libcurses/curses_standout.3:1.7 src/lib/libcurses/curses_standout.3:1.8 --- src/lib/libcurses/curses_standout.3:1.7 Tue Nov 29 17:33:48 2016 +++ src/lib/libcurses/curses_standout.3 Mon Jul 26 20:17:09 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_standout.3,v 1.7 2016/11/29 17:33:48 christos Exp $ +.\" $NetBSD: curses_standout.3,v 1.8 2021/07/26 20:17:09 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 29, 2016 +.Dd July 26, 2021 .Dt CURSES_STANDOUT 3 .Os .Sh NAME @@ -101,8 +101,3 @@ Single Unix Specification. .Sh HISTORY The Curses package appeared in .Bx 4.0 . -.Sh BUGS -On modern terminals that support other attributes, there is no difference -between characters displayed with the standout attribute set and those -displayed with one of the other attributes set (usually bold). -It is best to avoid using standout if the terminal supports other attributes.
CVS commit: src
Module Name:src Committed By: nia Date: Sun Jul 25 07:35:55 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: amdccp.4 Log Message: Add a man page for amdccp(4) To generate a diff of this commit: cvs rdiff -u -r1.1723 -r1.1724 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/amdccp.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1723 src/distrib/sets/lists/man/mi:1.1724 --- src/distrib/sets/lists/man/mi:1.1723 Tue Jun 29 10:22:34 2021 +++ src/distrib/sets/lists/man/mi Sun Jul 25 07:35:55 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1723 2021/06/29 10:22:34 nia Exp $ +# $NetBSD: mi,v 1.1724 2021/07/25 07:35:55 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2074,6 +2074,7 @@ ./usr/share/man/cat4/x68k/pow.0 man-obsolete obsolete ./usr/share/man/cat4/x68k/powsw.0 man-sys-catman .cat ./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat +./usr/share/man/cat4/x86/amdccp.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdsmn.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdzentemp.0 man-sys-catman .cat @@ -5230,6 +5231,7 @@ ./usr/share/man/html4/x68k/pow.html man-obsolete obsolete ./usr/share/man/html4/x68k/powsw.html man-sys-htmlman html ./usr/share/man/html4/x68k/vs.html man-sys-htmlman html +./usr/share/man/html4/x86/amdccp.html man-sys-htmlman html ./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/amdsmn.html man-sys-htmlman html ./usr/share/man/html4/x86/amdzentemp.html man-sys-htmlman html @@ -8318,6 +8320,7 @@ ./usr/share/man/man4/x68k/pow.4 man-obsolete obsolete ./usr/share/man/man4/x68k/powsw.4 man-sys-man .man ./usr/share/man/man4/x68k/vs.4 man-sys-man .man +./usr/share/man/man4/x86/amdccp.4 man-sys-man .man ./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man ./usr/share/man/man4/x86/amdsmn.4 man-sys-man .man ./usr/share/man/man4/x86/amdzentemp.4 man-sys-man .man Index: src/share/man/man4/man4.x86/Makefile diff -u src/share/man/man4/man4.x86/Makefile:1.22 src/share/man/man4/man4.x86/Makefile:1.23 --- src/share/man/man4/man4.x86/Makefile:1.22 Thu Jun 3 07:41:26 2021 +++ src/share/man/man4/man4.x86/Makefile Sun Jul 25 07:35:55 2021 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2021/06/03 07:41:26 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2021/07/25 07:35:55 nia Exp $ -MAN= amdpcib.4 apic.4 autoconf.4 balloon.4 console.4 coretemp.4 est.4 fdc.4 \ - fwhrng.4 hpet.4 ichlpcib.4 imcsmb.4 lpt.4 mem.4 odcm.4 powernow.4 \ - soekrisgpio.4 tco.4 \ - amdsmn.4 amdzentemp.4 +MAN= amdccp.4 amdpcib.4 apic.4 autoconf.4 balloon.4 console.4 coretemp.4 \ + est.4 fdc.4 fwhrng.4 hpet.4 ichlpcib.4 imcsmb.4 lpt.4 mem.4 odcm.4 \ + powernow.4 soekrisgpio.4 tco.4 amdsmn.4 amdzentemp.4 MLINKS+=apic.4 ioapic.4 \ apic.4 lapic.4 Added files: Index: src/share/man/man4/man4.x86/amdccp.4 diff -u /dev/null src/share/man/man4/man4.x86/amdccp.4:1.1 --- /dev/null Sun Jul 25 07:35:55 2021 +++ src/share/man/man4/man4.x86/amdccp.4 Sun Jul 25 07:35:55 2021 @@ -0,0 +1,54 @@ +.\" $NetBSD: amdccp.4,v 1.1 2021/07/25 07:35:55 nia Exp $ +.\" +.\" Copyright (c) 2021 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (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 July 25, 2021 +.Dt AMDCCP
CVS commit: src/usr.bin/aiomixer
Module Name:src
Committed By: nia
Date: Sun Jul 18 11:45:31 UTC 2021
Modified Files:
src/usr.bin/aiomixer: main.c
Log Message:
aiomixer: Honor terminal colors. Looks better in cool-retro-term.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/aiomixer/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/aiomixer/main.c
diff -u src/usr.bin/aiomixer/main.c:1.3 src/usr.bin/aiomixer/main.c:1.4
--- src/usr.bin/aiomixer/main.c:1.3 Thu Jul 15 06:57:10 2021
+++ src/usr.bin/aiomixer/main.c Sun Jul 18 11:45:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2021/07/15 06:57:10 nia Exp $ */
+/* $NetBSD: main.c,v 1.4 2021/07/18 11:45:31 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -537,6 +537,7 @@ main(int argc, char **argv)
if (has_colors()) {
start_color();
+ use_default_colors();
init_pair(COLOR_CONTROL_SELECTED, COLOR_BLUE, COLOR_BLACK);
init_pair(COLOR_LEVELS, COLOR_GREEN, COLOR_BLACK);
init_pair(COLOR_SET_SELECTED, COLOR_BLACK, COLOR_GREEN);
CVS commit: src/usr.bin/aiomixer
Module Name:src
Committed By: nia
Date: Thu Jul 15 07:03:14 UTC 2021
Modified Files:
src/usr.bin/aiomixer: draw.c
Log Message:
aiomixer: avoid wasting space
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/aiomixer/draw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/aiomixer/draw.c
diff -u src/usr.bin/aiomixer/draw.c:1.8 src/usr.bin/aiomixer/draw.c:1.9
--- src/usr.bin/aiomixer/draw.c:1.8 Thu Jul 15 06:59:55 2021
+++ src/usr.bin/aiomixer/draw.c Thu Jul 15 07:03:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: draw.c,v 1.8 2021/07/15 06:59:55 nia Exp $ */
+/* $NetBSD: draw.c,v 1.9 2021/07/15 07:03:14 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -311,7 +311,7 @@ draw_header(struct aiomixer *aio)
{
wprintw(aio->header, "\n");
mvwaddstr(aio->header, 0,
- getmaxx(aio->header) - ((int)sizeof("NetBSD audio mixer") + 1),
+ getmaxx(aio->header) - (int)sizeof("NetBSD audio mixer"),
"NetBSD audio mixer");
if (aio->mixerdev.version[0] != '\0') {
CVS commit: src/usr.bin/aiomixer
Module Name:src
Committed By: nia
Date: Thu Jul 15 06:59:55 UTC 2021
Modified Files:
src/usr.bin/aiomixer: draw.c
Log Message:
aiomixer: fix calculation of maximum screen width
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/aiomixer/draw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/aiomixer/draw.c
diff -u src/usr.bin/aiomixer/draw.c:1.7 src/usr.bin/aiomixer/draw.c:1.8
--- src/usr.bin/aiomixer/draw.c:1.7 Sat May 29 09:11:41 2021
+++ src/usr.bin/aiomixer/draw.c Thu Jul 15 06:59:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: draw.c,v 1.7 2021/05/29 09:11:41 nia Exp $ */
+/* $NetBSD: draw.c,v 1.8 2021/07/15 06:59:55 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -311,7 +311,7 @@ draw_header(struct aiomixer *aio)
{
wprintw(aio->header, "\n");
mvwaddstr(aio->header, 0,
- getmaxx(aio->header) - (int)sizeof("NetBSD audio mixer") + 1,
+ getmaxx(aio->header) - ((int)sizeof("NetBSD audio mixer") + 1),
"NetBSD audio mixer");
if (aio->mixerdev.version[0] != '\0') {
CVS commit: src/usr.bin/aiomixer
Module Name:src
Committed By: nia
Date: Thu Jul 15 06:57:11 UTC 2021
Modified Files:
src/usr.bin/aiomixer: main.c
Log Message:
aiomixer: Clear screen after device selection
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/aiomixer/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/aiomixer/main.c
diff -u src/usr.bin/aiomixer/main.c:1.2 src/usr.bin/aiomixer/main.c:1.3
--- src/usr.bin/aiomixer/main.c:1.2 Sun May 9 15:40:27 2021
+++ src/usr.bin/aiomixer/main.c Thu Jul 15 06:57:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.2 2021/05/09 15:40:27 christos Exp $ */
+/* $NetBSD: main.c,v 1.3 2021/07/15 06:57:10 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -405,6 +405,7 @@ process_device_select(struct aiomixer *a
while ((ch = getch()) != ERR) {
switch (ch) {
case '\n':
+ clear();
(void)snprintf(device_path, sizeof(device_path),
"/dev/mixer%d", selected_device);
open_device(aio, device_path);
CVS commit: src/share/man/man7
Module Name:src Committed By: nia Date: Tue Jul 13 16:56:43 UTC 2021 Modified Files: src/share/man/man7: sysctl.7 Log Message: Swap encryption no longer experimental or default-off. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/share/man/man7/sysctl.7 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/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.151 src/share/man/man7/sysctl.7:1.152 --- src/share/man/man7/sysctl.7:1.151 Sat Oct 17 09:20:33 2020 +++ src/share/man/man7/sysctl.7 Tue Jul 13 16:56:43 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.151 2020/10/17 09:20:33 wiz Exp $ +.\" $NetBSD: sysctl.7,v 1.152 2021/07/13 16:56:43 nia Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd October 17, 2020 +.Dd July 13, 2021 .Dt SYSCTL 7 .Os .Sh NAME @@ -2602,7 +2602,7 @@ Return system wide guard size for the ma .It Li vm.thread_guard_size Return system wide default size for the guard area of all other threads of a program. -.It Li vm.swap_encrypt Bq Sy "EXPERIMENTAL" Ns No , default off +.It Li vm.swap_encrypt If true, encrypt data while swapped out to disk. .Pp Each swap device maintains an independent AES-256 key, generated when
CVS commit: src/doc
Module Name:src Committed By: nia Date: Tue Jun 29 10:26:17 UTC 2021 Modified Files: src/doc: CHANGES Log Message: doc: removed uscanner To generate a diff of this commit: cvs rdiff -u -r1.2812 -r1.2813 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2812 src/doc/CHANGES:1.2813 --- src/doc/CHANGES:1.2812 Sat Jun 19 06:19:35 2021 +++ src/doc/CHANGES Tue Jun 29 10:26:17 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2812 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2813 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -383,3 +383,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: libfido2: Import 1.7.0 [christos 20210616] m68k: Switch to GCC 10. [mrg 20210619] arm: Switch to GCC 10. [mrg 20210619] + uscanner(4): Removed from the tree. [nia 20210629]
CVS commit: src/sys/conf
Module Name:src Committed By: nia Date: Tue Jun 29 10:24:41 UTC 2021 Modified Files: src/sys/conf: majors.usb Log Message: mark urio/uscanner device majors obsolete To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/conf/majors.usb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors.usb diff -u src/sys/conf/majors.usb:1.2 src/sys/conf/majors.usb:1.3 --- src/sys/conf/majors.usb:1.2 Mon Feb 3 13:28:11 2020 +++ src/sys/conf/majors.usb Tue Jun 29 10:24:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: majors.usb,v 1.2 2020/02/03 13:28:11 kre Exp $ +# $NetBSD: majors.usb,v 1.3 2021/06/29 10:24:41 nia Exp $ # # MI major assignments for USB devices # @@ -7,5 +7,5 @@ device-major uhid char 221 uhid device-major ulpt char 222 ulpt device-major ugen char 223 ugen device-major ucom char 224 ucom -#device-major urio char 225 urio -device-major uscanner char 226 uscanner +#device-major obsolete char 225 obsolete (urio) +#device-major obsolete char 226 obsolete (uscanner)
CVS commit: src
Module Name:src Committed By: nia Date: Tue Jun 29 10:22:37 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi src/etc: MAKEDEV.tmpl src/share/man/man4: Makefile usb.4 usscanner.4 src/sys/arch/aarch64/conf: majors.aarch64 src/sys/arch/algor/conf: P4032 P5064 P6032 majors.algor src/sys/arch/alpha/conf: GENERIC majors.alpha src/sys/arch/amd64/conf: ALL XEN3_DOM0 majors.amd64 src/sys/arch/arm/conf: majors.arm32 src/sys/arch/cats/conf: GENERIC src/sys/arch/cobalt/conf: majors.cobalt src/sys/arch/epoc32/conf: majors.epoc32 src/sys/arch/evbarm/conf: HDL_G HPT5325 MINI2440 MMNET_GENERIC MPCSA_GENERIC POGO SHEEVAPLUG SMDK2410 TS7200 TWINTAIL src/sys/arch/evbmips/conf: majors.evbmips src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT PMPPC majors.evbppc src/sys/arch/hpcarm/conf: majors.hpcarm src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX majors.hpcmips src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: ALL XEN3PAE_DOM0 majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/landisk/conf: GENERIC majors.landisk src/sys/arch/ofppc/conf: GENERIC src/sys/arch/or1k/conf: majors.or1k src/sys/arch/playstation2/conf: DEBUG majors.playstation2 src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/prep/conf: GENERIC src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sgimips/conf: majors.sgimips src/sys/arch/sparc64/conf: majors.sparc64 src/sys/arch/x68k/conf: GENERIC majors.x68k src/sys/arch/zaurus/conf: majors.zaurus src/sys/dev: DEVNAMES src/sys/dev/usb: FILES TODO.usbmp files.usb usbdevices.config src/sys/rump/librump/rumpkern: devsw.c Removed Files: src/share/man/man4: uscanner.4 src/sys/dev/usb: uscanner.c Log Message: Remove uscanner(4) driver This exists for compatibility with a Linux interface which was apparently deprecated in Linux 2.6. There are various mailing list threads going back to 2004 where the usefulness of this driver is discussed, but the conclusion is that scanner software has all moved to using ugen(4) instead, and enabling this driver will not help you scan things. To generate a diff of this commit: cvs rdiff -u -r1.1722 -r1.1723 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.222 -r1.223 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.713 -r1.714 src/share/man/man4/Makefile cvs rdiff -u -r1.117 -r1.118 src/share/man/man4/usb.4 cvs rdiff -u -r1.12 -r0 src/share/man/man4/uscanner.4 cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/usscanner.4 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/conf/majors.aarch64 cvs rdiff -u -r1.82 -r1.83 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.93 -r1.94 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.83 -r1.84 src/sys/arch/algor/conf/P6032 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/algor/conf/majors.algor cvs rdiff -u -r1.411 -r1.412 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/conf/majors.alpha cvs rdiff -u -r1.166 -r1.167 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.192 -r1.193 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/conf/majors.amd64 cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/conf/majors.arm32 cvs rdiff -u -r1.183 -r1.184 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cobalt/conf/majors.cobalt cvs rdiff -u -r1.6 -r1.7 src/sys/arch/epoc32/conf/majors.epoc32 cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.51 -r1.52 src/sys/arch/evbarm/conf/HPT5325 cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/MINI2440 cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/POGO cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.77 -r1.78 src/sys/arch/evbarm/conf/SMDK2410 cvs rdiff -u -r1.76 -r1.77 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.83 -r1.84 src/sys/arch/evbarm/conf/TWINTAIL cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbmips/conf/majors.evbmips cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbppc/conf/PMPPC cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbppc/conf/majors.evbppc cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcarm/conf/majors.hpcarm cvs rdiff -u -r1.244 -r1.245 src/sys/arch/hpcmips/conf/GENERIC cvs rdiff -u -r1.111 -r1.112 src/sys/arch/hpcmips/conf/TX3922 cvs rdiff -u -r1.75 -r1.76 src/sys/arch/hpcmips/conf/VR41XX cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hpcmips/conf/majors.hpcmips cvs rdiff -u -r1.37 -r1.38 src/sys/arch/hppa/conf/GENERIC cvs rdiff -u -r1.498 -r1.499 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.53 -r1.54 src/sys/arch/i386/conf/majors.i386 cvs
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nia Date: Sat Jun 26 09:29:14 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC.common GENERIC64 Log Message: move pad to GENERIC.common To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.46 -r1.47 src/sys/arch/evbarm/conf/GENERIC.common cvs rdiff -u -r1.178 -r1.179 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.98 src/sys/arch/evbarm/conf/GENERIC:1.99 --- src/sys/arch/evbarm/conf/GENERIC:1.98 Sat Jun 26 09:05:24 2021 +++ src/sys/arch/evbarm/conf/GENERIC Sat Jun 26 09:29:14 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.98 2021/06/26 09:05:24 nia Exp $ +# $NetBSD: GENERIC,v 1.99 2021/06/26 09:29:14 nia Exp $ # # GENERIC ARM (aarch32) kernel # @@ -439,8 +439,6 @@ sunxii2s* at fdt? # I2S/PCM audio* at audiobus? spkr* at audio? -pseudo-device pad # Pseudo audio device - # SDMMC bcmsdhost* at fdt? # Broadcom BCM283x SD Host Interface dwcmmc* at fdt? # DesignWare SDMMC Index: src/sys/arch/evbarm/conf/GENERIC.common diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.46 src/sys/arch/evbarm/conf/GENERIC.common:1.47 --- src/sys/arch/evbarm/conf/GENERIC.common:1.46 Mon Jan 18 00:32:38 2021 +++ src/sys/arch/evbarm/conf/GENERIC.common Sat Jun 26 09:29:14 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.common,v 1.46 2021/01/18 00:32:38 nia Exp $ +# $NetBSD: GENERIC.common,v 1.47 2021/06/26 09:29:14 nia Exp $ # # GENERIC evbarm kernel config (template) # @@ -162,6 +162,7 @@ pseudo-device gre # generic L3 over IP pseudo-device npf # NPF packet filter # miscellaneous pseudo-devices +pseudo-device pad # pseudo audio device pseudo-device pty # pseudo-terminals #options RND_COM pseudo-device clockctl # user control of clock subsystem Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.178 src/sys/arch/evbarm/conf/GENERIC64:1.179 --- src/sys/arch/evbarm/conf/GENERIC64:1.178 Sat Jun 26 09:05:24 2021 +++ src/sys/arch/evbarm/conf/GENERIC64 Sat Jun 26 09:29:14 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.178 2021/06/26 09:05:24 nia Exp $ +# $NetBSD: GENERIC64,v 1.179 2021/06/26 09:29:14 nia Exp $ # # GENERIC ARM (aarch64) kernel # @@ -417,8 +417,6 @@ audio* at audiobus? spkr* at audio? # PC speaker (synthesized) -pseudo-device pad # Pseudo audio device - # HDMI CEC tegracec0 at fdt? # NVIDIA Tegra HDMI CEC hdmicec* at hdmicecbus?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: nia Date: Sat Jun 26 09:05:24 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: Add pad(4) to arm kernels To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.177 -r1.178 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.97 src/sys/arch/evbarm/conf/GENERIC:1.98 --- src/sys/arch/evbarm/conf/GENERIC:1.97 Wed May 5 10:24:04 2021 +++ src/sys/arch/evbarm/conf/GENERIC Sat Jun 26 09:05:24 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.97 2021/05/05 10:24:04 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.98 2021/06/26 09:05:24 nia Exp $ # # GENERIC ARM (aarch32) kernel # @@ -439,6 +439,8 @@ sunxii2s* at fdt? # I2S/PCM audio* at audiobus? spkr* at audio? +pseudo-device pad # Pseudo audio device + # SDMMC bcmsdhost* at fdt? # Broadcom BCM283x SD Host Interface dwcmmc* at fdt? # DesignWare SDMMC Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.177 src/sys/arch/evbarm/conf/GENERIC64:1.178 --- src/sys/arch/evbarm/conf/GENERIC64:1.177 Mon Mar 1 18:12:58 2021 +++ src/sys/arch/evbarm/conf/GENERIC64 Sat Jun 26 09:05:24 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.177 2021/03/01 18:12:58 jakllsch Exp $ +# $NetBSD: GENERIC64,v 1.178 2021/06/26 09:05:24 nia Exp $ # # GENERIC ARM (aarch64) kernel # @@ -417,6 +417,8 @@ audio* at audiobus? spkr* at audio? # PC speaker (synthesized) +pseudo-device pad # Pseudo audio device + # HDMI CEC tegracec0 at fdt? # NVIDIA Tegra HDMI CEC hdmicec* at hdmicecbus?
CVS commit: src/sys/arch/i386/stand/efiboot
Module Name:src
Committed By: nia
Date: Tue Jun 22 19:53:58 UTC 2021
Modified Files:
src/sys/arch/i386/stand/efiboot: boot.c
Log Message:
efiboot (x86): add ASCII art
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/stand/efiboot/boot.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/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.18 src/sys/arch/i386/stand/efiboot/boot.c:1.19
--- src/sys/arch/i386/stand/efiboot/boot.c:1.18 Sun May 30 05:59:22 2021
+++ src/sys/arch/i386/stand/efiboot/boot.c Tue Jun 22 19:53:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.18 2021/05/30 05:59:22 mlelstv Exp $ */
+/* $NetBSD: boot.c,v 1.19 2021/06/22 19:53:58 nia Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -287,8 +287,19 @@ print_banner(void)
for (n = 0; n < BOOTCFG_MAXBANNER && bootcfg_info.banner[n];
n++)
printf("%s\n", bootcfg_info.banner[n]);
- } else
- command_version("short");
+ } else {
+ printf("\n"
+ " \\-__,--,___.\n"
+ " \\__,---` %s (from NetBSD %s)\n"
+ "\\ `---,_. Revision %s\n"
+ " \\-,_,.---` Memory: %d/%d k\n"
+ " \\\n"
+ " \\\n"
+ "\\\n",
+ bootprog_name, bootprog_kernrev,
+ bootprog_rev,
+ getbasemem(), getextmem());
+ }
}
void
CVS commit: src/sys/arch/i386/stand/boot
Module Name:src
Committed By: nia
Date: Mon Jun 21 19:52:17 UTC 2021
Modified Files:
src/sys/arch/i386/stand/boot: boot2.c
Log Message:
use a single printf call for readability
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/i386/stand/boot/boot2.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/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.76 src/sys/arch/i386/stand/boot/boot2.c:1.77
--- src/sys/arch/i386/stand/boot/boot2.c:1.76 Mon Jun 21 19:43:17 2021
+++ src/sys/arch/i386/stand/boot/boot2.c Mon Jun 21 19:52:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.76 2021/06/21 19:43:17 nia Exp $ */
+/* $NetBSD: boot2.c,v 1.77 2021/06/21 19:52:17 nia Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -311,16 +311,17 @@ print_banner(void)
printf("%s\n", bootcfg_info.banner[n]);
} else {
#endif /* !SMALL */
- printf("\n");
- printf(" \\-__,--,___.\n");
- printf(" \\__,---` %s (from NetBSD %s)\n",
- bootprog_name, bootprog_kernrev);
- printf("\\ `---,_. Revision %s\n", bootprog_rev);
- printf(" \\-,_,.---` Memory: %d/%d k\n",
- getbasemem(), getextmem());
- printf(" \\\n");
- printf(" \\\n");
- printf("\\\n");
+ printf("\n"
+ " \\-__,--,___.\n"
+ " \\__,---` %s (from NetBSD %s)\n"
+ "\\ `---,_. Revision %s\n"
+ " \\-,_,.---` Memory: %d/%d k\n"
+ " \\\n"
+ " \\\n"
+ "\\\n",
+ bootprog_name, bootprog_kernrev,
+ bootprog_rev,
+ getbasemem(), getextmem());
#ifndef SMALL
}
#endif /* !SMALL */
CVS commit: src/sys/arch/i386/stand/boot
Module Name:src
Committed By: nia
Date: Mon Jun 21 19:43:17 UTC 2021
Modified Files:
src/sys/arch/i386/stand/boot: boot2.c
Log Message:
biosboot: Add ASCII art.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/stand/boot/boot2.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/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.75 src/sys/arch/i386/stand/boot/boot2.c:1.76
--- src/sys/arch/i386/stand/boot/boot2.c:1.75 Sun May 30 05:59:22 2021
+++ src/sys/arch/i386/stand/boot/boot2.c Mon Jun 21 19:43:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.75 2021/05/30 05:59:22 mlelstv Exp $ */
+/* $NetBSD: boot2.c,v 1.76 2021/06/21 19:43:17 nia Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -311,12 +311,16 @@ print_banner(void)
printf("%s\n", bootcfg_info.banner[n]);
} else {
#endif /* !SMALL */
- printf("\n"
- ">> %s, Revision %s (from NetBSD %s)\n"
- ">> Memory: %d/%d k\n",
- bootprog_name, bootprog_rev, bootprog_kernrev,
- getbasemem(), getextmem());
-
+ printf("\n");
+ printf(" \\-__,--,___.\n");
+ printf(" \\__,---` %s (from NetBSD %s)\n",
+ bootprog_name, bootprog_kernrev);
+ printf("\\ `---,_. Revision %s\n", bootprog_rev);
+ printf(" \\-,_,.---` Memory: %d/%d k\n",
+ getbasemem(), getextmem());
+ printf(" \\\n");
+ printf(" \\\n");
+ printf("\\\n");
#ifndef SMALL
}
#endif /* !SMALL */
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: nia
Date: Mon Jun 21 19:07:30 UTC 2021
Modified Files:
src/sys/stand/efiboot: boot.c
Log Message:
efiboot: Add ASCII art.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/stand/efiboot/boot.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/stand/efiboot/boot.c
diff -u src/sys/stand/efiboot/boot.c:1.30 src/sys/stand/efiboot/boot.c:1.31
--- src/sys/stand/efiboot/boot.c:1.30 Mon May 31 11:12:42 2021
+++ src/sys/stand/efiboot/boot.c Mon Jun 21 19:07:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.30 2021/05/31 11:12:42 rin Exp $ */
+/* $NetBSD: boot.c,v 1.31 2021/06/21 19:07:30 nia Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -451,9 +451,13 @@ set_bootargs(const char *arg)
void
print_banner(void)
{
- printf("\n\n"
- ">> %s, Revision %s\n",
- bootprog_name, bootprog_rev);
+ printf(" \\-__,--,___.\n");
+ printf(" \\__,---` %s\n", bootprog_name);
+ printf("\\ `---,_. Revision %s\n", bootprog_rev);
+ printf(" \\-,_,.---`\n");
+ printf(" \\\n");
+ printf(" \\\n");
+ printf("\\\n\n");
}
void
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: nia Date: Fri Jun 18 13:13:45 UTC 2021 Modified Files: src/usr.bin/calendar/calendars: calendar.holiday Log Message: June 19 is Juneteenth in USA To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/calendar/calendars/calendar.holiday 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/calendar/calendars/calendar.holiday diff -u src/usr.bin/calendar/calendars/calendar.holiday:1.32 src/usr.bin/calendar/calendars/calendar.holiday:1.33 --- src/usr.bin/calendar/calendars/calendar.holiday:1.32 Thu Jun 17 11:48:19 2021 +++ src/usr.bin/calendar/calendars/calendar.holiday Fri Jun 18 13:13:44 2021 @@ -205,6 +205,7 @@ 06/19 Emancipation Day in Texas 06/19 Labor Day in Trinidad, Tobago 06/19 Revolution Day in Algeria +06/19 Juneteenth National Independence Day in United States 06/20 Flag Day in Argentina 06/20 West Virginia Day in West Virginia 06/22 National Sovereignty Day in Haiti
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: nia Date: Thu Jun 17 11:48:19 UTC 2021 Modified Files: src/usr.bin/calendar/calendars: calendar.holiday Log Message: U.S.S.R no longer exists To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/usr.bin/calendar/calendars/calendar.holiday 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/calendar/calendars/calendar.holiday diff -u src/usr.bin/calendar/calendars/calendar.holiday:1.31 src/usr.bin/calendar/calendars/calendar.holiday:1.32 --- src/usr.bin/calendar/calendars/calendar.holiday:1.31 Thu Jun 17 11:45:22 2021 +++ src/usr.bin/calendar/calendars/calendar.holiday Thu Jun 17 11:48:19 2021 @@ -61,7 +61,7 @@ 03/06 Lantern Day, Bejing 03/09* Purim - Feast of Lots 03/08 First Annual International Women's Day, 1909 -03/08 International Women's Day in U.S.S.R. +03/08 International Women's Day 03/08 Syrian National Day in Libyan Arab Republic 03/08 Women's Day in Guinea-Bissau, Taiwan, Yemen Democratic Republic 03/08 Youth Day in Zambia @@ -149,7 +149,7 @@ 05/07 May Day in United Kingdom 05/08 Truman Day in Missouri 05/09 Liberation Day in Czechoslovakia -05/09 Victory Day in Poland, U.S.S.R. +05/09 Victory Day in Poland, Israel, former U.S.S.R. 05/10 Confederate Memorial Day in South Carolina 05/10 Mothers Day in Guatemala 05/11 Minnesota Day in Minnesota @@ -348,7 +348,6 @@ 10/04 Independence Day in Lesotho 10/06 National Sports Day in Lesotho 10/07 National Heroes Day in Jamaica -10/08 Constitution Day in U.S.S.R 10/08 Fiji Day in Fiji 10/09 Independence Day in Uganda 10/09 Korean Alphabet Day in South Korea
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: nia Date: Thu Jun 17 11:45:22 UTC 2021 Modified Files: src/usr.bin/calendar/calendars: calendar.holiday Log Message: November 20 is International Transgender Day of Remembrance Officially recongized in Ontario, Canada. Originates from the murder of Rita Hester in Allston, Massachusetts, on November 28, 1998. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.bin/calendar/calendars/calendar.holiday 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/calendar/calendars/calendar.holiday diff -u src/usr.bin/calendar/calendars/calendar.holiday:1.30 src/usr.bin/calendar/calendars/calendar.holiday:1.31 --- src/usr.bin/calendar/calendars/calendar.holiday:1.30 Mon Dec 16 07:18:11 2019 +++ src/usr.bin/calendar/calendars/calendar.holiday Thu Jun 17 11:45:22 2021 @@ -551,6 +551,7 @@ 11/19 Anniversary of the 1968 Coup by the Army in Mali 11/19 Garifuna Settlement in Belize 11/19 Prince of Wales Birthday in Fiji +11/20 Transgender Day of Remembrance 11/22 Anniversary of Portuguese Aggression in Guinea 11/24 Anniversary of the New Regime in Zaire 11/28 Independence from Spain in Panama
CVS commit: src/usr.bin/calendar/calendars
Module Name:src Committed By: nia Date: Thu Jun 17 11:32:34 UTC 2021 Modified Files: src/usr.bin/calendar/calendars: calendar.computer Log Message: 1985: first ARM silicon and first Amiga To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/calendar/calendars/calendar.computer 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/calendar/calendars/calendar.computer diff -u src/usr.bin/calendar/calendars/calendar.computer:1.17 src/usr.bin/calendar/calendars/calendar.computer:1.18 --- src/usr.bin/calendar/calendars/calendar.computer:1.17 Wed Jun 16 19:31:03 2021 +++ src/usr.bin/calendar/calendars/calendar.computer Thu Jun 17 11:32:34 2021 @@ -34,6 +34,7 @@ 04/07 IBM announces System/360, 1964 04/09 ENIAC Project begun, 1943 04/20 Apple announces the Apple ][ at the 1st West Coast Computer Faire, 1977 +04/26 First ARM silicon produced, 1985 04/28 Zilog Z-80 introduced, 1974 05/01 First BASIC program run at Dartmouth, 1964 05/06 EDSAC demonstrated, 1949 @@ -58,6 +59,7 @@ Temple Univ., Phila, 1948, for symbolic differentiation on the ENIAC 07/08 Bell Telephone Co. formed (predecessor of AT), 1877 07/08 CDC incorporated, 1957 +07/23 Commodore Amiga 1000 released, 1985 08/09 First email sent from space by the crew of STS-43, 1991 08/14 First Unix-based mallet created, 1954 08/14 IBM PC announced, 1981
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: nia Date: Tue Jun 15 16:43:48 UTC 2021 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Add some more useful options to MIPSSIM In particular, MAKEDEV fails if tmpfs isn't available, and having compat_netbsd32 but no SysV shared memory causes some dmesg spam. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/MIPSSIM 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/evbmips/conf/MIPSSIM diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.3 src/sys/arch/evbmips/conf/MIPSSIM:1.4 --- src/sys/arch/evbmips/conf/MIPSSIM:1.3 Tue Feb 16 10:58:32 2021 +++ src/sys/arch/evbmips/conf/MIPSSIM Tue Jun 15 16:43:48 2021 @@ -1,4 +1,4 @@ -# $NetBSD: MIPSSIM,v 1.3 2021/02/16 10:58:32 reinoud Exp $ +# $NetBSD: MIPSSIM,v 1.4 2021/06/15 16:43:48 nia Exp $ # # Kernel config for the QEMU MIPS "mipssim" simulator # @@ -8,7 +8,7 @@ include "arch/evbmips/conf/std.mipssim" -#ident "GENERIC-$Revision: 1.3 $" +#ident "GENERIC-$Revision: 1.4 $" maxusers 32 @@ -25,7 +25,7 @@ options TCP_CSUM_COUNTERS options UDP_CSUM_COUNTERS options TCP_OUTPUT_COUNTERS -#options NTP # network time protocol +options NTP # network time protocol # Debugging options options DIAGNOSTIC # extra kernel sanity checking @@ -45,23 +45,29 @@ include "conf/compat_netbsd50.co #options EXEC_ECOFF # exec ECOFF binaries #options COMPAT_ULTRIX # binary compatibility with Ultrix +options SYSVMSG # System V-like message queues +options SYSVSEM # System V-like semaphores +options SYSVSHM # System V-like memory sharing + # File systems file-system FFS # Berkeley Fast Filesystem #file-system MFS # memory-based filesystem #file-system EXT2FS # second extended file system (linux) file-system NFS # Sun NFS-compatible filesystem client -#file-system KERNFS # kernel data-structure filesystem -#file-system NULLFS # NULL layered filesystem -#file-system OVERLAY # overlay file system -#file-system FDESC # user file descriptor filesystem +file-system KERNFS # kernel data-structure filesystem +file-system NULLFS # NULL layered filesystem +file-system OVERLAY # overlay file system +file-system FDESC # user file descriptor filesystem #file-system UMAPFS # uid/gid remapping filesystem #file-system LFS # Log-based filesystem (still experimental) -#file-system PROCFS # /proc +file-system PROCFS # /proc #file-system CD9660 # ISO 9660 + Rock Ridge file system -#file-system UNION # union file system +file-system UNION # union file system #file-system MSDOSFS # MS-DOS FAT filesystem(s). #file-system CODA # Coda File System; also needs vcoda (below) file-system PTYFS # /dev/pts/N support +file-system MFS # memory-based filesystem +file-system TMPFS # Efficient memory file-system # File system options #options NFSSERVER # Sun NFS-compatible filesystem server @@ -69,7 +75,7 @@ file-system PTYFS # /dev/pts/N support #options QUOTA2 # new, in-filesystem UFS quotas options DISKLABEL_EI # disklabel Endian Independent support options FFS_EI # FFS Endian Independent support -#options WAPBL # File system journaling support +options WAPBL # File system journaling support #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. @@ -81,7 +87,7 @@ options FFS_EI # FFS Endian Independen # Networking options #options GATEWAY # IP packet forwarding options INET # Internet protocols -#options INET6 # IPV6 +options INET6 # IPV6 #options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options MROUTING # packet forwarding of multicast packets
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Wed Jun 9 14:49:13 UTC 2021
Modified Files:
src/lib/libossaudio: oss_caps.c
Log Message:
ossaudio(3): continue getting capabilities if AUDIO_GETFORMAT fails
we want this to work on mixer devices too
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libossaudio/oss_caps.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/oss_caps.c
diff -u src/lib/libossaudio/oss_caps.c:1.1 src/lib/libossaudio/oss_caps.c:1.2
--- src/lib/libossaudio/oss_caps.c:1.1 Tue Jun 8 18:43:54 2021
+++ src/lib/libossaudio/oss_caps.c Wed Jun 9 14:49:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oss_caps.c,v 1.1 2021/06/08 18:43:54 nia Exp $ */
+/* $NetBSD: oss_caps.c,v 1.2 2021/06/09 14:49:13 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -41,27 +41,26 @@ _oss_get_caps(int fd, int *out)
if (ioctl(fd, AUDIO_GETPROPS, ) < 0)
return -1;
- if (ioctl(fd, AUDIO_GETFORMAT, ) < 0)
- return -1;
-
caps = 0;
caps |= PCM_CAP_TRIGGER;
caps |= PCM_CAP_MULTI;
caps |= PCM_CAP_FREERATE;
- nchannels = (props & AUDIO_PROP_PLAYBACK) ?
- info.play.channels : info.record.channels;
-
- switch (nchannels) {
- case 2:
- caps |= DSP_CH_STEREO;
- break;
- case 1:
- caps |= DSP_CH_MONO;
- break;
- default:
- caps |= DSP_CH_MULTI;
- break;
+ if (ioctl(fd, AUDIO_GETFORMAT, ) != -1) {
+ nchannels = (props & AUDIO_PROP_PLAYBACK) ?
+ info.play.channels : info.record.channels;
+
+ switch (nchannels) {
+ case 2:
+ caps |= DSP_CH_STEREO;
+ break;
+ case 1:
+ caps |= DSP_CH_MONO;
+ break;
+ default:
+ caps |= DSP_CH_MULTI;
+ break;
+ }
}
if (props & AUDIO_PROP_FULLDUPLEX)
CVS commit: src/lib/libc/sys
Module Name:src Committed By: nia Date: Wed Jun 9 06:00:16 UTC 2021 Modified Files: src/lib/libc/sys: vfork.2 Log Message: vfork.2: clarify posix_spawn recommendation, pointed out by kre To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/libc/sys/vfork.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/vfork.2 diff -u src/lib/libc/sys/vfork.2:1.29 src/lib/libc/sys/vfork.2:1.30 --- src/lib/libc/sys/vfork.2:1.29 Tue Jun 8 16:15:11 2021 +++ src/lib/libc/sys/vfork.2 Wed Jun 9 06:00:16 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: vfork.2,v 1.29 2021/06/08 16:15:11 nia Exp $ +.\" $NetBSD: vfork.2,v 1.30 2021/06/09 06:00:16 nia Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 .\" -.Dd June 8, 2021 +.Dd June 9, 2021 .Dt VFORK 2 .Os .Sh NAME @@ -140,4 +140,8 @@ signals; rather, output or calls are allowed and input attempts result in an end-of-file indication. .Pp New applications should prefer -.Xr posix_spawn 3 . +.Xr posix_spawn 3 +over +.Nm +followed by +.Xr execve 2 .
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Tue Jun 8 19:26:48 UTC 2021
Modified Files:
src/lib/libossaudio: oss_dsp.c
Log Message:
ossaudio(3): nested switch statements are hard to read, refactor
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libossaudio/oss_dsp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/oss_dsp.c
diff -u src/lib/libossaudio/oss_dsp.c:1.1 src/lib/libossaudio/oss_dsp.c:1.2
--- src/lib/libossaudio/oss_dsp.c:1.1 Tue Jun 8 18:43:54 2021
+++ src/lib/libossaudio/oss_dsp.c Tue Jun 8 19:26:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oss_dsp.c,v 1.1 2021/06/08 18:43:54 nia Exp $ */
+/* $NetBSD: oss_dsp.c,v 1.2 2021/06/08 19:26:48 nia Exp $ */
/*-
* Copyright (c) 1997-2021 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: oss_dsp.c,v 1.1 2021/06/08 18:43:54 nia Exp $");
+__RCSID("$NetBSD: oss_dsp.c,v 1.2 2021/06/08 19:26:48 nia Exp $");
#include
#include
@@ -38,6 +38,9 @@ __RCSID("$NetBSD: oss_dsp.c,v 1.1 2021/0
(((info)->mode == AUMODE_RECORD) \
? (info)->record.name : (info)->play.name)
+static int encoding_to_format(u_int, u_int);
+static int format_to_encoding(int, struct audio_info *);
+
static int get_vol(u_int, u_char);
static void set_vol(int, int, bool);
@@ -54,8 +57,6 @@ _oss_dsp_ioctl(int fd, unsigned long com
struct count_info cntinfo;
struct audio_encoding tmpenc;
u_int u;
- u_int encoding;
- u_int precision;
int perrors, rerrors;
static int totalperrors = 0;
static int totalrerrors = 0;
@@ -173,82 +174,8 @@ _oss_dsp_ioctl(int fd, unsigned long com
break;
case SNDCTL_DSP_SETFMT:
AUDIO_INITINFO();
- switch (INTARG) {
- case AFMT_MU_LAW:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULAW;
- break;
- case AFMT_A_LAW:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ALAW;
- break;
- case AFMT_U8:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULINEAR;
- break;
- case AFMT_S8:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 8;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR;
- break;
- case AFMT_S16_LE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR_LE;
- break;
- case AFMT_S16_BE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR_BE;
- break;
- case AFMT_U16_LE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULINEAR_LE;
- break;
- case AFMT_U16_BE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_ULINEAR_BE;
- break;
- /*
- * XXX: When the kernel supports 24-bit LPCM by default,
- * the 24-bit formats should be handled properly instead
- * of falling back to 32 bits.
- */
- case AFMT_S24_PACKED:
- case AFMT_S24_LE:
- case AFMT_S32_LE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 32;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR_LE;
- break;
- case AFMT_S24_BE:
- case AFMT_S32_BE:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 32;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_SLINEAR_BE;
- break;
- case AFMT_AC3:
- tmpinfo.play.precision =
- tmpinfo.record.precision = 16;
- tmpinfo.play.encoding =
- tmpinfo.record.encoding = AUDIO_ENCODING_AC3;
- break;
- default:
+ retval = format_to_encoding(INTARG, );
+ if (retval < 0) {
/*
* OSSv4 specifies that if an invalid format is chosen
* by an application then a sensible format supported
@@ -270,7 +197,6 @@ _oss_dsp_ioctl(int fd, unsigned long com
tmpinfo.record.precision =
(tmpinfo.mode == AUMODE_RECORD) ?
hwfmt.record.precision : hwfmt.play.precision ;
- break;
}
/*
* In the post-kernel-mixer world, assume that any error means
@@ -284,55 +210,17 @@ _oss_dsp_ioctl(int fd, unsigned long com
retval = ioctl(fd, AUDIO_GETBUFINFO, );
if (retval < 0)
return retval;
- encoding = GETPRINFO(, encoding);
- precision = GETPRINFO(, precision);
- switch (encoding) {
- case AUDIO_ENCODING_ULAW:
- idat = AFMT_MU_LAW;
- break;
- case AUDIO_ENCODING_ALAW:
- idat = AFMT_A_LAW;
- break;
- case AUDIO_ENCODING_SLINEAR_LE:
- if (precision == 32)
-idat = AFMT_S32_LE;
- else if (precision == 24)
-idat = AFMT_S24_LE;
- else if (precision ==
CVS commit: src/lib/libossaudio
%d\n", label->name, opq, i);*/
+ return (i);
+}
+
+static int
+enum_to_ord(struct audiodevinfo *di, int enm)
+{
+ if (enm >= NETBSD_MAXDEVS)
+ return (-1);
+
+ /*printf("enum_to_ord %d -> %d\n", enm, di->enum2opaque[enm]);*/
+ return (di->enum2opaque[enm]);
+}
+
+static int
+enum_to_mask(struct audiodevinfo *di, int enm)
+{
+ int m;
+ if (enm >= NETBSD_MAXDEVS)
+ return (0);
+
+ m = di->enum2opaque[enm];
+ if (m == -1)
+ m = 0;
+ /*printf("enum_to_mask %d -> %d\n", enm, di->enum2opaque[enm]);*/
+ return (m);
+}
Index: src/lib/libossaudio/oss4_global.c
diff -u /dev/null src/lib/libossaudio/oss4_global.c:1.1
--- /dev/null Tue Jun 8 18:43:54 2021
+++ src/lib/libossaudio/oss4_global.c Tue Jun 8 18:43:54 2021
@@ -0,0 +1,63 @@
+/* $NetBSD: oss4_global.c,v 1.1 2021/06/08 18:43:54 nia Exp $ */
+
+/*-
+ * Copyright (c) 2020-2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nia Alarie.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include
+#include "internal.h"
+
+oss_private int
+_oss4_global_ioctl(int fd, unsigned long com, void *argp)
+{
+ int retval = 0;
+
+ switch (com) {
+ /*
+ * These ioctls were added in OSSv4 with the idea that
+ * applications could apply strings to audio devices to
+ * display what they are using them for (e.g. with song
+ * names) in mixer applications. In practice, the popular
+ * implementations of the API in FreeBSD and Solaris treat
+ * these as a no-op and return EINVAL, and no software in the
+ * wild seems to use them.
+ */
+ case SNDCTL_SETSONG:
+ case SNDCTL_GETSONG:
+ case SNDCTL_SETNAME:
+ case SNDCTL_SETLABEL:
+ case SNDCTL_GETLABEL:
+ errno = EINVAL;
+ retval = -1;
+ break;
+ default:
+ errno = EINVAL;
+ retval = -1;
+ break;
+ }
+ return retval;
+}
Index: src/lib/libossaudio/oss4_mixer.c
diff -u /dev/null src/lib/libossaudio/oss4_mixer.c:1.1
--- /dev/null Tue Jun 8 18:43:54 2021
+++ src/lib/libossaudio/oss4_mixer.c Tue Jun 8 18:43:54 2021
@@ -0,0 +1,640 @@
+/* $NetBSD: oss4_mixer.c,v 1.1 2021/06/08 18:43:54 nia Exp $ */
+
+/*-
+ * Copyright (c) 2020-2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nia Alarie.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include
+#include
+#inclu
CVS commit: src/lib/libc/sys
Module Name:src Committed By: nia Date: Tue Jun 8 16:15:12 UTC 2021 Modified Files: src/lib/libc/sys: vfork.2 Log Message: vfork.2: recommend posix_spawn instead To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/sys/vfork.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/vfork.2 diff -u src/lib/libc/sys/vfork.2:1.28 src/lib/libc/sys/vfork.2:1.29 --- src/lib/libc/sys/vfork.2:1.28 Sat May 19 05:39:21 2018 +++ src/lib/libc/sys/vfork.2 Tue Jun 8 16:15:11 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: vfork.2,v 1.28 2018/05/19 05:39:21 kamil Exp $ +.\" $NetBSD: vfork.2,v 1.29 2021/06/08 16:15:11 nia Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 .\" -.Dd May 19, 2018 +.Dd June 8, 2021 .Dt VFORK 2 .Os .Sh NAME @@ -105,7 +105,8 @@ Same as for .Xr execve 2 , .Xr fork 2 , .Xr sigaction 2 , -.Xr wait 2 +.Xr wait 2 , +.Xr posix_spawn 3 .Sh HISTORY The .Fn vfork @@ -137,3 +138,6 @@ or signals; rather, output or .Xr ioctl 2 calls are allowed and input attempts result in an end-of-file indication. +.Pp +New applications should prefer +.Xr posix_spawn 3 .
CVS commit: src/sys/dev/pad
Module Name:src
Committed By: nia
Date: Tue Jun 8 09:09:29 UTC 2021
Modified Files:
src/sys/dev/pad: pad.c
Log Message:
pad(4): run the callout if the buffer is saturated instead of returning
reverts to the same behavior as in -8 and -9. prevents immediate failures
and device timeouts if there's a slight delay in the buffer being
consumed.
this is reproducible with the example in the man page that uses
ffmpeg to record the output of audioplay:
$ ffmpeg -f s16le -ar 44100 -ac 2 -i /dev/pad0 output.wav
$ audioplay -d /dev/audio1 input.wav
if output.wav already exists, ffmpeg will prompt for confirmation
to overwrite as soon as audioplay starts, causing a noticable delay,
followed by a write failure that causes audioplay to immediately
exit.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pad/pad.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/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.65 src/sys/dev/pad/pad.c:1.66
--- src/sys/dev/pad/pad.c:1.65 Sun Feb 23 04:02:46 2020
+++ src/sys/dev/pad/pad.c Tue Jun 8 09:09:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.65 2020/02/23 04:02:46 isaki Exp $ */
+/* $NetBSD: pad.c,v 1.66 2021/06/08 09:09:28 nia Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.65 2020/02/23 04:02:46 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.66 2021/06/08 09:09:28 nia Exp $");
#include
#include
@@ -622,14 +622,12 @@ pad_start_output(void *opaque, void *blo
err = pad_add_block(sc, block, blksize);
mutex_exit(>sc_cond_lock);
cv_broadcast(>sc_condvar);
- if (err)
- return err;
ms = blksize * 1000 / PADCHAN / (PADPREC / NBBY) / PADFREQ;
DPRINTF("%s: callout ms=%d\n", __func__, ms);
callout_reset(>sc_pcallout, mstohz(ms), pad_done_output, sc);
- return 0;
+ return err;
}
static int
CVS commit: src/share/man/man8
Module Name:src Committed By: nia Date: Fri Jun 4 12:43:14 UTC 2021 Modified Files: src/share/man/man8: afterboot.8 Log Message: actually, an anchor is needed so the period is appended To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/share/man/man8/afterboot.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/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.81 src/share/man/man8/afterboot.8:1.82 --- src/share/man/man8/afterboot.8:1.81 Fri Jun 4 12:29:33 2021 +++ src/share/man/man8/afterboot.8 Fri Jun 4 12:43:14 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.81 2021/06/04 12:29:33 nia Exp $ +.\" $NetBSD: afterboot.8,v 1.82 2021/06/04 12:43:14 nia Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -179,7 +179,7 @@ variable found in contains more information about this file. .Ss Security alerts All significant and easily fixed problems will be reported at -.Lk http://www.NetBSD.org/support/security/ +.Lk https://www.NetBSD.org/support/security/ the security advisories web page . It is recommended that you check this page regularly. .Pp Additionally, you should set
CVS commit: src/share/man/man8
Module Name:src Committed By: nia Date: Fri Jun 4 12:29:33 UTC 2021 Modified Files: src/share/man/man8: afterboot.8 Log Message: remove empty anchor text To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/share/man/man8/afterboot.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/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.80 src/share/man/man8/afterboot.8:1.81 --- src/share/man/man8/afterboot.8:1.80 Fri Jun 4 12:12:02 2021 +++ src/share/man/man8/afterboot.8 Fri Jun 4 12:29:33 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.80 2021/06/04 12:12:02 nia Exp $ +.\" $NetBSD: afterboot.8,v 1.81 2021/06/04 12:29:33 nia Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -179,7 +179,7 @@ variable found in contains more information about this file. .Ss Security alerts All significant and easily fixed problems will be reported at -.Lk http://www.NetBSD.org/support/security/ . +.Lk http://www.NetBSD.org/support/security/ It is recommended that you check this page regularly. .Pp Additionally, you should set
CVS commit: src/share/man/man8
Module Name:src Committed By: nia Date: Fri Jun 4 12:12:02 UTC 2021 Modified Files: src/share/man/man8: afterboot.8 Log Message: re-order initial sections in the order a user is likely to be able to address them. add a section on NPF. attempt to make various things easier to find. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/share/man/man8/afterboot.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/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.79 src/share/man/man8/afterboot.8:1.80 --- src/share/man/man8/afterboot.8:1.79 Fri Jun 4 11:56:47 2021 +++ src/share/man/man8/afterboot.8 Fri Jun 4 12:12:02 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.79 2021/06/04 11:56:47 wiz Exp $ +.\" $NetBSD: afterboot.8,v 1.80 2021/06/04 12:12:02 nia Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -88,46 +88,6 @@ command, type: Administrators will rapidly become more familiar with .Nx if they get used to using the manual pages. -.Ss Security alerts -By the time that you have installed your system, it is quite likely that -bugs in the release have been found. -All significant and easily fixed problems will be reported at -.Lk http://www.NetBSD.org/support/security/ . -It is recommended that you check this page regularly. -.Pp -Additionally, you should set -.Dq fetch_pkg_vulnerabilities=YES -in -.Pa /etc/daily.conf -to allow your system to automatically update the local database of known -vulnerable packages to the latest version available on-line. -The system will later check, on a daily basis, if any of your installed -packages are vulnerable based on the contents of this database. -See -.Xr daily.conf 5 -and -.Xr security.conf 5 -for more details. -.Ss Entropy -If your machine does not have a hardware random number generator, it -may not be safe to use on the internet until it has enough entropy to -generate unpredictable secrets for programs like web browsers and -.Xr ssh 1 . -You can use -.Xr rndctl 8 -to list the entropy sources with -.Ic rndctl -l , -or save entropy from another machine running -.Nx -with -.Ic rndctl -S -and load it on this one with -.Ic rndctl -L -(as long as there are no eavesdroppers on the medium between the two -machines). -See -.Xr entropy 7 -for more details. .Ss Login On a fresh install with no other user accounts, login as .Dq Ic root . @@ -217,6 +177,44 @@ variable found in .Pp .Xr wscons.conf 5 contains more information about this file. +.Ss Security alerts +All significant and easily fixed problems will be reported at +.Lk http://www.NetBSD.org/support/security/ . +It is recommended that you check this page regularly. +.Pp +Additionally, you should set +.Dq fetch_pkg_vulnerabilities=YES +in +.Pa /etc/daily.conf +to allow your system to automatically update the local database of known +vulnerable packages to the latest version available on-line. +The system will later check, on a daily basis, if any of your installed +packages are vulnerable based on the contents of this database. +See +.Xr daily.conf 5 +and +.Xr security.conf 5 +for more details. +.Ss Entropy +If your machine does not have a hardware random number generator, it +may not be safe to use on the internet until it has enough entropy to +generate unpredictable secrets for programs like web browsers and +.Xr ssh 1 . +You can use +.Xr rndctl 8 +to list the entropy sources with +.Ic rndctl -l , +or save entropy from another machine running +.Nx +with +.Ic rndctl -S +and load it on this one with +.Ic rndctl -L +(as long as there are no eavesdroppers on the medium between the two +machines). +See +.Xr entropy 7 +for more details. .Ss Check hostname Use the .Ic hostname @@ -260,9 +258,8 @@ and then using to manually configure it if you do not wish to reboot. .Pp -Alternatively, you can configure interfaces automatically via DHCP with -.Xr dhcpcd 8 -if you have a DHCP server running somewhere on your network. +Alternatively, many networks allow interfaces to be configured +automatically via DHCP. To get .Xr dhcpcd 8 to start automatically on boot, @@ -276,6 +273,8 @@ See and .Xr dhcpcd.conf 5 for more information on setting up a DHCP client. +For information on setting up Wi-Fi, see +.Sx Wireless networking . .Pp You can add new .Dq virtual interfaces @@ -436,6 +435,12 @@ and either rebooting or running the foll .Ic service mdnsd start .Ed .Pp +You may also wish to enable mdnsd as a source for host lookups +in +.Pa /etc/nsswitch.conf , +see +.Xr nsswitch.conf 5 . +.Pp If your network does not have a usable DNS resolver, e.g. one provided by DHCP, you can run a local caching recursive resolver by setting .Dq named=YES @@ -513,7 +518,7 @@ you will need to have this line in .Pa /etc/rc.conf : .Pp .Dl rpcbind=YES -.Ss YP (NIS) Setup +.Ss
CVS commit: src/share/man/man8
Module Name:src Committed By: nia Date: Fri Jun 4 11:48:18 UTC 2021 Modified Files: src/share/man/man8: afterboot.8 Log Message: adjust layout of afterboot(8) to make things easier to find To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/share/man/man8/afterboot.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/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.77 src/share/man/man8/afterboot.8:1.78 --- src/share/man/man8/afterboot.8:1.77 Fri Jun 4 11:33:18 2021 +++ src/share/man/man8/afterboot.8 Fri Jun 4 11:48:18 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.77 2021/06/04 11:33:18 nia Exp $ +.\" $NetBSD: afterboot.8,v 1.78 2021/06/04 11:48:18 nia Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -160,8 +160,11 @@ user, add said user to the .Dq wheel group, then use the .Xr su 1 -command when root privileges are required. -This process is described in more detail later. +command when root privileges are required: +.Bd -literal -offset indent +.Ic useradd -G wheel -m myuser +.Ic passwd myuser +.Ed .Ss Root password Change the password for the root user. (Note that throughout the documentation, the term @@ -207,7 +210,7 @@ Set the time zone to Eastern Europe Summ .Ss Console settings One of the first things you will likely need to do is to set up your keyboard map (and maybe some other aspects about the system console). -To change your keyboard encoding, edit the +To change your keyboard layout, edit the .Dq Va encoding variable found in .Pa /etc/wscons.conf . @@ -422,7 +425,9 @@ first, and then the DNS resolver specifi .Pa /etc/resolv.conf . .Pp Multicast DNS and DNS Service Discovery are usually not enabled by -default on a fresh NetBSD system, and can be enabled by setting +default on a fresh +.Nx +system, and can be enabled by setting .Dq mdnsd=YES in .Pa /etc/rc.conf , @@ -610,36 +615,6 @@ Refer to the above example and for information on the format of this file. .Pp You may wish to do NFS mounts now too, or you can do them later. -.Ss Concatenated disks (ccd) -If you are using -.Xr ccd 4 -concatenated disks, edit -.Pa /etc/ccd.conf . -You may wish to take a look to -.Xr ccdconfig 8 -for more information about this file. -Use the -.Ic ccdconfig -U -command to unload and the -.Ic ccdconfig -C -command to create tables internal to the kernel for the concatenated disks. -You then -.Xr mount 8 , -.Xr umount 8 , -and edit -.Pa /etc/fstab -as needed. -.Ss Automounter daemon (AMD) -To use the -.Xr amd 8 -automounter, create the -.Pa /etc/amd -directory, copy example config files from -.Pa /usr/share/examples/amd -to -.Pa /etc/amd -and customize them as needed. -Alternatively, you can get your maps with YP. .Ss Clock synchronization In order to make sure the system clock is synchronized to that of a publicly accessible NTP server, @@ -658,6 +633,30 @@ See and .Xr timed 8 for more information on setting the system's date. +.Ss Insalling packages +The +.Nx +packages collection, pkgsrc, includes a large set of third-party software. +A lot of it is available as binary packages that you can download from +.Lk https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/ +or a mirror. +.Pp +For most users, using pkgin to manage binary packages is recommended. +.Pp +To install pkgin, if it was not done by the installer: +.Bd -literal -offset indent +.Ic PKG_PATH=https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/[...] +.Ic export PKG_PATH +.Ic pkg_add pkgin +.Ic pkgin update +.Ic pkgin install bash mpg123 fluxbox ... +.Ed +.Pp +See +.Lk https://www.pkgsrc.org/ +and +.Pa pkgsrc/doc/pkgsrc.txt +for more details. .Sh CHANGING /etc FILES The system should be usable now, but you may wish to do more customizing, such as adding users, etc. @@ -747,6 +746,36 @@ directly, edit only See .Xr rc.conf 5 for further information. +.Ss Automounter daemon (AMD) +To use the +.Xr amd 8 +automounter, create the +.Pa /etc/amd +directory, copy example config files from +.Pa /usr/share/examples/amd +to +.Pa /etc/amd +and customize them as needed. +Alternatively, you can get your maps with YP. +.Ss Concatenated disks (ccd) +If you are using +.Xr ccd 4 +concatenated disks, edit +.Pa /etc/ccd.conf . +You may wish to take a look to +.Xr ccdconfig 8 +for more information about this file. +Use the +.Ic ccdconfig -U +command to unload and the +.Ic ccdconfig -C +command to create tables internal to the kernel for the concatenated disks. +You then +.Xr mount 8 , +.Xr umount 8 , +and edit +.Pa /etc/fstab +as needed. .Ss X Display Manager If you've installed X, you may want to turn on .Xr xdm 1 , @@ -933,46 +962,14 @@ Use and .Xr chown 8 as needed. -.Ss Packages -Install your own packages. -The -.Nx -packages collection, pkgsrc, includes a large set of
CVS commit: src/share/man/man8
Module Name:src Committed By: nia Date: Fri Jun 4 11:33:19 UTC 2021 Modified Files: src/share/man/man8: afterboot.8 Log Message: capitalization police, etc To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/share/man/man8/afterboot.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/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.76 src/share/man/man8/afterboot.8:1.77 --- src/share/man/man8/afterboot.8:1.76 Sun Jan 10 23:24:26 2021 +++ src/share/man/man8/afterboot.8 Fri Jun 4 11:33:18 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.76 2021/01/10 23:24:26 riastradh Exp $ +.\" $NetBSD: afterboot.8,v 1.77 2021/06/04 11:33:18 nia Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -59,7 +59,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 October 5, 2020 +.Dd June 4, 2021 .Dt AFTERBOOT 8 .Os .Sh NAME @@ -451,7 +451,7 @@ Then, to make the system use it, put the nameserver 127.0.0.1 .Ed .Ss Wireless networking -To configure the system to connect to a wireless network with a password +To configure the system to connect to a Wi-Fi network with a password using WPA: .Bd -literal -offset indent .Ic wpa_passphrase networkname password >> /etc/wpa_supplicant.conf @@ -939,21 +939,22 @@ The .Nx packages collection, pkgsrc, includes a large set of third-party software. A lot of it is available as binary packages that you can download from -.Lk https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/ +.Lk https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/ or a mirror. .Pp For most users, using pkgin to manage binary packages is recommended. .Pp To install pkgin, if it was not done by the installer: .Bd -literal -offset indent -.Ic export PKG_PATH=https://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r | cut -d_ -f1)/All +.Ic PKG_PATH=https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/[...] +.Ic export PKG_PATH .Ic pkg_add pkgin .Ic pkgin update .Ic pkgin install bash mpg123 fluxbox ... .Ed .Pp See -.Lk https://www.NetBSD.org/docs/pkgsrc/ +.Lk https://www.pkgsrc.org/ and .Pa pkgsrc/doc/pkgsrc.txt for more details.
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: nia Date: Fri Jun 4 11:18:31 UTC 2021 Modified Files: src/games/fortune/datfiles: netbsd-tips Log Message: SIGINFO is a useful tip To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/games/fortune/datfiles/netbsd-tips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/netbsd-tips diff -u src/games/fortune/datfiles/netbsd-tips:1.9 src/games/fortune/datfiles/netbsd-tips:1.10 --- src/games/fortune/datfiles/netbsd-tips:1.9 Fri Jun 4 10:56:55 2021 +++ src/games/fortune/datfiles/netbsd-tips Fri Jun 4 11:18:31 2021 @@ -159,3 +159,6 @@ on its extension. For example, to extra You can use progress(1) to monitor the progress of data in a pipe: zcat example.tar.gz | progress tar xf - +% +Press CTRL+T to send SIGINFO and see the current status of the +command running in the current terminal.
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: nia Date: Fri Jun 4 10:56:55 UTC 2021 Modified Files: src/games/fortune/datfiles: netbsd-tips Log Message: add some tips To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/games/fortune/datfiles/netbsd-tips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/netbsd-tips diff -u src/games/fortune/datfiles/netbsd-tips:1.8 src/games/fortune/datfiles/netbsd-tips:1.9 --- src/games/fortune/datfiles/netbsd-tips:1.8 Sun Jun 7 15:41:03 2020 +++ src/games/fortune/datfiles/netbsd-tips Fri Jun 4 10:56:55 2021 @@ -141,3 +141,21 @@ To do so: cd /usr/tests atf-run | atf-report % +To share files from your NetBSD system, you can use the built-in +httpd(8). Uncomment the 'http' lines in /etc/inetd.conf, reload inetd +with service(8), and then any files in /var/www will be published to +http://127.0.0.1/. +% +You can schedule simple periodic tasks for your NetBSD system to run +without using cron(8) by editing the sh(1) scripts /etc/daily.local, +/etc/weekly.local, and /etc/monthly.local. +% +NetBSD's tar(1) command can handle a wide range of file types, e.g. +zip, 7z, and rar, and will autodetect the type of the file based +on its extension. For example, to extract a zip file: + + tar xvf example.zip +% +You can use progress(1) to monitor the progress of data in a pipe: + + zcat example.tar.gz | progress tar xf -
CVS commit: src/sys/modules
Module Name:src
Committed By: nia
Date: Thu Jun 3 15:59:04 UTC 2021
Modified Files:
src/sys/modules/drmkms: Makefile
src/sys/modules/i915drmkms: Makefile
src/sys/modules/radeondrm: Makefile
Log Message:
build the drmkms modules with -fwrapv too
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/modules/drmkms/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/modules/i915drmkms/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/modules/radeondrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/drmkms/Makefile
diff -u src/sys/modules/drmkms/Makefile:1.13 src/sys/modules/drmkms/Makefile:1.14
--- src/sys/modules/drmkms/Makefile:1.13 Fri Feb 14 09:35:52 2020
+++ src/sys/modules/drmkms/Makefile Thu Jun 3 15:59:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/02/14 09:35:52 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2021/06/03 15:59:04 nia Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
@@ -25,6 +25,9 @@ SRCS+= drmfb.c
# XXX ttm
+# Code imported from Linux - expects signed overflow to be OK.
+COPTS+= -fwrapv
+
CPPFLAGS+= -I.
# XXX CWARNFLAGS.foo.c doesn't work.
Index: src/sys/modules/i915drmkms/Makefile
diff -u src/sys/modules/i915drmkms/Makefile:1.17 src/sys/modules/i915drmkms/Makefile:1.18
--- src/sys/modules/i915drmkms/Makefile:1.17 Tue Apr 13 04:59:00 2021
+++ src/sys/modules/i915drmkms/Makefile Thu Jun 3 15:59:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/04/13 04:59:00 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2021/06/03 15:59:04 nia Exp $
.include "../Makefile.inc"
.include "../drmkms/Makefile.inc"
@@ -27,6 +27,9 @@ CPPFLAGS+= -DNVGA=1
CWARNFLAGS+= -Wno-shadow
CWARNFLAGS+= -Wno-pointer-arith
+# Code imported from Linux - expects signed overflow to be OK.
+COPTS+= -fwrapv
+
COPTS.i915_drv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-override-init :}
COPTS.i915_drv.c+= ${${ACTIVE_CC} == "clang":? -Wno-initializer-overrides :}
Index: src/sys/modules/radeondrm/Makefile
diff -u src/sys/modules/radeondrm/Makefile:1.14 src/sys/modules/radeondrm/Makefile:1.15
--- src/sys/modules/radeondrm/Makefile:1.14 Mon Nov 11 22:45:27 2019
+++ src/sys/modules/radeondrm/Makefile Thu Jun 3 15:59:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/11/11 22:45:27 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2021/06/03 15:59:04 nia Exp $
.include "../Makefile.inc"
@@ -18,6 +18,9 @@ SRCS+= radeon_irq.c
SRCS+= radeon_mem.c
SRCS+= radeon_state.c
+# Code imported from Linux - expects signed overflow to be OK.
+COPTS+= -fwrapv
+
CPPFLAGS+= -I${S}/external/bsd/drm/dist/bsd-core \
-I${S}/external/bsd/drm/dist/shared-core
CVS commit: src/sys
Module Name:src
Committed By: nia
Date: Wed Jun 2 15:45:29 UTC 2021
Modified Files:
src/sys/conf: Makefile.kern.inc
src/sys/external/bsd/drm2/drm: files.drmkms
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
Log Message:
drm2: build with -fwrapv, since the Linux kernel does and we don't
want to spend too much time fixing their code. silences a lot of
KUBSAN warnings.
we need to use COPTS to have per-option compiler flags. help from
Riastradh.
To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.34 -r1.35 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/drm2/radeon/files.radeon
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.280 src/sys/conf/Makefile.kern.inc:1.281
--- src/sys/conf/Makefile.kern.inc:1.280 Tue Apr 6 15:05:12 2021
+++ src/sys/conf/Makefile.kern.inc Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.280 2021/04/06 15:05:12 simonb Exp $
+# $NetBSD: Makefile.kern.inc,v 1.281 2021/06/02 15:45:28 nia Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -449,7 +449,7 @@ CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAG
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
-.for _v in CFLAGS CPPFLAGS CWARNFLAGS
+.for _v in COPTS CPPFLAGS CWARNFLAGS
.for _c in ${CSRCS}
${_v}.${_c:T}+=${OPT.${_c:T}:@.o.@${${_v}.${.o.}}@}
.endfor
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.34 src/sys/external/bsd/drm2/drm/files.drmkms:1.35
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.34 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/drm/files.drmkms Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.34 2020/02/14 04:30:05 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.35 2021/06/02 15:45:28 nia Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -12,6 +12,10 @@ define drmkms: drmkms_linux, drmkms_i2c,
defflag opt_drmkms.h DRMKMS_DEBUG
+# This code comes from the Linux kernel, which assumes signed
+# overflow is OK.
+makeoptions drmkms "COPTS.drmkms"+="-fwrapv"
+
# Overrides first.
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include"
makeoptions drmkms_ttm CPPFLAGS+="-I$S/external/bsd/drm2/include/drm"
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.40 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.41
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.40 Tue Apr 13 04:59:00 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.40 2021/04/13 04:59:00 mrg Exp $
+# $NetBSD: files.i915drmkms,v 1.41 2021/06/02 15:45:28 nia Exp $
version 20180827
@@ -9,6 +9,10 @@ attach i915drmkms at pci
device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
attach intelfb at intelfbbus
+# This code comes from the Linux kernel, which assumes signed
+# overflow is OK.
+makeoptions i915drmkms "COPTS.i915drmkms"+="-fwrapv"
+
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/i915drm"
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
Index: src/sys/external/bsd/drm2/nouveau/files.nouveau
diff -u src/sys/external/bsd/drm2/nouveau/files.nouveau:1.29 src/sys/external/bsd/drm2/nouveau/files.nouveau:1.30
--- src/sys/external/bsd/drm2/nouveau/files.nouveau:1.29 Fri Feb 14 04:30:05 2020
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau Wed Jun 2 15:45:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.nouveau,v 1.29 2020/02/14 04:30:05 riastradh Exp $
+# $NetBSD: files.nouveau,v 1.30 2021/06/02 15:45:28 nia Exp $
version 20180827
@@ -16,6 +16,10 @@ file external/bsd/drm2/nouveau/nouveau_s
file external/bsd/drm2/nouveau/nouveau_vga.c nouveau
file external/bsd/drm2/nouveau/nouveaufb.c nouveaufb
+# This code comes from the Linux kernel, which assumes signed
+# overflow is OK.
+makeoptions nouveau "COPTS.nouveau"+="-fwrapv"
+
makeoptions nouveau CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/nouveau"
makeoptions nouveau CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/nouveau/include"
makeoptions nouveau CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/nouveau/include/nvkm"
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.28
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nia
Date: Wed Jun 2 11:32:24 UTC 2021
Modified Files:
src/sys/dev/pci: if_iwmreg.h
Log Message:
Can't left shift a signed int by 31. Found by kubsan.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/if_iwmreg.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/if_iwmreg.h
diff -u src/sys/dev/pci/if_iwmreg.h:1.7 src/sys/dev/pci/if_iwmreg.h:1.8
--- src/sys/dev/pci/if_iwmreg.h:1.7 Thu Apr 19 21:50:09 2018
+++ src/sys/dev/pci/if_iwmreg.h Wed Jun 2 11:32:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmreg.h,v 1.7 2018/04/19 21:50:09 christos Exp $ */
+/* $NetBSD: if_iwmreg.h,v 1.8 2021/06/02 11:32:24 nia Exp $ */
/* OpenBSD: if_iwmreg.h,v 1.19 2016/09/20 11:46:09 stsp Exp */
/*-
@@ -191,7 +191,7 @@
/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
* acknowledged (reset) by host writing "1" to flagged bits. */
-#define IWM_CSR_INT_BIT_FH_RX (1 << 31) /* Rx DMA, cmd responses, FH_INT[17:16] */
+#define IWM_CSR_INT_BIT_FH_RX (1U << 31) /* Rx DMA, cmd responses, FH_INT[17:16] */
#define IWM_CSR_INT_BIT_HW_ERR (1 << 29) /* DMA hardware error FH_INT[31] */
#define IWM_CSR_INT_BIT_RX_PERIODIC (1 << 28) /* Rx periodic */
#define IWM_CSR_INT_BIT_FH_TX (1 << 27) /* Tx DMA FH_INT[1:0] */
@@ -214,7 +214,7 @@
IWM_CSR_INT_BIT_RX_PERIODIC)
/* interrupt flags in FH (flow handler) (PCI busmaster DMA) */
-#define IWM_CSR_FH_INT_BIT_ERR (1 << 31) /* Error */
+#define IWM_CSR_FH_INT_BIT_ERR (1U << 31) /* Error */
#define IWM_CSR_FH_INT_BIT_HI_PRIOR (1 << 30) /* High priority Rx, bypass coalescing */
#define IWM_CSR_FH_INT_BIT_RX_CHNL1 (1 << 17) /* Rx channel 1 */
#define IWM_CSR_FH_INT_BIT_RX_CHNL0 (1 << 16) /* Rx channel 0 */
@@ -405,7 +405,7 @@
#define IWM_CSR_DBG_HPET_MEM_REG_VAL (0x)
/* DRAM INT TABLE */
-#define IWM_CSR_DRAM_INT_TBL_ENABLE (1 << 31)
+#define IWM_CSR_DRAM_INT_TBL_ENABLE (1U << 31)
#define IWM_CSR_DRAM_INIT_TBL_WRITE_POINTER (1 << 28)
#define IWM_CSR_DRAM_INIT_TBL_WRAP_CHECK (1 << 27)
@@ -558,7 +558,7 @@ enum iwm_secure_load_status_reg {
#define IWM_HOST_INT_TIMEOUT_MAX (0xFF)
#define IWM_HOST_INT_TIMEOUT_DEF (0x40)
#define IWM_HOST_INT_TIMEOUT_MIN (0x0)
-#define IWM_HOST_INT_OPER_MODE (1 << 31)
+#define IWM_HOST_INT_OPER_MODE (1U << 31)
/*
*7000/3000 series SHR DTS addresses *
@@ -643,7 +643,7 @@ enum iwm_ucode_tlv_flag {
IWM_UCODE_TLV_FLAGS_P2P_PS_UAPSD = (1 << 26),
IWM_UCODE_TLV_FLAGS_BCAST_FILTERING = (1 << 29),
IWM_UCODE_TLV_FLAGS_GO_UAPSD = (1 << 30),
- IWM_UCODE_TLV_FLAGS_LTE_COEX = (1 << 31),
+ IWM_UCODE_TLV_FLAGS_LTE_COEX = (1U << 31),
};
#define IWM_UCODE_TLV_FLAG_BITS \
"\020\1PAN\2NEWSCAN\3MFP\4P2P\5DW_BC_TABLE\6NEWBT_COEX\7PM_CMD\10SHORT_BL\11RX_ENERGY\12TIME_EVENT_V2\13D3_6_IPV6\14BF_UPDATED\15NO_BASIC_SSID\17D3_CONTINUITY\20NEW_NSOFFL_S\21NEW_NSOFFL_L\22SCHED_SCAN\24STA_KEY_CMD\25DEVICE_PS_CMD\26P2P_PS\27P2P_PS_DCM\30P2P_PS_SCM\31UAPSD_SUPPORT\32EBS\33P2P_PS_UAPSD\36BCAST_FILTERING\37GO_UAPSD\40LTE_COEX"
@@ -4369,7 +4369,7 @@ enum iwm_tx_flags {
IWM_TX_CMD_FLG_FW_DROP = (1 << 26),
IWM_TX_CMD_FLG_EXEC_PAPD = (1 << 27),
IWM_TX_CMD_FLG_PAPD_TYPE = (1 << 28),
- IWM_TX_CMD_FLG_HCCA_CHUNK = (1 << 31)
+ IWM_TX_CMD_FLG_HCCA_CHUNK = (1U << 31)
}; /* IWM_TX_FLAGS_BITS_API_S_VER_1 */
/**
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: nia
Date: Wed Jun 2 06:48:10 UTC 2021
Modified Files:
src/sys/arch/x86/x86: tsc.c
Log Message:
when warning about TSC going backwards, provide advice to the sysadmin.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x86/x86/tsc.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/x86/x86/tsc.c
diff -u src/sys/arch/x86/x86/tsc.c:1.55 src/sys/arch/x86/x86/tsc.c:1.56
--- src/sys/arch/x86/x86/tsc.c:1.55 Tue Jun 1 21:29:24 2021
+++ src/sys/arch/x86/x86/tsc.c Wed Jun 2 06:48:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tsc.c,v 1.55 2021/06/01 21:29:24 riastradh Exp $ */
+/* $NetBSD: tsc.c,v 1.56 2021/06/02 06:48:10 nia Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.55 2021/06/01 21:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.56 2021/06/02 06:48:10 nia Exp $");
#include
#include
@@ -427,7 +427,8 @@ tsc_get_timecount(struct timecounter *tc
ticks = getticks();
if (ticks - lastwarn >= hz) {
printf(
-"WARNING: TSC time went backwards by %u\n",
+"WARNING: TSC time went backwards by %u - "
+"change sysctl(7) kern.timecounter?\n",
(unsigned)(prev - cur));
lastwarn = ticks;
}
CVS commit: src/usr.bin/aiomixer
Module Name:src Committed By: nia Date: Sat May 29 09:11:41 UTC 2021 Modified Files: src/usr.bin/aiomixer: draw.c Log Message: aiomixer: remove workaround for libcurses bug To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/aiomixer/draw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/aiomixer/draw.c diff -u src/usr.bin/aiomixer/draw.c:1.6 src/usr.bin/aiomixer/draw.c:1.7 --- src/usr.bin/aiomixer/draw.c:1.6 Sat May 8 14:49:13 2021 +++ src/usr.bin/aiomixer/draw.c Sat May 29 09:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: draw.c,v 1.6 2021/05/08 14:49:13 nia Exp $ */ +/* $NetBSD: draw.c,v 1.7 2021/05/29 09:11:41 nia Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. * All rights reserved. @@ -364,13 +364,7 @@ create_widgets(struct aiomixer *aio) control->widget_y = class->height; class->height += control->height; } -#ifdef notyet - /* - * NetBSD curses wresize() bounds the pad to the height of - * the screen even though it's already taller. Probably a bug. - */ wresize(class->widgetpad, class->height, getmaxx(stdscr)); -#endif } aio->last_max_x = getmaxx(stdscr);
CVS commit: src/lib/libcurses
Module Name:src
Committed By: nia
Date: Sat May 29 09:11:14 UTC 2021
Modified Files:
src/lib/libcurses: resize.c
Log Message:
wresize: don't bound pads to the size of the screen
allows avoiding a workaround in aiomixer,
ok blymn uwe
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/resize.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/resize.c
diff -u src/lib/libcurses/resize.c:1.30 src/lib/libcurses/resize.c:1.31
--- src/lib/libcurses/resize.c:1.30 Fri Nov 2 04:17:39 2018
+++ src/lib/libcurses/resize.c Sat May 29 09:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: resize.c,v 1.30 2018/11/02 04:17:39 blymn Exp $ */
+/* $NetBSD: resize.c,v 1.31 2021/05/29 09:11:14 nia Exp $ */
/*
* Copyright (c) 2001
@@ -33,7 +33,7 @@
#if 0
static char sccsid[] = "@(#)resize.c blymn 2001/08/26";
#else
-__RCSID("$NetBSD: resize.c,v 1.30 2018/11/02 04:17:39 blymn Exp $");
+__RCSID("$NetBSD: resize.c,v 1.31 2021/05/29 09:11:14 nia Exp $");
#endif
#endif/* not lint */
@@ -62,7 +62,25 @@ wresize(WINDOW *win, int req_nlines, int
__CTRACE(__CTRACE_WINDOW, "wresize: (%p, %d, %d)\n",
win, nlines, ncols);
#endif
- if (win->orig == NULL) {
+ if (win->orig != NULL) {
+ /* subwins must fit inside the parent - check this */
+ if (win->begy > win->orig->begy + win->orig->maxy)
+ win->begy = win->orig->begy + win->orig->maxy - 1;
+ if (win->begy + nlines > win->orig->begy + win->orig->maxy)
+ nlines = 0;
+ if (nlines <= 0)
+ nlines += win->orig->begy + win->orig->maxy - win->begy;
+ if (nlines < 1)
+ nlines = 1;
+ if (win->begx > win->orig->begx + win->orig->maxx)
+ win->begx = win->orig->begx + win->orig->maxx - 1;
+ if (win->begx + ncols > win->orig->begx + win->orig->maxx)
+ ncols = 0;
+ if (ncols <= 0)
+ ncols += win->orig->begx + win->orig->maxx - win->begx;
+ if (ncols < 1)
+ ncols = 1;
+ } else if (!(win->flags & __ISPAD)) {
/* bound "our" windows by the screen size */
if (win == curscr || win == __virtscr || win == stdscr) {
if (nlines > LINES)
@@ -91,24 +109,6 @@ wresize(WINDOW *win, int req_nlines, int
if (ncols < 1)
ncols = 1;
}
- } else {
- /* subwins must fit inside the parent - check this */
- if (win->begy > win->orig->begy + win->orig->maxy)
- win->begy = win->orig->begy + win->orig->maxy - 1;
- if (win->begy + nlines > win->orig->begy + win->orig->maxy)
- nlines = 0;
- if (nlines <= 0)
- nlines += win->orig->begy + win->orig->maxy - win->begy;
- if (nlines < 1)
- nlines = 1;
- if (win->begx > win->orig->begx + win->orig->maxx)
- win->begx = win->orig->begx + win->orig->maxx - 1;
- if (win->begx + ncols > win->orig->begx + win->orig->maxx)
- ncols = 0;
- if (ncols <= 0)
- ncols += win->orig->begx + win->orig->maxx - win->begx;
- if (ncols < 1)
- ncols = 1;
}
if ((__resizewin(win, nlines, ncols)) == ERR)
CVS commit: src/doc
Module Name:src Committed By: nia Date: Sat May 22 17:20:01 UTC 2021 Modified Files: src/doc: RESPONSIBLE Log Message: ossaudio too I guess To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 src/doc/RESPONSIBLE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/RESPONSIBLE diff -u src/doc/RESPONSIBLE:1.127 src/doc/RESPONSIBLE:1.128 --- src/doc/RESPONSIBLE:1.127 Sat May 22 17:18:57 2021 +++ src/doc/RESPONSIBLE Sat May 22 17:20:01 2021 @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.127 2021/05/22 17:18:57 nia Exp $ +# $NetBSD: RESPONSIBLE,v 1.128 2021/05/22 17:20:01 nia Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -85,6 +85,7 @@ curses blymn, jdc edit christos, jdolecek kerberos lha*, joda* openssl thorpej*, christos +ossaudio nia pcap core pthread nathanw* quota dholland
CVS commit: src/doc
Module Name:src Committed By: nia Date: Sat May 22 17:18:57 UTC 2021 Modified Files: src/doc: RESPONSIBLE Log Message: doc: allege responsibility To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/doc/RESPONSIBLE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/RESPONSIBLE diff -u src/doc/RESPONSIBLE:1.126 src/doc/RESPONSIBLE:1.127 --- src/doc/RESPONSIBLE:1.126 Thu Oct 1 18:34:06 2020 +++ src/doc/RESPONSIBLE Sat May 22 17:18:57 2021 @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.126 2020/10/01 18:34:06 kamil Exp $ +# $NetBSD: RESPONSIBLE,v 1.127 2021/05/22 17:18:57 nia Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -11,6 +11,7 @@ necessarily incomplete! Userland Programs: +aiomixer nia amd christos atf jmmv audioplay mrg
CVS commit: src/doc
Module Name:src Committed By: nia Date: Wed May 19 16:06:13 UTC 2021 Modified Files: src/doc: CHANGES Log Message: fix syntax To generate a diff of this commit: cvs rdiff -u -r1.2807 -r1.2808 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2807 src/doc/CHANGES:1.2808 --- src/doc/CHANGES:1.2807 Mon May 17 06:31:30 2021 +++ src/doc/CHANGES Wed May 19 16:06:13 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2807 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2808 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -371,7 +371,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0: contain invalid characters will not resolve. [christos 20210430] evbarm: Add support for Allwinner V3s SoCs. [jmcneill 20210505] aiomixer(1): Added aiomixer, a curses-based mixer for NetBSD's - audio API. + audio API. [nia 20210507] wskbd(4): Added German Neo 2 layout. [nia 20210511] spiflash(4): Add support for Rockchip RK3328. [mrg 20210514] lagg(4): Added a link-aggregation interface. [yamaguchi 20210517]
CVS commit: src/bin/dd
Module Name:src Committed By: nia Date: Tue May 18 07:17:09 UTC 2021 Modified Files: src/bin/dd: dd.1 Log Message: dd.1: add an example of writing a NetBSD image To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/bin/dd/dd.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/dd/dd.1 diff -u src/bin/dd/dd.1:1.36 src/bin/dd/dd.1:1.37 --- src/bin/dd/dd.1:1.36 Wed Jan 30 10:28:50 2019 +++ src/bin/dd/dd.1 Tue May 18 07:17:09 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: dd.1,v 1.36 2019/01/30 10:28:50 wiz Exp $ +.\" $NetBSD: dd.1,v 1.37 2021/05/18 07:17:09 nia Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" -.Dd January 29, 2019 +.Dd May 18, 2021 .Dt DD 1 .Os .Sh NAME @@ -546,6 +546,18 @@ for more details. .Sh EXIT STATUS .Ex -std dd .Sh EXAMPLES +To write a +.Xr gzip 1 +compressed +.Nx +image to a removable drive, with +.Xr progress 1 +output: +.Bd -literal -unfilled -offset indent +zcat NetBSD-9.2-amd64-install.img.gz | \\ +progress dd of=/dev/rsd0 bs=1m +.Ed +.Pp To print summary information in human-readable form: .Pp .Dl dd if=/dev/zero of=/dev/null count=1 msgfmt=human
CVS commit: src/external/cddl/osnet/dist/lib/libzfs/common
Module Name:src Committed By: nia Date: Thu May 13 09:05:19 UTC 2021 Modified Files: src/external/cddl/osnet/dist/lib/libzfs/common: libzfs_dataset.c Log Message: this is not FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c diff -u src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.4 src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.5 --- src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c:1.4 Mon May 28 21:05:06 2018 +++ src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c Thu May 13 09:05:19 2021 @@ -1135,7 +1135,7 @@ badlabel: m_label_free(new_sl); /* OK if null */ #else /* !illumos */ zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "mlslabel is not supported on FreeBSD")); + "mlslabel is not supported on NetBSD")); (void) zfs_error(hdl, EZFS_BADPROP, errbuf); #endif /* illumos */ goto error; @@ -1644,7 +1644,7 @@ zfs_prop_set_list(zfs_handle_t *zhp, nvl case ZFS_PROP_NBMAND: case ZFS_PROP_MLSLABEL: (void) snprintf(errbuf, sizeof (errbuf), - "property '%s' not supported on FreeBSD", + "property '%s' not supported on NetBSD", nvpair_name(elem)); ret = zfs_error(hdl, EZFS_PERM, errbuf); goto error;
CVS commit: src/external/cddl/osnet/dist/cmd/zfs
Module Name:src
Committed By: nia
Date: Thu May 13 09:03:35 UTC 2021
Modified Files:
src/external/cddl/osnet/dist/cmd/zfs: zfs_main.c
Log Message:
zfs: this is not FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.7 src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.8
--- src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c:1.7 Sun Sep 15 19:38:09 2019
+++ src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c Thu May 13 09:03:35 2021
@@ -6130,7 +6130,7 @@ share_mount(int op, int argc, char **arg
break;
case 'O':
- warnx("no overlay mounts support on FreeBSD, ignoring");
+ warnx("no overlay mounts support on NetBSD, ignoring");
break;
case ':':
(void) fprintf(stderr, gettext("missing argument for "
CVS commit: src/games/snake/snake
Module Name:src
Committed By: nia
Date: Wed May 12 11:08:31 UTC 2021
Modified Files:
src/games/snake/snake: pathnames.h snake.c
Log Message:
snake: Avoid creating definitions prefixed with _ inside a program
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/games/snake/snake/pathnames.h
cvs rdiff -u -r1.30 -r1.31 src/games/snake/snake/snake.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/snake/snake/pathnames.h
diff -u src/games/snake/snake/pathnames.h:1.4 src/games/snake/snake/pathnames.h:1.5
--- src/games/snake/snake/pathnames.h:1.4 Thu Aug 7 09:37:45 2003
+++ src/games/snake/snake/pathnames.h Wed May 12 11:08:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:45 agc Exp $ */
+/* $NetBSD: pathnames.h,v 1.5 2021/05/12 11:08:31 nia Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -31,5 +31,5 @@
* @(#)pathnames.h 8.1 (Berkeley) 5/31/93
*/
-#define _PATH_RAWSCORES "/var/games/snakerawscores"
-#define _PATH_LOGFILE "/var/games/snake.log"
+#define SNAKE_PATH_RAWSCORES "/var/games/snakerawscores"
+#define SNAKE_PATH_LOGFILE "/var/games/snake.log"
Index: src/games/snake/snake/snake.c
diff -u src/games/snake/snake/snake.c:1.30 src/games/snake/snake/snake.c:1.31
--- src/games/snake/snake/snake.c:1.30 Thu May 14 08:34:18 2020
+++ src/games/snake/snake/snake.c Wed May 12 11:08:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: snake.c,v 1.30 2020/05/14 08:34:18 msaitoh Exp $ */
+/* $NetBSD: snake.c,v 1.31 2021/05/12 11:08:31 nia Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)snake.c 8.2 (Berkeley) 1/7/94";
#else
-__RCSID("$NetBSD: snake.c,v 1.30 2020/05/14 08:34:18 msaitoh Exp $");
+__RCSID("$NetBSD: snake.c,v 1.31 2021/05/12 11:08:31 nia Exp $");
#endif
#endif/* not lint */
@@ -143,15 +143,15 @@ main(int argc, char **argv)
time_t tv;
/* Open score files then revoke setgid privileges */
- rawscores = open(_PATH_RAWSCORES, O_RDWR|O_CREAT, 0664);
+ rawscores = open(SNAKE_PATH_RAWSCORES, O_RDWR|O_CREAT, 0664);
if (rawscores < 0) {
- warn("open %s", _PATH_RAWSCORES);
+ warn("open %s", SNAKE_PATH_RAWSCORES);
sleep(2);
} else if (rawscores < 3)
exit(1);
- logfile = fopen(_PATH_LOGFILE, "a");
+ logfile = fopen(SNAKE_PATH_LOGFILE, "a");
if (logfile == NULL) {
- warn("fopen %s", _PATH_LOGFILE);
+ warn("fopen %s", SNAKE_PATH_LOGFILE);
sleep(2);
}
setgid(getgid());
CVS commit: src/doc
Module Name:src Committed By: nia Date: Tue May 11 14:52:22 UTC 2021 Modified Files: src/doc: CHANGES Log Message: doc: added Neo 2 keyboard layout To generate a diff of this commit: cvs rdiff -u -r1.2804 -r1.2805 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2804 src/doc/CHANGES:1.2805 --- src/doc/CHANGES:1.2804 Sat May 8 12:45:04 2021 +++ src/doc/CHANGES Tue May 11 14:52:22 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2804 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2805 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -372,3 +372,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: evbarm: Add support for Allwinner V3s SoCs. [jmcneill 20210505] aiomixer(1): Added aiomixer, a curses-based mixer for NetBSD's audio API. + wskbd(4): Added German Neo 2 layout. [nia 20210511]
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Tue May 11 14:51:34 UTC 2021 Modified Files: src/share/man/man4: wskbd.4 Log Message: wskbd.4: document neo layout To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/wskbd.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/wskbd.4 diff -u src/share/man/man4/wskbd.4:1.24 src/share/man/man4/wskbd.4:1.25 --- src/share/man/man4/wskbd.4:1.24 Sun Sep 13 07:36:55 2020 +++ src/share/man/man4/wskbd.4 Tue May 11 14:51:34 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: wskbd.4,v 1.24 2020/09/13 07:36:55 wiz Exp $ +.\" $NetBSD: wskbd.4,v 1.25 2021/05/11 14:51:34 nia Exp $ .\" .\" Copyright (c) 1999 .\" Matthias Drochner. All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 13, 2020 +.Dd May 11, 2021 .Dt WSKBD 4 .Os .Sh NAME @@ -142,8 +142,9 @@ and .Dq dead accents .It Li fi Ta Dv KB_FI Ta Finnish .It Li fr Ta Dv KB_FR Ta French -.It Li de Ta Dv KB_DE Ta German with +.It Li de Ta Dv KB_DE Ta German QWERTZ with .Dq dead accents +.It Li neo Ta Dv KB_NEO Ta German Neo 2 layout .It Li gr Ta Dv KB_GR Ta Greek .It Li hu Ta Dv KB_HU Ta Hungarian .It Li is Ta Dv KB_IS Ta Icelandic with
CVS commit: src/sys/dev
Module Name:src
Committed By: nia
Date: Tue May 11 10:16:48 UTC 2021
Modified Files:
src/sys/dev/hid: hidkbdmap.c
src/sys/dev/pckbport: wskbdmap_mfii.c
src/sys/dev/wscons: wsksymdef.h
Log Message:
wscons: add support for the Neo 2 German keyboard layout
Neo is an optimized layout for German and English, similar to
Dvorak for English. It can be used to type most Latin-based languages
and has separate layers for symbols and directional commands.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/hid/hidkbdmap.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pckbport/wskbdmap_mfii.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/wscons/wsksymdef.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/hid/hidkbdmap.c
diff -u src/sys/dev/hid/hidkbdmap.c:1.12 src/sys/dev/hid/hidkbdmap.c:1.13
--- src/sys/dev/hid/hidkbdmap.c:1.12 Sat Aug 29 22:42:53 2020
+++ src/sys/dev/hid/hidkbdmap.c Tue May 11 10:16:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hidkbdmap.c,v 1.12 2020/08/29 22:42:53 macallan Exp $ */
+/* $NetBSD: hidkbdmap.c,v 1.13 2021/05/11 10:16:48 nia Exp $ */
/*
* Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.12 2020/08/29 22:42:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.13 2021/05/11 10:16:48 nia Exp $");
#include
#include
@@ -327,6 +327,60 @@ Static const keysym_t hidkbd_keydesc_de_
KC(53), KS_asciicircum, KS_degree,
};
+Static const keysym_t hidkbd_keydesc_de_neo[] = {
+/* pos normal shifted layer 3 layer 4 */
+KC(53), KS_dead_circumflex, KS_dead_caron,
+KC(30), KS_1, KS_degree, KS_onesuperior, KS_ordfeminine,
+KC(31), KS_2, KS_section, KS_twosuperior, KS_masculine,
+KC(32), KS_3, KS_l, KS_threesuperior,KS_numbersign,
+KC(33), KS_4, KS_guillemotright,KS_greater,
+KC(34), KS_5, KS_guillemotleft,KS_less, KS_periodcentered,
+KC(35), KS_6, KS_dollar, KS_cent, KS_sterling,
+KC(36), KS_7, KS_currency, KS_yen, KS_currency,
+KC(37), KS_8, KS_quotedbl, KS_quotedbl, KS_Tab,
+KC(38), KS_9, KS_quotedbl, KS_quotedbl, KS_KP_Divide,
+KC(39), KS_0, KS_quotedbl, KS_quotedbl, KS_KP_Multiply,
+KC(45), KS_minus, KS_hyphen, KS_minus, KS_minus,
+KC(46), KS_dead_grave, KS_dead_cedilla,KS_dead_abovering,
+KC(20), KS_x, KS_X, KS_period, KS_Prior,
+KC(26), KS_v, KS_V, KS_underscore, KS_BackSpace,
+KC(8), KS_l, KS_L, KS_bracketleft, KS_Up,
+KC(21), KS_c, KS_C, KS_bracketright,KS_Delete,
+KC(23), KS_w, KS_W, KS_asciicircum, KS_Next,
+KC(28), KS_k, KS_K, KS_exclam, KS_exclamdown,
+KC(24), KS_h, KS_H, KS_less, KS_KP_7,
+KC(12), KS_g, KS_G, KS_greater, KS_KP_8,
+KC(18), KS_f, KS_F, KS_equal, KS_KP_9,
+KC(19), KS_q, KS_Q, KS_ampersand, KS_KP_Add,
+KC(47), KS_ssharp, KS_ssharp, KS_f, KS_KP_Subtract,
+KC(48), KS_dead_acute, KS_dead_tilde,
+KC(4), KS_u, KS_U, KS_backslash, KS_Home,
+KC(22), KS_i, KS_I, KS_slash, KS_Left,
+KC(7), KS_a, KS_A, KS_braceleft, KS_Down,
+KC(9), KS_e, KS_E, KS_braceright, KS_Right,
+KC(10), KS_o, KS_O, KS_asterisk, KS_End,
+KC(11), KS_s, KS_S, KS_question, KS_questiondown,
+KC(13), KS_n, KS_N, KS_parenleft, KS_KP_4,
+KC(14), KS_r, KS_R, KS_parenright, KS_KP_5,
+KC(15), KS_t, KS_T, KS_minus, KS_KP_6,
+KC(51), KS_d, KS_D, KS_colon, KS_KP_Separator,
+KC(52), KS_y, KS_Y, KS_at, KS_KP_Decimal,
+KC(29), KS_udiaeresis, KS_Udiaeresis, KS_numbersign, KS_Escape,
+KC(27), KS_odiaeresis, KS_Odiaeresis, KS_dollar, KS_Tab,
+KC(6), KS_adiaeresis, KS_Adiaeresis, KS_bar, KS_Insert,
+KC(25), KS_p, KS_P, KS_asciitilde, KS_Return,
+KC(5), KS_z, KS_Z, KS_grave, KS_Undo,
+KC(17), KS_b, KS_B, KS_plus, KS_colon,
+KC(16), KS_m, KS_M, KS_percent, KS_KP_1,
+KC(54), KS_comma, KS_minus, KS_quotedbl, KS_KP_2,
+KC(55), KS_period, KS_period, KS_apostrophe, KS_KP_3,
+KC(56), KS_j, KS_J, KS_semicolon, KS_semicolon,
+KC(50), KS_Mode_switch, KS_Multi_key,
+KC(57), KS_Mode_switch, KS_Multi_key,
+KC(100), KS_Mode_switch, KS_Multi_key,
+KC(230), KS_Mode_switch, KS_Multi_key,
+};
+
Static const keysym_t hidkbd_keydesc_dk[] = {
/* pos normal shifted altgr shift-altgr */
KC(31), KS_2, KS_quotedbl, KS_at,
@@ -826,6 +880,7 @@ const struct wscons_keydesc hidkbd_keyde
KBD_MAP(KB_JP | KB_SWAPCTRLCAPS,KB_JP, hidkbd_keydesc_swapctrlcaps),
KBD_MAP(KB_DE, KB_US, hidkbd_keydesc_de),
KBD_MAP(KB_DE | KB_NODEAD, KB_DE, hidkbd_keydesc_de_nodead),
+ KBD_MAP(KB_NEO, KB_US, hidkbd_keydesc_de_neo),
KBD_MAP(KB_FR, KB_US, hidkbd_keydesc_fr),
KBD_MAP(KB_FR | KB_SWAPCTRLCAPS,KB_FR, hidkbd_keydesc_swapctrlcaps),
KBD_MAP(KB_BE,
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Sun May 9 12:51:45 UTC 2021
Modified Files:
src/lib/libossaudio: ossaudio.c
Log Message:
ossaudio: Set handle on OSSv4 mixer devices
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/lib/libossaudio/ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.67 src/lib/libossaudio/ossaudio.c:1.68
--- src/lib/libossaudio/ossaudio.c:1.67 Sun May 9 11:28:25 2021
+++ src/lib/libossaudio/ossaudio.c Sun May 9 12:51:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.67 2021/05/09 11:28:25 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.68 2021/05/09 12:51:45 nia Exp $ */
/*-
* Copyright (c) 1997-2021 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.67 2021/05/09 11:28:25 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.68 2021/05/09 12:51:45 nia Exp $");
/*
* This is an Open Sound System compatibility layer, which provides
@@ -1240,6 +1240,7 @@ mixer_oss4_ioctl(int fd, unsigned long c
return retval;
}
strlcpy(mi->id, devname, sizeof(mi->id));
+ strlcpy(mi->handle, devname, sizeof(mi->handle));
snprintf(mi->name, sizeof(mi->name),
"%s %s", dev.name, dev.version);
mi->card_number = mi->dev;
CVS commit: src/lib/libossaudio
Module Name:src
Committed By: nia
Date: Sun May 9 11:28:25 UTC 2021
Modified Files:
src/lib/libossaudio: ossaudio.c soundcard.h
Log Message:
libossaudio: Various OSSv4 fixes to allow reference programs to compile
- Define various new AFMT_*. These are not returned as supported
formats by SNDCTL_DSP_GETFMTS, because it would be very silly to
have Vorbis in the kernel.
- Implement PLAYTGT and RECSRC. For each NetBSD audio device
we only return one playback and recording source, "primary".
- Return preferred channel configuration in capabilities.
Either DSP_CH_STEREO, DSP_CH_MONO, or DSP_CH_MULTI
depending on the current hardware format.
- SNDCTL_DSP_HALT_* simply flushes the audio device.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libossaudio/soundcard.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.66 src/lib/libossaudio/ossaudio.c:1.67
--- src/lib/libossaudio/ossaudio.c:1.66 Mon Mar 15 10:58:05 2021
+++ src/lib/libossaudio/ossaudio.c Sun May 9 11:28:25 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: ossaudio.c,v 1.66 2021/03/15 10:58:05 nia Exp $ */
+/* $NetBSD: ossaudio.c,v 1.67 2021/05/09 11:28:25 nia Exp $ */
/*-
- * Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-2021 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.66 2021/03/15 10:58:05 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.67 2021/05/09 11:28:25 nia Exp $");
/*
* This is an Open Sound System compatibility layer, which provides
@@ -127,6 +127,7 @@ audio_ioctl(int fd, unsigned long com, v
int perrors, rerrors;
static int totalperrors = 0;
static int totalrerrors = 0;
+ oss_mixer_enuminfo *ei;
oss_count_t osscount;
int idat;
int retval;
@@ -134,6 +135,8 @@ audio_ioctl(int fd, unsigned long com, v
idat = 0;
switch (com) {
+ case SNDCTL_DSP_HALT_INPUT:
+ case SNDCTL_DSP_HALT_OUTPUT:
case SNDCTL_DSP_RESET:
retval = ioctl(fd, AUDIO_FLUSH, 0);
if (retval < 0)
@@ -293,6 +296,7 @@ audio_ioctl(int fd, unsigned long com, v
* the 24-bit formats should be handled properly instead
* of falling back to 32 bits.
*/
+ case AFMT_S24_PACKED:
case AFMT_S24_LE:
case AFMT_S32_LE:
tmpinfo.play.precision =
@@ -434,10 +438,6 @@ audio_ioctl(int fd, unsigned long com, v
case SNDCTL_DSP_SETFRAGMENT:
AUDIO_INITINFO();
idat = INTARG;
- if ((idat & 0x) < 4 || (idat & 0x) > 17) {
- errno = EINVAL;
- return -1;
- }
tmpinfo.blocksize = 1 << (idat & 0x);
tmpinfo.hiwat = ((unsigned)idat >> 16) & 0x7fff;
if (tmpinfo.hiwat == 0) /* 0 means set to max */
@@ -662,6 +662,21 @@ audio_ioctl(int fd, unsigned long com, v
case SNDCTL_DSP_SETSYNCRO:
errno = EINVAL;
return -1; /* XXX unimplemented */
+ case SNDCTL_DSP_GET_PLAYTGT_NAMES:
+ case SNDCTL_DSP_GET_RECSRC_NAMES:
+ ei = (oss_mixer_enuminfo *)argp;
+ ei->nvalues = 1;
+ ei->version = 0;
+ ei->strindex[0] = 0;
+ strlcpy(ei->strings, "primary", OSS_ENUM_STRINGSIZE);
+ break;
+ case SNDCTL_DSP_SET_PLAYTGT:
+ case SNDCTL_DSP_SET_RECSRC:
+ case SNDCTL_DSP_GET_PLAYTGT:
+ case SNDCTL_DSP_GET_RECSRC:
+ /* We have one recording source and play target. */
+ INTARG = 0;
+ break;
default:
errno = EINVAL;
return -1;
@@ -1114,7 +1129,7 @@ mixer_oss4_ioctl(int fd, unsigned long c
"%s %s", dev.name, dev.version);
tmpai->busy = 0;
tmpai->pid = -1;
- ioctl(newfd, SNDCTL_DSP_GETFMTS, >iformats);
+ audio_ioctl(newfd, SNDCTL_DSP_GETFMTS, >iformats);
tmpai->oformats = tmpai->iformats;
tmpai->magic = -1; /* reserved for "internal use" */
memset(tmpai->cmd, 0, sizeof(tmpai->cmd));
@@ -1603,17 +1618,40 @@ global_oss4_ioctl(int fd, unsigned long
static int
getcaps(int fd, int *out)
{
+ struct audio_info info;
int props, caps;
+ int nchannels;
if (ioctl(fd, AUDIO_GETPROPS, ) < 0)
return -1;
- caps = DSP_CAP_TRIGGER;
+ if (ioctl(fd, AUDIO_GETFORMAT, ) < 0)
+ return -1;
+
+ caps = 0;
+ caps |= PCM_CAP_TRIGGER;
+ caps |= PCM_CAP_MULTI;
+ caps |= PCM_CAP_FREERATE;
+
+ nchannels = (props & AUDIO_PROP_PLAYBACK) ?
+ info.play.channels : info.record.channels;
+
+ switch (nchannels) {
+ case 2:
+ caps |= DSP_CH_STEREO;
+ break;
+ case 1:
+ caps |= DSP_CH_MONO;
+ break;
+ default:
+ caps |= DSP_CH_MULTI;
+ break;
+ }
if (props & AUDIO_PROP_FULLDUPLEX)
- caps |= DSP_CAP_DUPLEX;
+ caps |= PCM_CAP_DUPLEX;
if (props & AUDIO_PROP_MMAP)
- caps |= DSP_CAP_MMAP;
+ caps |= PCM_CAP_MMAP;
if (props & AUDIO_PROP_CAPTURE)
caps |= PCM_CAP_INPUT;
if (props & AUDIO_PROP_PLAYBACK)
Index: src/lib/libossaudio/soundcard.h
diff -u
CVS commit: src/usr.bin/aiomixer
Module Name:src Committed By: nia Date: Sat May 8 14:49:14 UTC 2021 Modified Files: src/usr.bin/aiomixer: draw.c Log Message: aiomixer: bound the drawn area to the screen size, rather than replacing it To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/aiomixer/draw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/aiomixer/draw.c diff -u src/usr.bin/aiomixer/draw.c:1.5 src/usr.bin/aiomixer/draw.c:1.6 --- src/usr.bin/aiomixer/draw.c:1.5 Sat May 8 14:38:26 2021 +++ src/usr.bin/aiomixer/draw.c Sat May 8 14:49:13 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: draw.c,v 1.5 2021/05/08 14:38:26 nia Exp $ */ +/* $NetBSD: draw.c,v 1.6 2021/05/08 14:49:13 nia Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. * All rights reserved. @@ -134,10 +134,14 @@ draw_screen(struct aiomixer *aio) wnoutrefresh(stdscr); wnoutrefresh(aio->header); wnoutrefresh(aio->classbar); + max_y = aio->classes[aio->curclass].height + 1; + max_y -= aio->class_scroll_y; + if (max_y > (getmaxy(stdscr) - 3)) + max_y = getmaxy(stdscr) - 3; pnoutrefresh(aio->classes[aio->curclass].widgetpad, aio->class_scroll_y, 0, 3, 0, - getmaxy(stdscr) - 3, getmaxx(stdscr)); + max_y, getmaxx(stdscr)); doupdate(); }
CVS commit: src/usr.bin/aiomixer
Module Name:src Committed By: nia Date: Sat May 8 14:38:26 UTC 2021 Modified Files: src/usr.bin/aiomixer: draw.c Log Message: aiomixer: do not adjust class widget pad height, draw to end of screen ncurses refuses to paint pads if the height argument extends beyond the bounds of the screen. it's probably not good for our curses either. libcurses wresize() refuses to resize a pad beyond the bounds of the screen even if it was created with a larger size. this is probably a bug. found by uwe To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/aiomixer/draw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/aiomixer/draw.c diff -u src/usr.bin/aiomixer/draw.c:1.4 src/usr.bin/aiomixer/draw.c:1.5 --- src/usr.bin/aiomixer/draw.c:1.4 Sat May 8 13:28:45 2021 +++ src/usr.bin/aiomixer/draw.c Sat May 8 14:38:26 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: draw.c,v 1.4 2021/05/08 13:28:45 nia Exp $ */ +/* $NetBSD: draw.c,v 1.5 2021/05/08 14:38:26 nia Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. * All rights reserved. @@ -137,7 +137,7 @@ draw_screen(struct aiomixer *aio) pnoutrefresh(aio->classes[aio->curclass].widgetpad, aio->class_scroll_y, 0, 3, 0, - 1 + aio->classes[aio->curclass].height, getmaxx(stdscr)); + getmaxy(stdscr) - 3, getmaxx(stdscr)); doupdate(); } @@ -360,7 +360,13 @@ create_widgets(struct aiomixer *aio) control->widget_y = class->height; class->height += control->height; } +#ifdef notyet + /* + * NetBSD curses wresize() bounds the pad to the height of + * the screen even though it's already taller. Probably a bug. + */ wresize(class->widgetpad, class->height, getmaxx(stdscr)); +#endif } aio->last_max_x = getmaxx(stdscr);
CVS commit: src/usr.bin/aiomixer
Module Name:src Committed By: nia Date: Sat May 8 13:28:45 UTC 2021 Modified Files: src/usr.bin/aiomixer: draw.c Log Message: aiomixer: fix background banding with slightly older libcurses reported by uwe To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/aiomixer/draw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/aiomixer/draw.c diff -u src/usr.bin/aiomixer/draw.c:1.3 src/usr.bin/aiomixer/draw.c:1.4 --- src/usr.bin/aiomixer/draw.c:1.3 Fri May 7 19:37:03 2021 +++ src/usr.bin/aiomixer/draw.c Sat May 8 13:28:45 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: draw.c,v 1.3 2021/05/07 19:37:03 nia Exp $ */ +/* $NetBSD: draw.c,v 1.4 2021/05/08 13:28:45 nia Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. * All rights reserved. @@ -113,6 +113,8 @@ draw_control(struct aiomixer *aio, aio->channels_unlocked, selected); break; } + + wprintw(control->widgetpad, "\n"); } void
CVS commit: src/usr.bin/aiomixer
Module Name:src
Committed By: nia
Date: Sat May 8 13:03:41 UTC 2021
Modified Files:
src/usr.bin/aiomixer: parse.c
Log Message:
aiomixer: try to make sure the first pane is always "outputs"
In QEMU with an ac97 audio device, "inputs" is the first pane,
which is significantly less important especially when you don't
have input in QEMU most of the time.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/aiomixer/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/aiomixer/parse.c
diff -u src/usr.bin/aiomixer/parse.c:1.2 src/usr.bin/aiomixer/parse.c:1.3
--- src/usr.bin/aiomixer/parse.c:1.2 Sat May 8 12:53:15 2021
+++ src/usr.bin/aiomixer/parse.c Sat May 8 13:03:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.2 2021/05/08 12:53:15 nia Exp $ */
+/* $NetBSD: parse.c,v 1.3 2021/05/08 13:03:40 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,6 +36,7 @@
static struct aiomixer_class *get_class(struct aiomixer *, int);
static int compare_control(const void *, const void *);
+static int compare_class(const void *, const void *);
static struct aiomixer_class *
get_class(struct aiomixer *aio, int class)
@@ -68,6 +69,20 @@ compare_control(const void *pa, const vo
return 0;
}
+static int
+compare_class(const void *pa, const void *pb)
+{
+ const struct aiomixer_class *a = (const struct aiomixer_class *)pa;
+ const struct aiomixer_class *b = (const struct aiomixer_class *)pb;
+
+ if (strcmp(a->name, AudioCoutputs) == 0)
+ return -1;
+ if (strcmp(b->name, AudioCoutputs) == 0)
+ return 1;
+
+ return strcmp(a->name, b->name);
+}
+
int
aiomixer_parse(struct aiomixer *aio)
{
@@ -106,6 +121,9 @@ aiomixer_parse(struct aiomixer *aio)
control = >controls[class->numcontrols++];
control->info = info;
}
+ qsort(aio->classes, aio->numclasses,
+ sizeof(struct aiomixer_class),
+ compare_class);
for (i = 0; i < aio->numclasses; ++i) {
class = >classes[i];
qsort(class->controls, class->numcontrols,
CVS commit: src/usr.bin/aiomixer
Module Name:src
Committed By: nia
Date: Sat May 8 12:53:15 UTC 2021
Modified Files:
src/usr.bin/aiomixer: parse.c
Log Message:
aiomixer: Fix sorting of ac97 controls
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/aiomixer/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/aiomixer/parse.c
diff -u src/usr.bin/aiomixer/parse.c:1.1 src/usr.bin/aiomixer/parse.c:1.2
--- src/usr.bin/aiomixer/parse.c:1.1 Fri May 7 16:29:24 2021
+++ src/usr.bin/aiomixer/parse.c Sat May 8 12:53:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.1 2021/05/07 16:29:24 nia Exp $ */
+/* $NetBSD: parse.c,v 1.2 2021/05/08 12:53:15 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -56,14 +56,16 @@ compare_control(const void *pa, const vo
const struct aiomixer_control *a = (const struct aiomixer_control *)pa;
const struct aiomixer_control *b = (const struct aiomixer_control *)pb;
- if (a->info.prev != AUDIO_MIXER_LAST &&
+ if (a->info.prev != AUDIO_MIXER_LAST ||
b->info.prev != AUDIO_MIXER_LAST) {
if (b->info.prev == a->info.index)
return -1;
if (a->info.prev == b->info.index)
return 1;
+ } else {
+ return strcmp(a->info.label.name, b->info.label.name);
}
- return strcmp(a->info.label.name, b->info.label.name);
+ return 0;
}
int
CVS commit: src/doc
Module Name:src Committed By: nia Date: Sat May 8 12:45:04 UTC 2021 Modified Files: src/doc: CHANGES Log Message: doc: imported aiomixer To generate a diff of this commit: cvs rdiff -u -r1.2803 -r1.2804 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2803 src/doc/CHANGES:1.2804 --- src/doc/CHANGES:1.2803 Wed May 5 10:25:36 2021 +++ src/doc/CHANGES Sat May 8 12:45:04 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2803 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2804 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -370,3 +370,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: (see resolv.conf(5)), which means that hostnames that contain invalid characters will not resolve. [christos 20210430] evbarm: Add support for Allwinner V3s SoCs. [jmcneill 20210505] + aiomixer(1): Added aiomixer, a curses-based mixer for NetBSD's + audio API.
CVS commit: src
Module Name:src Committed By: nia Date: Fri May 7 21:51:21 UTC 2021 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi src/usr.bin: Makefile Log Message: hook up aiomixer To generate a diff of this commit: cvs rdiff -u -r1.1278 -r1.1279 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1718 -r1.1719 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.234 -r1.235 src/usr.bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1278 src/distrib/sets/lists/base/mi:1.1279 --- src/distrib/sets/lists/base/mi:1.1278 Fri Apr 16 01:14:38 2021 +++ src/distrib/sets/lists/base/mi Fri May 7 21:51:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1278 2021/04/16 01:14:38 mrg Exp $ +# $NetBSD: mi,v 1.1279 2021/05/07 21:51:21 nia Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -675,6 +675,7 @@ ./usr/bin base-sys-usr ./usr/bin/Mail base-obsolete obsolete ./usr/bin/agrep base-util-bin +./usr/bin/aiomixerbase-audio-bin ./usr/bin/apply base-util-bin ./usr/bin/aproposbase-man-bin ./usr/bin/arpanamebase-bind-bin Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1718 src/distrib/sets/lists/man/mi:1.1719 --- src/distrib/sets/lists/man/mi:1.1718 Tue Apr 27 21:13:38 2021 +++ src/distrib/sets/lists/man/mi Fri May 7 21:51:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1718 2021/04/27 21:13:38 nia Exp $ +# $NetBSD: mi,v 1.1719 2021/05/07 21:51:21 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -41,6 +41,7 @@ ./usr/share/man/cat1/Mail.0 man-obsolete obsolete ./usr/share/man/cat1/[.0 man-util-catman .cat ./usr/share/man/cat1/agrep.0 man-util-catman .cat +./usr/share/man/cat1/aiomixer.0 man-audio-catman .cat ./usr/share/man/cat1/alias.0 man-util-catman .cat ./usr/share/man/cat1/altqstat.0 man-router-catman .cat ./usr/share/man/cat1/amq.0 man-obsolete obsolete @@ -3353,6 +3354,7 @@ ./usr/share/man/html1/Mail.html man-obsolete obsolete ./usr/share/man/html1/[.html man-util-htmlman html ./usr/share/man/html1/agrep.html man-util-htmlman html +./usr/share/man/html1/aiomixer.html man-audio-htmlman html ./usr/share/man/html1/alias.html man-util-htmlman html ./usr/share/man/html1/altqstat.html man-router-htmlman html ./usr/share/man/html1/apply.html man-util-htmlman html @@ -6274,6 +6276,7 @@ ./usr/share/man/man1/Mail.1 man-obsolete obsolete ./usr/share/man/man1/[.1 man-util-man .man ./usr/share/man/man1/agrep.1 man-util-man .man +./usr/share/man/man1/aiomixer.1 man-audio-man .man ./usr/share/man/man1/alias.1 man-util-man .man ./usr/share/man/man1/altqstat.1 man-router-man .man ./usr/share/man/man1/amq.1 man-obsolete obsolete Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.234 src/usr.bin/Makefile:1.235 --- src/usr.bin/Makefile:1.234 Mon Dec 28 03:48:41 2020 +++ src/usr.bin/Makefile Fri May 7 21:51:20 2021 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.234 2020/12/28 03:48:41 htodd Exp $ +# $NetBSD: Makefile,v 1.235 2021/05/07 21:51:20 nia Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include -SUBDIR= apply asa at audio audiocfg \ +SUBDIR= aiomixer apply asa at audio audiocfg \ banner base64 basename biff bthset btkey btpin \ bzip2 bzip2recover c11 c89 c99 cal calendar cap_mkdb cdplay \ checknr chflags chpass cksum cmp cleantags col colcrt colrm \
CVS commit: src/usr.bin/aiomixer
Module Name:src Committed By: nia Date: Fri May 7 19:37:03 UTC 2021 Modified Files: src/usr.bin/aiomixer: draw.c Log Message: aiomixer: display the unit type for value controls To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/aiomixer/draw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/aiomixer/draw.c diff -u src/usr.bin/aiomixer/draw.c:1.2 src/usr.bin/aiomixer/draw.c:1.3 --- src/usr.bin/aiomixer/draw.c:1.2 Fri May 7 17:47:30 2021 +++ src/usr.bin/aiomixer/draw.c Fri May 7 19:37:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: draw.c,v 1.2 2021/05/07 17:47:30 nia Exp $ */ +/* $NetBSD: draw.c,v 1.3 2021/05/07 19:37:03 nia Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. * All rights reserved. @@ -93,7 +93,11 @@ draw_control(struct aiomixer *aio, wclear(control->widgetpad); if (selected) wattron(control->widgetpad, A_STANDOUT); - wprintw(control->widgetpad, "%s\n", control->info.label.name); + if (value.type == AUDIO_MIXER_VALUE) + wprintw(control->widgetpad, "%s (%s)\n", + control->info.label.name, control->info.un.v.units.name); + else + wprintw(control->widgetpad, "%s\n", control->info.label.name); if (selected) wattroff(control->widgetpad, A_STANDOUT);
CVS commit: src/usr.bin/aiomixer
Module Name:src
Committed By: nia
Date: Fri May 7 17:47:30 UTC 2021
Modified Files:
src/usr.bin/aiomixer: draw.c
Log Message:
aiomixer: use standout for headings, avoid banding in header
fixed a minor rendering problem when compiled against ncurses.
based mostly on feedback from uwe.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/aiomixer/draw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/aiomixer/draw.c
diff -u src/usr.bin/aiomixer/draw.c:1.1 src/usr.bin/aiomixer/draw.c:1.2
--- src/usr.bin/aiomixer/draw.c:1.1 Fri May 7 16:29:24 2021
+++ src/usr.bin/aiomixer/draw.c Fri May 7 17:47:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: draw.c,v 1.1 2021/05/07 16:29:24 nia Exp $ */
+/* $NetBSD: draw.c,v 1.2 2021/05/07 17:47:30 nia Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,38 +36,12 @@
#include
#include "draw.h"
-static void bold_on(WINDOW *);
-static void bold_off(WINDOW *);
static int get_enum_color(const char *);
static void draw_enum(struct aiomixer_control *, int, bool);
static void draw_set(struct aiomixer_control *, int);
static void draw_levels(struct aiomixer_control *,
const struct mixer_level *, bool, bool);
-static void
-bold_on(WINDOW *w)
-{
- /*
- * Some (XXX: which?) legacy terminals do not support a Bold
- * attribute. In this case, we fall back to standout.
- */
- if (termattrs() & A_BOLD)
- wattron(w, A_BOLD);
- else
- wattron(w, A_STANDOUT);
-}
-
-static void
-bold_off(WINDOW *w)
-{
- chtype attrs = getattrs(w);
-
- if (attrs & A_BOLD)
- wattroff(w, A_BOLD);
- if (attrs & A_STANDOUT)
- wattroff(w, A_STANDOUT);
-}
-
void
draw_mixer_select(unsigned int num_mixers, unsigned int selected_mixer)
{
@@ -90,7 +64,7 @@ draw_mixer_select(unsigned int num_mixer
}
close(fd);
if (selected_mixer == i) {
- bold_on(stdscr);
+ attron(A_STANDOUT);
addstr("[*] ");
} else {
addstr("[ ] ");
@@ -98,7 +72,7 @@ draw_mixer_select(unsigned int num_mixer
printw("%s: %s %s %s\n", mixer_path,
dev.name, dev.version, dev.config);
if (selected_mixer == i)
- bold_off(stdscr);
+ attroff(A_STANDOUT);
}
}
@@ -117,21 +91,11 @@ draw_control(struct aiomixer *aio,
err(EXIT_FAILURE, "failed to read from mixer device");
wclear(control->widgetpad);
- if (selected) {
- bold_on(control->widgetpad);
- if (has_colors()) {
- wattron(control->widgetpad,
- COLOR_PAIR(COLOR_CONTROL_SELECTED));
- }
- waddch(control->widgetpad, '*');
- if (has_colors()) {
- wattroff(control->widgetpad,
- COLOR_PAIR(COLOR_CONTROL_SELECTED));
- }
- }
+ if (selected)
+ wattron(control->widgetpad, A_STANDOUT);
wprintw(control->widgetpad, "%s\n", control->info.label.name);
if (selected)
- bold_off(control->widgetpad);
+ wattroff(control->widgetpad, A_STANDOUT);
switch (value.type) {
case AUDIO_MIXER_ENUM:
@@ -193,8 +157,12 @@ draw_enum(struct aiomixer_control *contr
for (i = 0; i < control->info.un.e.num_mem; ++i) {
e = >info.un.e;
- if (ord == e->member[i].ord && selected)
- bold_on(control->widgetpad);
+ if (ord == e->member[i].ord && selected) {
+ if (termattrs() & A_BOLD)
+wattron(control->widgetpad, A_BOLD);
+ else
+wattron(control->widgetpad, A_STANDOUT);
+ }
waddch(control->widgetpad, '[');
if (ord == e->member[i].ord) {
if (has_colors()) {
@@ -213,8 +181,12 @@ draw_enum(struct aiomixer_control *contr
}
}
waddch(control->widgetpad, ']');
- if (ord == e->member[i].ord && selected)
- bold_off(control->widgetpad);
+ if (ord == e->member[i].ord && selected) {
+ if (termattrs() & A_BOLD)
+wattroff(control->widgetpad, A_BOLD);
+ else
+wattroff(control->widgetpad, A_STANDOUT);
+ }
if (i != (e->num_mem - 1))
waddstr(control->widgetpad, ", ");
}
@@ -243,13 +215,19 @@ draw_set(struct aiomixer_control *contro
}
waddstr(control->widgetpad, "] ");
if (control->setindex == i) {
- bold_on(control->widgetpad);
- waddch(control->widgetpad, '*');
+ if (termattrs() & A_BOLD)
+wattron(control->widgetpad, A_BOLD);
+ else
+wattron(control->widgetpad, A_STANDOUT);
}
wprintw(control->widgetpad, "%s",
control->info.un.s.member[i].label.name);
- if (control->setindex == i)
- bold_off(control->widgetpad);
+ if (control->setindex == i) {
+ if (termattrs() & A_BOLD)
+wattroff(control->widgetpad, A_BOLD);
+ else
+wattroff(control->widgetpad, A_STANDOUT);
+ }
if (i != (control->info.un.s.num_mem - 1))
waddstr(control->widgetpad, ", ");
}
@@ -265,7 +243,10 @@ draw_levels(struct aiomixer_control *con
for (i = 0; i < control->info.un.v.num_channels; ++i) {
if ((selected && !channels_unlocked) ||
(control->setindex == i && channels_unlocked)) {
- bold_on(control->widgetpad);
+ if (termattrs() & A_BOLD)
+wattron(control->widgetpad,
CVS commit: src/usr.bin/aiomixer
Module Name:src Committed By: nia Date: Fri May 7 16:29:24 UTC 2021 Added Files: src/usr.bin/aiomixer: Makefile aiomixer.1 app.h draw.c draw.h main.c parse.c parse.h Log Message: import aiomixer from git into usr.bin. aiomixer is a graphical (curses-based) mixer for NetBSD audio. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/usr.bin/aiomixer/Makefile \ src/usr.bin/aiomixer/aiomixer.1 src/usr.bin/aiomixer/app.h \ src/usr.bin/aiomixer/draw.c src/usr.bin/aiomixer/draw.h \ src/usr.bin/aiomixer/main.c src/usr.bin/aiomixer/parse.c \ src/usr.bin/aiomixer/parse.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/usr.bin/aiomixer/Makefile diff -u /dev/null src/usr.bin/aiomixer/Makefile:1.1 --- /dev/null Fri May 7 16:29:24 2021 +++ src/usr.bin/aiomixer/Makefile Fri May 7 16:29:24 2021 @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1 2021/05/07 16:29:24 nia Exp $ + +PROG= aiomixer +SRCS+= main.c draw.c parse.c + +LDADD+= -lcurses +DPADD+= $(LIBCURSES) + +WARNS= 6 + +.include Index: src/usr.bin/aiomixer/aiomixer.1 diff -u /dev/null src/usr.bin/aiomixer/aiomixer.1:1.1 --- /dev/null Fri May 7 16:29:24 2021 +++ src/usr.bin/aiomixer/aiomixer.1 Fri May 7 16:29:24 2021 @@ -0,0 +1,90 @@ +.\" $NetBSD: aiomixer.1,v 1.1 2021/05/07 16:29:24 nia Exp $ +.\" +.\" Copyright (c) 2021 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Nia Alarie. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (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 4, 2019 +.Dt AIOMIXER 1 +.Os +.Sh NAME +.Nm aiomixer +.Nd graphical mixer for +.Nx +audio +.Sh SYNOPSIS +.Nm aiomixer +.Op Fl d Ar device +.Op Fl u +.Sh DESCRIPTION +.Nm +is a graphical frontend for +.Xr mixer 4 +devices that runs in your terminal. +.Pp +.Nm +is primarily controlled using the cursor keys, e.g. to select a +control, or change a control's value. +Movement similar to +.Xr vi 1 +is also supported. +The current class can be changed with the number keys. +The Q or Escape key can be used to return to the previous pane or exit +.Nm . +.Pp +By default, volume levels for individual channels cannot be changed +separately. +The U key can be pressed to toggle changing the volume of individual +channels. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl d Ar device +Used to specify an alternative mixer device. +.It Fl u +Used to unlock channels on start up. +.El +.Sh FILES +.Bl -tag -width /dev/mixer[0-3] -compact +.It Pa /dev/mixer +.It Pa /dev/mixer[0-3] +.El +.Sh SEE ALSO +.Xr mixerctl 1 , +.Xr mixer 4 +.Sh HISTORY +The first version (only available in pkgsrc) didn't support +.Dv AUDIO_MIXER_SET +properly, among other bugs. +.Sh AUTHORS +.Nm +was written by +.An Nia Alarie +.Aq n...@netbsd.org . +.Sh BUGS +.Nm aiomixer +shows whatever mixer nodes the audio device's driver returns. +Some drivers do not provide the most user-friendly control names. Index: src/usr.bin/aiomixer/app.h diff -u /dev/null src/usr.bin/aiomixer/app.h:1.1 --- /dev/null Fri May 7 16:29:24 2021 +++ src/usr.bin/aiomixer/app.h Fri May 7 16:29:24 2021 @@ -0,0 +1,82 @@ +/* $NetBSD: app.h,v 1.1 2021/05/07 16:29:24 nia Exp $ */ +/*- + * Copyright (c) 2021 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Nia Alarie. + * + * Redistribution and use in source and binary
CVS commit: src/sys/dev/audio
Module Name:src
Committed By: nia
Date: Sun May 2 21:37:32 UTC 2021
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
audio: Only score hardware formats by channel count at count<=2
Scoring by channel count makes sense when you are using hardware that
supports mono and stereo formats. However, if your hardware also supports
surround formats, defaulting to those might be confusing. So, don't
prefer them.
Problem reported and fix tested by tcmart14 with a 2015 model Macbook Pro.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/audio/audio.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.94 src/sys/dev/audio/audio.c:1.95
--- src/sys/dev/audio/audio.c:1.94 Mon Apr 26 19:59:58 2021
+++ src/sys/dev/audio/audio.c Sun May 2 21:37:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.94 2021/04/26 19:59:58 thorpej Exp $ */
+/* $NetBSD: audio.c,v 1.95 2021/05/02 21:37:32 nia Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.94 2021/04/26 19:59:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.95 2021/05/02 21:37:32 nia Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -6574,7 +6574,10 @@ audio_hw_probe(struct audio_softc *sc, a
query.fmt.precision == AUDIO_INTERNAL_BITS) {
score += 0x10;
}
- score += query.fmt.channels;
+
+ /* Do not prefer surround formats */
+ if (query.fmt.channels <= 2)
+ score += query.fmt.channels;
if (score < cand_score) {
DPRINTF(1, "fmt[%d] skip; score 0x%x < 0x%x\n", i,
CVS commit: src/share/man/man7
Module Name:src Committed By: nia Date: Sat May 1 07:41:14 UTC 2021 Modified Files: src/share/man/man7: intro.7 Log Message: intro.7: add missing entries To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/man/man7/intro.7 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/man7/intro.7 diff -u src/share/man/man7/intro.7:1.28 src/share/man/man7/intro.7:1.29 --- src/share/man/man7/intro.7:1.28 Wed Feb 26 10:06:08 2020 +++ src/share/man/man7/intro.7 Sat May 1 07:41:14 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.7,v 1.28 2020/02/26 10:06:08 wiz Exp $ +.\" $NetBSD: intro.7,v 1.29 2021/05/01 07:41:14 nia Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)intro.7 8.1 (Berkeley) 6/5/93 .\" -.Dd May 15, 2018 +.Dd May 1, 2021 .Dt INTRO 7 .Os .Sh NAME @@ -37,11 +37,13 @@ .Nd miscellaneous information pages .Sh DESCRIPTION This section contains miscellaneous documentation, including: -.Bl -tag -width "mdoc.samples(7)" -offset indent +.Bl -tag -width "kernel_sanitizers(7)" -offset indent .It Xr ascii 7 map of ASCII character set .It Xr c 7 the C programming language +.It Xr entropy 7 +random unpredictable secrets needed for security .It Xr environ 7 user environment .It Xr glob 7 @@ -57,6 +59,10 @@ file system hierarchy in .Nx .It Xr hostname 7 host name resolution description +.It Xr kernel_sanitizers 7 +bug detection features in the +.Nx +kernel .It Xr mailaddr 7 mail addressing description .\" .It Sy man @@ -76,6 +82,9 @@ tutorial for writing BSD manuals with kernel modules .It Xr nls 7 overview of national language support +.It Xr npf 7 +.Nx +Packet Filter .It Xr operator 7 C operator precedence and order of evaluation .It Xr orders 7 @@ -100,6 +109,10 @@ checklist for security and setuid progra .It Xr signal 7 available signals under .Nx +.It Xr src 7 +layout of the +.Nx +source tree .It Xr sticky 7 sticky bit .Pq Dv S_ISVTX
CVS commit: src/sbin/cgdconfig
Module Name:src Committed By: nia Date: Fri Apr 30 21:07:34 UTC 2021 Modified Files: src/sbin/cgdconfig: cgdconfig.8 Log Message: cgdconfig.8: use gpt in examples, it's more versatile for this use case To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sbin/cgdconfig/cgdconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/cgdconfig/cgdconfig.8 diff -u src/sbin/cgdconfig/cgdconfig.8:1.49 src/sbin/cgdconfig/cgdconfig.8:1.50 --- src/sbin/cgdconfig/cgdconfig.8:1.49 Sun Apr 18 19:56:09 2021 +++ src/sbin/cgdconfig/cgdconfig.8 Fri Apr 30 21:07:34 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: cgdconfig.8,v 1.49 2021/04/18 19:56:09 maya Exp $ +.\" $NetBSD: cgdconfig.8,v 1.50 2021/04/30 21:07:34 nia Exp $ .\" .\" Copyright (c) 2002, The NetBSD Foundation, Inc. .\" All rights reserved. @@ -387,14 +387,14 @@ when we configure the first time to set Here is the sequence of commands that is recommended: .Bd -literal - # cgdconfig -g -o /etc/cgd/wd0e -V disklabel adiantum - # cgdconfig -V re-enter cgd0 /dev/wd0e - /dev/wd0e's passphrase: + # cgdconfig -g -o /etc/cgd/dk3 -V gpt adiantum + # cgdconfig -V re-enter cgd0 /dev/dk3 + /dev/dk3's passphrase: re-enter device's passphrase: - # disklabel -e -I cgd0 + # gpt create cgd0 # cgdconfig -u cgd0 - # cgdconfig cgd0 /dev/wd0e - /dev/wd0e's passphrase: + # cgdconfig cgd0 /dev/dk3 + /dev/dk3's passphrase: .Ed .Pp To scrub data from a disk before setting up a cgd:
CVS commit: src/external/cddl/osnet/dist/cmd
Module Name:src Committed By: nia Date: Fri Apr 30 18:59:31 UTC 2021 Modified Files: src/external/cddl/osnet/dist/cmd/zfs: zfs.8 src/external/cddl/osnet/dist/cmd/zpool: zpool.8 Log Message: zfs: Fix up references to FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dist/cmd/zfs/zfs.8 cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/dist/cmd/zpool/zpool.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/cddl/osnet/dist/cmd/zfs/zfs.8 diff -u src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.1 src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.2 --- src/external/cddl/osnet/dist/cmd/zfs/zfs.8:1.1 Mon Jun 24 08:27:20 2019 +++ src/external/cddl/osnet/dist/cmd/zfs/zfs.8 Fri Apr 30 18:59:30 2021 @@ -285,12 +285,6 @@ .Op Fl FHt .Ar snapshot .Op Ar snapshot Ns | Ns Ar filesystem -.Nm -.Cm jail -.Ar jailid Ns | Ns Ar jailname filesystem -.Nm -.Cm unjail -.Ar jailid Ns | Ns Ar jailname filesystem .Sh DESCRIPTION The .Nm @@ -445,32 +439,6 @@ If a file system's mount point is set to .Tn ZFS makes no attempt to manage the file system, and the administrator is responsible for mounting and unmounting the file system. -.Ss Jails -.No A Tn ZFS -dataset can be attached to a jail by using the -.Qq Nm Cm jail -subcommand. You cannot attach a dataset to one jail and the children of the -same dataset to another jails. To allow management of the dataset from within -a jail, the -.Sy jailed -property has to be set and the jail needs access to the -.Pa /dev/zfs -device. The -.Sy quota -property cannot be changed from within a jail. See -.Xr jail 8 -for information on how to allow mounting -.Tn ZFS -datasets from within a jail. -.Pp -.No A Tn ZFS -dataset can be detached from a jail using the -.Qq Nm Cm unjail -subcommand. -.Pp -After a dataset is attached to a jail and the jailed property is set, a jailed -file system cannot be mounted outside the jail, since the jail administrator -might have set the mount point to an unacceptable value. .Ss Deduplication Deduplication is the process for removing redundant data at the block-level, reducing the total amount of data stored. If a file system has the @@ -1070,7 +1038,7 @@ signature to make sure the block content The .Sy devices property is currently not supported on -.Fx . +.Nx . .It Sy exec Ns = Ns Cm on | off Controls whether processes can be executed from within this file system. The default value is @@ -1079,7 +1047,7 @@ default value is The .Sy mlslabel property is currently not supported on -.Fx . +.Nx . .It Sy filesystem_limit Ns = Ns Ar count | Cm none Limits the number of filesystems and volumes that can exist under this point in the dataset tree. @@ -1118,7 +1086,7 @@ shared file systems are unshared and sha The .Sy nbmand property is currently not supported on -.Fx . +.Nx . .It Sy primarycache Ns = Ns Cm all | none | metadata Controls what is cached in the primary cache (ARC). If this property is set to .Cm all , @@ -1343,7 +1311,7 @@ bit is respected for the file system. Th The .Sy sharesmb property currently has no effect on -.Fx . +.Nx . .It Sy sharenfs Ns = Ns Cm on | off | Ar opts Controls whether the file system is shared via .Tn NFS , @@ -1493,17 +1461,12 @@ during volume creation and pool import. The .Sy vscan property is currently not supported on -.Fx . +.Nx . .It Sy xattr Ns = Ns Cm off | on The .Sy xattr property is currently not supported on -.Fx . -.It Sy jailed Ns = Ns Cm off | on -Controls whether the dataset is managed from a jail. See the -.Qq Sx Jails -section for more information. The default value is -.Cm off . +.Nx . .El .Pp The following three properties cannot be changed after the file system is @@ -2360,7 +2323,7 @@ The default is The default can be changed to include group types. .It Fl i Translate SID to POSIX ID. This flag currently has no effect on -.Fx . +.Nx . .El .It Xo .Nm @@ -2405,7 +2368,7 @@ file systems. Report mount progress. .It Fl O Perform an overlay mount. Overlay mounts are not supported on -.Fx . +.Nx . .It Fl o Ar property Ns Oo , Ns Ar property Oc Ns ... An optional, comma-separated list of mount options to use temporarily for the duration of the mount. See the @@ -2416,7 +2379,7 @@ Mount all available .Tn ZFS file systems. This command may be executed on -.Fx +.Nx system startup by .Pa /etc/rc.d/zfs . For more information, see variable @@ -2467,7 +2430,7 @@ file systems that have the .Sy sharenfs property set. This command may be executed on -.Fx +.Nx system startup by .Pa /etc/rc.d/zfs . For more information, see variable @@ -2500,7 +2463,7 @@ file systems that have the .Sy sharenfs property set. This command may be executed on -.Fx +.Nx system shutdown by .Pa /etc/rc.d/zfs . For more information, see variable @@ -3034,7 +2997,6 @@ protocol .It exec Ta property .It filesystem_limit Ta
CVS commit: src
Module Name:src Committed By: nia Date: Tue Apr 27 21:13:38 UTC 2021 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.evbarm: Makefile Added Files: src/share/man/man4/man4.evbarm: sun8icrypto.4 Log Message: add a man page for sun8icrypto(4) To generate a diff of this commit: cvs rdiff -u -r1.1717 -r1.1718 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.evbarm/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.evbarm/sun8icrypto.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1717 src/distrib/sets/lists/man/mi:1.1718 --- src/distrib/sets/lists/man/mi:1.1717 Thu Apr 1 00:03:01 2021 +++ src/distrib/sets/lists/man/mi Tue Apr 27 21:13:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1717 2021/04/01 00:03:01 riastradh Exp $ +# $NetBSD: mi,v 1.1718 2021/04/27 21:13:38 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1107,6 +1107,7 @@ ./usr/share/man/cat4/evbarm/iopaau.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/iopwdog.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/rktsadc.0 man-sys-catman .cat +./usr/share/man/cat4/evbarm/sun8icrypto.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/vcaudio.0 man-sys-catman .cat ./usr/share/man/cat4/evbarm/vchiq.0 man-sys-catman .cat ./usr/share/man/cat4/evbmips/aupci.0 man-sys-catman .cat @@ -4336,6 +4337,7 @@ ./usr/share/man/html4/evbarm/iopaau.html man-sys-htmlman html ./usr/share/man/html4/evbarm/iopwdog.html man-sys-htmlman html ./usr/share/man/html4/evbarm/rktsadc.html man-sys-htmlman html +./usr/share/man/html4/evbarm/sun8icrypto.html man-sys-htmlman html ./usr/share/man/html4/evbarm/vcaudio.html man-sys-htmlman html ./usr/share/man/html4/evbarm/vchiq.html man-sys-htmlman html ./usr/share/man/html4/evbmips/aupci.html man-sys-htmlman html @@ -7338,6 +7340,7 @@ ./usr/share/man/man4/evbarm/iopaau.4 man-sys-man .man ./usr/share/man/man4/evbarm/iopwdog.4 man-sys-man .man ./usr/share/man/man4/evbarm/rktsadc.4 man-sys-man .man +./usr/share/man/man4/evbarm/sun8icrypto.4 man-sys-man .man ./usr/share/man/man4/evbarm/vcaudio.4 man-sys-man .man ./usr/share/man/man4/evbarm/vchiq.4 man-sys-man .man ./usr/share/man/man4/evbmips/aupci.4 man-sys-man .man Index: src/share/man/man4/man4.evbarm/Makefile diff -u src/share/man/man4/man4.evbarm/Makefile:1.11 src/share/man/man4/man4.evbarm/Makefile:1.12 --- src/share/man/man4/man4.evbarm/Makefile:1.11 Fri Feb 26 10:33:46 2021 +++ src/share/man/man4/man4.evbarm/Makefile Tue Apr 27 21:13:38 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2021/02/26 10:33:46 nia Exp $ +# $NetBSD: Makefile,v 1.12 2021/04/27 21:13:38 nia Exp $ MAN= awge.4 bcmgpio.4 cpsw.4 epgpio.4 gxio.4 intro.4 iopaau.4 iopwdog.4 \ - rktsadc.4 vcaudio.4 vchiq.4 + rktsadc.4 sun8icrypto.4 vcaudio.4 vchiq.4 MANSUBDIR=/evbarm Added files: Index: src/share/man/man4/man4.evbarm/sun8icrypto.4 diff -u /dev/null src/share/man/man4/man4.evbarm/sun8icrypto.4:1.1 --- /dev/null Tue Apr 27 21:13:38 2021 +++ src/share/man/man4/man4.evbarm/sun8icrypto.4 Tue Apr 27 21:13:38 2021 @@ -0,0 +1,109 @@ +.\" $NetBSD: sun8icrypto.4,v 1.1 2021/04/27 21:13:38 nia Exp $ +.\" +.\" Copyright (c) 2021 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (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 25, 2021 +.Dt SUN8ICRYPTO 4 +.Os +.Sh NAME +.Nm sun8icrypto +.Nd driver for Allwinner Crypto Engine +.Sh SYNOPSIS +.Cd "sun8icrypto* at fdt?" +.Sh
CVS commit: src/distrib/notes/evbarm
Module Name:src Committed By: nia Date: Tue Apr 27 19:52:06 UTC 2021 Modified Files: src/distrib/notes/evbarm: install Log Message: ignore machine-dependent disklabel partitions To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/evbarm/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/evbarm/install diff -u src/distrib/notes/evbarm/install:1.16 src/distrib/notes/evbarm/install:1.17 --- src/distrib/notes/evbarm/install:1.16 Fri Aug 7 00:27:11 2020 +++ src/distrib/notes/evbarm/install Tue Apr 27 19:52:06 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.16 2020/08/07 00:27:11 snj Exp $ +.\" $NetBSD: install,v 1.17 2021/04/27 19:52:06 nia Exp $ .\" .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -35,7 +35,7 @@ on Unix. .It Write the image to disk: .Bd -literal -# dd if=armv7.img of=/dev/rld0d bs=1m conv=sync +# dd if=armv7.img of=/dev/rld0 bs=1m conv=sync progress=1 .Ed .It If you are using Microsoft Windows, you can use @@ -61,12 +61,12 @@ existing Install the board-specific U-Boot to the SD card, e.g. for Allwinner devices (PINE H64 in this case): .Bd -literal -# dd if=/usr/pkg/share/u-boot/pine-h64/u-boot-sunxi-with-spl.bin of=/dev/rld0d bs=1k seek=8 conv=sync +# dd if=/usr/pkg/share/u-boot/pine-h64/u-boot-sunxi-with-spl.bin of=/dev/rld0 bs=1k seek=8 conv=sync progress=1 .Ed .Pp Or a Rockchip device (e.g. RockPro64): .Bd -literal -# dd if=/usr/pkg/share/u-boot/rockpro64/rksd_loader.img of=/dev/rld0d seek=64 conv=sync +# dd if=/usr/pkg/share/u-boot/rockpro64/rksd_loader.img of=/dev/rld0 seek=64 conv=sync progress=1 .Ed .El .Pp
CVS commit: src/share/man/man8
Module Name:src Committed By: nia Date: Sun Apr 25 05:52:22 UTC 2021 Modified Files: src/share/man/man8: compat_linux.8 Log Message: these sysctl variables were removed To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/share/man/man8/compat_linux.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_linux.8 diff -u src/share/man/man8/compat_linux.8:1.41 src/share/man/man8/compat_linux.8:1.42 --- src/share/man/man8/compat_linux.8:1.41 Sat Apr 24 07:12:17 2021 +++ src/share/man/man8/compat_linux.8 Sun Apr 25 05:52:22 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: compat_linux.8,v 1.41 2021/04/24 07:12:17 nia Exp $ +.\" $NetBSD: compat_linux.8,v 1.42 2021/04/25 05:52:22 nia Exp $ .\" .\" Copyright (c) 1995 Frank van der Linden .\" All rights reserved. @@ -29,7 +29,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 4, 2021 +.Dd April 25, 2021 .Dt COMPAT_LINUX 8 .Os .Sh NAME @@ -193,19 +193,7 @@ but is available as a module. It must be added to .Xr modules.conf 5 to be used. -.Pp -When using a -.Dv MODULAR -kernel (see -.Xr module 7 ) , -binary compatibility is not activated automatically. -To activate it, set the appropriate -.Xr sysctl 8 -variables: -.Bd -literal -sysctl -w emul.linux.enabled=1 -sysctl -w emul.linux32.enabled=1 -.Ed +It will not be loaded automatically. .Sh BUGS The information about Linux distributions will become outdated. .Pp
CVS commit: src/usr.sbin/wsfontload
Module Name:src Committed By: nia Date: Sat Apr 24 09:18:44 UTC 2021 Modified Files: src/usr.sbin/wsfontload: wsfontload.8 Log Message: wsfontload.8: clean up examples add an example of loading a larger font since a lot of people ask. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/wsfontload/wsfontload.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/wsfontload/wsfontload.8 diff -u src/usr.sbin/wsfontload/wsfontload.8:1.30 src/usr.sbin/wsfontload/wsfontload.8:1.31 --- src/usr.sbin/wsfontload/wsfontload.8:1.30 Sat Apr 24 09:03:05 2021 +++ src/usr.sbin/wsfontload/wsfontload.8 Sat Apr 24 09:18:44 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsfontload.8,v 1.30 2021/04/24 09:03:05 nia Exp $ +.\" $NetBSD: wsfontload.8,v 1.31 2021/04/24 09:18:44 nia Exp $ .\" .\" Copyright (c) 1999, 2001 .\" Matthias Drochner. All rights reserved. @@ -117,23 +117,27 @@ configuration file. .Pa /etc/wscons.conf .Pa /usr/share/wscons/fonts .Sh EXAMPLES -.Dl wsfontload -N myname -h 8 -e ibm /usr/share/wscons/fonts/vt220l.808 +Load the ISO-encoded 16x32 Spleen font and switch the first console +screen to use it: +.Pp +.Bd -offset indent -unfilled +# wsfontload -w 16 -h 32 -e iso -N spleen32 \\ + /usr/share/wscons/fonts/spleen-16x32.fnt +# wsconsctl -dw font=spleen32 +.Ed .Pp Load the IBM-encoded 8\(mu8-font from the .Xr wscons 4 -distribution. +distribution: +.Pp +.Bd -offset indent -unfilled +# wsfontload -N myname -h 8 -e ibm /usr/share/wscons/fonts/vt220l.808 +.Ed +.Pp This (or another 8\(mu8-font) is necessary to use the 50-line screen type on .Xr vga 4 displays. -.Pp -.Dl wsfontload -N orator -e ibm /usr/share/wscons/fonts/orator.816 -.Dl wsconsctl -dw font=orator -.Pp -Load the -.Dq orator -IBM-encoded 8\(mu16 font and switch the first console screen -(ttyE0, wsconsctl's default) to this alternate font. .Sh SEE ALSO .Xr wscons 4 , .Xr wsconscfg 8 ,
CVS commit: src/usr.sbin/wsfontload
Module Name:src Committed By: nia Date: Sat Apr 24 09:03:05 UTC 2021 Modified Files: src/usr.sbin/wsfontload: wsfontload.8 Log Message: wsfontload: clarify more To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/wsfontload/wsfontload.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/wsfontload/wsfontload.8 diff -u src/usr.sbin/wsfontload/wsfontload.8:1.29 src/usr.sbin/wsfontload/wsfontload.8:1.30 --- src/usr.sbin/wsfontload/wsfontload.8:1.29 Sat Apr 24 08:59:09 2021 +++ src/usr.sbin/wsfontload/wsfontload.8 Sat Apr 24 09:03:05 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsfontload.8,v 1.29 2021/04/24 08:59:09 nia Exp $ +.\" $NetBSD: wsfontload.8,v 1.30 2021/04/24 09:03:05 nia Exp $ .\" .\" Copyright (c) 1999, 2001 .\" Matthias Drochner. All rights reserved. @@ -93,8 +93,7 @@ Default is Sets the height of a font character in pixels. Default is 16. .It Fl l -Print a list of available fonts that are built-in to the kernel -(as opposed to fonts available to load from the filesystem). +Print a list of fonts that have been loaded or are built-in to the kernel. .It Fl N Ar name Specifies a name which can be used later to refer to the font. If none is given, the @@ -143,5 +142,3 @@ IBM-encoded 8\(mu16 font and switch the Many features are missing. .Pp There is no way to remove a loaded font. -.Pp -There is no way to determine which fonts have been loaded.
CVS commit: src/usr.sbin/wsfontload
Module Name:src Committed By: nia Date: Sat Apr 24 08:59:09 UTC 2021 Modified Files: src/usr.sbin/wsfontload: wsfontload.8 Log Message: wsfontload: clarify documentation of -l To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/wsfontload/wsfontload.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/wsfontload/wsfontload.8 diff -u src/usr.sbin/wsfontload/wsfontload.8:1.28 src/usr.sbin/wsfontload/wsfontload.8:1.29 --- src/usr.sbin/wsfontload/wsfontload.8:1.28 Sat Apr 24 07:52:07 2021 +++ src/usr.sbin/wsfontload/wsfontload.8 Sat Apr 24 08:59:09 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsfontload.8,v 1.28 2021/04/24 07:52:07 wiz Exp $ +.\" $NetBSD: wsfontload.8,v 1.29 2021/04/24 08:59:09 nia Exp $ .\" .\" Copyright (c) 1999, 2001 .\" Matthias Drochner. All rights reserved. @@ -93,7 +93,8 @@ Default is Sets the height of a font character in pixels. Default is 16. .It Fl l -Print a list of available fonts. +Print a list of available fonts that are built-in to the kernel +(as opposed to fonts available to load from the filesystem). .It Fl N Ar name Specifies a name which can be used later to refer to the font. If none is given, the
CVS commit: src/share/man/man8
Module Name:src Committed By: nia Date: Sat Apr 24 07:12:17 UTC 2021 Modified Files: src/share/man/man8: compat_linux.8 Log Message: update information To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/share/man/man8/compat_linux.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_linux.8 diff -u src/share/man/man8/compat_linux.8:1.40 src/share/man/man8/compat_linux.8:1.41 --- src/share/man/man8/compat_linux.8:1.40 Mon Oct 2 12:55:10 2017 +++ src/share/man/man8/compat_linux.8 Sat Apr 24 07:12:17 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: compat_linux.8,v 1.40 2017/10/02 12:55:10 wiz Exp $ +.\" $NetBSD: compat_linux.8,v 1.41 2021/04/24 07:12:17 nia Exp $ .\" .\" Copyright (c) 1995 Frank van der Linden .\" All rights reserved. @@ -29,7 +29,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 September 29, 2017 +.Dd April 4, 2021 .Dt COMPAT_LINUX 8 .Os .Sh NAME @@ -40,14 +40,12 @@ supports running Linux binaries. This applies to amd64, arm, alpha, i386, m68k, and powerpc systems for now. Both the a.out and ELF binary formats are supported. -Most programs should work, including the ones that use the Linux SVGAlib (only -on i386). +Most programs should work. .Nx -amd64 can execute both 32bit and 64bit linux programs. +amd64 can execute both 32-bit and 64-bit Linux programs. Programs that will not work include some that use i386-specific calls, such as enabling virtual 8086 mode. -Currently, sound is only partially supported for Linux binaries (they will -probably run, depending on what Linux sound support features are used). +Currently, sound is supported through OSSv3 compat. .Pp The Linux compatibility feature is active for kernels compiled with the @@ -64,6 +62,9 @@ and/or .Dv EXEC_ELF64 options (respectively) should be enabled in addition to .Dv COMPAT_LINUX . +If sound support is desired, +.Dv COMPAT_OSSAUDIO +should be enabled. .Pp A lot of programs are dynamically linked. This means that you will also need the Linux shared libraries that the @@ -77,7 +78,7 @@ This directory is named .Pa /emul/linux or .Pa /emul/linux32 -for 32bit emulation on 64bit systems. +for 32-bit emulation on 64-bit systems. Any file operations done by Linux programs run under .Nx will look in this directory first. @@ -109,275 +110,62 @@ After a while, you will have a sufficien set of Linux shared libraries on your system to be able to run newly imported Linux binaries without any extra work. .Ss Setting up shared libraries -How to get to know which shared libraries Linux binaries need, and where -to get them? Basically, there are 2 possibilities (when following -these instructions: you will need to be root on your -.Nx -system to -do the necessary installation steps). -.Bl -enum -.It -For i386, you can simply install the SuSE shared libs using the -.Pa pkgsrc/emulators/suse100_linux -package(s). -On PowerPC ports, the -.Pa pkgsrc/emulators/linuxppc_lib -will install the needed libraries. -If you are on other platforms, or this doesn't supply you with all -the needed libraries, read on. -.It -You have access to a Linux system. -In this case you can temporarily install the binary there, see what -shared libraries it needs, and copy them to your -.Nx -system. -Example: you have just ftp-ed the Linux binary of Doom. -Put it on the Linux system you have access to, and check which shared libraries it -needs by running -.Sq ldd linuxxdoom : -.Bd -literal -offset indent -(me@linux) ldd linuxxdoom - libXt.so.3 (DLL Jump 3.1) => /usr/X11/lib/libXt.so.3.1.0 - libX11.so.3 (DLL Jump 3.1) => /usr/X11/lib/libX11.so.3.1.0 - libc.so.4 (DLL Jump 4.5pl26) => /lib/libc.so.4.6.29 -.Ed -.Pp -You would need go get all the files from the last column, and -put them under -.Pa /emul/linux , -with the names in the first column -as symbolic links pointing to them. -This means you eventually have these files on your -.Nx -system: -.Bl -item -compact -.It -.Pa /emul/linux/usr/X11/lib/libXt.so.3.1.0 -.It -.Pa /emul/linux/usr/X11/lib/libXt.so.3 -(symbolic link to the above) -.It -.Pa /emul/linux/usr/X11/lib/libX11.so.3.1.0 -.It -.Pa /emul/linux/usr/X11/lib/libX11.so.3 -(symbolic link to the above) -.It -.Pa /emul/linux/lib/libc.so.4.6.29 -.It -.Pa /emul/linux/lib/libc.so.4 -(symbolic link to the above) -.El -.Pp -Note that if you already have a Linux shared library with a -matching major revision number to the first column of the -.Xr ldd 1 -output, you won't need to copy the file named in the last column -to your system, the one you already have should work. -It is advisable to copy the shared library anyway if it is a newer version, -though. -You can remove the old one, as long as you make the symbolic -link point to the new one. -So, if you have these libraries
CVS commit: src/share/man/man3
Module Name:src Committed By: nia Date: Wed Apr 14 07:56:23 UTC 2021 Modified Files: src/share/man/man3: intro.3 Log Message: OpenSSL man pages have moved To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/share/man/man3/intro.3 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/man3/intro.3 diff -u src/share/man/man3/intro.3:1.35 src/share/man/man3/intro.3:1.36 --- src/share/man/man3/intro.3:1.35 Wed Apr 14 07:52:53 2021 +++ src/share/man/man3/intro.3 Wed Apr 14 07:56:23 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.3,v 1.35 2021/04/14 07:52:53 nia Exp $ +.\" $NetBSD: intro.3,v 1.36 2021/04/14 07:56:23 nia Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -123,7 +123,7 @@ See .It Em libcrypto Pq Fl l Ns Ar crypto The OpenSSL cryptographic library. See -.Xr crypto 3 . +.Xr crypto 7 . .It Em libcurses Pq Fl l Ns Ar curses Fl l Ns Ar terminfo Terminal independent screen management routines for two dimensional non-bitmap display terminals. @@ -281,7 +281,7 @@ See .It Em libssl Pq Fl l Ns Ar ssl The secure sockets layer (SSL) library. See -.Xr ssl 3 . +.Xr ssl 7 . .It Em libtelnet Pq Fl l Ns Ar telnet The telnet library. .It Em libterminfo Pq Fl l Ns Ar terminfo
CVS commit: src/share/man/man3
Module Name:src Committed By: nia Date: Wed Apr 14 07:52:53 UTC 2021 Modified Files: src/share/man/man3: intro.3 Log Message: intro.3: add a few To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/share/man/man3/intro.3 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/man3/intro.3 diff -u src/share/man/man3/intro.3:1.34 src/share/man/man3/intro.3:1.35 --- src/share/man/man3/intro.3:1.34 Fri May 11 12:54:56 2018 +++ src/share/man/man3/intro.3 Wed Apr 14 07:52:53 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.3,v 1.34 2018/05/11 12:54:56 sevan Exp $ +.\" $NetBSD: intro.3,v 1.35 2021/04/14 07:52:53 nia Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)intro.3 8.1 (Berkeley) 6/5/93 .\" -.Dd May 11, 2018 +.Dd April 14, 2021 .Dt INTRO 3 .Os .Sh NAME @@ -228,6 +228,15 @@ See The curses menu library. See .Xr menus 3 . +.It Em libnvmm Pq Fl l Ns Ar nvmm +.Nx +Virtualization API. +See +.Xr libnvmm 3 . +.It Em libossaudio Pq Fl l Ns Ar ossaudio +Open Sound System compatibility library. +See +.Xr ossaudio 3 . .It Em libpanel Pq Fl l Ns Ar panel The curses panel library. See
CVS commit: src/usr.sbin/hdaudioctl
Module Name:src Committed By: nia Date: Mon Apr 12 12:22:10 UTC 2021 Modified Files: src/usr.sbin/hdaudioctl: hdaudioctl.8 Log Message: hdaudioctl.8: add missing arguments pointed out by RVP To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/hdaudioctl/hdaudioctl.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/hdaudioctl/hdaudioctl.8 diff -u src/usr.sbin/hdaudioctl/hdaudioctl.8:1.7 src/usr.sbin/hdaudioctl/hdaudioctl.8:1.8 --- src/usr.sbin/hdaudioctl/hdaudioctl.8:1.7 Mon Jun 15 13:06:39 2020 +++ src/usr.sbin/hdaudioctl/hdaudioctl.8 Mon Apr 12 12:22:10 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hdaudioctl.8,v 1.7 2020/06/15 13:06:39 sborrill Exp $ +.\" $NetBSD: hdaudioctl.8,v 1.8 2021/04/12 12:22:10 nia Exp $ .\" .\" Copyright (c) 2009 Precedence Technologies Ltd .\" 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 June 12, 2020 +.Dd April 12, 2021 .Dt HDAUDIOCTL 8 .Os .Sh NAME @@ -55,7 +55,7 @@ Valid commands are: For each child codec of the chosen .Xr hdaudio 4 device, display the nid, vendor, product, subsystem and device IDs. -.It show +.It show Ar codecid Ar nid Retrieve and display the current codec configuration in human-readable form. .It get Ar codecid Ar nid Retrieve and display the current codec configuration as a
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Sun Apr 11 11:05:50 UTC 2021 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: ctwmrc: add DontShowWelcomeWindow, new in 4.x To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/ctwm/etc/system.ctwmrc diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.12 src/external/mit/ctwm/etc/system.ctwmrc:1.13 --- src/external/mit/ctwm/etc/system.ctwmrc:1.12 Thu Mar 4 08:35:58 2021 +++ src/external/mit/ctwm/etc/system.ctwmrc Sun Apr 11 11:05:49 2021 @@ -1,5 +1,5 @@ # -# $NetBSD: system.ctwmrc,v 1.12 2021/03/04 08:35:58 nia Exp $ +# $NetBSD: system.ctwmrc,v 1.13 2021/04/11 11:05:49 nia Exp $ # # ctwmrc by nia # @@ -15,6 +15,8 @@ # don't use the default buttons or key bindings, we define our own NoDefaults +DontShowWelcomeWindow + ShowWorkSpaceManager ShowIconManager
CVS commit: xsrc/external/mit/ctwm
Module Name:xsrc Committed By: nia Date: Sun Apr 11 11:00:30 UTC 2021 Added Files: xsrc/external/mit/ctwm: prepare-import.sh Removed Files: xsrc/external/mit/ctwm/dist: CHANGES.html CMakeLists.txt Doxyfile.in README.html image_jpeg.c image_jpeg.h sound.c sound.h xsrc/external/mit/ctwm/dist/examples: example.ctwmrc levitte.ctwmrc peterc.ctwmrc xsrc/external/mit/ctwm/dist/gen: ctwm.1.html xsrc/external/mit/ctwm/dist/minibuild: README.md defs.mk main.mk mkmk.sh xsrc/external/mit/ctwm/dist/tools: ctwm.astyle mk_atoms.sh mk_ctf_info.sh mk_deftwmrc.sh mk_event_names.sh mk_function_bits.sh mk_tar.sh mk_version_in.sh rewrite_version_bzr.sh rewrite_version_git.sh try_all_opts.pl Log Message: Remove some files we don't need, add a prepare-import script to automate it To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/ctwm/prepare-import.sh cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/CHANGES.html \ xsrc/external/mit/ctwm/dist/CMakeLists.txt \ xsrc/external/mit/ctwm/dist/Doxyfile.in \ xsrc/external/mit/ctwm/dist/README.html \ xsrc/external/mit/ctwm/dist/image_jpeg.c \ xsrc/external/mit/ctwm/dist/image_jpeg.h cvs rdiff -u -r1.2 -r0 xsrc/external/mit/ctwm/dist/sound.c \ xsrc/external/mit/ctwm/dist/sound.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/ctwm/dist/examples/example.ctwmrc \ xsrc/external/mit/ctwm/dist/examples/levitte.ctwmrc \ xsrc/external/mit/ctwm/dist/examples/peterc.ctwmrc cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/gen/ctwm.1.html cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/minibuild/README.md \ xsrc/external/mit/ctwm/dist/minibuild/defs.mk \ xsrc/external/mit/ctwm/dist/minibuild/main.mk \ xsrc/external/mit/ctwm/dist/minibuild/mkmk.sh cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/ctwm/dist/tools/ctwm.astyle \ xsrc/external/mit/ctwm/dist/tools/mk_atoms.sh \ xsrc/external/mit/ctwm/dist/tools/mk_ctf_info.sh \ xsrc/external/mit/ctwm/dist/tools/mk_deftwmrc.sh \ xsrc/external/mit/ctwm/dist/tools/mk_event_names.sh \ xsrc/external/mit/ctwm/dist/tools/mk_function_bits.sh \ xsrc/external/mit/ctwm/dist/tools/mk_tar.sh \ xsrc/external/mit/ctwm/dist/tools/mk_version_in.sh \ xsrc/external/mit/ctwm/dist/tools/rewrite_version_bzr.sh \ xsrc/external/mit/ctwm/dist/tools/rewrite_version_git.sh \ xsrc/external/mit/ctwm/dist/tools/try_all_opts.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/ctwm/prepare-import.sh diff -u /dev/null xsrc/external/mit/ctwm/prepare-import.sh:1.1 --- /dev/null Sun Apr 11 11:00:30 2021 +++ xsrc/external/mit/ctwm/prepare-import.sh Sun Apr 11 11:00:29 2021 @@ -0,0 +1,17 @@ +#!/bin/sh +# $NetBSD: prepare-import.sh,v 1.1 2021/04/11 11:00:29 nia Exp $ +# +# Run this script and check for additional files and +# directories to prune, only relevant content is included. + +set -e + +cd dist +rm -f CMakeLists.txt Doxyfile.in +rm -f README.html CHANGES.html +rm -f system.ctwmrc examples/*.ctwmrc +rm -f tools/*.sh tools/*.pl tools/*.astyle +rm -f minibuild/*.mk minibuild/*.sh minibuild/*.md +rm -f gen/ctwm.1.html +rm -f image_jpeg.c image_jpeg.h +rm -f sound.c sound.h
CVS commit: src/external/mit/ctwm/bin/ctwm
Module Name:src
Committed By: nia
Date: Sun Apr 11 10:52:16 UTC 2021
Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile
Log Message:
ctwm: build autogenerated files from gen/
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/ctwm/bin/ctwm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.9 src/external/mit/ctwm/bin/ctwm/Makefile:1.10
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.9 Sun Apr 11 10:29:50 2021
+++ src/external/mit/ctwm/bin/ctwm/Makefile Sun Apr 11 10:52:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/04/11 10:29:50 nia Exp $
+# $NetBSD: Makefile,v 1.10 2021/04/11 10:52:16 nia Exp $
.include
@@ -15,11 +15,13 @@ SRCS= add_window.c animate.c captive.c c
session.c util.c vscreen.c win_decorations.c win_decorations_init.c \
win_iconify.c win_ops.c win_regions.c win_resize.c win_utils.c \
windowbox.c workspace_config.c workspace_manager.c workspace_utils.c \
- ctwm_atoms.c deftwmrc.c gram.tab.c lex.c version.c \
+ ctwm_atoms.c deftwmrc.c version.c \
image_xpm.c parse_m4.c ewmh.c ewmh_atoms.c ctwm_wrap.c
SRCS+= repl_str.c
+SRCS+= gram.tab.c lex.c
+
YHEADER=1
CTWMCONFIGDIR= ${X11ETCDIR}/ctwm
@@ -27,7 +29,7 @@ CTWMCONFIGDIR= ${X11ETCDIR}/ctwm
CTWMDIR= ${X11SRCDIR}/external/mit/ctwm/dist
XPMDIR= ${X11INCDIR}/X11/pixmaps/ctwm
-CPPFLAGS+= -I. -I${CTWMDIR} \
+CPPFLAGS+= -I. -I${CTWMDIR} -I${CTWMDIR}/gen \
-DUSE_XPM -DUSE_M4 -DUSE_EWMH -DUSE_SREGEX \
-DPIXMAP_DIRECTORY=\"${XPMDIR}\" \
-DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.ctwmrc\" \
@@ -58,7 +60,7 @@ FILES= 3D_Expand15.xpm 3D_Iconify15.xp
LDADD+= -lXpm -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-.PATH: ${CTWMDIR} ${CTWMDIR}/xpm ${CTWMDIR}/ext
+.PATH: ${CTWMDIR} ${CTWMDIR}/xpm ${CTWMDIR}/ext ${CTWMDIR}/gen
.include
.include
CVS commit: xsrc/external/mit/ctwm/dist
Module Name:xsrc Committed By: nia Date: Sun Apr 11 10:51:49 UTC 2021 Removed Files: xsrc/external/mit/ctwm/dist: gram.tab.c gram.tab.h lex.c Log Message: Remove accidental duplicates of autogenerated files To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 xsrc/external/mit/ctwm/dist/gram.tab.c \ xsrc/external/mit/ctwm/dist/lex.c cvs rdiff -u -r1.2 -r0 xsrc/external/mit/ctwm/dist/gram.tab.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/ctwm/bin/ctwm
Module Name:src
Committed By: nia
Date: Sun Apr 11 10:29:50 UTC 2021
Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile
Log Message:
Update build recipe for ctwm-4.0.3
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/ctwm/bin/ctwm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.8 src/external/mit/ctwm/bin/ctwm/Makefile:1.9
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.8 Mon Sep 28 06:04:08 2020
+++ src/external/mit/ctwm/bin/ctwm/Makefile Sun Apr 11 10:29:50 2021
@@ -1,12 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2020/09/28 06:04:08 nia Exp $
+# $NetBSD: Makefile,v 1.9 2021/04/11 10:29:50 nia Exp $
.include
PROG= ctwm
-SRCS= add_window.c deftwmrc.c events.c gram.tab.c gc.c \
- list.c util.c ctwm.c lex.c parse.c menus.c resize.c \
- version.c iconmgr.c cursor.c icons.c workmgr.c windowbox.c \
- clicktofocus.c vscreen.c session.c mwmhints.c gnome.c
+SRCS= add_window.c animate.c captive.c clargs.c clicktofocus.c \
+ colormaps.c ctopts.c ctwm_main.c cursor.c drawing.c \
+ event_core.c event_handlers.c event_names.c event_utils.c \
+ functions.c functions_captive.c functions_icmgr_wsmgr.c \
+ functions_identify.c functions_misc.c functions_warp.c \
+ functions_win.c functions_win_moveresize.c functions_workspaces.c \
+ gc.c iconmgr.c icons.c icons_builtin.c image.c image_bitmap.c \
+ image_bitmap_builtin.c image_xwd.c list.c mask_screen.c menus.c \
+ mwmhints.c occupation.c otp.c parse.c parse_be.c parse_yacc.c \
+ session.c util.c vscreen.c win_decorations.c win_decorations_init.c \
+ win_iconify.c win_ops.c win_regions.c win_resize.c win_utils.c \
+ windowbox.c workspace_config.c workspace_manager.c workspace_utils.c \
+ ctwm_atoms.c deftwmrc.c gram.tab.c lex.c version.c \
+ image_xpm.c parse_m4.c ewmh.c ewmh_atoms.c ctwm_wrap.c
+
+SRCS+= repl_str.c
YHEADER=1
@@ -15,13 +27,10 @@ CTWMCONFIGDIR= ${X11ETCDIR}/ctwm
CTWMDIR= ${X11SRCDIR}/external/mit/ctwm/dist
XPMDIR= ${X11INCDIR}/X11/pixmaps/ctwm
-CPPFLAGS+= -I. -I${CTWMDIR}/src -DHAVE_MKSTEMP \
- -DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
-
-CPPFLAGS+= -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
-CPPFLAGS+= -DCTWM_WELCOME_FILE=\"xpm:${X11INCDIR}/X11/pixmaps/NetBSD-inv.xpm\"
-
-CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.ctwmrc\" \
+CPPFLAGS+= -I. -I${CTWMDIR} \
+ -DUSE_XPM -DUSE_M4 -DUSE_EWMH -DUSE_SREGEX \
+ -DPIXMAP_DIRECTORY=\"${XPMDIR}\" \
+ -DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.ctwmrc\" \
-DM4CMD=\"m4\"
FILESDIR= ${XPMDIR}
@@ -49,7 +58,7 @@ FILES= 3D_Expand15.xpm 3D_Iconify15.xp
LDADD+= -lXpm -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-.PATH: ${CTWMDIR} ${CTWMDIR}/xpm
+.PATH: ${CTWMDIR} ${CTWMDIR}/xpm ${CTWMDIR}/ext
.include
.include
CVS commit: xsrc/external/mit/ctwm/dist
Module Name:xsrc Committed By: nia Date: Sun Apr 11 10:11:58 UTC 2021 Modified Files: xsrc/external/mit/ctwm/dist: add_window.c add_window.h clicktofocus.c clicktofocus.h ctwm.h cursor.c cursor.h events.h gc.c gc.h gram.tab.h gram.y iconmgr.c iconmgr.h icons.c icons.h lex.l list.c list.h menus.c menus.h mwmhints.c mwmhints.h parse.c parse.h screen.h session.c session.h sound.c sound.h types.h util.c util.h version.c version.h vscreen.c vscreen.h windowbox.c windowbox.h Added Files: xsrc/external/mit/ctwm/dist: ctwm.1 ctwm_atoms.c ctwm_atoms.h ctwm_config.h event_names_table.h ewmh_atoms.c ewmh_atoms.h functions_deferral.h functions_defs.h functions_dispatch_execution.h functions_parse_table.h Removed Files: xsrc/external/mit/ctwm/dist: CHANGES Imakefile Imakefile.local-template PROBLEMS README README.VMS README.gnome TODO TODO.gnome ctwm.axp_opt ctwm.c ctwm.com ctwm.man ctwm.spec ctwm.txt ctwm.vax_opt demolib.c descrip.local-template descrip.mms descrip.submms events.c example.ctwmrc gendeftwmrc.com gnome.c gnome.h gnomewindefs.h gram.c_VMS gram.h_VMS gtw.c levitte.ctwmrc lex.c_VMS libctwm.c link.com lnm.c lnm.h make.com mk_tar.sh peterc.ctwmrc resize.c resize.h siconify.bm sound.doc system.ctwmrc system.ctwmrc.gnome twm.h vms.txt vms2.txt vms_cmd_services.c vms_cmd_services.h workmgr.c workmgr.h Log Message: Merge ctwm-4-0-3 # CTWM Change History ## 4.0.3 (2019-07-21) ### Bugfixes 1. Perform various manipulations and overrides of `WM_HINTS` property when it gets reset during runtime, like we do when initially adopting the window. The most visible effect of this was in windows that don't give a focus hint (which we override to give focus), but then reset `WM_HINTS` later and still don't give us a hint, where we wound up not re-overriding previously. Reported for `xvile` by Wayne Cuddy. 1. The font height estimation changes in 4.0.0 were not applied correctly when UseThreeDMenus was set, leading to some odd vertical misalignment of the text with some fonts. Reported by Wayne Cuddy. 1. A failure in OTP consistency checks caused by the handling of transients of fullscreen windows has been fixed. This manifested as failures in OtpCheckConsistencyVS() assertions. ## 4.0.2 (2018-08-25) ### Backward-Incompatible Changes And Removed Features 1. The `UseThreeDIconBorders` config var has been removed. It came in silently and undocumented in 3.4 and has never done anything. 1. The attempts to use DNS lookups for setting the `HOSTNAME` `m4` variable have been removed; it is now just a duplicate of `CLIENTHOST`. ### New Features 1. The EWMH `_NET_WM_NAME` property is now supported, and used for the window name in place of the ICCCM `WM_NAME` when set. By default, we also accept `UTF8_STRING` encoded `WM_NAME` as a result of this change; see below for var to restore historical strictness. 1. The EWMH `_NET_WM_ICON_NAME` property is now supported, and used for the icon name in place of the ICCCM `WM_ICON_NAME` when set. Similar comments as above apply to the encodings. 1. Support has been added for `CTWM_WM_NAME` and `CTWM_WM_ICON_NAME` properties, which will override any window/icon names otherwise specified. This may be useful for applications that set unhelpful names themselves, or for manually adjusting labelling. These properties can be set from the command line via `xprop`; as an example, `xprop -f CTWM_WM_NAME 8u -set CTWM_WM_NAME "awesome windowsauce"`. See `xprop(1)` manual for details; the `s`, `t`, and `u` field type specifiers will all work. 1. When no icon name is set for a window, we've always used the window name for the icon name as well. But that only happened the first time the window name is set; after that, the icon name is stuck at the first name. It now updates along with the window name, if no icon name is set. 1. All icon manager windows will now have the `TwmIconManager` class set on them, so they can be addressed en mass by other config like `NoTitle` by that class name. ### New Config Options 1. Added `DontNameDecorations` config option to disable setting names on the X windows we create for window decoration (added in 4.0.0). These have been reported to confuse `xwit`, and might do the same for other tools that don't expect to find them on non-end-app windows. Reported by Frank Steiner. 1. Added `StrictWinNameEncoding` config option to enable historical behavior, where we're reject invalid property encoding for window naming properties (like a `UTF8_STRING` encoded `WM_NAME`). ### Bugfixes 1. Fix up broken parsing of `IconifyStyle "sweep"`. Bug was introduced in 4.0.0. 1. When multiple X Screens are used,
CVS import: xsrc/external/mit/ctwm/dist/
Module Name:xsrc Committed By: nia Date: Sun Apr 11 08:36:54 UTC 2021 Update of /cvsroot/xsrc/external/mit/ctwm/dist/ In directory ivanova.netbsd.org:/tmp/cvs-serv9012 Log Message: ctwm-4.0.3 Status: Vendor Tag: CTWM Release Tags: ctwm-4-0-3 N xsrc/external/mit/ctwm/dist//workspace_manager.h N xsrc/external/mit/ctwm/dist//ctopts.h N xsrc/external/mit/ctwm/dist//colormaps.h C xsrc/external/mit/ctwm/dist//menus.h C xsrc/external/mit/ctwm/dist//gc.h C xsrc/external/mit/ctwm/dist//system.ctwmrc N xsrc/external/mit/ctwm/dist//event_handlers.h N xsrc/external/mit/ctwm/dist//ctwm_config.h.in N xsrc/external/mit/ctwm/dist//animate.c C xsrc/external/mit/ctwm/dist//parse.c N xsrc/external/mit/ctwm/dist//captive.h N xsrc/external/mit/ctwm/dist//.bzrignore C xsrc/external/mit/ctwm/dist//session.h N xsrc/external/mit/ctwm/dist//parse_be.h N xsrc/external/mit/ctwm/dist//deftwmrc.h N xsrc/external/mit/ctwm/dist//win_utils.h N xsrc/external/mit/ctwm/dist//workspace_utils.c N xsrc/external/mit/ctwm/dist//otp.h N xsrc/external/mit/ctwm/dist//win_decorations_init.c N xsrc/external/mit/ctwm/dist//win_iconify.c C xsrc/external/mit/ctwm/dist//list.c N xsrc/external/mit/ctwm/dist//drawing.h N xsrc/external/mit/ctwm/dist//parse_int.h N xsrc/external/mit/ctwm/dist//ewmh_atoms.in N xsrc/external/mit/ctwm/dist//event_names.list C xsrc/external/mit/ctwm/dist//vscreen.h C xsrc/external/mit/ctwm/dist//mwmhints.c N xsrc/external/mit/ctwm/dist//COPYRIGHT N xsrc/external/mit/ctwm/dist//clargs.h N xsrc/external/mit/ctwm/dist//functions_misc.c C xsrc/external/mit/ctwm/dist//icons.c C xsrc/external/mit/ctwm/dist//gram.y N xsrc/external/mit/ctwm/dist//occupation.h N xsrc/external/mit/ctwm/dist//image_jpeg.h N xsrc/external/mit/ctwm/dist//functions_captive.c N xsrc/external/mit/ctwm/dist//win_ops.h N xsrc/external/mit/ctwm/dist//ctwm_main.h N xsrc/external/mit/ctwm/dist//mask_screen.h N xsrc/external/mit/ctwm/dist//event_names.h N xsrc/external/mit/ctwm/dist//image_bitmap.h N xsrc/external/mit/ctwm/dist//parse_yacc.c N xsrc/external/mit/ctwm/dist//workspace_config.h C xsrc/external/mit/ctwm/dist//version.h C xsrc/external/mit/ctwm/dist//clicktofocus.h N xsrc/external/mit/ctwm/dist//functions_warp.c N xsrc/external/mit/ctwm/dist//functions_defs.list N xsrc/external/mit/ctwm/dist//win_resize.h N xsrc/external/mit/ctwm/dist//README.html C xsrc/external/mit/ctwm/dist//util.c C xsrc/external/mit/ctwm/dist//windowbox.h N xsrc/external/mit/ctwm/dist//functions_win.c N xsrc/external/mit/ctwm/dist//VERSION N xsrc/external/mit/ctwm/dist//ewmh.c N xsrc/external/mit/ctwm/dist//win_decorations.c N xsrc/external/mit/ctwm/dist//image.c N xsrc/external/mit/ctwm/dist//functions.c N xsrc/external/mit/ctwm/dist//functions_workspaces.c C xsrc/external/mit/ctwm/dist//events.h N xsrc/external/mit/ctwm/dist//image_xwd.c C xsrc/external/mit/ctwm/dist//iconmgr.h N xsrc/external/mit/ctwm/dist//image_xpm.c N xsrc/external/mit/ctwm/dist//image_bitmap_builtin.h N xsrc/external/mit/ctwm/dist//event_core.c C xsrc/external/mit/ctwm/dist//cursor.h N xsrc/external/mit/ctwm/dist//CHANGES.html C xsrc/external/mit/ctwm/dist//sound.c C xsrc/external/mit/ctwm/dist//add_window.h N xsrc/external/mit/ctwm/dist//win_regions.c N xsrc/external/mit/ctwm/dist//icons_builtin.c N xsrc/external/mit/ctwm/dist//README.md C xsrc/external/mit/ctwm/dist//mwmhints.h N xsrc/external/mit/ctwm/dist//clargs.c N xsrc/external/mit/ctwm/dist//functions_icmgr_wsmgr.c C xsrc/external/mit/ctwm/dist//lex.l C xsrc/external/mit/ctwm/dist//icons.h N xsrc/external/mit/ctwm/dist//occupation.c N xsrc/external/mit/ctwm/dist//parse_m4.c N xsrc/external/mit/ctwm/dist//image_jpeg.c N xsrc/external/mit/ctwm/dist//win_ops.c N xsrc/external/mit/ctwm/dist//workspace_utils.h N xsrc/external/mit/ctwm/dist//otp.c N xsrc/external/mit/ctwm/dist//win_decorations_init.h N xsrc/external/mit/ctwm/dist//win_iconify.h C xsrc/external/mit/ctwm/dist//list.h N xsrc/external/mit/ctwm/dist//drawing.c C xsrc/external/mit/ctwm/dist//vscreen.c C xsrc/external/mit/ctwm/dist//parse.h N xsrc/external/mit/ctwm/dist//captive.c N xsrc/external/mit/ctwm/dist//Doxyfile.in N xsrc/external/mit/ctwm/dist//workspace_structs.h C xsrc/external/mit/ctwm/dist//session.c N xsrc/external/mit/ctwm/dist//parse_be.c N xsrc/external/mit/ctwm/dist//win_utils.c N xsrc/external/mit/ctwm/dist//CHANGES.md N xsrc/external/mit/ctwm/dist//Makefile N xsrc/external/mit/ctwm/dist//CMakeLists.txt N xsrc/external/mit/ctwm/dist//workspace_manager.c N xsrc/external/mit/ctwm/dist//event_internal.h N xsrc/external/mit/ctwm/dist//ctopts.c N xsrc/external/mit/ctwm/dist//colormaps.c C xsrc/external/mit/ctwm/dist//menus.c N xsrc/external/mit/ctwm/dist//version.c.in C xsrc/external/mit/ctwm/dist//gc.c N xsrc/external/mit/ctwm/dist//event_utils.c N xsrc/external/mit/ctwm/dist//twm_window_struct.h N xsrc/external/mit/ctwm/dist//ctwm_atoms.in N xsrc/external/mit/ctwm/dist//event_handlers.c C xsrc/external/mit/ctwm/dist//ctwm.h N
CVS commit: src/doc
Module Name:src Committed By: nia Date: Sat Apr 10 20:12:47 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new pkg_install To generate a diff of this commit: cvs rdiff -u -r1.1792 -r1.1793 src/doc/3RDPARTY cvs rdiff -u -r1.2794 -r1.2795 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1792 src/doc/3RDPARTY:1.1793 --- src/doc/3RDPARTY:1.1792 Sat Apr 10 13:54:25 2021 +++ src/doc/3RDPARTY Sat Apr 10 20:12:47 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1792 2021/04/10 13:54:25 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1793 2021/04/10 20:12:47 nia Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1192,8 +1192,8 @@ definition (files.pf). userland code is reachover Makefiles are in src/usr.sbin/pf. Package: pkg_install -Version: 20201212 -Current Vers: 20201212 +Version: 20210410 +Current Vers: 20210410 Maintainer: The pkgsrc developers Home Page: http://www.pkgsrc.org/ Date: 2020-12-12 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2794 src/doc/CHANGES:1.2795 --- src/doc/CHANGES:1.2794 Fri Apr 9 19:12:37 2021 +++ src/doc/CHANGES Sat Apr 10 20:12:47 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2794 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2795 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -350,3 +350,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: services(5), protocols(5): Pull iana-generated services and protocols. [christos 20210408] file(1): Upgraded to 5.40. [christos 20210409] + pkg_install: Updated to 20210410. This simplifes version checking for + NetBSD. [nia 20210410]
CVS commit: src/external/bsd/pkg_install/dist/add
Module Name:src
Committed By: nia
Date: Sat Apr 10 20:07:57 UTC 2021
Modified Files:
src/external/bsd/pkg_install/dist/add: perform.c
Log Message:
fix build, sign comparison is an issue here
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/pkg_install/dist/add/perform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.9 src/external/bsd/pkg_install/dist/add/perform.c:1.10
--- src/external/bsd/pkg_install/dist/add/perform.c:1.9 Sat Apr 10 19:49:59 2021
+++ src/external/bsd/pkg_install/dist/add/perform.c Sat Apr 10 20:07:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia Exp $ */
+/* $NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: perform.c,v 1.9 2021/04/10 19:49:59 nia Exp $");
+__RCSID("$NetBSD: perform.c,v 1.10 2021/04/10 20:07:57 nia Exp $");
/*-
* Copyright (c) 2003 Grant Beattie
@@ -159,7 +159,7 @@ compatible_platform(const char *opsys, c
loc = strchr(host, '.');
if (loc != NULL) {
majorlen = loc - host;
- if (majorlen != (strchr(package, '.') - package))
+ if (majorlen != (size_t)(strchr(package, '.') - package))
return 0;
if (strncmp(host, package, majorlen) == 0)
return 1;
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: nia Date: Sat Apr 10 19:50:00 UTC 2021 Modified Files: src/external/bsd/pkg_install/dist/add: add.h main.c perform.c pkg_add.1 src/external/bsd/pkg_install/dist/admin: audit-packages.8 audit.c check.c download-vulnerability-list.8 pkg_admin.1 src/external/bsd/pkg_install/dist/create: build.c create.h main.c perform.c pkg_create.1 pl.c src/external/bsd/pkg_install/dist/delete: pkg_delete.1 pkg_delete.c src/external/bsd/pkg_install/dist/info: info.h main.c perform.c pkg_info.1 show.c src/external/bsd/pkg_install/dist/lib: automatic.c conflicts.c defs.h dewey.c dewey.h fexec.c file.c global.c gpgsig.c iterate.c lib.h license.c lpkg.c opattern.c parse-config.c pkcs7.c pkg_install.conf.5.in pkg_io.c pkg_signature.c pkg_summary.5 pkgdb.c pkgsrc.7 plist.c remove.c str.c var.c version.c version.h vulnerabilities-file.c xwrapper.c src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf pkgsrc.sh Log Message: merge pkg_install-20210410 - simplified version checking for netbsd, treat 9.0 and 9.1 as compatible - minor man page updates To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/add/add.h \ src/external/bsd/pkg_install/dist/add/main.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/dist/add/perform.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/add/pkg_add.1 cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/admin/audit-packages.8 \ src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/admin/audit.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/admin/check.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/admin/pkg_admin.1 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/build.c \ src/external/bsd/pkg_install/dist/create/create.h \ src/external/bsd/pkg_install/dist/create/main.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/create/perform.c \ src/external/bsd/pkg_install/dist/create/pkg_create.1 cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/create/pl.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.1 cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/pkg_install/dist/delete/pkg_delete.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/info.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/info/main.c \ src/external/bsd/pkg_install/dist/info/perform.c \ src/external/bsd/pkg_install/dist/info/pkg_info.1 cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/info/show.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/automatic.c \ src/external/bsd/pkg_install/dist/lib/conflicts.c \ src/external/bsd/pkg_install/dist/lib/dewey.h \ src/external/bsd/pkg_install/dist/lib/fexec.c \ src/external/bsd/pkg_install/dist/lib/file.c \ src/external/bsd/pkg_install/dist/lib/global.c \ src/external/bsd/pkg_install/dist/lib/gpgsig.c \ src/external/bsd/pkg_install/dist/lib/lpkg.c \ src/external/bsd/pkg_install/dist/lib/opattern.c \ src/external/bsd/pkg_install/dist/lib/pkgsrc.7 \ src/external/bsd/pkg_install/dist/lib/remove.c \ src/external/bsd/pkg_install/dist/lib/str.c \ src/external/bsd/pkg_install/dist/lib/version.c \ src/external/bsd/pkg_install/dist/lib/xwrapper.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/pkg_install/dist/lib/defs.h \ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 \ src/external/bsd/pkg_install/dist/lib/pkgdb.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/dewey.c \ src/external/bsd/pkg_install/dist/lib/parse-config.c \ src/external/bsd/pkg_install/dist/lib/pkcs7.c \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in \ src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/iterate.c \ src/external/bsd/pkg_install/dist/lib/pkg_io.c \ src/external/bsd/pkg_install/dist/lib/pkg_signature.c \ src/external/bsd/pkg_install/dist/lib/var.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/pkg_install/dist/lib/lib.h cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/pkg_install/dist/lib/plist.c cvs rdiff -u -r1.19 -r1.20 src/external/bsd/pkg_install/dist/lib/version.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf \ src/external/bsd/pkg_install/dist/x509/pkgsrc.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/pkg_install/dist/add/add.h diff -u src/external/bsd/pkg_install/dist/add/add.h:1.2
CVS import: src/external/bsd/pkg_install/dist
Module Name:src Committed By: nia Date: Sat Apr 10 19:26:04 UTC 2021 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29884 Log Message: pkg_install-20210410 Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20210410 C src/external/bsd/pkg_install/dist/add/perform.c C src/external/bsd/pkg_install/dist/add/add.h C src/external/bsd/pkg_install/dist/add/main.c C src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/admin.h C src/external/bsd/pkg_install/dist/admin/audit-packages.8 U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in C src/external/bsd/pkg_install/dist/admin/audit.c C src/external/bsd/pkg_install/dist/admin/check.c C src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in C src/external/bsd/pkg_install/dist/admin/main.c C src/external/bsd/pkg_install/dist/admin/pkg_admin.1 C src/external/bsd/pkg_install/dist/create/build.c C src/external/bsd/pkg_install/dist/create/create.h C src/external/bsd/pkg_install/dist/create/main.c C src/external/bsd/pkg_install/dist/create/perform.c C src/external/bsd/pkg_install/dist/create/pkg_create.1 C src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c C src/external/bsd/pkg_install/dist/delete/pkg_delete.1 C src/external/bsd/pkg_install/dist/delete/pkg_delete.c C src/external/bsd/pkg_install/dist/info/perform.c C src/external/bsd/pkg_install/dist/info/info.h C src/external/bsd/pkg_install/dist/info/main.c C src/external/bsd/pkg_install/dist/info/pkg_info.1 C src/external/bsd/pkg_install/dist/info/show.c C src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in C src/external/bsd/pkg_install/dist/lib/conflicts.c C src/external/bsd/pkg_install/dist/lib/defs.h C src/external/bsd/pkg_install/dist/lib/dewey.c C src/external/bsd/pkg_install/dist/lib/dewey.h C src/external/bsd/pkg_install/dist/lib/fexec.c C src/external/bsd/pkg_install/dist/lib/file.c C src/external/bsd/pkg_install/dist/lib/global.c C src/external/bsd/pkg_install/dist/lib/gpgsig.c C src/external/bsd/pkg_install/dist/lib/iterate.c C src/external/bsd/pkg_install/dist/lib/lib.h C src/external/bsd/pkg_install/dist/lib/license.c C src/external/bsd/pkg_install/dist/lib/lpkg.c C src/external/bsd/pkg_install/dist/lib/opattern.c C src/external/bsd/pkg_install/dist/lib/parse-config.c C src/external/bsd/pkg_install/dist/lib/pkcs7.c C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in C src/external/bsd/pkg_install/dist/lib/pkg_io.c C src/external/bsd/pkg_install/dist/lib/pkg_signature.c C src/external/bsd/pkg_install/dist/lib/pkg_summary.5 C src/external/bsd/pkg_install/dist/lib/pkgdb.c C src/external/bsd/pkg_install/dist/lib/pkgsrc.7 C src/external/bsd/pkg_install/dist/lib/plist.c C src/external/bsd/pkg_install/dist/lib/remove.c C src/external/bsd/pkg_install/dist/lib/str.c C src/external/bsd/pkg_install/dist/lib/var.c C src/external/bsd/pkg_install/dist/lib/version.c C src/external/bsd/pkg_install/dist/lib/version.h C src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c C src/external/bsd/pkg_install/dist/lib/xwrapper.c C src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf C src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt 55 conflicts created by this import. Use the following command to help the merge: cvs checkout -jPKGSRC:yesterday -jPKGSRC src/external/bsd/pkg_install/dist
CVS import: external/bsd/pkg_install/dist
Module Name:external Committed By: nia Date: Sat Apr 10 19:00:12 UTC 2021 Update of /cvsroot/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13146 Log Message: pkg_install-20210410 Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20210410 N external/bsd/pkg_install/dist/add/add.h N external/bsd/pkg_install/dist/add/main.c N external/bsd/pkg_install/dist/add/perform.c N external/bsd/pkg_install/dist/add/pkg_add.1 N external/bsd/pkg_install/dist/admin/admin.h N external/bsd/pkg_install/dist/admin/audit-packages.8 N external/bsd/pkg_install/dist/admin/audit-packages.sh.in N external/bsd/pkg_install/dist/admin/audit.c N external/bsd/pkg_install/dist/admin/check.c N external/bsd/pkg_install/dist/admin/download-vulnerability-list.8 N external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in N external/bsd/pkg_install/dist/admin/main.c N external/bsd/pkg_install/dist/admin/pkg_admin.1 N external/bsd/pkg_install/dist/create/build.c N external/bsd/pkg_install/dist/create/create.h N external/bsd/pkg_install/dist/create/main.c N external/bsd/pkg_install/dist/create/perform.c N external/bsd/pkg_install/dist/create/pkg_create.1 N external/bsd/pkg_install/dist/create/pl.c N external/bsd/pkg_install/dist/create/util.c N external/bsd/pkg_install/dist/delete/pkg_delete.1 N external/bsd/pkg_install/dist/delete/pkg_delete.c N external/bsd/pkg_install/dist/info/info.h N external/bsd/pkg_install/dist/info/main.c N external/bsd/pkg_install/dist/info/perform.c N external/bsd/pkg_install/dist/info/pkg_info.1 N external/bsd/pkg_install/dist/info/show.c N external/bsd/pkg_install/dist/lib/automatic.c N external/bsd/pkg_install/dist/lib/config.h.in N external/bsd/pkg_install/dist/lib/conflicts.c N external/bsd/pkg_install/dist/lib/defs.h N external/bsd/pkg_install/dist/lib/dewey.c N external/bsd/pkg_install/dist/lib/dewey.h N external/bsd/pkg_install/dist/lib/fexec.c N external/bsd/pkg_install/dist/lib/file.c N external/bsd/pkg_install/dist/lib/global.c N external/bsd/pkg_install/dist/lib/gpgsig.c N external/bsd/pkg_install/dist/lib/iterate.c N external/bsd/pkg_install/dist/lib/lib.h N external/bsd/pkg_install/dist/lib/license.c N external/bsd/pkg_install/dist/lib/lpkg.c N external/bsd/pkg_install/dist/lib/opattern.c N external/bsd/pkg_install/dist/lib/parse-config.c N external/bsd/pkg_install/dist/lib/pkcs7.c N external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in N external/bsd/pkg_install/dist/lib/pkg_io.c N external/bsd/pkg_install/dist/lib/pkg_signature.c N external/bsd/pkg_install/dist/lib/pkg_summary.5 N external/bsd/pkg_install/dist/lib/pkgdb.c N external/bsd/pkg_install/dist/lib/pkgsrc.7 N external/bsd/pkg_install/dist/lib/plist.c N external/bsd/pkg_install/dist/lib/remove.c N external/bsd/pkg_install/dist/lib/str.c N external/bsd/pkg_install/dist/lib/var.c N external/bsd/pkg_install/dist/lib/version.c N external/bsd/pkg_install/dist/lib/version.h N external/bsd/pkg_install/dist/lib/vulnerabilities-file.c N external/bsd/pkg_install/dist/lib/xwrapper.c N external/bsd/pkg_install/dist/x509/pkgsrc.cnf N external/bsd/pkg_install/dist/x509/pkgsrc.sh N external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Sat Apr 10 08:01:21 UTC 2021 Modified Files: src/share/man/man4: hdaudio.4 Log Message: 'no merit' is a strong statement To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/hdaudio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/hdaudio.4 diff -u src/share/man/man4/hdaudio.4:1.20 src/share/man/man4/hdaudio.4:1.21 --- src/share/man/man4/hdaudio.4:1.20 Sat Apr 10 04:10:21 2021 +++ src/share/man/man4/hdaudio.4 Sat Apr 10 08:01:21 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: hdaudio.4,v 1.20 2021/04/10 04:10:21 isaki Exp $ +.\" $NetBSD: hdaudio.4,v 1.21 2021/04/10 08:01:21 nia Exp $ .\" .\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -133,8 +133,8 @@ Handle unsolicited RIRB messages .It Modem function groups .It -Hardware formats higher than 16 bits precision. +24-bit and 20-bit hardware formats cannot yet be used. Since the machine-independent audio layer converts all input from -the userland and the hardware layer to 16 bits precision for processing, -so there is no (or few) merit to support them. +userland and the hardware layer to 16-bit precision for processing, +there would currently be no advantage in using them. .El
CVS commit: src/usr.bin/audiocfg
Module Name:src Committed By: nia Date: Wed Apr 7 09:58:58 UTC 2021 Modified Files: src/usr.bin/audiocfg: audiocfg.1 Log Message: audiocfg(1): add examples To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/audiocfg/audiocfg.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/audiocfg/audiocfg.1 diff -u src/usr.bin/audiocfg/audiocfg.1:1.7 src/usr.bin/audiocfg/audiocfg.1:1.8 --- src/usr.bin/audiocfg/audiocfg.1:1.7 Mon Oct 19 21:46:15 2020 +++ src/usr.bin/audiocfg/audiocfg.1 Wed Apr 7 09:58:58 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: audiocfg.1,v 1.7 2020/10/19 21:46:15 dholland Exp $ +.\" $NetBSD: audiocfg.1,v 1.8 2021/04/07 09:58:58 nia Exp $ .\" .\" Copyright (c) 2010 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 October 19, 2020 +.Dd April 7, 2021 .Dt AUDIOCFG 1 .Os .Sh NAME @@ -120,6 +120,12 @@ see .It Pa /dev/sound[0-9]* Available audio devices. .El +.Sh EXAMPLES +Configure audio device 0 for playing BluRay 5.1 surround sound: +.Dl $ audiocfg set 0 p slinear_le 16 6 48000 +.Pp +Configure audio device 0 for playing CD quality audio: +.Dl $ audiocfg set 0 p slinear_le 16 2 44100 .Sh SEE ALSO .Xr audioplay 1 , .Xr audiorecord 1 ,
CVS commit: src/distrib/notes
Module Name:src
Committed By: nia
Date: Wed Apr 7 07:51:13 UTC 2021
Modified Files:
src/distrib/notes/arc: prep
src/distrib/notes/cats: prep
src/distrib/notes/macppc: prep.OPENFIRMWARE
Log Message:
Update for pkgsrc README.html transition
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/notes/arc/prep
cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/cats/prep
cvs rdiff -u -r1.21 -r1.22 src/distrib/notes/macppc/prep.OPENFIRMWARE
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/arc/prep
diff -u src/distrib/notes/arc/prep:1.5 src/distrib/notes/arc/prep:1.6
--- src/distrib/notes/arc/prep:1.5 Sun Nov 24 11:15:32 2019
+++ src/distrib/notes/arc/prep Wed Apr 7 07:51:12 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.5 2019/11/24 11:15:32 martin Exp $
+.\" $NetBSD: prep,v 1.6 2021/04/07 07:51:12 nia Exp $
.
First and foremost, before beginning the installation process,
.Em make sure you have a reliable backup
@@ -49,7 +49,7 @@ This is available in the packages collec
Systems not supported by the packages
collection should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://cdrecord.berlios.de/old/private/cdrecord.html
.Pp
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.14 src/distrib/notes/cats/prep:1.15
--- src/distrib/notes/cats/prep:1.14 Sun Nov 24 11:15:32 2019
+++ src/distrib/notes/cats/prep Wed Apr 7 07:51:12 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.14 2019/11/24 11:15:32 martin Exp $
+.\" $NetBSD: prep,v 1.15 2021/04/07 07:51:12 nia Exp $
.
A \*M machine usually needs little or no preparation before installing
.Nx ,
@@ -45,7 +45,7 @@ This is available in the packages collec
Systems not supported by the packages
collection should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.21 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.22
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.21 Sun Nov 24 11:15:34 2019
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Wed Apr 7 07:51:12 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep.OPENFIRMWARE,v 1.21 2019/11/24 11:15:34 martin Exp $
+.\" $NetBSD: prep.OPENFIRMWARE,v 1.22 2021/04/07 07:51:12 nia Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1056,7 +1056,7 @@ for
file systems, and
.Ic hfstools
to create and mount HFS file systems.
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/hfsutils/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/hfsutils/
.Pp
Make the following partitions:
.(tag "A/UXxUserxandxA/UXxFree1" -offset indent
@@ -1199,7 +1199,7 @@ Other
.Ul
systems should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
@@ -1391,7 +1391,7 @@ Other
.Ul
systems should get it from the official website:
.br
-.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/README.html
+.Lk https://cdn.NetBSD.org/pub/NetBSD/packages/pkgsrc/sysutils/cdrtools/
.br
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
CVS commit: src/sbin/rndctl
Module Name:src
Committed By: nia
Date: Sun Apr 4 13:37:17 UTC 2021
Modified Files:
src/sbin/rndctl: rndctl.c
Log Message:
rndctl(8): to -l, add a "samples" column separate to "bits"
rename the "bits" column to "estimated bits".
this provides a clear indication when a source is being used, but
not increasing the entropy counter.
this commit fixes an unrelated bug where verbose output functioned
incorrectly when a class of device was specified with -t.
while here, reduce code duplication.
"gofer it" riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sbin/rndctl/rndctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/rndctl/rndctl.c
diff -u src/sbin/rndctl/rndctl.c:1.39 src/sbin/rndctl/rndctl.c:1.40
--- src/sbin/rndctl/rndctl.c:1.39 Sun Apr 4 12:50:31 2021
+++ src/sbin/rndctl/rndctl.c Sun Apr 4 13:37:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rndctl.c,v 1.39 2021/04/04 12:50:31 nia Exp $ */
+/* $NetBSD: rndctl.c,v 1.40 2021/04/04 13:37:17 nia Exp $ */
/*-
* Copyright (c) 1997 Michael Graff.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: rndctl.c,v 1.39 2021/04/04 12:50:31 nia Exp $");
+__RCSID("$NetBSD: rndctl.c,v 1.40 2021/04/04 13:37:17 nia Exp $");
#endif
#include
@@ -77,6 +77,8 @@ static const char *find_name(u_int32_t);
static void do_ioctl(rndctl_t *);
static char * strflags(uint32_t, u_int32_t);
static void do_list(int, u_int32_t, char *);
+static void do_print_source(rndsource_est_t *);
+static void do_print_source_verbose(rndsource_est_t *);
static void do_stats(void);
static int iflag;
@@ -466,7 +468,26 @@ strflags(uint32_t totalbits, u_int32_t f
return (str);
}
-#define HEADER "Source Bits Type Flags\n"
+#define HEADER "Source Estimated bitsSamples Type Flags\n"
+
+static void
+do_print_source(rndsource_est_t *source)
+{
+ printf("%-16s ", source->rt.name);
+ printf("%10" PRIu32 " ", source->rt.total);
+ printf("%10" PRIu32 " ", source->dt_samples + source->dv_samples);
+ printf("%-6s ", find_name(source->rt.type));
+ printf("%s\n", strflags(source->rt.total, source->rt.flags));
+}
+
+static void
+do_print_source_verbose(rndsource_est_t *source)
+{
+ printf("\tDt samples = %d\n", source->dt_samples);
+ printf("\tDt bits = %d\n", source->dt_total);
+ printf("\tDv samples = %d\n", source->dv_samples);
+ printf("\tDv bits = %d\n", source->dv_total);
+}
static void
do_list(int all, u_int32_t type, char *name)
@@ -482,28 +503,15 @@ do_list(int all, u_int32_t type, char *n
if (fd < 0)
err(1, "open");
- if (all == 0 && type == 0xff) {
+ if (!all && type == 0xff) {
strncpy(rstat_name.name, name, sizeof(rstat_name.name));
res = ioctl(fd, RNDGETESTNAME, _name);
if (res < 0)
err(1, "ioctl(RNDGETESTNAME)");
printf(HEADER);
- printf("%-16s %10u %-4s %s\n",
- rstat_name.source.rt.name,
- rstat_name.source.rt.total,
- find_name(rstat_name.source.rt.type),
- strflags(rstat_name.source.rt.total,
- rstat_name.source.rt.flags));
- if (vflag) {
- printf("\tDt samples = %d\n",
- rstat_name.source.dt_samples);
- printf("\tDt bits = %d\n",
- rstat_name.source.dt_total);
- printf("\tDv samples = %d\n",
-rstat_name.source.dv_samples);
- printf("\tDv bits = %d\n",
- rstat_name.source.dv_total);
- }
+ do_print_source(_name.source);
+ if (vflag)
+ do_print_source_verbose(_name.source);
close(fd);
return;
}
@@ -525,23 +533,10 @@ do_list(int all, u_int32_t type, char *n
break;
for (i = 0; i < rstat.count; i++) {
- if (all != 0 ||
- type == rstat.source[i].rt.type)
-printf("%-16s %10u %-4s %s\n",
-rstat.source[i].rt.name,
-rstat.source[i].rt.total,
-find_name(rstat.source[i].rt.type),
-strflags(rstat.source[i].rt.total,
- rstat.source[i].rt.flags));
- if (vflag) {
-printf("\tDt samples = %d\n",
- rstat.source[i].dt_samples);
-printf("\tDt bits = %d\n",
- rstat.source[i].dt_total);
-printf("\tDv samples = %d\n",
- rstat.source[i].dv_samples);
-printf("\tDv bits = %d\n",
- rstat.source[i].dv_total);
+ if (all || type == rstat.source[i].rt.type) {
+do_print_source([i]);
+if (vflag)
+ do_print_source_verbose([i]);
}
}
start += rstat.count;
CVS commit: src/sbin/rndctl
Module Name:src
Committed By: nia
Date: Sun Apr 4 12:50:31 UTC 2021
Modified Files:
src/sbin/rndctl: rndctl.c
Log Message:
rndctl(8): remove no-longer-useful stats from -s
these are always 0 now.
"gofer it" riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sbin/rndctl/rndctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/rndctl/rndctl.c
diff -u src/sbin/rndctl/rndctl.c:1.38 src/sbin/rndctl/rndctl.c:1.39
--- src/sbin/rndctl/rndctl.c:1.38 Fri Apr 2 07:17:56 2021
+++ src/sbin/rndctl/rndctl.c Sun Apr 4 12:50:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rndctl.c,v 1.38 2021/04/02 07:17:56 nia Exp $ */
+/* $NetBSD: rndctl.c,v 1.39 2021/04/04 12:50:31 nia Exp $ */
/*-
* Copyright (c) 1997 Michael Graff.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: rndctl.c,v 1.38 2021/04/02 07:17:56 nia Exp $");
+__RCSID("$NetBSD: rndctl.c,v 1.39 2021/04/04 12:50:31 nia Exp $");
#endif
#include
@@ -563,13 +563,8 @@ do_stats(void)
if (ioctl(fd, RNDGETPOOLSTAT, ) < 0)
err(1, "ioctl(RNDGETPOOLSTAT)");
- printf("\t%9u bits mixed into pool\n", rs.added);
printf("\t%9u bits currently stored in pool (max %u)\n",
rs.curentropy, rs.maxentropy);
- printf("\t%9u bits of entropy discarded due to full pool\n",
- rs.discarded);
- printf("\t%9u hard-random bits generated\n", rs.removed);
- printf("\t%9u pseudo-random bits generated\n", rs.generated);
close(fd);
}
CVS commit: src/sbin/rndctl
Module Name:src
Committed By: nia
Date: Fri Apr 2 07:17:56 UTC 2021
Modified Files:
src/sbin/rndctl: rndctl.c
Log Message:
rndctl: make -l's "Flags" field reflect current reality
don't print "legacy options" RND_FLAG_ESTIMATE_TIME and
"RND_FLAG_ESTIMATE_VALUE"
only print "estimate" if we have actually counted any bits from
something, since it's no longer really possible to "enable estimation".
ideally, there should also be a "samples" field so it's clear
collected bits are not being counted.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sbin/rndctl/rndctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/rndctl/rndctl.c
diff -u src/sbin/rndctl/rndctl.c:1.37 src/sbin/rndctl/rndctl.c:1.38
--- src/sbin/rndctl/rndctl.c:1.37 Tue May 12 09:48:44 2020
+++ src/sbin/rndctl/rndctl.c Fri Apr 2 07:17:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rndctl.c,v 1.37 2020/05/12 09:48:44 simonb Exp $ */
+/* $NetBSD: rndctl.c,v 1.38 2021/04/02 07:17:56 nia Exp $ */
/*-
* Copyright (c) 1997 Michael Graff.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: rndctl.c,v 1.37 2020/05/12 09:48:44 simonb Exp $");
+__RCSID("$NetBSD: rndctl.c,v 1.38 2021/04/02 07:17:56 nia Exp $");
#endif
#include
@@ -75,7 +75,7 @@ __dead static void usage(void);
static u_int32_t find_type(const char *name);
static const char *find_name(u_int32_t);
static void do_ioctl(rndctl_t *);
-static char * strflags(u_int32_t);
+static char * strflags(uint32_t, u_int32_t);
static void do_list(int, u_int32_t, char *);
static void do_stats(void);
@@ -444,29 +444,21 @@ do_ioctl(rndctl_t *rctl)
}
static char *
-strflags(u_int32_t fl)
+strflags(uint32_t totalbits, u_int32_t fl)
{
static char str[512];
str[0] = '\0';
- if (fl & RND_FLAG_NO_ESTIMATE)
- ;
- else
+ if (totalbits > 0 && (fl & RND_FLAG_NO_ESTIMATE) == 0)
strlcat(str, "estimate, ", sizeof(str));
- if (fl & RND_FLAG_NO_COLLECT)
- ;
- else
+ if ((fl & RND_FLAG_NO_COLLECT) == 0)
strlcat(str, "collect, ", sizeof(str));
if (fl & RND_FLAG_COLLECT_VALUE)
strlcat(str, "v, ", sizeof(str));
if (fl & RND_FLAG_COLLECT_TIME)
strlcat(str, "t, ", sizeof(str));
- if (fl & RND_FLAG_ESTIMATE_VALUE)
- strlcat(str, "dv, ", sizeof(str));
- if (fl & RND_FLAG_ESTIMATE_TIME)
- strlcat(str, "dt, ", sizeof(str));
if (str[strlen(str) - 2] == ',')
str[strlen(str) - 2] = '\0';
@@ -500,7 +492,8 @@ do_list(int all, u_int32_t type, char *n
rstat_name.source.rt.name,
rstat_name.source.rt.total,
find_name(rstat_name.source.rt.type),
- strflags(rstat_name.source.rt.flags));
+ strflags(rstat_name.source.rt.total,
+ rstat_name.source.rt.flags));
if (vflag) {
printf("\tDt samples = %d\n",
rstat_name.source.dt_samples);
@@ -538,7 +531,8 @@ do_list(int all, u_int32_t type, char *n
rstat.source[i].rt.name,
rstat.source[i].rt.total,
find_name(rstat.source[i].rt.type),
-strflags(rstat.source[i].rt.flags));
+strflags(rstat.source[i].rt.total,
+ rstat.source[i].rt.flags));
if (vflag) {
printf("\tDt samples = %d\n",
rstat.source[i].dt_samples);
