CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Tue Apr 20 06:12:06 UTC 2010 Modified Files: src/share/man/man7: sysctl.7 Log Message: Mark nine undocumented kern.x nodes/variables with XXX. The total amount of undocumented variables is well over twenty in the kern-subtree alone. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 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.40 src/share/man/man7/sysctl.7:1.41 --- src/share/man/man7/sysctl.7:1.40 Mon Apr 19 12:44:33 2010 +++ src/share/man/man7/sysctl.7 Tue Apr 20 06:12:06 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.40 2010/04/19 12:44:33 jruoho Exp $ +.\ $NetBSD: sysctl.7,v 1.41 2010/04/20 06:12:06 jruoho 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 April 19, 2010 +.Dd April 20, 2010 .Dt SYSCTL 7 .Os .Sh NAME @@ -240,6 +240,7 @@ information. .Bl -column kern.posix_reader_writer_locks struct kinfo_drivers not applicable .It Sy Second level name Type Changeable +.\.It kern.arandom integer no .It kern.argmax integer no .It kern.autonicetime integer yes .It kern.autoniceval integer yes @@ -252,6 +253,7 @@ .It kern.coredump node not applicable .It kern.cp_id struct no .It kern.cp_time uint64_t[\|] no +.\.It kern.cryptodevallowsoft integer yes .It kern.defcorename string yes .It kern.detachall integer yes .It kern.domainname string yes @@ -282,14 +284,17 @@ .It kern.memlock integer no .It kern.memlock_range integer no .It kern.memory_protection integer no +.\.It kern.module node not applicable .It kern.monotonic_clock integer no .It kern.msgbuf integer no .It kern.msgbufsize integer no .It kern.ngroups integer no +.\.It kern.no_sa_support integer yes .It kern.ntptime struct ntptimeval no .It kern.osrelease string no .It kern.osrevision integer no .It kern.ostype string no +.\.It kern.panic_now integer yes .It kern.pipe node not applicable .\ .It kern.posix node not applicable .It kern.posix1version integer no @@ -304,12 +309,14 @@ .It kern.proc2 struct kinfo_proc2 no .It kern.proc_args string no .It kern.profiling node not applicable +.\.It kern.pset node not applicable .It kern.rawpartition integer no .It kern.root_device string no .It kern.root_partition integer no .It kern.rtc_offset integer yes .It kern.saved_ids integer no .It kern.sbmax integer yes +.\.It kern.sched node not applicable .It kern.securelevel integer raise only .It kern.somaxkva integer yes .It kern.synchronized_io integer no @@ -317,11 +324,15 @@ .It kern.timex struct no .It kern.tkstat node not applicable .It kern.urandom integer no +.\.It kern.usercrypto integer yes +.\ It kern.userasymcrypto integer yes .It kern.veriexec node not applicable .It kern.version string no .It kern.vnode struct vnode no .El .Bl -tag -width 123456 +.\.It Li kern.arandom +.\ XXX: Undocumented. .It Li kern.argmax ( KERN_ARGMAX ) The maximum bytes of argument to .Xr execve 2 . @@ -343,7 +354,8 @@ .Va struct timeval structure is returned. This structure contains the time that the system was booted. -.\ XXX: Undocumented: .It Li kern.bufq +.\ .It Li kern.bufq +.\ XXX: Undocumented. .It Li kern.ccpu ( KERN_CCPU ) The scheduler exponential decay value. .It Li kern.clockrate ( KERN_CLOCKRATE ) @@ -402,6 +414,8 @@ appropriate space is given for one data set for each CPU. Data for a specific CPU can also be obtained by adding the number of the CPU at the end of the MIB, enlarging it by one. +.\.It Li kern.cryptodevallowsoft +.\ XXX: Undocumented. .It Li kern.defcorename ( KERN_DEFCORENAME ) Default template for the name of core dump files (see also .Li proc.pid.corename @@ -434,7 +448,8 @@ .Va d_bmajor field will be set to \-1 if the driver doesn't have a block device. .It Li kern.dump_on_panic ( KERN_DUMP_ON_PANIC ) -Perform a crash dump on system panic. +Perform a crash dump on system +.Xr panic 9 . .It Li kern.file ( KERN_FILE ) Return the entire file table. The returned data consists of a single @@ -653,6 +668,8 @@ Returns 1 if the POSIX 1003.1b Memory Protection Option is available on this system, otherwise 0. +.\ .It Li kern.module +.\ XXX: Undocumented. .It Li kern.monotonic_clock ( KERN_MONOTONIC_CLOCK ) Returns the standard version the implementation of the POSIX 1003.1b Monotonic Clock Option conforms to, @@ -665,6 +682,8 @@ The maximum number of characters that the kernel message buffer can hold. .It Li kern.ngroups ( KERN_NGROUPS ) The maximum number of supplemental groups. +.\ .It Li kern.no_sa_support +.\ XXX: Undocumented. .It Li kern.ntptime ( KERN_NTPTIME ) A .Va struct ntptimeval @@ -678,6 +697,8 @@ The system revision string. .It Li kern.ostype ( KERN_OSTYPE ) The system
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Tue Apr 20 06:22:52 UTC 2010 Modified Files: src/share/man/man7: sysctl.7 Log Message: Document the kern.module node. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 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.41 src/share/man/man7/sysctl.7:1.42 --- src/share/man/man7/sysctl.7:1.41 Tue Apr 20 06:12:06 2010 +++ src/share/man/man7/sysctl.7 Tue Apr 20 06:22:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.41 2010/04/20 06:12:06 jruoho Exp $ +.\ $NetBSD: sysctl.7,v 1.42 2010/04/20 06:22:52 jruoho Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -284,7 +284,7 @@ .It kern.memlock integer no .It kern.memlock_range integer no .It kern.memory_protection integer no -.\.It kern.module node not applicable +.It kern.module node not applicable .It kern.monotonic_clock integer no .It kern.msgbuf integer no .It kern.msgbufsize integer no @@ -668,8 +668,26 @@ Returns 1 if the POSIX 1003.1b Memory Protection Option is available on this system, otherwise 0. -.\ .It Li kern.module -.\ XXX: Undocumented. +.It Li kern.module +Settings related to kernel modules. +The third level names for the settings are described below. +.Bl -column kern.module.autoload integer Changeable -offset indent +.It Sy Third level name Type Changeable +.It kern.module.autoload integer yes +.It kern.module.verbose integer yes +.El +.Pp +The variables are as follows: +.Bl -tag -width 123456 +.It Li kern.module.autoload +A boolean that controls whether kernel modules are loaded automatically. +See for example +.Xr modstat 8 +for additional details. +.It Li kern.module.verbose +A boolean that enables or disables verbose +debug messages related to kernel modules. +.El .It Li kern.monotonic_clock ( KERN_MONOTONIC_CLOCK ) Returns the standard version the implementation of the POSIX 1003.1b Monotonic Clock Option conforms to,
CVS commit: src/share/man/man7
Module Name:src
Committed By: jruoho
Date: Tue Apr 20 07:33:46 UTC 2010
Modified Files:
src/share/man/man7: sysctl.7
Log Message:
Add sublists to the security-tree.
In addition, some small fixes to spelling errors, wording, and markup.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 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.42 src/share/man/man7/sysctl.7:1.43
--- src/share/man/man7/sysctl.7:1.42 Tue Apr 20 06:22:52 2010
+++ src/share/man/man7/sysctl.7 Tue Apr 20 07:33:45 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: sysctl.7,v 1.42 2010/04/20 06:22:52 jruoho Exp $
+.\ $NetBSD: sysctl.7,v 1.43 2010/04/20 07:33:45 jruoho Exp $
.\
.\ Copyright (c) 1993
.\ The Regents of the University of California. All rights reserved.
@@ -112,6 +112,7 @@
For example, to export the variable
.Dv dospecialcheck
as a debugging variable, the following declaration would be used:
+.Pp
.Bd -literal -offset indent -compact
int dospecialcheck = 1;
struct ctldebug debug5 = { dospecialcheck, \*[Am]dospecialcheck };
@@ -229,16 +230,14 @@
The bytes of non-kernel memory as a 64-bit integer.
.El
.Sh The kern.* subtree
+This subtree includes data generally related to the kernel.
The string and integer information available for the
.Li kern
level is detailed below.
The changeable column shows whether a process with appropriate
privilege may change the value.
-The types of data currently available are process information,
-system vnodes, the open file entries, routing table entries,
-virtual memory statistics, load average history, and clock rate
-information.
-.Bl -column kern.posix_reader_writer_locks struct kinfo_drivers not applicable
+.Bl -column kern.posix_reader_writer_locks \
+struct kinfo_drivers not applicable
.It Sy Second level name Type Changeable
.\.It kern.arandom integer no
.It kern.argmax integer no
@@ -433,7 +432,6 @@
).
.It Li kern.detachall
Detach all devices at shutdown.
-.\ XXX: Lacks CTL_KERN identifier.
.It Li kern.domainname ( KERN_DOMAINNAME )
Get or set the YP domain name.
.It Li kern.drivers ( KERN_DRIVERS )
@@ -993,15 +991,16 @@
.Va struct vnode *
followed by the vnode itself
.Va struct vnode .
-.\ XXX kern.lwp
+.\ XXX: Undocumented: kern.lwp: no children?
.El
.Sh The machdep.* subtree
The set of variables defined is architecture dependent.
Most architectures define at least the following variables.
-.Bl -column Second level name Type Changeable -offset indent
+.Bl -column machdep.booted_kernel Type Changeable -offset indent
.It Sy Second level name Type Changeable
-.It Li CPU_CONSDEV dev_t no
+.It Li machdep.booted_kernel string no
.El
+.\ XXX: Document the above.
.Sh The net.* subtree
The string and integer information available for the
.Li net
@@ -2098,13 +2097,22 @@
.Li security
level contains various security-related settings for
the system.
+The available second level names are:
+.Bl -column Second level name integer Changeable -offset indent
+.It Sy Second level name Type Changeable
+.It Li security.curtain integer yes
+.It Li security.models node not applicable
+.It Li security.pax node not applicable
+.El
+.Pp
Available settings are detailed below.
.Pp
.Bl -tag -width 123456
.It Li security.curtain
-If non-zero, will filter return objects according to the user-id
+If non-zero, will filter return objects according to the user
+.Tn ID
requesting information about them, preventing from users any
-access to objects they don't own.
+access to objects they do not own.
.Pp
At the moment, it affects
.Xr ps 1 ,
@@ -2135,14 +2143,33 @@
.Xr paxctl 8
and
.Xr security 8 .
+The available third and fourth level names are:
+.Bl -column security.pax.segvguard.suspend_timeout integer Changeable \
+-offset 2n
+.It Sy Third and fourth level names Ta Sy Type Ta Sy Changeable
+.It Li security.pax.aslr.enabled integer yes
+.\.It Li security.pax.aslr.exec_len integer yes
+.It Li security.pax.aslr.global integer yes
+.\.It Li security.pax.aslr.mmap_len integer yes
+.\.It Li security.pax.aslr.stack_len integer yes
+.It Li security.pax.mprotect.enabled integer yes
+.It Li security.pax.mprotect.global integer yes
+.It Li security.pax.segvguard.enabled integer yes
+.It Li security.pax.segvguard.expiry_timeout integer yes
+.It Li security.pax.segvguard.global integer yes
+.It Li security.pax.segvguard.max_crashes integer yes
+.It Li security.pax.segvguard.suspend_timeout integer yes
+.El
.Pp
.Bl -tag -width 123456
-.It Li security.pax.aslr.enable
+.It Li security.pax.aslr.enabled
Enable PaX ASLR (Address Space Layout Randomization).
.Pp
The value of this
knob must be non-zero for PaX ASLR to be enabled, even if a program is set to
explicit enable.
+.\.It Li security.pax.aslr.exec_len
+.\ XXX: Undocumented.
.It Li security.pax.aslr.global
Specifies the
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Tue Apr 20 07:58:16 UTC 2010 Modified Files: src/share/man/man7: sysctl.7 Log Message: Document kern.arandom, and remove kern.autonicetime and kern.autoniceval. XXX: Although no sysctl variables exist for the last two, these are still defined in sys/sysctl.h and sys/systm.h. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 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.43 src/share/man/man7/sysctl.7:1.44 --- src/share/man/man7/sysctl.7:1.43 Tue Apr 20 07:33:45 2010 +++ src/share/man/man7/sysctl.7 Tue Apr 20 07:58:16 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.43 2010/04/20 07:33:45 jruoho Exp $ +.\ $NetBSD: sysctl.7,v 1.44 2010/04/20 07:58:16 jruoho Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -239,10 +239,8 @@ .Bl -column kern.posix_reader_writer_locks \ struct kinfo_drivers not applicable .It Sy Second level name Type Changeable -.\.It kern.arandom integer no +.It kern.arandom integer no .It kern.argmax integer no -.It kern.autonicetime integer yes -.It kern.autoniceval integer yes .It kern.boothowto integer no .It kern.boottime struct timeval no .\.It kern.bufq node not applicable @@ -330,20 +328,15 @@ .It kern.vnode struct vnode no .El .Bl -tag -width 123456 -.\.It Li kern.arandom -.\ XXX: Undocumented. +.It Li kern.arandom +This variable picks a random number each time it is queried. +The used random number generator +.Pq Tn RNG +is based on +.Xr arc4random 3 . .It Li kern.argmax ( KERN_ARGMAX ) The maximum bytes of argument to .Xr execve 2 . -.\ XXX: Is kern.autonicetime still available? -.It Li kern.autonicetime ( KERN_AUTONICETIME ) -The number of seconds of CPU-time a non-root process may accumulate before -having its priority lowered from the default to the value of KERN_AUTONICEVAL. -If set to 0, automatic lowering of priority is not performed, and if set to \-1 -all non-root processes are immediately lowered. -.\ XXX: Is kern.autoniceval still available? -.It Li kern.autoniceval ( KERN_AUTONICEVAL ) -The priority assigned for automatically niced processes. .It Li kern.boothowto Flags passed from the boot loader; see .Xr reboot 2
CVS commit: src/share/man
Module Name:src Committed By: jruoho Date: Tue Apr 20 08:27:24 UTC 2010 Modified Files: src/share/man/man4: crypto.4 src/share/man/man7: sysctl.7 Log Message: Document kern.usercrypto and kern.userasymcrypto. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/crypto.4 cvs rdiff -u -r1.44 -r1.45 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/man4/crypto.4 diff -u src/share/man/man4/crypto.4:1.19 src/share/man/man4/crypto.4:1.20 --- src/share/man/man4/crypto.4:1.19 Sun Jan 31 15:05:49 2010 +++ src/share/man/man4/crypto.4 Tue Apr 20 08:27:24 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: crypto.4,v 1.19 2010/01/31 15:05:49 wiz Exp $ +.\ $NetBSD: crypto.4,v 1.20 2010/04/20 08:27:24 jruoho Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -53,7 +53,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\ THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 28, 2010 +.Dd April 20, 2010 .Dt CRYPTO 4 .Os .Sh NAME @@ -94,6 +94,17 @@ then issue .Xr ioctl 2 calls on the descriptor. +User-mode access to +.Pa /dev/crypto +is generally controlled by two +.Xr sysctl 8 +variables, +.Ic kern.usercrypto +and +.Ic kern.userasymcrypto . +See +.Xr sysctl 7 +for additional details. .Pp The .Nm Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.44 src/share/man/man7/sysctl.7:1.45 --- src/share/man/man7/sysctl.7:1.44 Tue Apr 20 07:58:16 2010 +++ src/share/man/man7/sysctl.7 Tue Apr 20 08:27:24 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.44 2010/04/20 07:58:16 jruoho Exp $ +.\ $NetBSD: sysctl.7,v 1.45 2010/04/20 08:27:24 jruoho Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -321,8 +321,8 @@ .It kern.timex struct no .It kern.tkstat node not applicable .It kern.urandom integer no -.\.It kern.usercrypto integer yes -.\ It kern.userasymcrypto integer yes +.It kern.usercrypto integer yes +.It kern.userasymcrypto integer yes .It kern.veriexec node not applicable .It kern.version string no .It kern.vnode struct vnode no @@ -933,10 +933,18 @@ .El .It Li kern.urandom ( KERN_URND ) Random integer value. -.\.It Li kern.usercrypto -.\ XXX: Undocumented. -.\.It Li kern.userasymcrypto -.\ XXX: Undocumented. +.It Li kern.usercrypto +When enabled, allows userland to +.Xr open 2 +the +.Pa /dev/crypto +special device, used by the +.Xr crypto 4 +system. +.It Li kern.userasymcrypto +Enables or disables the use of software asymmetric crypto support in the +.Xr crypto 4 +system. .It Li kern.veriexec Runtime information for .Xr veriexec 8 .
CVS commit: src/share/man
Module Name:src Committed By: jruoho Date: Tue Apr 20 08:37:23 UTC 2010 Modified Files: src/share/man/man4: crypto.4 src/share/man/man7: sysctl.7 Log Message: Document also kern.cryptodevallowsoft. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/crypto.4 cvs rdiff -u -r1.45 -r1.46 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/man4/crypto.4 diff -u src/share/man/man4/crypto.4:1.20 src/share/man/man4/crypto.4:1.21 --- src/share/man/man4/crypto.4:1.20 Tue Apr 20 08:27:24 2010 +++ src/share/man/man4/crypto.4 Tue Apr 20 08:37:22 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: crypto.4,v 1.20 2010/04/20 08:27:24 jruoho Exp $ +.\ $NetBSD: crypto.4,v 1.21 2010/04/20 08:37:22 jruoho Exp $ .\ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -96,12 +96,13 @@ calls on the descriptor. User-mode access to .Pa /dev/crypto -is generally controlled by two +is generally controlled by three .Xr sysctl 8 variables, -.Ic kern.usercrypto +.Ic kern.usercrypto , +.Ic kern.userasymcrypto , and -.Ic kern.userasymcrypto . +.Ic kern.cryptodevallowsoft . See .Xr sysctl 7 for additional details. Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.45 src/share/man/man7/sysctl.7:1.46 --- src/share/man/man7/sysctl.7:1.45 Tue Apr 20 08:27:24 2010 +++ src/share/man/man7/sysctl.7 Tue Apr 20 08:37:23 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.45 2010/04/20 08:27:24 jruoho Exp $ +.\ $NetBSD: sysctl.7,v 1.46 2010/04/20 08:37:23 jruoho Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -250,7 +250,7 @@ .It kern.coredump node not applicable .It kern.cp_id struct no .It kern.cp_time uint64_t[\|] no -.\.It kern.cryptodevallowsoft integer yes +.It kern.cryptodevallowsoft integer yes .It kern.defcorename string yes .It kern.detachall integer yes .It kern.domainname string yes @@ -406,8 +406,21 @@ appropriate space is given for one data set for each CPU. Data for a specific CPU can also be obtained by adding the number of the CPU at the end of the MIB, enlarging it by one. -.\.It Li kern.cryptodevallowsoft -.\ XXX: Undocumented. +.It Li kern.cryptodevallowsoft +This variable controls userland access to hardware versus software transforms +in the +.Xr crypto 4 +system. +The available values are as follows: +.Bl -tag -width 0 -offset indent +.It Dv 0 +Always force userlevel requests to use software transforms. +.It Dv = 0 +If present, use hardware and grant userlevel requests for +non-accelerated transforms (handling the latter in software). +.It Dv 0 +Allow user requests only for transforms which are hardware-accelerated. +.El .It Li kern.defcorename ( KERN_DEFCORENAME ) Default template for the name of core dump files (see also .Li proc.pid.corename
CVS commit: src/share/man/man5
Module Name:src Committed By: wiz Date: Tue Apr 20 12:09:05 UTC 2010 Modified Files: src/share/man/man5: rc.conf.5 Log Message: Fix xref. To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.142 src/share/man/man5/rc.conf.5:1.143 --- src/share/man/man5/rc.conf.5:1.142 Mon Apr 19 12:59:36 2010 +++ src/share/man/man5/rc.conf.5 Tue Apr 20 12:09:05 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rc.conf.5,v 1.142 2010/04/19 12:59:36 jruoho Exp $ +.\ $NetBSD: rc.conf.5,v 1.143 2010/04/20 12:09:05 wiz Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -412,7 +412,7 @@ .It Sy quota Boolean value. Checks and enables quotas by running -.Xr quotacheck 1 +.Xr quotacheck 8 and .Xr quotaon 8 . .It Sy raidframe
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Tue Apr 20 13:03:33 UTC 2010 Modified Files: src/share/man/man7: sysctl.7 Log Message: Make HTML-ready. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 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.46 src/share/man/man7/sysctl.7:1.47 --- src/share/man/man7/sysctl.7:1.46 Tue Apr 20 08:37:23 2010 +++ src/share/man/man7/sysctl.7 Tue Apr 20 13:03:33 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.7,v 1.46 2010/04/20 08:37:23 jruoho Exp $ +.\ $NetBSD: sysctl.7,v 1.47 2010/04/20 13:03:33 wiz Exp $ .\ .\ Copyright (c) 1993 .\ The Regents of the University of California. All rights reserved. @@ -412,13 +412,13 @@ .Xr crypto 4 system. The available values are as follows: -.Bl -tag -width 0 -offset indent -.It Dv 0 +.Bl -tag -width XX0 -offset indent +.It Dv \*[Lt] 0 Always force userlevel requests to use software transforms. .It Dv = 0 If present, use hardware and grant userlevel requests for non-accelerated transforms (handling the latter in software). -.It Dv 0 +.It Dv \*[Gt] 0 Allow user requests only for transforms which are hardware-accelerated. .El .It Li kern.defcorename ( KERN_DEFCORENAME )
CVS commit: src/sys/net
Module Name:src
Committed By: jmcneill
Date: Tue Apr 20 14:32:03 UTC 2010
Modified Files:
src/sys/net: if_sppp.h if_spppsubr.c
Log Message:
COMPAT_50 support for SPPP[GS]ETIDLETO and SPPP[GS]ETKEEPALIVE, ok martin@
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/net/if_sppp.h
cvs rdiff -u -r1.119 -r1.120 src/sys/net/if_spppsubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_sppp.h
diff -u src/sys/net/if_sppp.h:1.26 src/sys/net/if_sppp.h:1.27
--- src/sys/net/if_sppp.h:1.26 Mon Apr 28 20:24:09 2008
+++ src/sys/net/if_sppp.h Tue Apr 20 14:32:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sppp.h,v 1.26 2008/04/28 20:24:09 martin Exp $ */
+/* $NetBSD: if_sppp.h,v 1.27 2010/04/20 14:32:03 jmcneill Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -101,8 +101,16 @@
* disconnect, 0 to disable idle-timeout */
};
+struct spppidletimeout50 {
+ char ifname[IFNAMSIZ]; /* pppoe interface name */
+ uint32_t idle_seconds; /* number of seconds idle before
+ * disconnect, 0 to disable idle-timeout */
+};
+
#define SPPPGETIDLETO _IOWR('i', 125, struct spppidletimeout)
#define SPPPSETIDLETO _IOW('i', 126, struct spppidletimeout)
+#define __SPPPGETIDLETO50 _IOWR('i', 125, struct spppidletimeout50)
+#define __SPPPSETIDLETO50 _IOW('i', 126, struct spppidletimeout50)
struct spppauthfailurestats {
char ifname[IFNAMSIZ]; /* pppoe interface name */
@@ -141,8 +149,16 @@
time_t max_noreceive; /* (sec.) grace period before we start
sending LCP echo requests. */
};
+struct spppkeepalivesettings50 {
+ char ifname[IFNAMSIZ]; /* pppoe interface name */
+ u_int maxalive; /* number of LCP echo req. w/o reply */
+ uint32_t max_noreceive; /* (sec.) grace period before we start
+ sending LCP echo requests. */
+};
#define SPPPSETKEEPALIVE _IOW('i', 132, struct spppkeepalivesettings)
#define SPPPGETKEEPALIVE _IOWR('i', 133, struct spppkeepalivesettings)
+#define __SPPPSETKEEPALIVE50 _IOW('i', 132, struct spppkeepalivesettings50)
+#define __SPPPGETKEEPALIVE50 _IOWR('i', 133, struct spppkeepalivesettings50)
/* 134 already used! */
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.119 src/sys/net/if_spppsubr.c:1.120
--- src/sys/net/if_spppsubr.c:1.119 Sun Feb 28 15:52:17 2010
+++ src/sys/net/if_spppsubr.c Tue Apr 20 14:32:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.119 2010/02/28 15:52:17 snj Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.120 2010/04/20 14:32:03 jmcneill Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,12 +41,17 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_spppsubr.c,v 1.119 2010/02/28 15:52:17 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_spppsubr.c,v 1.120 2010/04/20 14:32:03 jmcneill Exp $);
+#if defined(_KERNEL_OPT)
#include opt_inet.h
#include opt_ipx.h
#include opt_iso.h
#include opt_pfil_hooks.h
+#include opt_modular.h
+#include opt_compat_netbsd.h
+#endif
+
#include sys/param.h
#include sys/proc.h
@@ -1095,6 +1100,10 @@
case SPPPSETAUTHFAILURE:
case SPPPSETDNSOPTS:
case SPPPSETKEEPALIVE:
+#if defined(COMPAT_50) || defined(MODULAR)
+ case __SPPPSETIDLETO50:
+ case __SPPPSETKEEPALIVE50:
+#endif /* COMPAT_50 || MODULAR */
error = kauth_authorize_network(l-l_cred,
KAUTH_NETWORK_INTERFACE,
KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, (void *)cmd,
@@ -1122,6 +1131,10 @@
case SPPPGETDNSOPTS:
case SPPPGETDNSADDRS:
case SPPPGETKEEPALIVE:
+#if defined(COMPAT_50) || defined(MODULAR)
+ case __SPPPGETIDLETO50:
+ case __SPPPGETKEEPALIVE50:
+#endif /* COMPAT_50 || MODULAR */
error = sppp_params(sp, cmd, data);
break;
@@ -5327,6 +5340,36 @@
sp-pp_max_noreceive = settings-max_noreceive;
}
break;
+#if defined(COMPAT_50) || defined(MODULAR)
+ case __SPPPGETIDLETO50:
+ {
+ struct spppidletimeout50 *to = (struct spppidletimeout50 *)data;
+ to-idle_seconds = (uint32_t)sp-pp_idle_timeout;
+ }
+ break;
+ case __SPPPSETIDLETO50:
+ {
+ struct spppidletimeout50 *to = (struct spppidletimeout50 *)data;
+ sp-pp_idle_timeout = (time_t)to-idle_seconds;
+ }
+ break;
+ case __SPPPGETKEEPALIVE50:
+ {
+ struct spppkeepalivesettings50 *settings =
+ (struct spppkeepalivesettings50*)data;
+ settings-maxalive = sp-pp_maxalive;
+ settings-max_noreceive = (uint32_t)sp-pp_max_noreceive;
+ }
+ break;
+ case __SPPPSETKEEPALIVE50:
+ {
+ struct spppkeepalivesettings50 *settings =
+ (struct spppkeepalivesettings50*)data;
+ sp-pp_maxalive = settings-maxalive;
+ sp-pp_max_noreceive = (time_t)settings-max_noreceive;
+ }
+ break;
+#endif /* COMPAT_50 || MODULAR */
default:
return (EINVAL);
}
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: jym Date: Tue Apr 20 15:42:21 UTC 2010 Modified Files: src/sys/arch/amd64/amd64: mptramp.S Log Message: Enable the NX bit feature early in the MP trampoline code (do not rely on cpu_init_msrs() to do it). Having NX bit set on a page will raise a #GP on fetch if NXE is not enabled, which can happen early when structures (like idlelwp) are allocated with just rw- rights. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amd64/amd64/mptramp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/mptramp.S diff -u src/sys/arch/amd64/amd64/mptramp.S:1.11 src/sys/arch/amd64/amd64/mptramp.S:1.12 --- src/sys/arch/amd64/amd64/mptramp.S:1.11 Sun Apr 18 23:47:50 2010 +++ src/sys/arch/amd64/amd64/mptramp.S Tue Apr 20 15:42:21 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mptramp.S,v 1.11 2010/04/18 23:47:50 jym Exp $ */ +/* $NetBSD: mptramp.S,v 1.12 2010/04/20 15:42:21 jym Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -216,6 +216,18 @@ _C_LABEL(cpu_spinup_trampoline_end): #end of code copied to MP_TRAMPOLINE + /* + * If EFER_NXE is not enabled, fetching a page with a NX bit set + * will raise a #GP. Avoid that by setting the NXE feature now. + */ + movl _C_LABEL(cpu_feature)+2*4,%eax /* cpu_feature[2] */ + andl $CPUID_NOX,%eax + jz 1f + movl $MSR_EFER,%ecx + rdmsr + orl $EFER_NXE,%eax /* enable No-Execute feature */ + wrmsr + 1: /* Don't touch lapic until BP has done init sequence. */ movq _C_LABEL(cpu_starting),%rdi @@ -223,7 +235,6 @@ testq %rdi, %rdi jz 1b -1: movq CPU_INFO_IDLELWP(%rdi),%rsi movq L_PCB(%rsi),%rsi
CVS commit: src/sys/kern
Module Name:src
Committed By: rmind
Date: Tue Apr 20 16:49:49 UTC 2010
Modified Files:
src/sys/kern: kern_synch.c
Log Message:
sched_pstats: fix previous, exclude system/softintr threads from loadavg.
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/sys/kern/kern_synch.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/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.281 src/sys/kern/kern_synch.c:1.282
--- src/sys/kern/kern_synch.c:1.281 Fri Apr 16 03:21:49 2010
+++ src/sys/kern/kern_synch.c Tue Apr 20 16:49:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.281 2010/04/16 03:21:49 rmind Exp $ */
+/* $NetBSD: kern_synch.c,v 1.282 2010/04/20 16:49:48 rmind Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_synch.c,v 1.281 2010/04/16 03:21:49 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_synch.c,v 1.282 2010/04/20 16:49:48 rmind Exp $);
#include opt_kstack.h
#include opt_perfctrs.h
@@ -1198,20 +1198,10 @@
runtm += l-l_rtime.sec;
l-l_swtime++;
sched_lwp_stats(l);
- lwp_unlock(l);
-
- l-l_pctcpu = (l-l_pctcpu * ccpu) FSHIFT;
- if (l-l_slptime != 0)
-continue;
-
- lpctcpu = l-l_pctcpu;
- lcpticks = atomic_swap_uint(l-l_cpticks, 0);
- lpctcpu += ((FSCALE - ccpu) *
- (lcpticks * FSCALE / clkhz)) FSHIFT;
- l-l_pctcpu = lpctcpu;
/* For load average calculation. */
- if (__predict_false(lavg_count == 0)) {
+ if (__predict_false(lavg_count == 0)
+ (l-l_flag (LW_SINTR | LW_SYSTEM)) == 0) {
switch (l-l_stat) {
case LSSLEEP:
if (l-l_slptime 1) {
@@ -1223,6 +1213,17 @@
nrun++;
}
}
+ lwp_unlock(l);
+
+ l-l_pctcpu = (l-l_pctcpu * ccpu) FSHIFT;
+ if (l-l_slptime != 0)
+continue;
+
+ lpctcpu = l-l_pctcpu;
+ lcpticks = atomic_swap_uint(l-l_cpticks, 0);
+ lpctcpu += ((FSCALE - ccpu) *
+ (lcpticks * FSCALE / clkhz)) FSHIFT;
+ l-l_pctcpu = lpctcpu;
}
/* Calculating p_pctcpu only for ps(1) */
p-p_pctcpu = (p-p_pctcpu * ccpu) FSHIFT;
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Tue Apr 20 17:18:08 UTC 2010
Modified Files:
src/usr.bin/make: main.c
Log Message:
On some systems realpath will prefix make with cwd, so make sure
we can stat(2) the value for .MAKE
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/usr.bin/make/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/make/main.c
diff -u src/usr.bin/make/main.c:1.178 src/usr.bin/make/main.c:1.179
--- src/usr.bin/make/main.c:1.178 Wed Apr 14 16:16:17 2010
+++ src/usr.bin/make/main.c Tue Apr 20 17:18:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $ */
+/* $NetBSD: main.c,v 1.179 2010/04/20 17:18:08 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.179 2010/04/20 17:18:08 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $);
+__RCSID($NetBSD: main.c,v 1.179 2010/04/20 17:18:08 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -899,7 +899,7 @@
p1 = argv[0];
} else {
p1 = realpath(argv[0], mdpath);
- if (!p1 || *p1 != '/') {
+ if (!p1 || *p1 != '/' || stat(p1, sb) 0) {
p1 = argv[0]; /* realpath failed */
}
}
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Tue Apr 20 17:48:16 UTC 2010
Modified Files:
src/usr.bin/make: var.c
Log Message:
Behavior of realpath() appears to vary.
To ensure consistent results, use stat(2) as a final check for success.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.156 src/usr.bin/make/var.c:1.157
--- src/usr.bin/make/var.c:1.156 Thu Apr 15 03:48:39 2010
+++ src/usr.bin/make/var.c Tue Apr 20 17:48:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.156 2010/04/15 03:48:39 sjg Exp $ */
+/* $NetBSD: var.c,v 1.157 2010/04/20 17:48:16 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.156 2010/04/15 03:48:39 sjg Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.157 2010/04/20 17:48:16 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: var.c,v 1.156 2010/04/15 03:48:39 sjg Exp $);
+__RCSID($NetBSD: var.c,v 1.157 2010/04/20 17:48:16 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -123,6 +123,7 @@
* XXX: There's a lot of duplication in these functions.
*/
+#includesys/stat.h
#ifndef NO_REGEX
#includesys/types.h
#includeregex.h
@@ -1870,6 +1871,7 @@
char *word, Boolean addSpace, Buffer *buf,
void *patternp __unused)
{
+ struct stat st;
char rbuf[MAXPATHLEN];
char *rp;
@@ -1878,7 +1880,7 @@
}
addSpace = TRUE;
rp = realpath(word, rbuf);
- if (rp *rp == '/')
+ if (rp *rp == '/' stat(rp, st) == 0)
word = rp;
Buf_AddBytes(buf, strlen(word), word);
CVS commit: src/external/bsd/mdocml/dist
Module Name:src Committed By: joerg Date: Tue Apr 20 18:06:04 UTC 2010 Update of /cvsroot/src/external/bsd/mdocml/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3480 Log Message: mdocml-1.9.23: - Smaller bug fixes - Relax some constraints that don't deal well with the real world usage Status: Vendor Tag: KRISTAPS Release Tags: mdocml-1-9-23 U src/external/bsd/mdocml/dist/mdoc_macro.c U src/external/bsd/mdocml/dist/config.h.pre U src/external/bsd/mdocml/dist/test-strlcpy.c U src/external/bsd/mdocml/dist/test-strlcat.c U src/external/bsd/mdocml/dist/external.png.uu U src/external/bsd/mdocml/dist/chars.in U src/external/bsd/mdocml/dist/vol.in U src/external/bsd/mdocml/dist/st.in U src/external/bsd/mdocml/dist/msec.in U src/external/bsd/mdocml/dist/lib.in U src/external/bsd/mdocml/dist/att.in U src/external/bsd/mdocml/dist/arch.in U src/external/bsd/mdocml/dist/style.css U src/external/bsd/mdocml/dist/man.3 U src/external/bsd/mdocml/dist/man.7 U src/external/bsd/mdocml/dist/mandoc_char.7 U src/external/bsd/mdocml/dist/manuals.7 U src/external/bsd/mdocml/dist/mdoc.7 U src/external/bsd/mdocml/dist/mdoc.3 U src/external/bsd/mdocml/dist/mandoc.1 U src/external/bsd/mdocml/dist/Makefile U src/external/bsd/mdocml/dist/main.h U src/external/bsd/mdocml/dist/out.h U src/external/bsd/mdocml/dist/chars.h U src/external/bsd/mdocml/dist/html.h U src/external/bsd/mdocml/dist/libmandoc.h U src/external/bsd/mdocml/dist/term.h U src/external/bsd/mdocml/dist/libman.h U src/external/bsd/mdocml/dist/man.h U src/external/bsd/mdocml/dist/libmdoc.h U src/external/bsd/mdocml/dist/mdoc.h U src/external/bsd/mdocml/dist/man_argv.c U src/external/bsd/mdocml/dist/mandoc.c U src/external/bsd/mdocml/dist/man_action.c U src/external/bsd/mdocml/dist/man_validate.c U src/external/bsd/mdocml/dist/man_hash.c U src/external/bsd/mdocml/dist/man.c U src/external/bsd/mdocml/dist/man_macro.c U src/external/bsd/mdocml/dist/out.c U src/external/bsd/mdocml/dist/man_html.c U src/external/bsd/mdocml/dist/mdoc_html.c U src/external/bsd/mdocml/dist/html.c U src/external/bsd/mdocml/dist/man_term.c U src/external/bsd/mdocml/dist/compat.c U src/external/bsd/mdocml/dist/tree.c U src/external/bsd/mdocml/dist/term.c U src/external/bsd/mdocml/dist/chars.c U src/external/bsd/mdocml/dist/main.c U src/external/bsd/mdocml/dist/mdoc_term.c U src/external/bsd/mdocml/dist/st.c U src/external/bsd/mdocml/dist/msec.c U src/external/bsd/mdocml/dist/vol.c U src/external/bsd/mdocml/dist/arch.c U src/external/bsd/mdocml/dist/att.c U src/external/bsd/mdocml/dist/lib.c C src/external/bsd/mdocml/dist/mdoc_action.c U src/external/bsd/mdocml/dist/mdoc_validate.c U src/external/bsd/mdocml/dist/mdoc_argv.c U src/external/bsd/mdocml/dist/mdoc_strings.c U src/external/bsd/mdocml/dist/mdoc_hash.c U src/external/bsd/mdocml/dist/mdoc.c U src/external/bsd/mdocml/dist/config.h.post 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jKRISTAPS:yesterday -jKRISTAPS src/external/bsd/mdocml/dist
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: joerg
Date: Tue Apr 20 18:07:52 UTC 2010
Modified Files:
src/external/bsd/mdocml/dist: mdoc_action.c
Log Message:
Merge for mdocml-1.9.23.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/mdoc_action.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/mdocml/dist/mdoc_action.c
diff -u src/external/bsd/mdocml/dist/mdoc_action.c:1.6 src/external/bsd/mdocml/dist/mdoc_action.c:1.7
--- src/external/bsd/mdocml/dist/mdoc_action.c:1.6 Mon Apr 5 14:22:59 2010
+++ src/external/bsd/mdocml/dist/mdoc_action.c Tue Apr 20 18:07:52 2010
@@ -1,4 +1,4 @@
-/* $Vendor-Id: mdoc_action.c,v 1.51 2010/03/31 07:13:53 kristaps Exp $ */
+/* $Vendor-Id: mdoc_action.c,v 1.53 2010/04/06 11:33:00 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons krist...@kth.se
*
@@ -420,7 +420,11 @@
if ( ! concat(m, buf, n-child, BUFSIZ))
return(0);
sec = mdoc_atosec(buf);
- if (SEC_CUSTOM != sec)
+ /*
+ * The first section should always make us move into a non-new
+ * state.
+ */
+ if (SEC_NONE == m-lastnamed || SEC_CUSTOM != sec)
m-lastnamed = sec;
/* Some sections only live in certain manual sections. */
@@ -725,7 +729,7 @@
nn-string = NULL;
nnp = nn;
nn = nn-next;
- mdoc_node_free(nnp);
+ mdoc_node_delete(NULL, nnp);
}
n-nchild = 0;
@@ -850,29 +854,10 @@
static int
post_prol(POST_ARGS)
{
- struct mdoc_node *np;
-
- if (n-parent-child == n)
- n-parent-child = n-prev;
- if (n-prev)
- n-prev-next = NULL;
-
- np = n;
- assert(NULL == n-next);
-
- if (n-prev) {
- m-last = n-prev;
- m-next = MDOC_NEXT_SIBLING;
- } else {
- m-last = n-parent;
- m-next = MDOC_NEXT_CHILD;
- }
-
- mdoc_node_freelist(np);
+ mdoc_node_delete(m, n);
if (m-meta.title m-meta.date m-meta.os)
m-flags |= MDOC_PBODY;
-
return(1);
}
CVS commit: src/external/bsd/mdocml
Module Name:src
Committed By: joerg
Date: Tue Apr 20 18:08:08 UTC 2010
Modified Files:
src/external/bsd/mdocml: Makefile.inc
Log Message:
Update for mdocml-1.9.23.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/Makefile.inc
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/mdocml/Makefile.inc
diff -u src/external/bsd/mdocml/Makefile.inc:1.6 src/external/bsd/mdocml/Makefile.inc:1.7
--- src/external/bsd/mdocml/Makefile.inc:1.6 Mon Apr 5 14:23:56 2010
+++ src/external/bsd/mdocml/Makefile.inc Tue Apr 20 18:08:08 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.6 2010/04/05 14:23:56 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2010/04/20 18:08:08 joerg Exp $
.include bsd.own.mk
-VERSION= 1.9.22
+VERSION= 1.9.23
CPPFLAGS+= -DVERSION=\${VERSION}\
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: plunky Date: Tue Apr 20 21:25:25 UTC 2010 Modified Files: src/sbin/ifconfig: parse.c Log Message: C99 says that offsetof() expands to a constant expresssion, so we can't use variable array index in there. Do the calculation manually for C99 compilers (pcc) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sbin/ifconfig/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/sbin/ifconfig/parse.c diff -u src/sbin/ifconfig/parse.c:1.14 src/sbin/ifconfig/parse.c:1.15 --- src/sbin/ifconfig/parse.c:1.14 Tue Jul 28 18:21:06 2009 +++ src/sbin/ifconfig/parse.c Tue Apr 20 21:25:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.14 2009/07/28 18:21:06 dyoung Exp $ */ +/* $NetBSD: parse.c,v 1.15 2010/04/20 21:25:25 plunky Exp $ */ /*- * Copyright (c) 2008 David Young. All rights reserved. @@ -27,7 +27,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: parse.c,v 1.14 2009/07/28 18:21:06 dyoung Exp $); +__RCSID($NetBSD: parse.c,v 1.15 2010/04/20 21:25:25 plunky Exp $); #endif /* not lint */ #include err.h @@ -252,8 +252,8 @@ return -1; dbg_warnx(%s.%d, __func__, __LINE__); sdl-sdl_data[i++] = octet; - sdl-sdl_len = - offsetof(struct sockaddr_dl, sdl_data[i]); + sdl-sdl_len = offsetof(struct sockaddr_dl, sdl_data) + + i * sizeof(sdl-sdl_data[0]); sdl-sdl_alen = i; return 0; }
CVS commit: [matt-nb5-mips64] src/sys/nfs
Module Name:src
Committed By: matt
Date: Tue Apr 20 21:29:06 UTC 2010
Modified Files:
src/sys/nfs [matt-nb5-mips64]: nfs_serv.c nfs_socket.c
Log Message:
Pullin some NFS fixes from netbsd-5.
To generate a diff of this commit:
cvs rdiff -u -r1.138.16.1 -r1.138.16.1.4.1 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.173.4.3 -r1.173.4.3.4.1 src/sys/nfs/nfs_socket.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/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.138.16.1 src/sys/nfs/nfs_serv.c:1.138.16.1.4.1
--- src/sys/nfs/nfs_serv.c:1.138.16.1 Mon Apr 13 21:06:50 2009
+++ src/sys/nfs/nfs_serv.c Tue Apr 20 21:29:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_serv.c,v 1.138.16.1 2009/04/13 21:06:50 snj Exp $ */
+/* $NetBSD: nfs_serv.c,v 1.138.16.1.4.1 2010/04/20 21:29:06 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.138.16.1 2009/04/13 21:06:50 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_serv.c,v 1.138.16.1.4.1 2010/04/20 21:29:06 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1859,7 +1859,7 @@
saved_uid = kauth_cred_geteuid(cred);
fromnd.ni_cnd.cn_cred = cred;
fromnd.ni_cnd.cn_nameiop = DELETE;
- fromnd.ni_cnd.cn_flags = LOCKPARENT | SAVESTART;
+ fromnd.ni_cnd.cn_flags = LOCKPARENT | SAVESTART | INRENAME;
error = nfs_namei(fromnd, fnsfh, len, slp, nam, md,
dpos, fdirp, lwp, (nfsd-nd_flag ND_KERBAUTH), false);
if (fdirp v3) {
@@ -1930,7 +1930,8 @@
kauth_cred_seteuid(cred, saved_uid);
tond.ni_cnd.cn_cred = cred;
tond.ni_cnd.cn_nameiop = RENAME;
- tond.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART;
+ tond.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | NOCACHE |
+ SAVESTART | INRENAME;
error = nfs_namei(tond, tnsfh, len2, slp, nam, md,
dpos, tdirp, lwp, (nfsd-nd_flag ND_KERBAUTH), false);
if (tdirp v3) {
Index: src/sys/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.173.4.3 src/sys/nfs/nfs_socket.c:1.173.4.3.4.1
--- src/sys/nfs/nfs_socket.c:1.173.4.3 Fri Feb 6 01:48:58 2009
+++ src/sys/nfs/nfs_socket.c Tue Apr 20 21:29:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_socket.c,v 1.173.4.3 2009/02/06 01:48:58 snj Exp $ */
+/* $NetBSD: nfs_socket.c,v 1.173.4.3.4.1 2010/04/20 21:29:06 matt Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.173.4.3 2009/02/06 01:48:58 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_socket.c,v 1.173.4.3.4.1 2010/04/20 21:29:06 matt Exp $);
#include fs_nfs.h
#include opt_nfs.h
@@ -1157,7 +1157,7 @@
/*
* Wait for the reply from our send or the timer's.
*/
- if (!error || error == EPIPE)
+ if (!error || error == EPIPE || error == EWOULDBLOCK)
error = nfs_reply(rep, lwp);
/*
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src Committed By: matt Date: Tue Apr 20 22:03:27 UTC 2010 Modified Files: src/sys/dev/pci [matt-nb5-mips64]: pcidevs Log Message: sync with netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.962.4.1.4.2 -r1.962.4.1.4.3 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.962.4.1.4.2 src/sys/dev/pci/pcidevs:1.962.4.1.4.3 --- src/sys/dev/pci/pcidevs:1.962.4.1.4.2 Wed Apr 7 18:32:20 2010 +++ src/sys/dev/pci/pcidevs Tue Apr 20 22:03:26 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.962.4.1.4.2 2010/04/07 18:32:20 cliff Exp $ +$NetBSD: pcidevs,v 1.962.4.1.4.3 2010/04/20 22:03:26 matt Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1060,6 +1060,7 @@ product ASUSTEK HFCPCI 0x0675 ISDN /* Attansic Technology Corp. */ +product ATTANSIC ETHERNET_L1E 0x1026 L1E Gigabit Ethernet Adapter product ATTANSIC ETHERNET_GIGA 0x1048 L1 Gigabit Ethernet Adapter product ATTANSIC ETHERNET_100 0x2048 L2 100 Mbit Ethernet Adapter @@ -1410,6 +1411,9 @@ product BROADCOM BCM5752 0x1600 BCM5752 10/100/1000 Ethernet product BROADCOM BCM5752M 0x1601 BCM5752M 10/100/1000 Ethernet product BROADCOM BCM5709 0x1639 BCM5709 NetXtreme II 1000baseT Ethernet +product BROADCOM BCM5709S 0x163a BCM5709 NetXtreme II 1000baseSX Ethernet +product BROADCOM BCM5716 0x163b BCM5716 NetXtreme II 1000baseT Ethernet +product BROADCOM BCM5716S 0x163c BCM5716 NetXtreme II 1000baseSX Ethernet product BROADCOM BCM5700 0x1644 BCM5700 10/100/1000 Ethernet product BROADCOM BCM5701 0x1645 BCM5701 10/100/1000 Ethernet product BROADCOM BCM5702 0x1646 BCM5702 10/100/1000 Ethernet @@ -1815,6 +1819,7 @@ /* ENE Technology products */ product ENE MCR510 0x0510 MCR510 PCI Memory Card Reader Controller +product ENE CB712 0x0550 CB712/714/810 PCI SD Card Reader Controller product ENE CB1211 0x1211 CB1211 CardBus Controller product ENE CB1225 0x1225 CB1225 CardBus Controller product ENE CB1410 0x1410 CB1410 CardBus Controller @@ -2066,6 +2071,8 @@ product IBM GXT6500P 0x021b GXT-6500P Graphics Adapter product IBM GXT4500P 0x021c GXT-4500P Graphics Adapter product IBM GXT135P 0x0233 GXT-135P Graphics Adapter +product IBM 4810_BSP 0x0295 4810 BSP +product IBM 4810_SCC 0x0297 4810 SCC product IBM SERVERAID8K 0x9580 ServeRAID 8k product IBM MPIC2 0x MPIC-II @@ -2195,16 +2202,18 @@ product INTEL PRO_100_VE_6 0x1092 PRO/100 VE Network Controller product INTEL PRO_100_VE_8 0x1093 PRO/100 VE Network Controller product INTEL PRO_100_VE_7 0x1094 PRO/100 VE Network Controller with 82562G PHY -product INTEL 80K3LAN_CPR_DPT 0x1096 i80003 dual 1000baseT Ethernet -product INTEL 80K3LAN_FIB_DPT 0x1097 i80003 dual 1000baseX Ethernet -product INTEL 80K3LAN_SDS_DPT 0x1098 i80003 dual Gigabit Ethernet (SERDES) +product INTEL 80K3LAN_CPR_DPT 0x1096 i80003 dual 1000baseT Ethernet +product INTEL 80K3LAN_FIB_DPT 0x1097 i80003 dual 1000baseX Ethernet +product INTEL 80K3LAN_SDS_DPT 0x1098 i80003 dual Gigabit Ethernet (SERDES) product INTEL 82546GB_QUAD_COPPER 0x1099 i82546GB quad-port Gigabit Ethernet product INTEL 82573L 0x109a i82573L Gigabit Ethernet product INTEL 82571EB_QUAD_COPPER 0x10a4 i82571EB quad-1000baseT Ethernet +product INTEL 82575EB_COPPER 0x10a7 i82575EB dual-1000baseT Ethernet +product INTEL 82575EB_FIBER_SERDES 0x10a9 i82575EB dual-1000baseX Ethernet (SERDES) product INTEL 82546GB_QUAD_COPPER_KSP3 0x10b5 i82546GB quad-port Gigabit Ethernet (KSP3) product INTEL 82572EI 0x10b9 i82572EI 1000baseT Ethernet -product INTEL 80K3LAN_CPR_SPT 0x10ba i80003 1000baseT Ethernet -product INTEL 80K3LAN_SDS_SPT 0x10bb i80003 Gigabit Ethernet (SERDES) +product INTEL 80K3LAN_CPR_SPT 0x10ba i80003 1000baseT Ethernet +product INTEL 80K3LAN_SDS_SPT 0x10bb i80003 Gigabit Ethernet (SERDES) product INTEL 82571GB_QUAD_COPPER 0x10bc i82571GB quad 1000baseT Ethernet product INTEL 82801I_IGP_AMT 0x10bd 82801I (AMT) LAN Controller product INTEL 82801I_IGP_M 0x10bf 82801I mobile LAN controller @@ -2214,9 +2223,20 @@ product INTEL 82801H_IFE_GT 0x10c4 i82801H IFE (GT) LAN Controller product INTEL 82801H_IFE_G 0x10c5 i82801H IFE (G) LAN Controller product INTEL 82801H_IGP_M_V 0x10cb i82801H IGP (MV) LAN Controller -product INTEL 82567V 0x10ce i82567V LAN controller +product INTEL 82801J_R_BM_LM 0x10cc i82567LM-2 LAN Controller +product INTEL 82801J_R_BM_LF 0x10cd i82567LF-2 LAN Controller +product INTEL 82801J_R_BM_V 0x10ce i82567V-2 LAN Controller product INTEL 82574L 0x10d3 i82574L 1000baseT Ethernet -product INTEL 82801I_IGP_M_AMT 0x10f5 82801I mobile (AMT) LAN controller +product INTEL 82575GB_QUAD_COPPER 0x10d6 i82575GB quad-1000baseT Ethernet +product INTEL 82801J_D_BM_LM 0x10de i82567LM-3 LAN Controller +product INTEL 82801J_D_BM_LF 0x10df i82567LF-3 LAN Controller +product INTEL 82575GB_QUAD_COPPER_PM 0x10e2 i82575GB
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Tue Apr 20 22:08:13 UTC 2010 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: spl.S Log Message: fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/mips/spl.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/spl.S diff -u src/sys/arch/mips/mips/spl.S:1.1.2.4 src/sys/arch/mips/mips/spl.S:1.1.2.5 --- src/sys/arch/mips/mips/spl.S:1.1.2.4 Sun Mar 21 18:50:45 2010 +++ src/sys/arch/mips/mips/spl.S Tue Apr 20 22:08:13 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.1.2.4 2010/03/21 18:50:45 cliff Exp $ */ +/* $NetBSD: spl.S,v 1.1.2.5 2010/04/20 22:08:13 matt Exp $ */ /*- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include mips/asm.h #include mips/cpuregs.h -RCSID($NetBSD: spl.S,v 1.1.2.4 2010/03/21 18:50:45 cliff Exp $) +RCSID($NetBSD: spl.S,v 1.1.2.5 2010/04/20 22:08:13 matt Exp $) #include assym.h @@ -217,7 +217,7 @@ beq v0, a1, 1f # don't do anything if IPL_HIGH mfc0 v1, MIPS_COP_0_STATUS # fetch status register and a0, v1, MIPS_INT_MASK # select all interrupts - xor a0, v1# clear akk interrupts + xor a0, v1# clear all interrupts DYNAMIC_STATUS_MASK(a0,a2) # machine dependent masking mtc0 a0, MIPS_COP_0_STATUS ## store back COP0_SYNC
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Tue Apr 20 22:08:39 UTC 2010 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c Log Message: Fix formatting. To generate a diff of this commit: cvs rdiff -u -r1.22.16.16 -r1.22.16.17 src/sys/arch/mips/mips/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/bus_dma.c diff -u src/sys/arch/mips/mips/bus_dma.c:1.22.16.16 src/sys/arch/mips/mips/bus_dma.c:1.22.16.17 --- src/sys/arch/mips/mips/bus_dma.c:1.22.16.16 Sat Apr 17 07:34:45 2010 +++ src/sys/arch/mips/mips/bus_dma.c Tue Apr 20 22:08:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.22.16.16 2010/04/17 07:34:45 cliff Exp $ */ +/* $NetBSD: bus_dma.c,v 1.22.16.17 2010/04/20 22:08:39 matt Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.16 2010/04/17 07:34:45 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.17 2010/04/20 22:08:39 matt Exp $); #include sys/param.h #include sys/systm.h @@ -844,9 +844,10 @@ break; case _BUS_DMA_BUFTYPE_MBUF: - m_copyback(cookie-id_origmbuf, offset, len, - (char *)cookie-id_bouncebuf + offset); + m_copyback(cookie-id_origmbuf, offset, len, + (char *)cookie-id_bouncebuf + offset); break; + case _BUS_DMA_BUFTYPE_UIO: _bus_dma_uiomove((char *)cookie-id_bouncebuf + offset, cookie-id_origuio, len, UIO_READ);
CVS commit: src/sys/arch/i386/isa
Module Name:src
Committed By: dyoung
Date: Tue Apr 20 22:37:25 UTC 2010
Modified Files:
src/sys/arch/i386/isa: isapnp_machdep.c
Log Message:
Re-uppercase x86_bus_space_io.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/isa/isapnp_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/isa/isapnp_machdep.c
diff -u src/sys/arch/i386/isa/isapnp_machdep.c:1.14 src/sys/arch/i386/isa/isapnp_machdep.c:1.15
--- src/sys/arch/i386/isa/isapnp_machdep.c:1.14 Mon Apr 19 18:24:26 2010
+++ src/sys/arch/i386/isa/isapnp_machdep.c Tue Apr 20 22:37:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp_machdep.c,v 1.14 2010/04/19 18:24:26 dyoung Exp $ */
+/* $NetBSD: isapnp_machdep.c,v 1.15 2010/04/20 22:37:25 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isapnp_machdep.c,v 1.14 2010/04/19 18:24:26 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: isapnp_machdep.c,v 1.15 2010/04/20 22:37:25 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -67,7 +67,7 @@
{
#ifdef DIAGNOSTIC
- if (!bus_space_is_equal(sc-sc_iot, x86_bus_space_io))
+ if (!bus_space_is_equal(sc-sc_iot, X86_BUS_SPACE_IO))
panic(isapnp_map: bogus bus space tag);
#endif
@@ -100,7 +100,7 @@
#endif
#ifdef DIAGNOSTIC
- if (!bus_space_is_equal(sc-sc_iot, x86_bus_space_io))
+ if (!bus_space_is_equal(sc-sc_iot, X86_BUS_SPACE_IO))
panic(isapnp_map_readport: bogus bus space tag);
#endif
CVS commit: src/external/gpl3/binutils/dist/ld/emulparams
Module Name:src
Committed By: christos
Date: Tue Apr 20 22:47:48 UTC 2010
Modified Files:
src/external/gpl3/binutils/dist/ld/emulparams: elf_i386.sh
Log Message:
XXX: This is a hack, the note inclusion does not belong here, and
it belongs in a separate elf_nbsd.sh, included from elf_i386_nbsd.sh.
The problem is described in:
https://bugzilla.redhat.com/show_bug.cgi?id=492183#c7, namely if
all the sections are not defined in the ld script, it can screw
up. This happens when building /usr/src/usr.sbin.crash with
MKPIE=yes. Thanks to Piotr Meyer for the report and analysis.
We don't need to fix any other archs yet (because crash only works on i386),
but we should. skrll should look into it, please :-)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/dist/ld/emulparams/elf_i386.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/gpl3/binutils/dist/ld/emulparams/elf_i386.sh
diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf_i386.sh:1.2 src/external/gpl3/binutils/dist/ld/emulparams/elf_i386.sh:1.3
--- src/external/gpl3/binutils/dist/ld/emulparams/elf_i386.sh:1.2 Wed Aug 19 03:19:31 2009
+++ src/external/gpl3/binutils/dist/ld/emulparams/elf_i386.sh Tue Apr 20 18:47:48 2010
@@ -12,3 +12,4 @@
GENERATE_PIE_SCRIPT=yes
NO_SMALL_DATA=yes
SEPARATE_GOTPLT=12
+OTHER_SECTIONS=.note.netbsd.ident 0 : { KEEP(*(.note.netbsd.ident)); }
CVS commit: [matt-nb5-mips64] src/sys/dev/mii
Module Name:src Committed By: matt Date: Tue Apr 20 22:55:48 UTC 2010 Modified Files: src/sys/dev/mii [matt-nb5-mips64]: miidevs Log Message: Sync to netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.78.10.1 -r1.78.10.2 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.78.10.1 src/sys/dev/mii/miidevs:1.78.10.2 --- src/sys/dev/mii/miidevs:1.78.10.1 Mon Nov 9 10:11:16 2009 +++ src/sys/dev/mii/miidevs Tue Apr 20 22:55:48 2010 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.78.10.1 2009/11/09 10:11:16 cliff Exp $ +$NetBSD: miidevs,v 1.78.10.2 2010/04/20 22:55:48 matt Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -45,8 +45,14 @@ * which is mangled accordingly to compensate. */ +/* +* Use make -f Makefile.miidevs to regenerate miidevs.h and miidevs_data.h +*/ + oui ALTIMA 0x0010a9 Altima Communications oui AMD0x1a Advanced Micro Devices +oui ATHEROS 0x001374 Atheros +oui ATTANSIC 0x00c82e Attansic Technology oui BROADCOM 0x001018 Broadcom Corporation oui BROADCOM2 0x000af7 Broadcom Corporation oui CICADA 0x0003F1 Cicada Semiconductor @@ -101,6 +107,14 @@ * List of known models. Grouped by oui. */ +/* Atheros PHYs */ +model ATHEROS F1 0x0001 F1 10/100/1000 PHY +model ATHEROS F2 0x0002 F2 10/100 PHY + +/* Attansic PHYs */ +model ATTANSIC L1 0x0001 L1 10/100/1000 PHY +model ATTANSIC L2 0x0002 L2 10/100 PHY + /* Altima Communications PHYs */ /* Don't know the model for ACXXX */ model ALTIMA ACXXX 0x0001 ACXXX 10/100 media interface @@ -128,19 +142,25 @@ model BROADCOM BCM5400 0x0004 BCM5400 1000BASE-T media interface model BROADCOM BCM5401 0x0005 BCM5401 1000BASE-T media interface model BROADCOM BCM5411 0x0007 BCM5411 1000BASE-T media interface +model BROADCOM BCM5462 0x000d BCM5462 1000BASE-T media interface model BROADCOM BCM5421 0x000e BCM5421 1000BASE-T media interface model BROADCOM BCM5752 0x0010 BCM5752 1000BASE-T media interface model BROADCOM BCM5701 0x0011 BCM5701 1000BASE-T media interface model BROADCOM BCM5703 0x0016 BCM5703 1000BASE-T media interface +model BROADCOM BCM5750 0x0018 BCM5750 1000BASE-T media interface model BROADCOM BCM5704 0x0019 BCM5704 1000BASE-T media interface model BROADCOM BCM5705 0x001a BCM5705 1000BASE-T media interface -model BROADCOM BCM5750 0x0018 BCM5750 1000BASE-T media interface +model BROADCOM BCM54K2 0x002e BCM54K2 1000BASE-T media interface model BROADCOM BCM5714 0x0034 BCM5714 1000BASE-T media interface model BROADCOM BCM5780 0x0035 BCM5780 1000BASE-T media interface model BROADCOM BCM5708C 0x0036 BCM5708C 1000BASE-T media interface +model BROADCOM2 BCM5906 0x0004 BCM5906 10/100baseTX media interface model BROADCOM2 BCM5755 0x000c BCM5755 1000BASE-T media interface model BROADCOM2 BCM5754 0x000e BCM5754/5787 1000BASE-T media interface -model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface +model BROADCOM2 BCM5709CAX 0x002c BCM5709CAX 10/100/1000baseT PHY +model BROADCOM2 BCM5722 0x002d BCM5722 1000BASE-T media interface +model BROADCOM2 BCM5709C 0x003c BCM5709 10/100/1000baseT PHY +model xxBROADCOM_ALT1 BCM5906 0x0004 BCM5906 10/100baseTX media interface /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: dyoung
Date: Tue Apr 20 23:39:11 UTC 2010
Modified Files:
src/sys/dev/pci: pccbb.c pccbbvar.h
Log Message:
Change sc_pil_intr_enable from an int to a bool. No functional change
intended.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/dev/pci/pccbb.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/pci/pccbbvar.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/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.198 src/sys/dev/pci/pccbb.c:1.199
--- src/sys/dev/pci/pccbb.c:1.198 Mon Apr 19 18:24:27 2010
+++ src/sys/dev/pci/pccbb.c Tue Apr 20 23:39:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.198 2010/04/19 18:24:27 dyoung Exp $ */
+/* $NetBSD: pccbb.c,v 1.199 2010/04/20 23:39:10 dyoung Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.198 2010/04/19 18:24:27 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.199 2010/04/20 23:39:10 dyoung Exp $);
/*
#define CBB_DEBUG
@@ -639,7 +639,7 @@
/* bus bridge initialization */
pccbb_chipinit(sc);
- sc-sc_pil_intr_enable = 1;
+ sc-sc_pil_intr_enable = true;
{
u_int32_t sockstat;
@@ -3152,7 +3152,7 @@
if (sc-sc_pil_intr_enable)
(void)pccbbintr_function(sc);
- sc-sc_pil_intr_enable = 0;
+ sc-sc_pil_intr_enable = false;
reg = bus_space_read_4(base_memt, base_memh, CB_SOCKET_MASK);
/* Disable interrupts. */
@@ -3207,7 +3207,7 @@
*/
(void)pccbbintr(sc);
- sc-sc_pil_intr_enable = 1;
+ sc-sc_pil_intr_enable = true;
return true;
}
Index: src/sys/dev/pci/pccbbvar.h
diff -u src/sys/dev/pci/pccbbvar.h:1.40 src/sys/dev/pci/pccbbvar.h:1.41
--- src/sys/dev/pci/pccbbvar.h:1.40 Mon Mar 15 20:02:56 2010
+++ src/sys/dev/pci/pccbbvar.h Tue Apr 20 23:39:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbbvar.h,v 1.40 2010/03/15 20:02:56 dyoung Exp $ */
+/* $NetBSD: pccbbvar.h,v 1.41 2010/04/20 23:39:11 dyoung Exp $ */
/*
* Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved.
@@ -135,7 +135,8 @@
/* interrupt handler list on the bridge */
LIST_HEAD(, pccbb_intrhand_list) sc_pil;
- int sc_pil_intr_enable; /* can i call intr handler for child device? */
+ /* can i call intr handler for child device? */
+ bool sc_pil_intr_enable;
};
/*
CVS commit: [matt-nb5-mips64] src/sys/arch
Module Name:src
Committed By: matt
Date: Wed Apr 21 00:36:40 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dev/g2 [matt-nb5-mips64]: g2bus_bus_mem.c
src/sys/arch/dreamcast/include [matt-nb5-mips64]: bus.h
src/sys/arch/hp300/include [matt-nb5-mips64]: cpu.h
src/sys/arch/hppa/hppa [matt-nb5-mips64]: vm_machdep.c
src/sys/arch/powerpc/powerpc [matt-nb5-mips64]: locore_subr.S trap.c
vm_machdep.c
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.18.1 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
cvs rdiff -u -r1.14 -r1.14.18.1 src/sys/arch/dreamcast/include/bus.h
cvs rdiff -u -r1.59 -r1.59.22.1 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.33.6.1 -r1.33.6.1.2.1 src/sys/arch/hppa/hppa/vm_machdep.c
cvs rdiff -u -r1.37.20.1 -r1.37.20.1.2.1 \
src/sys/arch/powerpc/powerpc/locore_subr.S
cvs rdiff -u -r1.128 -r1.128.10.1 src/sys/arch/powerpc/powerpc/trap.c
cvs rdiff -u -r1.74.6.1 -r1.74.6.1.2.1 \
src/sys/arch/powerpc/powerpc/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14.18.1
--- src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: g2bus_bus_mem.c,v 1.14 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: g2bus_bus_mem.c,v 1.14.18.1 2010/04/21 00:36:39 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: g2bus_bus_mem.c,v 1.14 2008/04/28 20:23:16 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: g2bus_bus_mem.c,v 1.14.18.1 2010/04/21 00:36:39 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -53,6 +53,7 @@
int g2bus_bus_mem_map(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *);
void g2bus_bus_mem_unmap(void *, bus_space_handle_t, bus_size_t);
+paddr_t g2bus_bus_mem_mmap(void *, bus_addr_t, off_t, int, int);
uint8_t g2bus_bus_mem_read_1(void *, bus_space_handle_t, bus_size_t);
uint16_t g2bus_bus_mem_read_2(void *, bus_space_handle_t, bus_size_t);
@@ -114,6 +115,7 @@
t-dbs_map = g2bus_bus_mem_map;
t-dbs_unmap = g2bus_bus_mem_unmap;
+ t-dbs_mmap = g2bus_bus_mem_mmap;
t-dbs_r_1 = g2bus_bus_mem_read_1;
t-dbs_r_2 = g2bus_bus_mem_read_2;
@@ -153,6 +155,14 @@
/* Nothing to do. */
}
+paddr_t
+g2bus_bus_mem_mmap(void *v, bus_addr_t addr, off_t offset, int prot, int flags)
+{
+
+ /* XXX not implemented */
+ return -1;
+}
+
/*
* G2 bus cycles must not be interrupted by IRQs or G2 DMA.
* The following paired macros will take the necessary precautions.
Index: src/sys/arch/dreamcast/include/bus.h
diff -u src/sys/arch/dreamcast/include/bus.h:1.14 src/sys/arch/dreamcast/include/bus.h:1.14.18.1
--- src/sys/arch/dreamcast/include/bus.h:1.14 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/dreamcast/include/bus.h Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.14 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: bus.h,v 1.14.18.1 2010/04/21 00:36:39 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -121,6 +121,7 @@
bus_size_t);
int (*dbs_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
+ paddr_t (*dbs_mmap)(void *, bus_addr_t, off_t, int, int);
/* allocation/deallocation */
int (*dbs_alloc)(void *, bus_addr_t, bus_addr_t,
@@ -270,6 +271,8 @@
(*(t)-dbs_unmap)((t)-dbs_cookie, (h), (s))
#define bus_space_subregion(t, h, o, s, hp)\
(*(t)-dbs_subregion)((t)-dbs_cookie, (h), (o), (s), (hp))
+#define bus_space_mmap(t, a, o, p, f)\
+ (*(t)-dbs_mmap)((t)-dbs_cookie, (a), (o), (p), (f))
#endif /* _KERNEL */
Index: src/sys/arch/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.59 src/sys/arch/hp300/include/cpu.h:1.59.22.1
--- src/sys/arch/hp300/include/cpu.h:1.59 Wed Feb 27 18:26:15 2008
+++ src/sys/arch/hp300/include/cpu.h Wed Apr 21 00:36:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.59 2008/02/27 18:26:15 xtraeme Exp $ */
+/* $NetBSD: cpu.h,v 1.59.22.1 2010/04/21 00:36:39 matt Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -159,7 +159,7 @@
* through trap, marking the proc as needing a profiling tick.
*/
#define cpu_need_proftick(l) \
- do { (l)-l_flag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
+ do { (l)-l_pflag |= LP_OWEUPC; aston(); } while (/* CONSTCOND */0)
/*
* Notify the current process (p) that it has a signal pending,
Index: src/sys/arch/hppa/hppa/vm_machdep.c
diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1 src/sys/arch/hppa/hppa/vm_machdep.c:1.33.6.1.2.1
---
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Wed Apr 21 00:54:14 UTC 2010 Modified Files: src/sys/arch/evbmips/conf [matt-nb5-mips64]: std.adm5120 std.alchemy std.atheros std.malta std.meraki Log Message: sync to netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.62.1 src/sys/arch/evbmips/conf/std.adm5120 cvs rdiff -u -r1.3 -r1.3.88.1 src/sys/arch/evbmips/conf/std.alchemy cvs rdiff -u -r1.3 -r1.3.72.1 src/sys/arch/evbmips/conf/std.atheros cvs rdiff -u -r1.5.94.1 -r1.5.94.2 src/sys/arch/evbmips/conf/std.malta cvs rdiff -u -r1.1 -r1.1.78.1 src/sys/arch/evbmips/conf/std.meraki 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/std.adm5120 diff -u src/sys/arch/evbmips/conf/std.adm5120:1.1 src/sys/arch/evbmips/conf/std.adm5120:1.1.62.1 --- src/sys/arch/evbmips/conf/std.adm5120:1.1 Tue Mar 20 08:52:01 2007 +++ src/sys/arch/evbmips/conf/std.adm5120 Wed Apr 21 00:54:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: std.adm5120,v 1.1 2007/03/20 08:52:01 dyoung Exp $ +# $NetBSD: std.adm5120,v 1.1.62.1 2010/04/21 00:54:13 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -16,3 +16,6 @@ include arch/evbmips/conf/files.adm5120 include arch/mips/conf/files.adm5120 + +# Atheros HAL options +include external/isc/atheros_hal/conf/std.ath_hal Index: src/sys/arch/evbmips/conf/std.alchemy diff -u src/sys/arch/evbmips/conf/std.alchemy:1.3 src/sys/arch/evbmips/conf/std.alchemy:1.3.88.1 --- src/sys/arch/evbmips/conf/std.alchemy:1.3 Tue Mar 28 03:43:57 2006 +++ src/sys/arch/evbmips/conf/std.alchemy Wed Apr 21 00:54:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: std.alchemy,v 1.3 2006/03/28 03:43:57 gdamore Exp $ +# $NetBSD: std.alchemy,v 1.3.88.1 2010/04/21 00:54:13 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -15,3 +15,6 @@ include arch/evbmips/conf/files.alchemy include arch/mips/conf/files.alchemy + +# Atheros HAL options +include external/isc/atheros_hal/conf/std.ath_hal Index: src/sys/arch/evbmips/conf/std.atheros diff -u src/sys/arch/evbmips/conf/std.atheros:1.3 src/sys/arch/evbmips/conf/std.atheros:1.3.72.1 --- src/sys/arch/evbmips/conf/std.atheros:1.3 Tue Sep 26 06:37:32 2006 +++ src/sys/arch/evbmips/conf/std.atheros Wed Apr 21 00:54:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: std.atheros,v 1.3 2006/09/26 06:37:32 gdamore Exp $ +# $NetBSD: std.atheros,v 1.3.72.1 2010/04/21 00:54:13 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -13,3 +13,6 @@ include arch/evbmips/conf/files.atheros include arch/mips/conf/files.atheros + +# Atheros HAL options +include external/isc/atheros_hal/conf/std.ath_hal Index: src/sys/arch/evbmips/conf/std.malta diff -u src/sys/arch/evbmips/conf/std.malta:1.5.94.1 src/sys/arch/evbmips/conf/std.malta:1.5.94.2 --- src/sys/arch/evbmips/conf/std.malta:1.5.94.1 Sun Aug 23 03:43:33 2009 +++ src/sys/arch/evbmips/conf/std.malta Wed Apr 21 00:54:13 2010 @@ -1,4 +1,4 @@ -# $NetBSD: std.malta,v 1.5.94.1 2009/08/23 03:43:33 matt Exp $ +# $NetBSD: std.malta,v 1.5.94.2 2010/04/21 00:54:13 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -16,3 +16,6 @@ makeoptions BOARDTYPE=malta include arch/evbmips/conf/files.malta + +# Atheros HAL options +include external/isc/atheros_hal/conf/std.ath_hal Index: src/sys/arch/evbmips/conf/std.meraki diff -u src/sys/arch/evbmips/conf/std.meraki:1.1 src/sys/arch/evbmips/conf/std.meraki:1.1.78.1 --- src/sys/arch/evbmips/conf/std.meraki:1.1 Tue Sep 26 06:37:32 2006 +++ src/sys/arch/evbmips/conf/std.meraki Wed Apr 21 00:54:14 2010 @@ -1,4 +1,4 @@ -# $NetBSD: std.meraki,v 1.1 2006/09/26 06:37:32 gdamore Exp $ +# $NetBSD: std.meraki,v 1.1.78.1 2010/04/21 00:54:14 matt Exp $ machine evbmips mips include conf/std # MI standard options @@ -13,3 +13,6 @@ include arch/evbmips/conf/files.atheros include arch/mips/conf/files.atheros + +# Atheros HAL options +include external/isc/atheros_hal/conf/std.ath_hal
CVS commit: src/share/man/man4/man4.i386
Module Name:src Committed By: jruoho Date: Wed Apr 21 02:59:30 UTC 2010 Modified Files: src/share/man/man4/man4.i386: cmos.4 Log Message: Make the examples fit into 80 columns. Use .Tn. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.i386/cmos.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/man4.i386/cmos.4 diff -u src/share/man/man4/man4.i386/cmos.4:1.6 src/share/man/man4/man4.i386/cmos.4:1.7 --- src/share/man/man4/man4.i386/cmos.4:1.6 Mon Oct 19 23:19:38 2009 +++ src/share/man/man4/man4.i386/cmos.4 Wed Apr 21 02:59:29 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: cmos.4,v 1.6 2009/10/19 23:19:38 rmind Exp $ +.\ $NetBSD: cmos.4,v 1.7 2010/04/21 02:59:29 jruoho Exp $ .\ .\ Copyright (c) 2007 David Young. All rights reserved. .\ @@ -27,7 +27,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd February 5, 2007 +.Dd April 21, 2010 .Dt CMOS 4 i386 .Os .Sh NAME @@ -36,13 +36,23 @@ .Sh SYNOPSIS .Cd pseudo-device cmos .Sh DESCRIPTION -Use +The .Nm -to read the real-time clock and ISA configuration data from an -ISA-compatible CMOS RAM, and to write the ISA configuration data. +pseudo-device can be used to read the real-time clock and +.Tn ISA +configuration data from an ISA-compatible +.Tn CMOS +.Tn RAM , +and to write the +.Tn ISA +configuration data. .Pp -A program reads between 0 and 48 bytes from the CMOS RAM, starting at -byte 0 of the RAM, using a single call to +A program reads between 0 and 48 bytes from the +.Tn CMOS +.Tn RAM , starting at +byte 0 of the +.Tn RAM , +using a single call to .Xr read 2 . Likewise, a program writes between 0 and 48 bytes to the CMOS RAM, starting at byte 0 of the RAM, using a single call to @@ -51,16 +61,24 @@ .Nm does not allow programs to overwrite the real-time clock data (bytes 0 through 9), the status registers (10 through 13), -the diagnostic status or CMOS shutdown status (bytes 14 and 15), -or the CMOS checksum (bytes 46 and 47). +the diagnostic status or +.Tn CMOS +shutdown status (bytes 14 and 15), +or the +.Tn CMOS +checksum (bytes 46 and 47). Writes to those bytes are ignored. .Pp On writes, .Nm -recomputes the CMOS checksum and writes it to the CMOS RAM. +recomputes the +.Tn CMOS +checksum and writes it to the +.Tn CMOS +.Tn RAM . .Sh EXAMPLES Display entire contents of CMOS RAM: -.Bd -literal -offset indent +.Bd -literal -offset 2n # dd if=/dev/cmos bs=48 count=1 | od -t x1 000 37 00 09 00 22 00 06 13 04 80 26 02 50 80 00 00 020 00 51 f0 00 01 80 02 00 fc 0f 2f 00 00 00 00 00 @@ -68,9 +86,14 @@ 060 .Ed .Pp -Change boot order on Soekris net4521 to PXE ROM, Primary HDD, -Secondary HDD: -.Bd -literal -offset indent +Change boot order on Soekris net4521 to +.Tn PXE +.Tn ROM , +Primary +.Tn HDD , +Secondary +.Tn HDD : +.Bd -literal -offset 2n # dd if=/dev/cmos of=/tmp/cmos0 bs=48 count=1 1+0 records in 1+0 records out @@ -88,12 +111,13 @@ .Sh ERRORS A program can read or write no more than 48 bytes to .Nm . +Both .Xr read 2 -/ +and .Xr write 2 will return .Er EINVAL -if more than 48 bytes are read / written at once. +if more than 48 bytes are read or written at once. .Sh AUTHORS The original .Nm
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Apr 21 04:25:28 UTC 2010
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: export-all test.exp
Log Message:
If we do .export (all) and have any variables that involve :sh
we will hit an error (var is recursive) while trying to evaluate that.
Fix, and add a unit test for this.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/usr.bin/make/var.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/export-all
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/make/unit-tests/test.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.157 src/usr.bin/make/var.c:1.158
--- src/usr.bin/make/var.c:1.157 Tue Apr 20 17:48:16 2010
+++ src/usr.bin/make/var.c Wed Apr 21 04:25:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.157 2010/04/20 17:48:16 sjg Exp $ */
+/* $NetBSD: var.c,v 1.158 2010/04/21 04:25:27 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: var.c,v 1.157 2010/04/20 17:48:16 sjg Exp $;
+static char rcsid[] = $NetBSD: var.c,v 1.158 2010/04/21 04:25:27 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)var.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: var.c,v 1.157 2010/04/20 17:48:16 sjg Exp $);
+__RCSID($NetBSD: var.c,v 1.158 2010/04/21 04:25:27 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -591,6 +591,13 @@
v-flags |= (VAR_EXPORTED|VAR_REEXPORT);
return 1;
}
+ if (v-flags VAR_IN_USE) {
+ /*
+ * We recursed while exporting in a child.
+ * This isn't going to end well, just skip it.
+ */
+ return 0;
+ }
n = snprintf(tmp, sizeof(tmp), ${%s}, name);
if (n (int)sizeof(tmp)) {
val = Var_Subst(NULL, tmp, VAR_GLOBAL, 0);
Index: src/usr.bin/make/unit-tests/export-all
diff -u src/usr.bin/make/unit-tests/export-all:1.1 src/usr.bin/make/unit-tests/export-all:1.2
--- src/usr.bin/make/unit-tests/export-all:1.1 Fri Oct 5 15:27:46 2007
+++ src/usr.bin/make/unit-tests/export-all Wed Apr 21 04:25:28 2010
@@ -1,8 +1,20 @@
-# $Id: export-all,v 1.1 2007/10/05 15:27:46 sjg Exp $
+# $Id: export-all,v 1.2 2010/04/21 04:25:28 sjg Exp $
UT_OK=good
UT_F=fine
+# the old way to do :tA
+M_tAbad = C,.*,cd \\ 'pwd',:sh
+# the new
+M_tA = tA
+
+here := ${.PARSEDIR}
+
+# this will cause trouble (recursing if we let it)
+UT_BADDIR = ${${here}/../${here:T}:L:${M_tAbad}:T}
+# this will be ok
+UT_OKDIR = ${${here}/../${here:T}:L:${M_tA}:T}
+
.export
.include export
Index: src/usr.bin/make/unit-tests/test.exp
diff -u src/usr.bin/make/unit-tests/test.exp:1.31 src/usr.bin/make/unit-tests/test.exp:1.32
--- src/usr.bin/make/unit-tests/test.exp:1.31 Thu Apr 8 17:41:29 2010
+++ src/usr.bin/make/unit-tests/test.exp Wed Apr 21 04:25:28 2010
@@ -33,12 +33,14 @@
UT_TEST=export
UT_ZOO=hoopie
UT_ALL=even this gets exported
+UT_BADDIR=unit-tests
UT_DOLLAR=This is $UT_FU
UT_F=fine
UT_FOO=foobar is fubar
UT_FU=fubar
UT_NO=all
UT_OK=good
+UT_OKDIR=unit-tests
UT_TEST=export-all
UT_ZOO=hoopie
At first, I am
CVS commit: src/share/man/man8
Module Name:src Committed By: jruoho Date: Wed Apr 21 05:05:08 UTC 2010 Modified Files: src/share/man/man8: security.8 Log Message: Small improvements to wording and markup. Note also the default use of SSP on x86. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man8/security.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/security.8 diff -u src/share/man/man8/security.8:1.20 src/share/man/man8/security.8:1.21 --- src/share/man/man8/security.8:1.20 Mon Apr 19 12:59:36 2010 +++ src/share/man/man8/security.8 Wed Apr 21 05:05:07 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.8,v 1.20 2010/04/19 12:59:36 jruoho Exp $ +.\ $NetBSD: security.8,v 1.21 2010/04/21 05:05:07 jruoho Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -25,7 +25,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 19, 2010 +.Dd April 21, 2010 .Dt SECURITY 8 .Os .Sh NAME @@ -40,9 +40,10 @@ that will help you get started. .Pp Contents: -.Bl -hyphen -compact +.Bl -hyphen -compact -offset indent .It -Veriexec (file integrity) +Veriexec +.Pq file integrity .It Exploit mitigation .It @@ -68,30 +69,33 @@ .Sh EXPLOIT MITIGATION .Nx incorporates some exploit mitigation features. -The purpose of exploit mitigation features is to interfere with the way exploits -work, in order to prevent them from succeeding. -Due to that, some features may have other impact on the system, so be sure to +The purpose of exploit mitigation features is to interfere +with the way exploits work, in order to prevent them from succeeding. +Due to that, some features may have other impacts on the system, so be sure to fully understand the implications of each feature. .Pp .Nx provides the following exploit mitigation features: -.Bl -hyphen -compact +.Pp +.Bl -hyphen -compact -offset indent .It -PaX ASLR (Address Space Layout Randomization) +.Tn PaX ASLR +.Pq Address Space Layout Randomization . .It -PaX MPROTECT +.Tn PaX MPROTECT .Xr ( mprotect 2 restrictions) .It -PaX SegvGuard +.Tn PaX SegvGuard .It .Xr gcc 1 stack-smashing protection (SSP) .El .Ss PaX ASLR .Em PaX ASLR -implements Address Space Layout Randomization, meant to complement -non-executable mappings. +implements Address Space Layout Randomization +.Pq Tn ASLR , +meant to complement non-executable mappings. Its purpose is to harden prediction of the address space layout, namely location of library and application functions that can be used by an attacker to circumvent non-executable mappings by using a technique called @@ -108,20 +112,25 @@ .Em PaX Segvguard can be used (see below). .Pp -For non-PIE (Position Independent Executable) executables, +For non-PIE +.Pq Position Independent Executable executables , the .Nx .Em PaX ASLR implementation introduces randomization to the following memory regions: -.Bl -enum -compact +.Pp +.Bl -enum -compact -offset indent .It The data segment .It The stack .El .Pp -For PIE executables: -.Bl -enum -compact +For +.Tn PIE +executables: +.Pp +.Bl -enum -compact -offset indent .It The program itself (exec base) .It @@ -153,9 +162,9 @@ .Ed .Ss PaX MPROTECT .Em PaX MPROTECT -implements memory protection restrictions, meant to complement non-executable -mappings. -Their purpose is to prevent situations where malicious code attempts to mark +implements memory protection restrictions, +meant to complement non-executable mappings. +The purpose is to prevent situations where malicious code attempts to mark writable memory regions as executable, often by trashing arguments to an .Xr mprotect 2 call. @@ -198,7 +207,8 @@ .Pp For this reason, it is highly recommended to have .Em PaX Segvguard -enabled explicitly only for network services, etc. +enabled explicitly only for network services or +other processes deemed as critical to system security. Enabling .Em PaX Segvguard explicitly works like this: @@ -207,8 +217,8 @@ .Ed .Pp However, a global knob is still provided, for use in strict environments -with no local users (some network appliances, embedded devices, firewalls, -etc.): +with no local users (for example, some network appliances, embedded devices, +and firewalls) .Bd -literal -offset indent # sysctl -w security.pax.segvguard.global=1 .Ed @@ -281,8 +291,11 @@ Use of .Em SSP is especially encouraged on platforms without per-page execute bit granularity -such as -.Em i386 . +such as i386. +As of +.Nx 6.0 , +.Em SSP +is used by default on i386 and amd64 architectures. .Sh PER-USER TEMPORARY STORAGE It is possible to configure per-user temporary storage to avoid potential security issues (race conditions, etc.) in programs that do not make secure
CVS commit: [matt-nb5-mips64] src
Module Name:src Committed By: matt Date: Wed Apr 21 05:15:01 UTC 2010 Modified Files: src [matt-nb5-mips64]: BUILDING UPDATING Log Message: sync to netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.78.2.2 -r1.78.2.2.4.1 src/BUILDING cvs rdiff -u -r1.178.2.1.2.1 -r1.178.2.1.2.1.2.1 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.78.2.2 src/BUILDING:1.78.2.2.4.1 --- src/BUILDING:1.78.2.2 Sat Nov 15 22:10:33 2008 +++ src/BUILDING Wed Apr 21 05:15:01 2010 @@ -281,6 +281,12 @@ Default: ``no'' + MKSUBPIXEL Can be set to ``yes'' or ``no''. For X builds, decides if + subpixel rendering code in FreeType is turned on. Turned off + by default because of patent issues. + + Default: ``no'' + MKTTINTERP Can be set to ``yes'' or ``no''. For X builds, decides if the TrueType bytecode interpreter is turned on. See http://www.freetype.org/patents.html for details. @@ -886,4 +892,4 @@ The build.sh based build scheme was introduced for NetBSD 1.6 as USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that. -NetBSDSeptember 10, 2008NetBSD +NetBSDMay 1, 2009 NetBSD Index: src/UPDATING diff -u src/UPDATING:1.178.2.1.2.1 src/UPDATING:1.178.2.1.2.1.2.1 --- src/UPDATING:1.178.2.1.2.1 Sat May 30 16:30:24 2009 +++ src/UPDATING Wed Apr 21 05:15:01 2010 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.178.2.1.2.1 2009/05/30 16:30:24 snj Exp $ +$NetBSD: UPDATING,v 1.178.2.1.2.1.2.1 2010/04/21 05:15:01 matt Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for
CVS commit: [matt-nb5-mips64] src/bin
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:15:28 UTC 2010
Modified Files:
src/bin/df [matt-nb5-mips64]: df.c
src/bin/kill [matt-nb5-mips64]: kill.c
src/bin/ksh [matt-nb5-mips64]: var.c
src/bin/pax [matt-nb5-mips64]: Makefile options.c tar.1
src/bin/sh [matt-nb5-mips64]: cd.c sh.1
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.83.8.1 src/bin/df/df.c
cvs rdiff -u -r1.25 -r1.25.10.1 src/bin/kill/kill.c
cvs rdiff -u -r1.14 -r1.14.32.1 src/bin/ksh/var.c
cvs rdiff -u -r1.37.12.2 -r1.37.12.3 src/bin/pax/Makefile
cvs rdiff -u -r1.101.12.2 -r1.101.12.2.4.1 src/bin/pax/options.c
cvs rdiff -u -r1.26.12.1 -r1.26.12.1.4.1 src/bin/pax/tar.1
cvs rdiff -u -r1.39 -r1.39.32.1 src/bin/sh/cd.c
cvs rdiff -u -r1.87.18.1 -r1.87.18.1.4.1 src/bin/sh/sh.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/df/df.c
diff -u src/bin/df/df.c:1.83 src/bin/df/df.c:1.83.8.1
--- src/bin/df/df.c:1.83 Sun Jul 20 00:52:39 2008
+++ src/bin/df/df.c Wed Apr 21 05:15:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: df.c,v 1.83 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: df.c,v 1.83.8.1 2010/04/21 05:15:27 matt Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -45,7 +45,7 @@
#if 0
static char sccsid[] = @(#)df.c 8.7 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: df.c,v 1.83 2008/07/20 00:52:39 lukem Exp $);
+__RCSID($NetBSD: df.c,v 1.83.8.1 2010/04/21 05:15:27 matt Exp $);
#endif
#endif /* not lint */
@@ -473,9 +473,9 @@
*/
(void)printf(%s % PRId64 % PRId64 % PRId64 %s %s\n,
sfsp-f_mntfromname,
- fsbtoblk(sfsp-f_blocks, sfsp-f_bsize, blocksize),
- fsbtoblk(used, sfsp-f_bsize, blocksize),
- fsbtoblk(sfsp-f_bavail, sfsp-f_bsize, blocksize),
+ fsbtoblk(sfsp-f_blocks, sfsp-f_frsize, blocksize),
+ fsbtoblk(used, sfsp-f_frsize, blocksize),
+ fsbtoblk(bavail, sfsp-f_frsize, blocksize),
availblks == 0 ? full : strpct64((uint64_t) used,
(uint64_t) availblks, 0), sfsp-f_mntonname);
/*
Index: src/bin/kill/kill.c
diff -u src/bin/kill/kill.c:1.25 src/bin/kill/kill.c:1.25.10.1
--- src/bin/kill/kill.c:1.25 Sun Jul 20 00:52:40 2008
+++ src/bin/kill/kill.c Wed Apr 21 05:15:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kill.c,v 1.25 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: kill.c,v 1.25.10.1 2010/04/21 05:15:28 matt Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)kill.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: kill.c,v 1.25 2008/07/20 00:52:40 lukem Exp $);
+__RCSID($NetBSD: kill.c,v 1.25.10.1 2010/04/21 05:15:28 matt Exp $);
#endif
#endif /* not lint */
@@ -49,6 +49,8 @@
#include signal.h
#include stdio.h
#include stdlib.h
+#include limits.h
+#include inttypes.h
#include string.h
#include termios.h
#include unistd.h
@@ -69,7 +71,8 @@
int
main(int argc, char *argv[])
{
- int errors, numsig, pid;
+ int errors;
+ intmax_t numsig, pid;
char *ep;
setprogname(argv[0]);
@@ -87,17 +90,19 @@
if (argc == 1) {
if (isdigit((unsigned char)**argv) == 0)
usage();
- numsig = strtol(*argv, ep, 10);
- if (*ep != '\0') {
+ numsig = strtoimax(*argv, ep, 10);
+ /* check for correctly parsed number */
+ if (*ep != '\0' || numsig == INTMAX_MIN || numsig == INTMAX_MAX) {
errx(EXIT_FAILURE, illegal signal number: %s,
*argv);
/* NOTREACHED */
}
if (numsig = 128)
numsig -= 128;
+ /* and whether it fits into signals range */
if (numsig = 0 || numsig = NSIG)
nosig(*argv);
- printf(%s\n, sys_signame[numsig]);
+ printf(%s\n, sys_signame[(int) numsig]);
exit(0);
}
printsignals(stdout);
@@ -122,12 +127,14 @@
if ((numsig = signame_to_signum(sn)) 0)
nosig(sn);
} else if (isdigit((unsigned char)*sn)) {
- numsig = strtol(sn, ep, 10);
- if (*ep) {
+ numsig = strtoimax(sn, ep, 10);
+ /* check for correctly parsed number */
+ if (*ep || numsig == INTMAX_MIN || numsig == INTMAX_MAX ) {
errx(EXIT_FAILURE, illegal signal number: %s,
sn);
/* NOTREACHED */
}
+ /* and whether it fits into signals range */
if (numsig 0 || numsig = NSIG)
nosig(sn);
} else
@@ -151,14 +158,17 @@
} else
#endif
{
- pid = strtol(*argv, ep, 10);
- if (!**argv || *ep) {
+ pid = strtoimax(*argv, ep, 10);
+ /* make sure the pid is a number and fits into pid_t */
+ if (!**argv || *ep || pid == INTMAX_MIN ||
+pid == INTMAX_MAX || pid != (pid_t) pid) {
+
warnx(illegal process id: %s, *argv);
errors = 1;
continue;
}
}
- if (kill(pid, numsig) == -1) {
+ if (kill((pid_t) pid, (int) numsig) == -1) {
warn(%s, *argv);
errors = 1;
}
@@ -166,7 +176,7 @@
/* Wakeup the process if it was suspended, so it can
exit without an explicit 'fg'. */
if (numsig == SIGTERM || numsig == SIGHUP)
- kill(pid,
CVS commit: [matt-nb5-mips64] src/compat
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:17:03 UTC 2010
Modified Files:
src/compat [matt-nb5-mips64]: Makefile.md_subdir
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/compat/Makefile.md_subdir
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/Makefile.md_subdir
diff -u src/compat/Makefile.md_subdir:1.1.2.2 src/compat/Makefile.md_subdir:1.1.2.3
--- src/compat/Makefile.md_subdir:1.1.2.2 Wed Jan 27 06:52:47 2010
+++ src/compat/Makefile.md_subdir Wed Apr 21 05:17:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.md_subdir,v 1.1.2.2 2010/01/27 06:52:47 matt Exp $
+# $NetBSD: Makefile.md_subdir,v 1.1.2.3 2010/04/21 05:17:03 matt Exp $
# list of subdirs
@@ -11,5 +11,9 @@
.endif
.if (${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el)
-MD_SUBDIR= mips64/64 .WAIT mips64/o32
+MD_SUBDIR= mips64/64
+.if target(obj)
+MD_SUBDIR+= .WAIT
+.endif
+MD_SUBDIR+= mips64/o32
.endif
CVS commit: [matt-nb5-mips64] src/common
Module Name:src Committed By: matt Date: Wed Apr 21 05:17:12 UTC 2010 Modified Files: src/common/dist/zlib [matt-nb5-mips64]: zlib.h src/common/lib/libc/arch/mips/string [matt-nb5-mips64]: ffs.S src/common/lib/libc/hash/sha2 [matt-nb5-mips64]: sha2.c Log Message: sync to netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.40.1 src/common/dist/zlib/zlib.h cvs rdiff -u -r1.1.40.1 -r1.1.40.2 src/common/lib/libc/arch/mips/string/ffs.S cvs rdiff -u -r1.7.14.1 -r1.7.14.1.2.1 src/common/lib/libc/hash/sha2/sha2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/dist/zlib/zlib.h diff -u src/common/dist/zlib/zlib.h:1.2 src/common/dist/zlib/zlib.h:1.2.40.1 --- src/common/dist/zlib/zlib.h:1.2 Mon Jan 16 17:02:29 2006 +++ src/common/dist/zlib/zlib.h Wed Apr 21 05:17:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: zlib.h,v 1.2 2006/01/16 17:02:29 christos Exp $ */ +/* $NetBSD: zlib.h,v 1.2.40.1 2010/04/21 05:17:12 matt Exp $ */ /* zlib.h -- interface of the 'zlib' general purpose compression library version 1.2.3, July 18th, 2005 @@ -1284,7 +1284,9 @@ seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. */ +#if !defined(_KERNEL) !defined(_STANDALONE) ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); +#endif /* Update a running CRC-32 with the bytes buf[0..len-1] and return the updated CRC-32. If buf is NULL, this function returns the required initial Index: src/common/lib/libc/arch/mips/string/ffs.S diff -u src/common/lib/libc/arch/mips/string/ffs.S:1.1.40.1 src/common/lib/libc/arch/mips/string/ffs.S:1.1.40.2 --- src/common/lib/libc/arch/mips/string/ffs.S:1.1.40.1 Sun Aug 16 03:02:47 2009 +++ src/common/lib/libc/arch/mips/string/ffs.S Wed Apr 21 05:17:12 2010 @@ -1,11 +1,10 @@ -/* $NetBSD: ffs.S,v 1.1.40.1 2009/08/16 03:02:47 matt Exp $ */ - +/* $NetBSD: ffs.S,v 1.1.40.2 2010/04/21 05:17:12 matt Exp $ */ /*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2010 The NetBSD Foundation, Inc. + * All rights reserved. * - * This code is derived from software contributed to Berkeley by - * Ralph Campbell. + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,40 +14,130 @@ * 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. - * 3. Neither the name of the University nor the names of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + * 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 mips/asm.h -#if defined(LIBC_SCCS) !defined(lint) - /* RCSID(from: @(#)ffs.s 8.1 (Berkeley) 6/4/93) */ - RCSID($NetBSD: ffs.S,v 1.1.40.1 2009/08/16 03:02:47 matt Exp $) -#endif /* LIBC_SCCS and not lint */ +RCSID($NetBSD: ffs.S,v 1.1.40.2 2010/04/21 05:17:12 matt Exp $) /* bit = ffs(value) */ + .set noreorder + +#if __mips == 64 || __mips == 32 LEAF(ffs)
CVS commit: [matt-nb5-mips64] src/crypto/dist
Module Name:src Committed By: matt Date: Wed Apr 21 05:17:37 UTC 2010 Modified Files: src/crypto/dist/heimdal/lib/krb5 [matt-nb5-mips64]: krb5_get_creds.3 krb5_get_in_cred.3 krb5_keytab.3 src/crypto/dist/ipsec-tools/src/racoon [matt-nb5-mips64]: handler.c isakmp.c racoon.conf.5 src/crypto/dist/openssl/crypto/comp [matt-nb5-mips64]: c_zlib.c src/crypto/dist/openssl/crypto/evp [matt-nb5-mips64]: m_sha1.c src/crypto/dist/openssl/ssl [matt-nb5-mips64]: s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c ssl_locl.h t1_enc.c src/crypto/dist/ssh [matt-nb5-mips64]: cipher.c cipher.h packet.c Log Message: sync to netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.14.1 \ src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 \ src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 cvs rdiff -u -r1.9 -r1.9.14.1 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3 cvs rdiff -u -r1.21.4.1 -r1.21.4.1.4.1 \ src/crypto/dist/ipsec-tools/src/racoon/handler.c cvs rdiff -u -r1.42.4.1 -r1.42.4.1.4.1 \ src/crypto/dist/ipsec-tools/src/racoon/isakmp.c cvs rdiff -u -r1.46.4.1 -r1.46.4.1.4.1 \ src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 cvs rdiff -u -r1.1.1.7 -r1.1.1.7.10.1 \ src/crypto/dist/openssl/crypto/comp/c_zlib.c cvs rdiff -u -r1.1.1.5.8.1 -r1.1.1.5.8.1.2.1 \ src/crypto/dist/openssl/crypto/evp/m_sha1.c cvs rdiff -u -r1.1.1.12 -r1.1.1.12.10.1 src/crypto/dist/openssl/ssl/s3_enc.c \ src/crypto/dist/openssl/ssl/t1_enc.c cvs rdiff -u -r1.14 -r1.14.10.1 src/crypto/dist/openssl/ssl/s3_lib.c cvs rdiff -u -r1.9.8.1 -r1.9.8.1.2.1 src/crypto/dist/openssl/ssl/s3_pkt.c cvs rdiff -u -r1.15.4.1 -r1.15.4.1.4.1 src/crypto/dist/openssl/ssl/s3_srvr.c cvs rdiff -u -r1.13 -r1.13.10.1 src/crypto/dist/openssl/ssl/ssl_locl.h cvs rdiff -u -r1.21.8.1 -r1.21.8.1.2.1 src/crypto/dist/ssh/cipher.c cvs rdiff -u -r1.2.28.1 -r1.2.28.1.2.1 src/crypto/dist/ssh/cipher.h cvs rdiff -u -r1.30.8.1 -r1.30.8.1.2.1 src/crypto/dist/ssh/packet.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1.14.1 --- src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3:1.1 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_get_creds.3 Wed Apr 21 05:17:36 2010 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_get_creds.3 22071 2007-11-14 20:04:50Z lha $ -.\ $NetBSD: krb5_get_creds.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_get_creds.3,v 1.1.14.1 2010/04/21 05:17:36 matt Exp $ .\ .Dd June 15, 2006 .Dt KRB5_GET_CREDS 3 @@ -134,7 +134,7 @@ and .Fn krb5_get_creds_opt_set_options adds and sets options to the -.Fi krb5_get_creds_opt +.Vt krb5_get_creds_opt structure . The possible options to set are .Bl -tag -width KRB5_GC_USER_USER -compact Index: src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1 src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1.14.1 --- src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3:1.1 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_get_in_cred.3 Wed Apr 21 05:17:36 2010 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_get_in_cred.3 17593 2006-05-29 14:55:18Z lha $ -.\ $NetBSD: krb5_get_in_cred.3,v 1.1 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_get_in_cred.3,v 1.1.14.1 2010/04/21 05:17:36 matt Exp $ .\ .Dd May 31, 2003 .Dt KRB5_GET_IN_TKT 3 @@ -170,7 +170,7 @@ .Nm krb5_get_in_tkt_with_password uses the clients password to authenticate. If the password argument is -.DV NULL +.Dv NULL the user user queried with the default password query function. .Pp .Nm krb5_get_in_tkt_with_keytab Index: src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3 diff -u src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9 src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9.14.1 --- src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3:1.9 Sat Mar 22 08:37:14 2008 +++ src/crypto/dist/heimdal/lib/krb5/krb5_keytab.3 Wed Apr 21 05:17:36 2010 @@ -30,7 +30,7 @@ .\ SUCH DAMAGE. .\ .\ $Heimdal: krb5_keytab.3 22071 2007-11-14 20:04:50Z lha $ -.\ $NetBSD: krb5_keytab.3,v 1.9 2008/03/22 08:37:14 mlelstv Exp $ +.\ $NetBSD: krb5_keytab.3,v 1.9.14.1 2010/04/21 05:17:36 matt Exp $ .\ .Dd August 12, 2005 .Dt KRB5_KEYTAB 3 @@ -204,7 +204,7 @@ For compatibility with other Kerberos implemtation .Li WRFILE and -.LI JAVA14 +.Li JAVA14 is also accepted. .Li WRFILE has the same format as @@ -380,7 +380,7 @@ function .Fn krb5_kt_compare is used, so the wildcard rules applies to the argument of -.F krb5_kt_get_entry +.Fn krb5_kt_get_entry too. On success the returne entry must be freed with .Fn krb5_kt_free_entry . Index:
CVS commit: [matt-nb5-mips64] src/dist
Module Name:src Committed By: matt Date: Wed Apr 21 05:19:58 UTC 2010 Modified Files: src/dist/bind [matt-nb5-mips64]: CHANGES COPYRIGHT FAQ FAQ.xml Makefile.in README README.idnkit acconfig.h config.guess config.h.in configure configure.in libtool.m4 ltmain.sh version src/dist/bind/bin/check [matt-nb5-mips64]: check-tool.c named-checkconf.8 named-checkconf.c named-checkconf.html named-checkzone.8 named-checkzone.c named-checkzone.docbook named-checkzone.html src/dist/bind/bin/dig [matt-nb5-mips64]: dig.1 dig.c dig.docbook dig.html dighost.c host.1 host.c host.docbook host.html nslookup.1 nslookup.c nslookup.html src/dist/bind/bin/dig/include/dig [matt-nb5-mips64]: dig.h src/dist/bind/bin/dnssec [matt-nb5-mips64]: dnssec-keygen.8 dnssec-keygen.docbook dnssec-keygen.html dnssec-signzone.8 dnssec-signzone.c dnssec-signzone.docbook dnssec-signzone.html src/dist/bind/bin/named [matt-nb5-mips64]: bind9.xsl bind9.xsl.h client.c config.c control.c controlconf.c convertxsl.pl interfacemgr.c log.c lwresd.8 lwresd.c lwresd.docbook lwresd.html main.c named.8 named.conf.5 named.conf.docbook named.conf.html named.docbook named.html query.c server.c statschannel.c update.c xfrout.c zoneconf.c src/dist/bind/bin/named/include/named [matt-nb5-mips64]: client.h globals.h log.h lwdclient.h notify.h server.h src/dist/bind/bin/named/unix [matt-nb5-mips64]: os.c src/dist/bind/bin/named/unix/include/named [matt-nb5-mips64]: os.h src/dist/bind/bin/named/win32 [matt-nb5-mips64]: ntservice.c os.c src/dist/bind/bin/named/win32/include/named [matt-nb5-mips64]: os.h src/dist/bind/bin/nsupdate [matt-nb5-mips64]: Makefile.in nsupdate.c nsupdate.docbook nsupdate.html src/dist/bind/bin/rndc [matt-nb5-mips64]: rndc-confgen.8 rndc-confgen.c rndc-confgen.html rndc.8 rndc.c rndc.conf.5 rndc.conf.html rndc.html src/dist/bind/bin/rndc/include/rndc [matt-nb5-mips64]: os.h src/dist/bind/bin/tests [matt-nb5-mips64]: cfg_test.c sig0_test.c sock_test.c src/dist/bind/bin/tests/db [matt-nb5-mips64]: t_db.c src/dist/bind/bin/tests/dst [matt-nb5-mips64]: Makefile.in dst_test.c t_dst.c src/dist/bind/bin/tests/master [matt-nb5-mips64]: t_master.c src/dist/bind/bin/tests/mem [matt-nb5-mips64]: t_mem.c src/dist/bind/bin/tests/names [matt-nb5-mips64]: t_names.c src/dist/bind/bin/tests/rbt [matt-nb5-mips64]: t_rbt.c src/dist/bind/bin/tests/system [matt-nb5-mips64]: conf.sh.in ifconfig.sh src/dist/bind/bin/tests/system/acl [matt-nb5-mips64]: tests.sh src/dist/bind/bin/tests/system/dnssec [matt-nb5-mips64]: tests.sh src/dist/bind/bin/tests/system/dnssec/ns1 [matt-nb5-mips64]: sign.sh src/dist/bind/bin/tests/system/dnssec/ns2 [matt-nb5-mips64]: example.db.in sign.sh src/dist/bind/bin/tests/system/glue/ns1 [matt-nb5-mips64]: named.conf src/dist/bind/bin/tests/system/rrsetorder [matt-nb5-mips64]: tests.sh src/dist/bind/bin/tests/system/tkey/ns1 [matt-nb5-mips64]: named.conf.in src/dist/bind/bin/tests/tasks [matt-nb5-mips64]: t_tasks.c src/dist/bind/bin/tests/timers [matt-nb5-mips64]: t_timers.c src/dist/bind/bin/win32/BINDInstall [matt-nb5-mips64]: BINDInstall.rc BINDInstallDlg.cpp BINDInstallDlg.h VersionInfo.cpp resource.h src/dist/bind/contrib/dlz [matt-nb5-mips64]: config.dlz.in src/dist/bind/contrib/dlz/drivers [matt-nb5-mips64]: dlz_bdb_driver.c dlz_mysql_driver.c src/dist/bind/contrib/idn/idnkit-1.0-src/tools/idnconv [matt-nb5-mips64]: selectiveencode.h src/dist/bind/contrib/queryperf/utils [matt-nb5-mips64]: gen-data-queryperf.py src/dist/bind/contrib/sdb/pgsql [matt-nb5-mips64]: zonetodb.c src/dist/bind/doc/arm [matt-nb5-mips64]: Bv9ARM-book.xml Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.ch10.html Bv9ARM.html Bv9ARM.pdf Makefile.in man.dig.html man.dnssec-keygen.html man.dnssec-signzone.html man.host.html man.named-checkconf.html man.named-checkzone.html man.named.html man.rndc-confgen.html man.rndc.conf.html man.rndc.html src/dist/bind/doc/misc [matt-nb5-mips64]: Makefile.in options src/dist/bind/doc/rfc [matt-nb5-mips64]: index src/dist/bind/doc/xsl [matt-nb5-mips64]: copyright.xsl src/dist/bind/lib/bind [matt-nb5-mips64]: api configure configure.in src/dist/bind/lib/bind/dst
CVS commit: [matt-nb5-mips64] src/etc
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:21:24 UTC 2010
Modified Files:
src/etc [matt-nb5-mips64]: MAKEDEV.tmpl Makefile
src/etc/defaults [matt-nb5-mips64]: rc.conf
src/etc/etc.i386 [matt-nb5-mips64]: Makefile.inc
src/etc/etc.sparc [matt-nb5-mips64]: ttys
src/etc/etc.sparc64 [matt-nb5-mips64]: MAKEDEV.conf
src/etc/mtree [matt-nb5-mips64]: NetBSD.dist special
src/etc/rc.d [matt-nb5-mips64]: Makefile named network
src/etc/ssh [matt-nb5-mips64]: ssh_known_hosts
Added Files:
src/etc/rc.d [matt-nb5-mips64]: dhcpcd
Removed Files:
src/etc [matt-nb5-mips64]: audit-packages.conf
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.113.2.6 -r1.113.2.6.4.1 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.359.2.3.4.1 -r1.359.2.3.4.2 src/etc/Makefile
cvs rdiff -u -r1.1 -r0 src/etc/audit-packages.conf
cvs rdiff -u -r1.95.2.3 -r1.95.2.3.4.1 src/etc/defaults/rc.conf
cvs rdiff -u -r1.59 -r1.59.8.1 src/etc/etc.i386/Makefile.inc
cvs rdiff -u -r1.14 -r1.14.6.1 src/etc/etc.sparc/ttys
cvs rdiff -u -r1.13 -r1.13.8.1 src/etc/etc.sparc64/MAKEDEV.conf
cvs rdiff -u -r1.385.2.1.4.1 -r1.385.2.1.4.2 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.121.2.2 -r1.121.2.2.4.1 src/etc/mtree/special
cvs rdiff -u -r1.68.2.3 -r1.68.2.3.4.1 src/etc/rc.d/Makefile
cvs rdiff -u -r0 -r1.1.6.2 src/etc/rc.d/dhcpcd
cvs rdiff -u -r1.18 -r1.18.34.1 src/etc/rc.d/named
cvs rdiff -u -r1.57 -r1.57.8.1 src/etc/rc.d/network
cvs rdiff -u -r1.4 -r1.4.32.1 src/etc/ssh/ssh_known_hosts
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.113.2.6 src/etc/MAKEDEV.tmpl:1.113.2.6.4.1
--- src/etc/MAKEDEV.tmpl:1.113.2.6 Fri Jan 16 23:01:09 2009
+++ src/etc/MAKEDEV.tmpl Wed Apr 21 05:21:22 2010
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.113.2.6 2009/01/16 23:01:09 bouyer Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.113.2.6.4.1 2010/04/21 05:21:22 matt Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -236,6 +236,7 @@
# fb* PMAX generic framebuffer pseudo-device
# fd file descriptors
# grf* graphics frame buffer device
+# hdaudio* High Definition audio control device
# hil HP300 HIL input devices
# icp ICP-Vortex/Intel RAID control interface
# iic* IIC bus device
@@ -753,6 +754,7 @@
%MI_DEVICES_BEGIN%
audio)
makedev audio0 audio1 audio2 audio3
+ makedev hdaudio0 hdaudio1 hdaudio2 hdaudio3
lndev sound0 sound
lndev audio0 audio
lndev mixer0 mixer
@@ -1299,6 +1301,11 @@
mkdev $audioctl c %audio_chr% $(($unit + 192)) 666
;;
+hdaudio*)
+ unit=${i#hdaudio}
+ mkdev hdaudio$unit c %hdaudio_chr% $unit 644
+ ;;
+
gpio*)
unit=${i#gpio}
mkdev gpio$unit c %gpio_chr% $unit 644
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.359.2.3.4.1 src/etc/Makefile:1.359.2.3.4.2
--- src/etc/Makefile:1.359.2.3.4.1 Wed Sep 9 02:09:15 2009
+++ src/etc/Makefile Wed Apr 21 05:21:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.359.2.3.4.1 2009/09/09 02:09:15 matt Exp $
+# $NetBSD: Makefile,v 1.359.2.3.4.2 2010/04/21 05:21:22 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -88,7 +88,7 @@
BINOWN= root
BINGRP= wheel
UTMPGRP= utmp
-BIN1+= audit-packages.conf bootptab changelist csh.cshrc csh.login \
+BIN1+= bootptab changelist csh.cshrc csh.login \
csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \
ftpusers gettytab group hosts hosts.lpd inetd.conf lkm.conf \
locate.conf login.conf mailer.conf man.conf monthly monthly.conf \
@@ -305,7 +305,7 @@
${BINOWN} operator 664 /etc/dumpdates \
${BINOWN} operator 600 /etc/skeykeys \
root wheel 600 /var/at/at.deny \
- nobody ${BINGRP} 664 /var/db/locate.database \
+ root wheel 644 /var/db/locate.database \
${BINOWN} ${BINGRP} 600 /var/log/authlog \
root wheel 600 /var/log/cron \
${BINOWN} ${UTMPGRP} 664 /var/log/lastlog \
@@ -351,7 +351,7 @@
${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/ssh configinstall
.endif
.if (${MKPOSTFIX} != no)
- ${MAKEDIRTARGET} ${NETBSDSRCDIR}/gnu/usr.sbin/postfix configinstall
+ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/ibm-public/postfix configinstall
.endif
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.95.2.3 src/etc/defaults/rc.conf:1.95.2.3.4.1
--- src/etc/defaults/rc.conf:1.95.2.3 Thu Mar 26 17:45:38 2009
+++ src/etc/defaults/rc.conf Wed Apr 21 05:21:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.95.2.3 2009/03/26 17:45:38 snj Exp $
+# $NetBSD: rc.conf,v 1.95.2.3.4.1 2010/04/21 05:21:23 matt Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -154,6 +154,7 @@
auto_ifconfig=YES# config all avail. interfaces
net_interfaces=# used only if above is NO
flushroutes=YES # flush routes in netstart
+dhcpcd=NO
dhcpcd_flags=-q
CVS commit: [matt-nb5-mips64] src/games
Module Name:src Committed By: matt Date: Wed Apr 21 05:25:15 UTC 2010 Modified Files: src/games/fortune/strfile [matt-nb5-mips64]: strfile.8 src/games/hack [matt-nb5-mips64]: extern.h hack.do_name.c hack.eat.c hack.end.c hack.fight.c hack.h hack.invent.c hack.main.c hack.objnam.c hack.options.c hack.pri.c hack.rip.c hack.shk.c hack.topl.c hack.unix.c src/games/hunt/huntd [matt-nb5-mips64]: answer.c src/games/rogue [matt-nb5-mips64]: monster.c Log Message: sync to netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.38.1 src/games/fortune/strfile/strfile.8 cvs rdiff -u -r1.8.8.1 -r1.8.8.1.2.1 src/games/hack/extern.h cvs rdiff -u -r1.7.14.2 -r1.7.14.2.2.1 src/games/hack/hack.do_name.c cvs rdiff -u -r1.6.42.1 -r1.6.42.1.2.1 src/games/hack/hack.eat.c cvs rdiff -u -r1.9.14.1 -r1.9.14.1.2.1 src/games/hack/hack.end.c \ src/games/hack/hack.pri.c cvs rdiff -u -r1.8.14.1 -r1.8.14.1.2.1 src/games/hack/hack.fight.c cvs rdiff -u -r1.10.42.1 -r1.10.42.1.2.1 src/games/hack/hack.h cvs rdiff -u -r1.10.30.2 -r1.10.30.2.2.1 src/games/hack/hack.invent.c cvs rdiff -u -r1.10.14.2 -r1.10.14.2.2.1 src/games/hack/hack.main.c cvs rdiff -u -r1.7.14.1 -r1.7.14.1.2.1 src/games/hack/hack.objnam.c cvs rdiff -u -r1.7.42.1 -r1.7.42.1.2.1 src/games/hack/hack.options.c cvs rdiff -u -r1.8.14.2 -r1.8.14.2.2.1 src/games/hack/hack.rip.c \ src/games/hack/hack.topl.c cvs rdiff -u -r1.8.30.1 -r1.8.30.1.2.1 src/games/hack/hack.shk.c cvs rdiff -u -r1.9.42.2 -r1.9.42.2.2.1 src/games/hack/hack.unix.c cvs rdiff -u -r1.9.14.1 -r1.9.14.1.2.1 src/games/hunt/huntd/answer.c cvs rdiff -u -r1.14 -r1.14.16.1 src/games/rogue/monster.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/fortune/strfile/strfile.8 diff -u src/games/fortune/strfile/strfile.8:1.12 src/games/fortune/strfile/strfile.8:1.12.38.1 --- src/games/fortune/strfile/strfile.8:1.12 Thu Sep 9 22:03:21 2004 +++ src/games/fortune/strfile/strfile.8 Wed Apr 21 05:25:14 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: strfile.8,v 1.12 2004/09/09 22:03:21 wiz Exp $ +.\ $NetBSD: strfile.8,v 1.12.38.1 2010/04/21 05:25:14 matt Exp $ .\ .\ Copyright (c) 1989, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)strfile.8 8.1 (Berkeley) 6/9/93 .\ -.Dd June 9, 1993 +.Dd January 17, 2010 .Dt STRFILE 8 .Os .Sh NAME @@ -57,7 +57,7 @@ This allows random access of the strings. .Pp The output file, if not specified on the command line, is named -.Ar source_file Ns Sy .out . +.Ar source_file Ns Sy .dat . .Pp The options are as follows: .Bl -tag -width -c char @@ -130,7 +130,7 @@ to dump them out in the table order. .Sh FILES .Bl -tag -width strfile.out -compact -.It Pa strfile.out +.It Pa strfile.dat default output file. .El .Sh SEE ALSO Index: src/games/hack/extern.h diff -u src/games/hack/extern.h:1.8.8.1 src/games/hack/extern.h:1.8.8.1.2.1 --- src/games/hack/extern.h:1.8.8.1 Mon Jun 29 23:22:24 2009 +++ src/games/hack/extern.h Wed Apr 21 05:25:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.8.8.1 2009/06/29 23:22:24 snj Exp $ */ +/* $NetBSD: extern.h,v 1.8.8.1.2.1 2010/04/21 05:25:14 matt Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. Index: src/games/hack/hack.do_name.c diff -u src/games/hack/hack.do_name.c:1.7.14.2 src/games/hack/hack.do_name.c:1.7.14.2.2.1 --- src/games/hack/hack.do_name.c:1.7.14.2 Mon Jun 29 23:25:09 2009 +++ src/games/hack/hack.do_name.c Wed Apr 21 05:25:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: hack.do_name.c,v 1.7.14.2 2009/06/29 23:25:09 snj Exp $ */ +/* $NetBSD: hack.do_name.c,v 1.7.14.2.2.1 2010/04/21 05:25:14 matt Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: hack.do_name.c,v 1.7.14.2 2009/06/29 23:25:09 snj Exp $); +__RCSID($NetBSD: hack.do_name.c,v 1.7.14.2.2.1 2010/04/21 05:25:14 matt Exp $); #endif/* not lint */ #include stdlib.h Index: src/games/hack/hack.eat.c diff -u src/games/hack/hack.eat.c:1.6.42.1 src/games/hack/hack.eat.c:1.6.42.1.2.1 --- src/games/hack/hack.eat.c:1.6.42.1 Mon Jun 29 23:22:24 2009 +++ src/games/hack/hack.eat.c Wed Apr 21 05:25:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: hack.eat.c,v 1.6.42.1 2009/06/29 23:22:24 snj Exp $ */ +/* $NetBSD: hack.eat.c,v 1.6.42.1.2.1 2010/04/21 05:25:14 matt Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: hack.eat.c,v 1.6.42.1 2009/06/29 23:22:24 snj Exp $); +__RCSID($NetBSD: hack.eat.c,v 1.6.42.1.2.1 2010/04/21 05:25:14 matt Exp $); #endif/* not lint */ #include hack.h Index: src/games/hack/hack.end.c diff -u src/games/hack/hack.end.c:1.9.14.1 src/games/hack/hack.end.c:1.9.14.1.2.1 ---
CVS commit: [matt-nb5-mips64] src/include
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:26:00 UTC 2010
Modified Files:
src/include [matt-nb5-mips64]: dlfcn.h link_elf.h math.h paths.h util.h
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.16.1 src/include/dlfcn.h
cvs rdiff -u -r1.7 -r1.7.36.1 src/include/link_elf.h
cvs rdiff -u -r1.47 -r1.47.16.1 src/include/math.h
cvs rdiff -u -r1.34 -r1.34.12.1 src/include/paths.h
cvs rdiff -u -r1.49 -r1.49.18.1 src/include/util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/dlfcn.h
diff -u src/include/dlfcn.h:1.19 src/include/dlfcn.h:1.19.16.1
--- src/include/dlfcn.h:1.19 Mon Apr 28 20:22:54 2008
+++ src/include/dlfcn.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dlfcn.h,v 1.19 2008/04/28 20:22:54 martin Exp $ */
+/* $NetBSD: dlfcn.h,v 1.19.16.1 2010/04/21 05:26:00 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
#if defined(_NETBSD_SOURCE)
int dladdr(const void * __restrict, Dl_info * __restrict);
int dlctl(void *, int, void *);
+int dlinfo(void *, int, void *);
#endif
__aconst char *dlerror(void);
__END_DECLS
@@ -88,4 +89,23 @@
#endif /* 0 */
#endif /* defined(_NETBSD_SOURCE) */
+/*
+ * dlinfo() commands
+ *
+ * From Solarisa: http://docs.sun.com/app/docs/doc/816-5168/dlinfo-3c?a=view
+ */
+#if defined(_NETBSD_SOURCE)
+#define RTLD_DI_LINKMAP 3
+#if 0
+#define RTLD_DI_ARGSINFO 1
+#define RTLD_DI_CONFIGADDR 2
+#define RTLD_DI_LMID 4
+#define RTLD_DI_SERINFO 5
+#define RTLD_DI_SERINFOSIZE 6
+#define RTLD_DI_ORIGIN 7
+#define RTLD_DI_GETSIGNAL 8
+#define RTLD_DI_SETSIGNAL 9
+#endif
+#endif /* _NETBSD_SOURCE */
+
#endif /* !defined(_DLFCN_H_) */
Index: src/include/link_elf.h
diff -u src/include/link_elf.h:1.7 src/include/link_elf.h:1.7.36.1
--- src/include/link_elf.h:1.7 Wed Jan 11 22:50:35 2006
+++ src/include/link_elf.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: link_elf.h,v 1.7 2006/01/11 22:50:35 uwe Exp $ */
+/* $NetBSD: link_elf.h,v 1.7.36.1 2010/04/21 05:26:00 matt Exp $ */
/*
* This only exists for GDB.
@@ -11,7 +11,7 @@
#include machine/elf_machdep.h
-struct link_map {
+typedef struct link_map {
caddr_t l_addr; /* Base Address of library */
#ifdef __mips__
caddr_t l_offs; /* Load Offset of library */
@@ -20,7 +20,7 @@
void *l_ld; /* Pointer to .dynamic in memory */
struct link_map *l_next; /* linked list of of mapped libs */
struct link_map *l_prev;
-};
+} Link_map;
struct r_debug {
int r_version; /* not used */
Index: src/include/math.h
diff -u src/include/math.h:1.47 src/include/math.h:1.47.16.1
--- src/include/math.h:1.47 Fri Apr 25 21:20:57 2008
+++ src/include/math.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: math.h,v 1.47 2008/04/25 21:20:57 christos Exp $ */
+/* $NetBSD: math.h,v 1.47.16.1 2010/04/21 05:26:00 matt Exp $ */
/*
*
@@ -59,8 +59,12 @@
* ANSI/POSIX
*/
/* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */
+#if __GNUC_PREREQ__(3, 3)
+#define HUGE_VAL __builtin_huge_val()
+#else
extern const union __double_u __infinity;
#define HUGE_VAL __infinity.__val
+#endif
/*
* ISO C99
@@ -72,14 +76,21 @@
((_XOPEN_SOURCE - 0) = 600) || \
defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
/* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */
+#if __GNUC_PREREQ__(3, 3)
+#define HUGE_VALF __builtin_huge_valf()
+#define HUGE_VALL __builtin_huge_vall()
+#else
extern const union __float_u __infinityf;
#define HUGE_VALF __infinityf.__val
extern const union __long_double_u __infinityl;
#define HUGE_VALL __infinityl.__val
+#endif
/* 7.12#4 INFINITY */
-#ifdef __INFINITY
+#if __GNUC_PREREQ__(3, 3)
+#define INFINITY __builtin_inff()
+#elif defined(__INFINITY)
#define INFINITY __INFINITY /* float constant which overflows */
#else
#define INFINITY HUGE_VALF /* positive infinity */
@@ -348,6 +359,15 @@
#define islessequal(x, y) (!isunordered((x), (y)) (x) = (y))
#define islessgreater(x, y) (!isunordered((x), (y)) \
((x) (y) || (y) (x)))
+double fdim(double, double);
+double fmax(double, double);
+double fmin(double, double);
+float fdimf(float, float);
+float fmaxf(float, float);
+float fminf(float, float);
+long double fdiml(long double, long double);
+long double fmaxl(long double, long double);
+long double fminl(long double, long double);
#endif /* !_ANSI_SOURCE ... */
Index: src/include/paths.h
diff -u src/include/paths.h:1.34 src/include/paths.h:1.34.12.1
--- src/include/paths.h:1.34 Sun Sep 28 06:38:02 2008
+++ src/include/paths.h Wed Apr 21 05:26:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: paths.h,v 1.34 2008/09/28 06:38:02 lukem Exp $ */
+/* $NetBSD: paths.h,v 1.34.12.1 2010/04/21 05:26:00 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -82,6 +82,7 @@
#define _PATH_MIXER0 /dev/mixer0
#define _PATH_NOLOGIN /etc/nologin
CVS commit: [matt-nb5-mips64] src/libexec
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:26:10 UTC 2010
Modified Files:
src/libexec/ftpd [matt-nb5-mips64]: popen.c version.h
src/libexec/ld.elf_so [matt-nb5-mips64]: map_object.c reloc.c rtld.c
rtld.h symbol.c
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.10.1 src/libexec/ftpd/popen.c
cvs rdiff -u -r1.70 -r1.70.10.1 src/libexec/ftpd/version.h
cvs rdiff -u -r1.36.4.1 -r1.36.4.1.4.1 src/libexec/ld.elf_so/map_object.c
cvs rdiff -u -r1.96 -r1.96.10.1 src/libexec/ld.elf_so/reloc.c
cvs rdiff -u -r1.123 -r1.123.8.1 src/libexec/ld.elf_so/rtld.c
cvs rdiff -u -r1.79 -r1.79.10.1 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.47 -r1.47.10.1 src/libexec/ld.elf_so/symbol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ftpd/popen.c
diff -u src/libexec/ftpd/popen.c:1.34 src/libexec/ftpd/popen.c:1.34.10.1
--- src/libexec/ftpd/popen.c:1.34 Sat Sep 13 02:41:52 2008
+++ src/libexec/ftpd/popen.c Wed Apr 21 05:26:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: popen.c,v 1.34 2008/09/13 02:41:52 lukem Exp $ */
+/* $NetBSD: popen.c,v 1.34.10.1 2010/04/21 05:26:10 matt Exp $ */
/*-
* Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = @(#)popen.c 8.3 (Berkeley) 4/6/94;
#else
-__RCSID($NetBSD: popen.c,v 1.34 2008/09/13 02:41:52 lukem Exp $);
+__RCSID($NetBSD: popen.c,v 1.34.10.1 2010/04/21 05:26:10 matt Exp $);
#endif
#endif /* not lint */
@@ -138,7 +138,8 @@
int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE|GLOB_LIMIT;
memset(gl, 0, sizeof(gl));
- if (glob(argv[argc], flags, NULL, gl)) {
+ if (glob(argv[argc], flags, NULL, gl)
+ || gl.gl_pathv == NULL) {
if (sl_add(sl, ftpd_strdup(argv[argc])) == -1) {
globfree(gl);
goto pfree;
Index: src/libexec/ftpd/version.h
diff -u src/libexec/ftpd/version.h:1.70 src/libexec/ftpd/version.h:1.70.10.1
--- src/libexec/ftpd/version.h:1.70 Tue Sep 16 12:30:38 2008
+++ src/libexec/ftpd/version.h Wed Apr 21 05:26:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.70 2008/09/16 12:30:38 lukem Exp $ */
+/* $NetBSD: version.h,v 1.70.10.1 2010/04/21 05:26:10 matt Exp $ */
/*-
* Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,5 +29,5 @@
*/
#ifndef FTPD_VERSION
-#define FTPD_VERSION NetBSD-ftpd 20080916
+#define FTPD_VERSION NetBSD-ftpd 20100320
#endif
Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.36.4.1 src/libexec/ld.elf_so/map_object.c:1.36.4.1.4.1
--- src/libexec/ld.elf_so/map_object.c:1.36.4.1 Fri Jan 16 22:21:30 2009
+++ src/libexec/ld.elf_so/map_object.c Wed Apr 21 05:26:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: map_object.c,v 1.36.4.1 2009/01/16 22:21:30 bouyer Exp $ */
+/* $NetBSD: map_object.c,v 1.36.4.1.4.1 2010/04/21 05:26:10 matt Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: map_object.c,v 1.36.4.1 2009/01/16 22:21:30 bouyer Exp $);
+__RCSID($NetBSD: map_object.c,v 1.36.4.1.4.1 2010/04/21 05:26:10 matt Exp $);
#endif /* not lint */
#include errno.h
@@ -325,6 +325,9 @@
xfree(elm);
}
xfree(obj);
+#ifdef COMBRELOC
+ _rtld_combreloc_reset(obj);
+#endif
}
Obj_Entry *
Index: src/libexec/ld.elf_so/reloc.c
diff -u src/libexec/ld.elf_so/reloc.c:1.96 src/libexec/ld.elf_so/reloc.c:1.96.10.1
--- src/libexec/ld.elf_so/reloc.c:1.96 Tue Jul 29 16:27:01 2008
+++ src/libexec/ld.elf_so/reloc.c Wed Apr 21 05:26:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: reloc.c,v 1.96 2008/07/29 16:27:01 matt Exp $ */
+/* $NetBSD: reloc.c,v 1.96.10.1 2010/04/21 05:26:10 matt Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: reloc.c,v 1.96 2008/07/29 16:27:01 matt Exp $);
+__RCSID($NetBSD: reloc.c,v 1.96.10.1 2010/04/21 05:26:10 matt Exp $);
#endif /* not lint */
#include err.h
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.123 src/libexec/ld.elf_so/rtld.c:1.123.8.1
--- src/libexec/ld.elf_so/rtld.c:1.123 Sun Oct 26 07:11:54 2008
+++ src/libexec/ld.elf_so/rtld.c Wed Apr 21 05:26:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.123 2008/10/26 07:11:54 mrg Exp $ */
+/* $NetBSD: rtld.c,v 1.123.8.1 2010/04/21 05:26:10 matt Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: rtld.c,v 1.123 2008/10/26 07:11:54 mrg Exp $);
+__RCSID($NetBSD: rtld.c,v 1.123.8.1 2010/04/21 05:26:10 matt Exp $);
#endif /* not lint */
#include err.h
@@ -439,8 +439,8 @@
getenv(LD_LIBRARY_PATH));
} else {
execname = NULL;
- unsetenv(LD_DEBUG);
- unsetenv(LD_LIBRARY_PATH);
+ if (unsetenv(LD_DEBUG) || unsetenv(LD_LIBRARY_PATH))
+ _rtld_die();
}
_rtld_process_hints(execname, _rtld_paths, _rtld_xforms,
CVS commit: [matt-nb5-mips64] src/regress/lib/libevent
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:26:20 UTC 2010
Modified Files:
src/regress/lib/libevent [matt-nb5-mips64]: regress.c regress.gen.c
regress.gen.h regress_dns.c regress_http.c regress_rpc.c
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.14.1 src/regress/lib/libevent/regress.c \
src/regress/lib/libevent/regress.gen.c \
src/regress/lib/libevent/regress.gen.h \
src/regress/lib/libevent/regress_dns.c \
src/regress/lib/libevent/regress_http.c \
src/regress/lib/libevent/regress_rpc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/lib/libevent/regress.c
diff -u src/regress/lib/libevent/regress.c:1.1 src/regress/lib/libevent/regress.c:1.1.14.1
--- src/regress/lib/libevent/regress.c:1.1 Fri May 16 20:24:57 2008
+++ src/regress/lib/libevent/regress.c Wed Apr 21 05:26:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: regress.c,v 1.1 2008/05/16 20:24:57 peter Exp $ */
+/* $NetBSD: regress.c,v 1.1.14.1 2010/04/21 05:26:19 matt Exp $ */
/*
* Copyright (c) 2003, 2004 Niels Provos pro...@citi.umich.edu
* All rights reserved.
@@ -83,6 +83,9 @@
char buf[256];
int len;
+ if (arg == NULL)
+ return;
+
len = read(fd, buf, sizeof(buf));
if (len) {
@@ -101,6 +104,9 @@
{
int len;
+ if (arg == NULL)
+ return;
+
len = write(fd, TEST1, strlen(TEST1) + 1);
if (len == -1)
test_ok = 0;
@@ -169,7 +175,7 @@
struct timeval tv;
int diff;
- gettimeofday(tcalled, NULL);
+ evutil_gettimeofday(tcalled, NULL);
if (evutil_timercmp(tcalled, tset, ))
evutil_timersub(tcalled, tset, tv);
else
@@ -288,6 +294,52 @@
}
static void
+test_registerfds(void)
+{
+ int i, j;
+ int pair[2];
+ struct event read_evs[512];
+ struct event write_evs[512];
+
+ struct event_base *base = event_base_new();
+
+ fprintf(stdout, Testing register fds: );
+
+ for (i = 0; i 512; ++i) {
+ if (evutil_socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) {
+ /* run up to the limit of file descriptors */
+ break;
+ }
+ event_set(read_evs[i], pair[0],
+ EV_READ|EV_PERSIST, simple_read_cb, NULL);
+ event_base_set(base, read_evs[i]);
+ event_add(read_evs[i], NULL);
+ event_set(write_evs[i], pair[1],
+ EV_WRITE|EV_PERSIST, simple_write_cb, NULL);
+ event_base_set(base, write_evs[i]);
+ event_add(write_evs[i], NULL);
+
+ /* just loop once */
+ event_base_loop(base, EVLOOP_ONCE);
+ }
+
+ /* now delete everything */
+ for (j = 0; j i; ++j) {
+ event_del(read_evs[j]);
+ event_del(write_evs[j]);
+ close(read_evs[j].ev_fd);
+ close(write_evs[j].ev_fd);
+
+ /* just loop once */
+ event_base_loop(base, EVLOOP_ONCE);
+ }
+
+ event_base_free(base);
+
+ fprintf(stdout, OK\n);
+}
+
+static void
test_simpleread(void)
{
struct event ev;
@@ -428,18 +480,32 @@
evtimer_set(ev, timeout_cb, NULL);
evtimer_add(ev, tv);
- gettimeofday(tset, NULL);
+ evutil_gettimeofday(tset, NULL);
event_dispatch();
cleanup_test();
}
extern struct event_base *current_base;
+
+static void
+child_signal_cb(int fd, short event, void *arg)
+{
+ struct timeval tv;
+ int *pint = arg;
+
+ *pint = 1;
+
+ tv.tv_usec = 50;
+ tv.tv_sec = 0;
+ event_loopexit(tv);
+}
+
static void
test_fork(void)
{
- int status;
- struct event ev;
+ int status, got_sigchld = 0;
+ struct event ev, sig_ev;
pid_t pid;
setup_test(After fork: );
@@ -450,6 +516,9 @@
if (event_add(ev, NULL) == -1)
exit(1);
+ signal_set(sig_ev, SIGCHLD, child_signal_cb, got_sigchld);
+ signal_add(sig_ev, NULL);
+
if ((pid = fork()) == 0) {
/* in the child */
if (event_reinit(current_base) == -1) {
@@ -457,6 +526,8 @@
exit(1);
}
+ signal_del(sig_ev);
+
called = 0;
event_dispatch();
@@ -488,6 +559,13 @@
event_dispatch();
+ if (!got_sigchld) {
+ fprintf(stdout, FAILED (sigchld)\n);
+ exit(1);
+ }
+
+ signal_del(sig_ev);
+
cleanup_test();
}
@@ -500,6 +578,9 @@
setup_test(Simple signal: );
signal_set(ev, SIGALRM, signal_cb, ev);
signal_add(ev, NULL);
+ /* find bugs in which operations are re-ordered */
+ signal_del(ev);
+ signal_add(ev, NULL);
memset(itv, 0, sizeof(itv));
itv.it_value.tv_sec = 1;
@@ -515,6 +596,36 @@
}
static void
+test_multiplesignal(void)
+{
+ struct event ev_one, ev_two;
+ struct itimerval itv;
+
+ setup_test(Multiple signal: );
+
+ signal_set(ev_one, SIGALRM, signal_cb, ev_one);
+ signal_add(ev_one, NULL);
+
+ signal_set(ev_two, SIGALRM, signal_cb, ev_two);
+ signal_add(ev_two, NULL);
+
+ memset(itv, 0, sizeof(itv));
+ itv.it_value.tv_sec = 1;
+ if (setitimer(ITIMER_REAL, itv, NULL) == -1)
+ goto skip_simplesignal;
+
+ event_dispatch();
+
+ skip_simplesignal:
+ if (signal_del(ev_one) == -1)
+ test_ok = 0;
+ if (signal_del(ev_two) == -1)
+ test_ok = 0;
+
+ cleanup_test();
+}
+
+static void
test_immediatesignal(void)
{
struct event ev;
@@ -690,6 +801,52 @@
}
static void
CVS commit: [matt-nb5-mips64] src/sbin
Module Name:src
Committed By: matt
Date: Wed Apr 21 05:26:35 UTC 2010
Modified Files:
src/sbin/atactl [matt-nb5-mips64]: atactl.c
src/sbin/dkctl [matt-nb5-mips64]: dkctl.8 dkctl.c
src/sbin/drvctl [matt-nb5-mips64]: drvctl.8 drvctl.c
src/sbin/fdisk [matt-nb5-mips64]: fdisk.c
src/sbin/fsck_ext2fs [matt-nb5-mips64]: main.c
src/sbin/fsck_ffs [matt-nb5-mips64]: extern.h setup.c wapbl.c
src/sbin/ifconfig [matt-nb5-mips64]: af_link.c ifconfig.8 ifconfig.c
parse.c util.c util.h vlan.c
src/sbin/newfs [matt-nb5-mips64]: newfs.c
src/sbin/newfs_msdos [matt-nb5-mips64]: newfs_msdos.c
src/sbin/newfs_udf [matt-nb5-mips64]: newfs_udf.8 udf_create.c
src/sbin/ping [matt-nb5-mips64]: ping.c
src/sbin/raidctl [matt-nb5-mips64]: raidctl.8 raidctl.c
src/sbin/savecore [matt-nb5-mips64]: savecore.c
src/sbin/tunefs [matt-nb5-mips64]: tunefs.c
src/sbin/wsconsctl [matt-nb5-mips64]: wsconsctl.8
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.8.1 src/sbin/atactl/atactl.c
cvs rdiff -u -r1.17 -r1.17.32.1 src/sbin/dkctl/dkctl.8
cvs rdiff -u -r1.16 -r1.16.32.1 src/sbin/dkctl/dkctl.c
cvs rdiff -u -r1.5 -r1.5.16.1 src/sbin/drvctl/drvctl.8
cvs rdiff -u -r1.6 -r1.6.16.1 src/sbin/drvctl/drvctl.c
cvs rdiff -u -r1.116.6.1 -r1.116.6.1.4.1 src/sbin/fdisk/fdisk.c
cvs rdiff -u -r1.32 -r1.32.8.1 src/sbin/fsck_ext2fs/main.c
cvs rdiff -u -r1.24 -r1.24.8.1 src/sbin/fsck_ffs/extern.h
cvs rdiff -u -r1.84 -r1.84.8.1 src/sbin/fsck_ffs/setup.c
cvs rdiff -u -r1.2 -r1.2.10.1 src/sbin/fsck_ffs/wapbl.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/sbin/ifconfig/af_link.c
cvs rdiff -u -r1.94 -r1.94.8.1 src/sbin/ifconfig/ifconfig.8
cvs rdiff -u -r1.213.2.1 -r1.213.2.1.4.1 src/sbin/ifconfig/ifconfig.c
cvs rdiff -u -r1.12 -r1.12.6.1 src/sbin/ifconfig/parse.c
cvs rdiff -u -r1.8 -r1.8.6.1 src/sbin/ifconfig/util.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sbin/ifconfig/util.h
cvs rdiff -u -r1.12 -r1.12.8.1 src/sbin/ifconfig/vlan.c
cvs rdiff -u -r1.102 -r1.102.8.1 src/sbin/newfs/newfs.c
cvs rdiff -u -r1.27.2.2 -r1.27.2.2.4.1 src/sbin/newfs_msdos/newfs_msdos.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.1.4.1 src/sbin/newfs_udf/newfs_udf.8
cvs rdiff -u -r1.12.4.2 -r1.12.4.2.4.1 src/sbin/newfs_udf/udf_create.c
cvs rdiff -u -r1.87 -r1.87.16.1 src/sbin/ping/ping.c
cvs rdiff -u -r1.56 -r1.56.8.1 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.39.4.1 -r1.39.4.1.4.1 src/sbin/raidctl/raidctl.c
cvs rdiff -u -r1.76.2.1 -r1.76.2.1.4.1 src/sbin/savecore/savecore.c
cvs rdiff -u -r1.37 -r1.37.8.1 src/sbin/tunefs/tunefs.c
cvs rdiff -u -r1.25.6.1 -r1.25.6.1.2.1 src/sbin/wsconsctl/wsconsctl.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/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.52 src/sbin/atactl/atactl.c:1.52.8.1
--- src/sbin/atactl/atactl.c:1.52 Mon Aug 25 00:45:56 2008
+++ src/sbin/atactl/atactl.c Wed Apr 21 05:26:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atactl.c,v 1.52 2008/08/25 00:45:56 dholland Exp $ */
+/* $NetBSD: atactl.c,v 1.52.8.1 2010/04/21 05:26:33 matt Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.52 2008/08/25 00:45:56 dholland Exp $);
+__RCSID($NetBSD: atactl.c,v 1.52.8.1 2010/04/21 05:26:33 matt Exp $);
#endif
@@ -856,9 +856,9 @@
device_identify(int argc, char *argv[])
{
struct ataparams *inqbuf;
- char model[sizeof(inqbuf-atap_model)];
- char revision[sizeof(inqbuf-atap_revision)];
- char serial[sizeof(inqbuf-atap_serial)];
+ char model[sizeof(inqbuf-atap_model)+1];
+ char revision[sizeof(inqbuf-atap_revision)+1];
+ char serial[sizeof(inqbuf-atap_serial)+1];
int needswap = 0;
/* No arguments. */
Index: src/sbin/dkctl/dkctl.8
diff -u src/sbin/dkctl/dkctl.8:1.17 src/sbin/dkctl/dkctl.8:1.17.32.1
--- src/sbin/dkctl/dkctl.8:1.17 Thu Jan 12 20:28:29 2006
+++ src/sbin/dkctl/dkctl.8 Wed Apr 21 05:26:33 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: dkctl.8,v 1.17 2006/01/12 20:28:29 wiz Exp $
+.\ $NetBSD: dkctl.8,v 1.17.32.1 2010/04/21 05:26:33 matt Exp $
.\
.\ Copyright 2002 Wasabi Systems, Inc.
.\ All rights reserved.
@@ -33,7 +33,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd December 26, 2005
+.Dd July 30, 2009
.Dt DKCTL 8
.Os
.Sh NAME
@@ -118,6 +118,24 @@
.Ar name
and the partition type
.Ar ptype .
+Valid choices for ptype would be
+.Ar unused ,
+.Ar swap ,
+.Ar ffs ,
+.Ar lfs ,
+.Ar ext2fs ,
+.Ar cd9660 ,
+.Ar ados ,
+.Ar hfs ,
+.Ar msdos ,
+.Ar filecore ,
+.Ar raidframe ,
+.Ar ccd ,
+.Ar appleufs ,
+.Ar ntfs ,
+and
+.Ar cgd .
+.Pp
The device name of the virtual block device assigned to the wedge will be
displayed after the wedge has been successfully created.
See
Index: src/sbin/dkctl/dkctl.c
diff -u
CVS commit: [matt-nb5-mips64] src/tools/compat
Module Name:src Committed By: matt Date: Wed Apr 21 05:27:00 UTC 2010 Modified Files: src/tools/compat [matt-nb5-mips64]: compat_defs.h getmode.c Log Message: sync to netbsd-5 To generate a diff of this commit: cvs rdiff -u -r1.67.2.1 -r1.67.2.1.4.1 src/tools/compat/compat_defs.h cvs rdiff -u -r1.7 -r1.7.10.1 src/tools/compat/getmode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.67.2.1 src/tools/compat/compat_defs.h:1.67.2.1.4.1 --- src/tools/compat/compat_defs.h:1.67.2.1 Thu Jan 15 04:32:35 2009 +++ src/tools/compat/compat_defs.h Wed Apr 21 05:27:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.67.2.1 2009/01/15 04:32:35 snj Exp $ */ +/* $NetBSD: compat_defs.h,v 1.67.2.1.4.1 2010/04/21 05:27:00 matt Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -38,7 +38,6 @@ #include sys/stat.h #include errno.h #include fcntl.h -#include grp.h #include limits.h #include paths.h #include stdarg.h @@ -76,6 +75,9 @@ /* We don't include pwd.h here, so that compat_pwd.h works. */ struct passwd; +/* We don't include grp.h here, so that compat_pwd.h works. */ +struct group; + /* Assume an ANSI compiler for the host. */ #undef __P Index: src/tools/compat/getmode.c diff -u src/tools/compat/getmode.c:1.7 src/tools/compat/getmode.c:1.7.10.1 --- src/tools/compat/getmode.c:1.7 Mon Apr 28 20:24:12 2008 +++ src/tools/compat/getmode.c Wed Apr 21 05:27:00 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: getmode.c,v 1.7 2008/04/28 20:24:12 martin Exp $ */ +/* $NetBSD: getmode.c,v 1.7.10.1 2010/04/21 05:27:00 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,6 +31,7 @@ #include nbtool_config.h #include stdlib.h +#include unistd.h void * setmode(const char *str)
CVS commit: src/share/man/man8
Module Name:src Committed By: jruoho Date: Wed Apr 21 05:39:13 UTC 2010 Modified Files: src/share/man/man8: security.8 Log Message: Add a paragraph also for FORTIFY_SOURCE (or USE_FORT). To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man8/security.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/security.8 diff -u src/share/man/man8/security.8:1.21 src/share/man/man8/security.8:1.22 --- src/share/man/man8/security.8:1.21 Wed Apr 21 05:05:07 2010 +++ src/share/man/man8/security.8 Wed Apr 21 05:39:13 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.8,v 1.21 2010/04/21 05:05:07 jruoho Exp $ +.\ $NetBSD: security.8,v 1.22 2010/04/21 05:39:13 jruoho Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -296,6 +296,35 @@ .Nx 6.0 , .Em SSP is used by default on i386 and amd64 architectures. +.Ss FORTIFY_SOURCE +The so-called +.Em FORTIFY_SOURCE +is a relatively simple technique to detect a subset of buffer overflows +before these can do damage. +It is integrated to +.Xr gcc 1 +together with some common memory and string functions in the standard +C library of +.Nx . +.Pp +The underlying idea builds on the observation that there are cases where +the compiler knows the size of a buffer (cf. +.Xr __builtin_object_size 3 ) . +If a buffer overflow is suspected in a function that does little or no +bounds checking, either a compile time warning can be issued or a +safer substitute function can be used at runtime. +.Pp +The +.Em FORTIY_SOURCE +is enabled by default in some parts of the +.Nx +source tree. +It is also possible to explicitly enable it by defining +the following in +.Xr mk.conf 5 : +.Bd -literal -offset indent +USE_FORT=yes +.Ed .Sh PER-USER TEMPORARY STORAGE It is possible to configure per-user temporary storage to avoid potential security issues (race conditions, etc.) in programs that do not make secure
CVS commit: src/share/man/man8
Module Name:src Committed By: jruoho Date: Wed Apr 21 05:40:59 UTC 2010 Modified Files: src/share/man/man8: security.8 Log Message: Fix a typo noted by w...@. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man8/security.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/security.8 diff -u src/share/man/man8/security.8:1.22 src/share/man/man8/security.8:1.23 --- src/share/man/man8/security.8:1.22 Wed Apr 21 05:39:13 2010 +++ src/share/man/man8/security.8 Wed Apr 21 05:40:59 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.8,v 1.22 2010/04/21 05:39:13 jruoho Exp $ +.\ $NetBSD: security.8,v 1.23 2010/04/21 05:40:59 jruoho Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -113,8 +113,8 @@ can be used (see below). .Pp For non-PIE -.Pq Position Independent Executable executables , -the +.Pq Position Independent Executable +executables, the .Nx .Em PaX ASLR implementation introduces randomization to the following memory regions:
CVS commit: src/share/man/man8
Module Name:src Committed By: jruoho Date: Wed Apr 21 05:49:36 UTC 2010 Modified Files: src/share/man/man8: security.8 Log Message: Refer to the generic ssp(3) instead of the specific __builtin_object_size(3). To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man8/security.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/security.8 diff -u src/share/man/man8/security.8:1.23 src/share/man/man8/security.8:1.24 --- src/share/man/man8/security.8:1.23 Wed Apr 21 05:40:59 2010 +++ src/share/man/man8/security.8 Wed Apr 21 05:49:36 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.8,v 1.23 2010/04/21 05:40:59 jruoho Exp $ +.\ $NetBSD: security.8,v 1.24 2010/04/21 05:49:36 jruoho Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -308,11 +308,13 @@ .Nx . .Pp The underlying idea builds on the observation that there are cases where -the compiler knows the size of a buffer (cf. -.Xr __builtin_object_size 3 ) . +the compiler knows the size of a buffer. If a buffer overflow is suspected in a function that does little or no bounds checking, either a compile time warning can be issued or a safer substitute function can be used at runtime. +Refer to +.Xr ssp 3 +for additional details. .Pp The .Em FORTIY_SOURCE
CVS commit: src/share/man/man8
Module Name:src Committed By: wiz Date: Wed Apr 21 05:53:32 UTC 2010 Modified Files: src/share/man/man8: security.8 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/share/man/man8/security.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/security.8 diff -u src/share/man/man8/security.8:1.24 src/share/man/man8/security.8:1.25 --- src/share/man/man8/security.8:1.24 Wed Apr 21 05:49:36 2010 +++ src/share/man/man8/security.8 Wed Apr 21 05:53:32 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: security.8,v 1.24 2010/04/21 05:49:36 jruoho Exp $ +.\ $NetBSD: security.8,v 1.25 2010/04/21 05:53:32 wiz Exp $ .\ .\ Copyright (c) 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -317,7 +317,7 @@ for additional details. .Pp The -.Em FORTIY_SOURCE +.Em FORTIFY_SOURCE is enabled by default in some parts of the .Nx source tree.
