CVS commit: src/lib

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Wed Aug 14 08:29:26 UTC 2013

Modified Files:
src/lib/librump: rump.3
src/lib/librumpuser: rumpuser.c

Log Message:
Change the default value of rump kernels CPUs to 2.  It used to be
the number of host cores, but that value is overkill for most uses,
especially with massively multicore hosts.  Dozens of useless virtual
CPUs are relatively speaking expensive in terms of bootstrap time and
memory footprint.  On the other end of the spectrum, defaulting to 2
might shake out some bugs from the qemu test runs.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/librump/rump.3
cvs rdiff -u -r1.53 -r1.54 src/lib/librumpuser/rumpuser.c

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

Modified files:

Index: src/lib/librump/rump.3
diff -u src/lib/librump/rump.3:1.14 src/lib/librump/rump.3:1.15
--- src/lib/librump/rump.3:1.14	Sat Jul 20 21:39:57 2013
+++ src/lib/librump/rump.3	Wed Aug 14 08:29:26 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: rump.3,v 1.14 2013/07/20 21:39:57 wiz Exp $
+.\ $NetBSD: rump.3,v 1.15 2013/08/14 08:29:26 pooka Exp $
 .\
 .\ Copyright (c) 2008-2011 Antti Kantee.  All rights reserved.
 .\
@@ -23,7 +23,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd May 2, 2013
+.Dd July 14, 2013
 .Dt RUMP 3
 .Os
 .Sh NAME
@@ -76,16 +76,15 @@ communication medium.
 .Pp
 A rump kernel is bootstrapped by calling
 .Fn rump_init .
-A number of environment variables set before a rump kernel is bootstrapped
-will affect how it works.
-Some examples include:
+On a POSIX Host, environment variables can be used to adjust some
+operating parameters:
 .Bl -tag -width RUMP_MEMLIMITXX
 .It Dv RUMP_NCPU
-If set, indicates the number of virtual CPUs configured into a
+If set, the number indicates the number of virtual CPUs configured into a
 rump kernel.
-The default is the number of host CPUs.
-The number of virtual CPUs controls how many threads can enter
-the rump kernel simultaneously.
+The special value host can be used to specify the number of
+of host CPUs available.
+If the value is unset, two CPUs will be configured.
 .It Dv RUMP_VERBOSE
 If set to non-zero, activates bootverbose.
 .It Dv RUMP_THREADS

Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.53 src/lib/librumpuser/rumpuser.c:1.54
--- src/lib/librumpuser/rumpuser.c:1.53	Wed May 15 15:57:01 2013
+++ src/lib/librumpuser/rumpuser.c	Wed Aug 14 08:29:25 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser.c,v 1.53 2013/05/15 15:57:01 pooka Exp $	*/
+/*	$NetBSD: rumpuser.c,v 1.54 2013/08/14 08:29:25 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
 #include rumpuser_port.h
 
 #if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.53 2013/05/15 15:57:01 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.54 2013/08/14 08:29:25 pooka Exp $);
 #endif /* !lint */
 
 #include sys/ioctl.h
@@ -572,6 +572,8 @@ rumpuser_getparam(const char *name, void
 		int ncpu;
 
 		if (getenv_r(RUMP_NCPU, buf, blen) == -1) {
+			sprintf(buf, 2); /* default */
+		} else if (strcmp(buf, host) == 0) {
 			ncpu = gethostncpu();
 			snprintf(buf, blen, %d, ncpu);
 		}

CVS commit: src/share/man/man4

[Radoslaw Kujawa]

Module Name:src
Committed By:   rkujawa
Date:   Wed Aug 14 09:19:09 UTC 2013

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


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/ne.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/ne.4
diff -u src/share/man/man4/ne.4:1.18 src/share/man/man4/ne.4:1.19
--- src/share/man/man4/ne.4:1.18	Tue Aug 13 17:30:27 2013
+++ src/share/man/man4/ne.4	Wed Aug 14 09:19:09 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: ne.4,v 1.18 2013/08/13 17:30:27 rkujawa Exp $
+.\	$NetBSD: ne.4,v 1.19 2013/08/14 09:19:09 rkujawa Exp $
 .\
 .\ Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -80,8 +80,14 @@ driver also supports such devices on var
 The Realtek 8019 (ISA, ISAPnP, some PCMCIA) and Realtek 8029 (PCI)
 NE2000-compatible Ethernet chips include support for software media
 selection.
-If one of these chips is detected by the driver, the list
-of supported media will be displayed.
+.Pp
+Some cards based on AX88x9x chips (like X-Surf 100) also support media
+selection and link auto negotiation through the
+.Xr mii 4
+interface.
+.Pp 
+If one of the above chips is detected by the driver, the list of supported
+media will be displayed.
 .Pp
 For all other chips supported by the
 .Nm

CVS commit: src/share/man/man4

[Radoslaw Kujawa]

Module Name:src
Committed By:   rkujawa
Date:   Wed Aug 14 09:20:55 UTC 2013

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

Log Message:
Note AX88x9x MII support (in previous commit, which accidentally had no
commit log message), bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/ne.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/ne.4
diff -u src/share/man/man4/ne.4:1.19 src/share/man/man4/ne.4:1.20
--- src/share/man/man4/ne.4:1.19	Wed Aug 14 09:19:09 2013
+++ src/share/man/man4/ne.4	Wed Aug 14 09:20:55 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: ne.4,v 1.19 2013/08/14 09:19:09 rkujawa Exp $
+.\	$NetBSD: ne.4,v 1.20 2013/08/14 09:20:55 rkujawa Exp $
 .\
 .\ Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -28,7 +28,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd August 13, 2013
+.Dd August 14, 2013
 .Dt NE 4
 .Os
 .Sh NAME

CVS commit: src

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Wed Aug 14 09:31:42 UTC 2013

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/sys/rump/net: Makefile.rumpnetcomp
src/sys/rump/net/lib/libnet: Makefile
src/sys/rump/net/lib/libnetinet: Makefile.inc component.c
Added Files:
src/sys/rump/net/lib/libnetinet6: Makefile Makefile.inc component.c
shlib_version

Log Message:
Separate inet and inet6, allows inet6-only rump kernels.


To generate a diff of this commit:
cvs rdiff -u -r1.670 -r1.671 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1831 -r1.1832 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.252 -r1.253 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/net/lib/libnetinet/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libnetinet/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnetinet6/Makefile \
src/sys/rump/net/lib/libnetinet6/Makefile.inc \
src/sys/rump/net/lib/libnetinet6/component.c \
src/sys/rump/net/lib/libnetinet6/shlib_version

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

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.670 src/distrib/sets/lists/base/shl.mi:1.671
--- src/distrib/sets/lists/base/shl.mi:1.670	Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/base/shl.mi	Wed Aug 14 09:31:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.670 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: shl.mi,v 1.671 2013/08/14 09:31:41 pooka Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -663,6 +663,9 @@
 ./usr/lib/librumpnet_netinet.so			base-rump-shlib	rump
 ./usr/lib/librumpnet_netinet.so.0		base-rump-shlib	rump
 ./usr/lib/librumpnet_netinet.so.0.0		base-rump-shlib	rump
+./usr/lib/librumpnet_netinet6.so			base-rump-shlib	rump
+./usr/lib/librumpnet_netinet6.so.0		base-rump-shlib	rump
+./usr/lib/librumpnet_netinet6.so.0.0		base-rump-shlib	rump
 ./usr/lib/librumpnet_netmpls.so			base-rump-shlib	rump
 ./usr/lib/librumpnet_netmpls.so.0		base-rump-shlib	rump
 ./usr/lib/librumpnet_netmpls.so.0.0		base-rump-shlib	rump

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1831 src/distrib/sets/lists/comp/mi:1.1832
--- src/distrib/sets/lists/comp/mi:1.1831	Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/comp/mi	Wed Aug 14 09:31:41 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1831 2013/08/11 22:29:02 joerg Exp $
+#	$NetBSD: mi,v 1.1832 2013/08/14 09:31:41 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -3235,6 +3235,8 @@
 ./usr/lib/librumpnet_netbt_p.a			comp-c-proflib		profile,rump
 ./usr/lib/librumpnet_netinet.a			comp-c-lib		rump
 ./usr/lib/librumpnet_netinet_p.a		comp-c-proflib		profile,rump
+./usr/lib/librumpnet_netinet6.a			comp-c-lib		rump
+./usr/lib/librumpnet_netinet6_p.a		comp-c-proflib		profile,rump
 ./usr/lib/librumpnet_netmpls.a			comp-c-lib		rump
 ./usr/lib/librumpnet_netmpls_p.a		comp-c-proflib		profile,rump
 ./usr/lib/librumpnet_npf.a			comp-c-lib		rump

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.252 src/distrib/sets/lists/comp/shl.mi:1.253
--- src/distrib/sets/lists/comp/shl.mi:1.252	Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/comp/shl.mi	Wed Aug 14 09:31:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.252 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: shl.mi,v 1.253 2013/08/14 09:31:41 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -203,6 +203,7 @@
 ./usr/lib/librumpnet_net_pic.a			comp-c-piclib		rump
 ./usr/lib/librumpnet_netbt_pic.a		comp-c-piclib		rump
 ./usr/lib/librumpnet_netinet_pic.a		comp-c-piclib		rump
+./usr/lib/librumpnet_netinet6_pic.a		comp-c-piclib		rump
 ./usr/lib/librumpnet_netmpls_pic.a		comp-c-piclib		rump
 ./usr/lib/librumpnet_npf_pic.a			comp-c-piclib		rump
 ./usr/lib/librumpnet_pic.a			comp-c-piclib		rump

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.29 src/distrib/sets/lists/debug/mi:1.30
--- src/distrib/sets/lists/debug/mi:1.29	Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/debug/mi	Wed Aug 14 09:31:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.29 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: mi,v 1.30 2013/08/14 09:31:41 pooka Exp $
 
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib/i18n/libBIG5_g.a			-unknown-		debuglib
@@ -199,6 +199,7 @@
 ./usr/lib/librumpnet_net_g.a			-unknown-		debuglib,rump
 

CVS commit: src/sys/rump/net/lib

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Wed Aug 14 09:55:05 UTC 2013

Modified Files:
src/sys/rump/net/lib/libnetinet: component.c
src/sys/rump/net/lib/libnetinet6: component.c

Log Message:
Partially revert previous, there are still a few gotchas in
running ipv4/ipv6-only (too many dependencies on ifdefs).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/lib/libnetinet/component.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnetinet6/component.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/rump/net/lib/libnetinet/component.c
diff -u src/sys/rump/net/lib/libnetinet/component.c:1.7 src/sys/rump/net/lib/libnetinet/component.c:1.8
--- src/sys/rump/net/lib/libnetinet/component.c:1.7	Wed Aug 14 09:31:42 2013
+++ src/sys/rump/net/lib/libnetinet/component.c	Wed Aug 14 09:55:05 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: component.c,v 1.7 2013/08/14 09:31:42 pooka Exp $	*/
+/*	$NetBSD: component.c,v 1.8 2013/08/14 09:55:05 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: component.c,v 1.7 2013/08/14 09:31:42 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.8 2013/08/14 09:55:05 pooka Exp $);
 
 #include sys/param.h
 #include sys/domain.h
@@ -46,10 +46,11 @@ int carpattach(int);
 
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
 {
-	extern struct domain arpdomain, inetdomain;
+	extern struct domain arpdomain, inetdomain, inet6domain;
 
 	DOMAINADD(arpdomain);
 	DOMAINADD(inetdomain);
+	DOMAINADD(inet6domain);
 
 	carpattach(1);
 }

Index: src/sys/rump/net/lib/libnetinet6/component.c
diff -u src/sys/rump/net/lib/libnetinet6/component.c:1.1 src/sys/rump/net/lib/libnetinet6/component.c:1.2
--- src/sys/rump/net/lib/libnetinet6/component.c:1.1	Wed Aug 14 09:31:42 2013
+++ src/sys/rump/net/lib/libnetinet6/component.c	Wed Aug 14 09:55:05 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: component.c,v 1.1 2013/08/14 09:31:42 pooka Exp $	*/
+/*	$NetBSD: component.c,v 1.2 2013/08/14 09:55:05 pooka Exp $	*/
 
 /*
  * Copyright (c) 2013 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: component.c,v 1.1 2013/08/14 09:31:42 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.2 2013/08/14 09:55:05 pooka Exp $);
 
 #include sys/param.h
 #include sys/domain.h
@@ -38,12 +38,14 @@ __KERNEL_RCSID(0, $NetBSD: component.c,
 #include rump_private.h
 #include rump_net_private.h
 
+#ifdef notyet
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
 {
 	extern struct domain inet6domain;
 
 	DOMAINADD(inet6domain);
 }
+#endif
 
 RUMP_COMPONENT(RUMP_COMPONENT_NET_IFCFG)
 {

CVS commit: src/tools/compat

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Aug 14 10:14:45 UTC 2013

Modified Files:
src/tools/compat: configure.ac

Log Message:
add test for struct tm tm_gmtoff member


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/tools/compat/configure.ac

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/configure.ac
diff -u src/tools/compat/configure.ac:1.79 src/tools/compat/configure.ac:1.80
--- src/tools/compat/configure.ac:1.79	Fri Aug  9 20:12:38 2013
+++ src/tools/compat/configure.ac	Wed Aug 14 10:14:45 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.79 2013/08/09 20:12:38 jmcneill Exp $
+#	$NetBSD: configure.ac,v 1.80 2013/08/14 10:14:45 jmcneill Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -137,6 +137,7 @@ AC_CHECK_MEMBERS([struct stat.st_flags, 
 	struct stat.st_atim, struct stat.st_mtimensec],,, 
 	[#include sys/stat.h])
 AC_CHECK_MEMBERS(struct statvfs.f_iosize,,, [#include sys/statvfs.h])
+AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include time.h])
 
 # Global variable decls.
 AC_CHECK_DECLS([optind, optreset],,, [

CVS commit: src/usr.sbin/makefs

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Aug 14 10:16:04 UTC 2013

Modified Files:
src/usr.sbin/makefs: udf.c

Log Message:
when building as a tool, only use struct tm tm_gmtoff if 
HAVE_STRUCT_TM_TM_GMTOFF is defined -- fixes cygwin build


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/makefs/udf.c

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

Modified files:

Index: src/usr.sbin/makefs/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.12 src/usr.sbin/makefs/udf.c:1.13
--- src/usr.sbin/makefs/udf.c:1.12	Fri Aug  9 15:11:08 2013
+++ src/usr.sbin/makefs/udf.c	Wed Aug 14 10:16:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.12 2013/08/09 15:11:08 reinoud Exp $ */
+/* $NetBSD: udf.c,v 1.13 2013/08/14 10:16:04 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
 #endif
 
 #include sys/cdefs.h
-__RCSID($NetBSD: udf.c,v 1.12 2013/08/09 15:11:08 reinoud Exp $);
+__RCSID($NetBSD: udf.c,v 1.13 2013/08/14 10:16:04 jmcneill Exp $);
 
 #include stdio.h
 #include stdlib.h
@@ -53,6 +53,10 @@ __RCSID($NetBSD: udf.c,v 1.12 2013/08/0
 #include udf/cdio_mmc_structs.h
 #endif
 
+#if !HAVE_NBTOOL_CONFIG_H
+#define HAVE_STRUCT_TM_TM_GMTOFF
+#endif
+
 #include makefs.h
 #include udf_create.h
 #include udf_write.h
@@ -328,7 +332,11 @@ udf_prep_opts(fsinfo_t *fsopts)
 	/* use user's time zone as default */
 	(void)time(now);
 	tm = localtime(now);
+#ifdef HAVE_STRUCT_TM_TM_GMTOFF
 	context.gmtoff = tm-tm_gmtoff;
+#else
+	context.gmtoff = 0;
+#endif
 
 	/* return info */
 	fsopts-fs_specific = NULL;

CVS commit: src/share/man/man4/man4.amiga

[Radoslaw Kujawa]

Module Name:src
Committed By:   rkujawa
Date:   Wed Aug 14 10:45:17 UTC 2013

Modified Files:
src/share/man/man4/man4.amiga: xsh.4

Log Message:
Link to X-Surf 100 docs, add info about the chip.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/man4.amiga/xsh.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.amiga/xsh.4
diff -u src/share/man/man4/man4.amiga/xsh.4:1.3 src/share/man/man4/man4.amiga/xsh.4:1.4
--- src/share/man/man4/man4.amiga/xsh.4:1.3	Tue Aug 13 16:09:54 2013
+++ src/share/man/man4/man4.amiga/xsh.4	Wed Aug 14 10:45:17 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: xsh.4,v 1.3 2013/08/13 16:09:54 rkujawa Exp $
+.\ $NetBSD: xsh.4,v 1.4 2013/08/14 10:45:17 rkujawa Exp $
 .\
 .\ Copyright (c) 2013 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -42,6 +42,9 @@ The
 .Nm
 driver provides support for ethernet interface present on the Individual 
 Computers X-Surf 100 card.
+It acts as a bus attachment layer for the machine idependent
+.Xr ne 4
+driver, which supports the AX88796 chip.
 .Sh HARDWARE
 The
 .Nm
@@ -50,7 +53,10 @@ driver supports the following hardware:
 .It Individual Computers X-Surf 100
 .El
 .Sh SEE ALSO
-.Xr ne 4
+.Xr ne 4 ,
+.Xr mii 4
+.Pp
+.Lk http://wiki.icomp.de/wiki/X-Surf-100 X-Surf 100 on Individual Computers wiki
 .Sh HISTORY
 The
 .Nm

CVS commit: src/share/man/man4/man4.amiga

[Radoslaw Kujawa]

Module Name:src
Committed By:   rkujawa
Date:   Wed Aug 14 11:29:57 UTC 2013

Modified Files:
src/share/man/man4/man4.amiga: ed.4

Log Message:
This driver was actually pulled back to 6.1, so it first appeared in 6.1, not
7.0.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/man4.amiga/ed.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.amiga/ed.4
diff -u src/share/man/man4/man4.amiga/ed.4:1.15 src/share/man/man4/man4.amiga/ed.4:1.16
--- src/share/man/man4/man4.amiga/ed.4:1.15	Wed Oct 31 06:53:14 2012
+++ src/share/man/man4/man4.amiga/ed.4	Wed Aug 14 11:29:57 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: ed.4,v 1.15 2012/10/31 06:53:14 wiz Exp $
+.\ $NetBSD: ed.4,v 1.16 2013/08/14 11:29:57 rkujawa Exp $
 .\
 .\ Copyright (c) 1994 Christopher G. Demetriou
 .\ All rights reserved.
@@ -77,4 +77,4 @@ The
 interface first appeared in
 .Nx 1.0 .
 It was rewritten by Frank Wille for
-.Nx 7.0 .
+.Nx 6.1 .

CVS commit: src/sys/arch/shark/include

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Aug 14 14:43:12 UTC 2013

Added Files:
src/sys/arch/shark/include: netbsd32_machdep.h

Log Message:
Allow building of COMPAT_NETBSD32.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/shark/include/netbsd32_machdep.h

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

Added files:

Index: src/sys/arch/shark/include/netbsd32_machdep.h
diff -u /dev/null src/sys/arch/shark/include/netbsd32_machdep.h:1.1
--- /dev/null	Wed Aug 14 14:43:12 2013
+++ src/sys/arch/shark/include/netbsd32_machdep.h	Wed Aug 14 14:43:12 2013
@@ -0,0 +1,3 @@
+/* $NetBSD: netbsd32_machdep.h,v 1.1 2013/08/14 14:43:12 martin Exp $ */
+
+#include arm/netbsd32_machdep.h

CVS commit: src/sys/arch/shark/conf

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Aug 14 14:45:12 UTC 2013

Modified Files:
src/sys/arch/shark/conf: Makefile.shark.inc

Log Message:
Do not output unwind tables, they make no sense for the kernel.
Do not force MACHINE=arm, to allow building eabi kernels with MACHINE=earmv4


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/shark/conf/Makefile.shark.inc

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/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.16 src/sys/arch/shark/conf/Makefile.shark.inc:1.17
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.16	Sun Jul 10 04:37:56 2011
+++ src/sys/arch/shark/conf/Makefile.shark.inc	Wed Aug 14 14:45:12 2013
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile.shark.inc,v 1.16 2011/07/10 04:37:56 tsutsui Exp $
+#	$NetBSD: Makefile.shark.inc,v 1.17 2013/08/14 14:45:12 martin Exp $
 
-MACHINE_ARCH=		arm
 CPPFLAGS+=		-D${MACHINE}
+CFLAGS+=		-fno-unwind-tables
 GENASSYM_EXTRAS+=	${THISARM}/shark/genassym.cf
 
 # Need to convert the kernel from ELF to a.out so that OpenFirmware

CVS commit: src/share/man/man4/man4.amiga

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Aug 14 17:41:20 UTC 2013

Modified Files:
src/share/man/man4/man4.amiga: xsh.4

Log Message:
Remove trailing space, sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.amiga/xsh.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.amiga/xsh.4
diff -u src/share/man/man4/man4.amiga/xsh.4:1.4 src/share/man/man4/man4.amiga/xsh.4:1.5
--- src/share/man/man4/man4.amiga/xsh.4:1.4	Wed Aug 14 10:45:17 2013
+++ src/share/man/man4/man4.amiga/xsh.4	Wed Aug 14 17:41:20 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: xsh.4,v 1.4 2013/08/14 10:45:17 rkujawa Exp $
+.\ $NetBSD: xsh.4,v 1.5 2013/08/14 17:41:20 wiz Exp $
 .\
 .\ Copyright (c) 2013 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -40,7 +40,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for ethernet interface present on the Individual 
+driver provides support for ethernet interface present on the Individual
 Computers X-Surf 100 card.
 It acts as a bus attachment layer for the machine idependent
 .Xr ne 4
@@ -53,8 +53,8 @@ driver supports the following hardware:
 .It Individual Computers X-Surf 100
 .El
 .Sh SEE ALSO
-.Xr ne 4 ,
-.Xr mii 4
+.Xr mii 4 ,
+.Xr ne 4
 .Pp
 .Lk http://wiki.icomp.de/wiki/X-Surf-100 X-Surf 100 on Individual Computers wiki
 .Sh HISTORY

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Aug 14 17:42:03 UTC 2013

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

Log Message:
Remove trailing space.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/ne.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/ne.4
diff -u src/share/man/man4/ne.4:1.20 src/share/man/man4/ne.4:1.21
--- src/share/man/man4/ne.4:1.20	Wed Aug 14 09:20:55 2013
+++ src/share/man/man4/ne.4	Wed Aug 14 17:42:03 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: ne.4,v 1.20 2013/08/14 09:20:55 rkujawa Exp $
+.\	$NetBSD: ne.4,v 1.21 2013/08/14 17:42:03 wiz Exp $
 .\
 .\ Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -85,7 +85,7 @@ Some cards based on AX88x9x chips (like 
 selection and link auto negotiation through the
 .Xr mii 4
 interface.
-.Pp 
+.Pp
 If one of the above chips is detected by the driver, the list of supported
 media will be displayed.
 .Pp

CVS commit: [netbsd-6-1] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Aug 15 03:27:37 UTC 2013

Modified Files:
src/distrib/notes/common [netbsd-6-1]: main
src/doc [netbsd-6-1]: CHANGES-6.1.1 LAST_MINUTE README.files
src/sys/sys [netbsd-6-1]: param.h

Log Message:
Welcome to 6.1.1!


To generate a diff of this commit:
cvs rdiff -u -r1.484.2.6 -r1.484.2.6.2.1 src/distrib/notes/common/main
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-6.1.1
cvs rdiff -u -r1.2.40.2 -r1.2.40.2.2.1 src/doc/LAST_MINUTE
cvs rdiff -u -r1.4.20.2.2.1 -r1.4.20.2.2.2 src/doc/README.files
cvs rdiff -u -r1.408.2.12.2.1 -r1.408.2.12.2.2 src/sys/sys/param.h

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.484.2.6 src/distrib/notes/common/main:1.484.2.6.2.1
--- src/distrib/notes/common/main:1.484.2.6	Sun May 12 16:44:03 2013
+++ src/distrib/notes/common/main	Thu Aug 15 03:27:37 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: main,v 1.484.2.6 2013/05/12 16:44:03 riz Exp $
+.\	$NetBSD: main,v 1.484.2.6.2.1 2013/08/15 03:27:37 snj Exp $
 .\
 .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -50,7 +50,7 @@
 .as MACHINE_LIST  sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
 .so \*[.CURDIR]/../common/macros
 .
-.Dd August 17, 2012
+.Dd August 15, 2013
 .Dt INSTALL 8
 .Os NetBSD
 .Sh NAME
@@ -458,306 +458,74 @@ possible, it's likely that
 wouldn't exist.
 .
 .if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 6.0 and 6.1 Releases
+.Ss Changes Between The NetBSD 6.1 and 6.1.1 Releases
 .Pp
-The
 .Nx
-\*V release
-provides numerous significant functional enhancements, including
-support for new devices, integration of hundreds of bug fixes,
-updated kernel subsystems, and many user-land enhancements.
-The result of these improvements is a stable operating system fit for
-production use that rivals most commercially available systems.
+\*V
+is the first critical/security update of the NetBSD 6.1 release branch.
+It represents a selected subset of fixes deemed critical for security
+or stability reasons.
 .Pp
 The complete list of changes can be found in the
-CHANGES-6.1:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.1/CHANGES-6.1
-file in the top level directory of the NetBSD 6.1 release tree. An abbreviated list is as follows:
+CHANGES-6.1.1:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.1.1/CHANGES-6.1.1
+file in the top level directory of the NetBSD 6.1.1 release tree.
+An abbreviated list is as follows:
 .Ss2 Security Advisory Fixes
 .(bullet
-NetBSD-SA2013-001:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-001.txt.asc ,
-Kernel panic triggered from userland
-.It
-NetBSD-SA2013-002:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-002.txt.asc ,
-kqueue related kernel panic triggered from userland
-.It
-NetBSD-SA2013-003:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-003.txt.asc ,
-RNG Bug May Result in Weak Cryptographic Keys
-.It
-NetBSD-SA2013-004:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-004.txt.asc ,
-Vulnerabilities in grep
-.bullet)
-.
-.Ss2 Security Fixes
-.(bullet
-expat: Fix CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876.
-.It
-BIND: Address CVE-2012-5688: Named could die on specific queries with dns64 enabled.
-.It
-Fixed a crash which could happen with sysctl security.curtain=1 set.
-(PR#47598):
-.Lk http://gnats.NetBSD.org/47598
+NetBSD-SA2013-005:
+.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-005.txt.asc ,
+bind Denial of Service (CVE-2013-4854)
 .It
-Address CVE-2012-5667: Multiple integer overflows in GNU grep.
+NetBSD-SA2013-006:
+.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-006.txt.asc ,
+Arbitrary Kernel Read with netstat -P
 .It
-Several fixes to entropy handling in the kernel.
+NetBSD-SA2013-007:
+.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-007.txt.asc ,
+Protocol handling issues in X Window System client libraries
 .It
-Prevent ktrace from being able to crash the kernel.
+NetBSD-SA2013-008:
+.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-008.txt.asc ,
+Error in authorization check re tcpdrop sysctl
 .bullet)
 .
-.Ss2 General kernel
+.Ss2 Security
 .(bullet
-posix_spawn(): Fix processes with attributes.
-.It
-Resolve races between vget() and vrele() resulting in vget() returning dead vnodes.
-.It
-Prevent crash when unsupported fd's are used with kevent.
-.It
-Fix a bug where kmem_alloc() could be called from interrupt context.
-.It
-WAPBL: coalesce writes to the journal to speed up wapbl_flush() on raid5 by a factor of 3 to 4.
+Add four new sysctls to avoid IPv6 DoS attacks.
 .bullet)
 .
 .Ss2 Networking
 .(bullet
-Fix atomic fragments for IPv6.
-.It
-ipf: Fix alignment issues in ipmon.
-(PR#47101):
-.Lk