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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Apr 30 05:24:45 UTC 2016

Modified Files:
src/sys/arch/sparc/conf: files.sparc

Log Message:
cgfourteen needs glyphcache now


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/sparc/conf/files.sparc

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/sparc/conf/files.sparc
diff -u src/sys/arch/sparc/conf/files.sparc:1.155 src/sys/arch/sparc/conf/files.sparc:1.156
--- src/sys/arch/sparc/conf/files.sparc:1.155	Thu Apr 21 18:27:29 2016
+++ src/sys/arch/sparc/conf/files.sparc	Sat Apr 30 05:24:45 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sparc,v 1.155 2016/04/21 18:27:29 macallan Exp $
+#	$NetBSD: files.sparc,v 1.156 2016/04/30 05:24:45 macallan Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
 # sparc-specific configuration info
@@ -256,7 +256,7 @@ device cgeight: bt_dac, fb, rasops24, pf
 attach cgeight at obio
 file	arch/sparc/dev/cgeight.c	cgeight needs-flag
 
-device cgfourteen: fb, rasops8, wsemuldisplaydev, vcons
+device cgfourteen: fb, rasops8, wsemuldisplaydev, vcons, glyphcache
 attach cgfourteen at obio
 file	arch/sparc/dev/cgfourteen.c	cgfourteen needs-flag
 

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Apr 30 05:24:45 UTC 2016

Modified Files:
src/sys/arch/sparc/conf: files.sparc

Log Message:
cgfourteen needs glyphcache now


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/sparc/conf/files.sparc

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

CVS commit: src/sys/arch/sparc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Apr 30 05:23:03 UTC 2016

Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c cgfourteenvar.h

Log Message:
support anti-aliased fonts, glyphcache etc.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/dev/cgfourteenvar.h

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

CVS commit: src/sys/arch/sparc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Apr 30 05:23:03 UTC 2016

Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c cgfourteenvar.h

Log Message:
support anti-aliased fonts, glyphcache etc.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/dev/cgfourteenvar.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/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.79 src/sys/arch/sparc/dev/cgfourteen.c:1.80
--- src/sys/arch/sparc/dev/cgfourteen.c:1.79	Fri Jul 25 08:10:34 2014
+++ src/sys/arch/sparc/dev/cgfourteen.c	Sat Apr 30 05:23:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgfourteen.c,v 1.79 2014/07/25 08:10:34 dholland Exp $ */
+/*	$NetBSD: cgfourteen.c,v 1.80 2016/04/30 05:23:03 macallan Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -96,6 +96,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -164,10 +165,9 @@ static void cg14_rectfill(struct cgfourt
 uint32_t);
 static void cg14_invert(struct cgfourteen_softc *, int, int, int, int);
 static void cg14_bitblt(void *, int, int, int, int, int, int, int);
+static void cg14_bitblt_gc(void *, int, int, int, int, int, int, int);
 
-#if 0
 static void cg14_putchar_aa(void *, int, int, u_int, long);
-#endif
 static void cg14_cursor(void *, int, int, int);
 static void cg14_putchar(void *, int, int, u_int, long);
 static void cg14_copycols(void *, int, int, int, int);
@@ -595,74 +595,14 @@ cgfourteenpoll(dev_t dev, int events, st
 static void
 cg14_init(struct cgfourteen_softc *sc)
 {
-#if 0
-	volatile uint32_t *clut;
-	volatile uint8_t  *xlut;
-	int i;
-
-	/*
-	 * We stash away the following to restore on close:
-	 *
-	 * 	color look-up table 1 	(sc->sc_saveclut)
-	 *	x look-up table		(sc->sc_savexlut)
-	 *	control register	(sc->sc_savectl)
-	 *	cursor control register (sc->sc_savehwc)
-	 */
-	sc->sc_savectl = sc->sc_ctl->ctl_mctl;
-	sc->sc_savehwc = sc->sc_hwc->curs_ctl;
-
-	clut = (volatile uint32_t *) sc->sc_clut1->clut_lut;
-	xlut = (volatile uint8_t *) sc->sc_xlut->xlut_lut;
-	for (i = 0; i < CG14_CLUT_SIZE; i++) {
-		sc->sc_saveclut.cm_chip[i] = clut[i];
-		sc->sc_savexlut[i] = xlut[i];
-	}
-
-	/*
-	 * Enable the video and put it in 8 bit mode
-	 */
-	sc->sc_ctl->ctl_mctl = CG14_MCTL_ENABLEVID | CG14_MCTL_PIXMODE_8 |
-		CG14_MCTL_POWERCTL;
-#else
 	cg14_set_depth(sc, 32);
-#endif
 }
 
 static void
 /* Restore the state saved on cg14_init */
 cg14_reset(struct cgfourteen_softc *sc)
 {
-#if 0
-	volatile uint32_t *clut;
-	volatile uint8_t  *xlut;
-	int i;
-
-	/*
-	 * We restore the following, saved in cg14_init:
-	 *
-	 * 	color look-up table 1 	(sc->sc_saveclut)
-	 *	x look-up table		(sc->sc_savexlut)
-	 *	control register	(sc->sc_savectl)
-	 *	cursor control register (sc->sc_savehwc)
-	 *
-	 * Note that we don't touch the video enable bits in the
-	 * control register; otherwise, screenblank wouldn't work.
-	 */
-	sc->sc_ctl->ctl_mctl = (sc->sc_ctl->ctl_mctl & (CG14_MCTL_ENABLEVID |
-			CG14_MCTL_POWERCTL)) |
-(sc->sc_savectl & ~(CG14_MCTL_ENABLEVID |
-		CG14_MCTL_POWERCTL));
-	sc->sc_hwc->curs_ctl = sc->sc_savehwc;
-
-	clut = sc->sc_clut1->clut_lut;
-	xlut = sc->sc_xlut->xlut_lut;
-	for (i = 0; i < CG14_CLUT_SIZE; i++) {
-		clut[i] = sc->sc_saveclut.cm_chip[i];
-		xlut[i] = sc->sc_savexlut[i];
-	}
-#else
 	cg14_set_depth(sc, 8);
-#endif
 }
 
 /* Enable/disable video display; power down monitor if DPMS-capable */
@@ -767,7 +707,6 @@ cg14_load_hwcmap(struct cgfourteen_softc
 		*lutp++ = *colp++;
 }
 
-#if NWSDISPLAY > 0
 static void
 cg14_setup_wsdisplay(struct cgfourteen_softc *sc, int is_cons)
 {
@@ -793,20 +732,35 @@ cg14_setup_wsdisplay(struct cgfourteen_s
 
 	ri = >sc_console_screen.scr_ri;
 
+	sc->sc_gc.gc_bitblt = cg14_bitblt_gc;
+	sc->sc_gc.gc_blitcookie = sc;
+	sc->sc_gc.gc_rop = 0xc;
 	if (is_cons) {
 		vcons_init_screen(>sc_vd, >sc_console_screen, 1,
 		);
 
 		/* clear the screen with the default background colour */
-		memset(sc->sc_fb.fb_pixels,
-		   (defattr >> 16) & 0xff,
-		   ri->ri_stride * ri->ri_height);
+		if (sc->sc_sx != NULL) {
+			cg14_rectfill(sc, 0, 0, ri->ri_width, ri->ri_height,
+ri->ri_devcmap[(defattr >> 16) & 0xf]);
+		} else {
+			memset(sc->sc_fb.fb_pixels,
+			   ri->ri_devcmap[(defattr >> 16) & 0xf],
+			   ri->ri_stride * ri->ri_height);
+		}
 		sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
 
 		sc->sc_defaultscreen_descr.textops = >ri_ops;
 		sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
 		sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
 		sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
+		glyphcache_init(>sc_gc, sc->sc_fb.fb_type.fb_height + 5,
+			(sc->sc_vramsize / sc->sc_fb.fb_type.fb_width) - 
+			 sc->sc_fb.fb_type.fb_height - 5,
+			sc->sc_fb.fb_type.fb_width,
+			ri->ri_font->fontwidth,
+			

CVS commit: src/sys/arch/sparc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Apr 30 05:22:19 UTC 2016

Modified Files:
src/sys/arch/sparc/dev: sxreg.h

Log Message:
sprinkle ()s in macros


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/dev/sxreg.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/arch/sparc/dev/sxreg.h
diff -u src/sys/arch/sparc/dev/sxreg.h:1.11 src/sys/arch/sparc/dev/sxreg.h:1.12
--- src/sys/arch/sparc/dev/sxreg.h:1.11	Wed Jun 19 00:41:16 2013
+++ src/sys/arch/sparc/dev/sxreg.h	Sat Apr 30 05:22:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sxreg.h,v 1.11 2013/06/19 00:41:16 macallan Exp $	*/
+/*	$NetBSD: sxreg.h,v 1.12 2016/04/30 05:22:19 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
 /* write registers via pseudo instructions */
 #define SX_QUEUED_R0		0x0300
 #define SX_QUEUED_R1		0x0304	/* and so on until R127 */
-#define SX_QUEUED(r)		(0x300 + (r << 2))
+#define SX_QUEUED(r)		(0x300 + ((r) << 2))
 
 /* special purpose registers */
 #define R_ZERO	0

CVS commit: src/sys/arch/sparc/dev

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Sat Apr 30 05:22:19 UTC 2016

Modified Files:
src/sys/arch/sparc/dev: sxreg.h

Log Message:
sprinkle ()s in macros


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/dev/sxreg.h

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

Re: CVS commit: src/tests/bin/sh

[Robert Elz]

Date:Fri, 29 Apr 2016 14:29:17 -0400
From:"Christos Zoulas" 
Message-ID:  <20160429182917.d265bf...@cvs.netbsd.org>

  | use "" so ${TEST_SH} is expanded.

Ugh!!!

It worked for me as I always have TEST_SH in the environment, so it
was getting expanded (much much) later...

I'm appending a new version of the fd patch - the basics of it are all
more or less unchanged, but the salad dressing has altered a bit.
This applies to the CVS version of src/bin/sh - ignoring the previous patch.

The system re-build finished (more or less, I forgot to fetch my src sets
making script, which is a little different than the standard one, so no
src sets got built) - aside from that, no problems.   That was with the
previous patch, I'm not sure if I will run it again (it took 18 1/2 hrs...)

Sometime later I will also have a patch so that compiling with -DSTATIC=static
works (which it definitely doesn't as it is.)

I have been working on t_redir.sh so I'll append that as I have it at the
minute (it passes with the shell with the patch included here) but there's
still one empty test I want to finish before any of this is ready to commit.

kre



T_REDIR.SH
Description: t_redir.sh
Index: cd.c
===
RCS file: /cvsroot/src/bin/sh/cd.c,v
retrieving revision 1.45
diff -u -u -r1.45 cd.c
--- cd.c4 Jan 2016 03:00:24 -   1.45
+++ cd.c29 Apr 2016 20:16:39 -
@@ -427,11 +427,7 @@
jp = makejob(NULL, 1);
if (forkshell(jp, NULL, FORK_NOJOB) == 0) {
(void) close(pip[0]);
-   if (pip[1] != 1) {
-   close(1);
-   copyfd(pip[1], 1, 1, 0);
-   close(pip[1]);
-   }
+   movefd(pip[1], 1);
(void) execl("/bin/pwd", "pwd", (char *)0);
error("Cannot exec /bin/pwd");
}
Index: eval.c
===
RCS file: /cvsroot/src/bin/sh/eval.c,v
retrieving revision 1.119
diff -u -u -r1.119 eval.c
--- eval.c  16 Mar 2016 21:20:59 -  1.119
+++ eval.c  29 Apr 2016 20:16:39 -
@@ -508,6 +508,7 @@
 
for (redir = n ; redir ; redir = redir->nfile.next) {
struct arglist fn;
+
fn.lastp = 
switch (redir->type) {
case NFROMTO:
@@ -566,18 +567,11 @@
}
if (forkshell(jp, lp->n, n->npipe.backgnd ? FORK_BG : FORK_FG) 
== 0) {
INTON;
-   if (prevfd > 0) {
-   close(0);
-   copyfd(prevfd, 0, 1, 0);
-   close(prevfd);
-   }
+   if (prevfd > 0)
+   movefd(prevfd, 0);
if (pip[1] >= 0) {
close(pip[0]);
-   if (pip[1] != 1) {
-   close(1);
-   copyfd(pip[1], 1, 1, 0);
-   close(pip[1]);
-   }
+   movefd(pip[1], 1);
}
evaltree(lp->n, EV_EXIT);
}
@@ -638,11 +632,7 @@
if (forkshell(jp, n, FORK_NOJOB) == 0) {
FORCEINTON;
close(pip[0]);
-   if (pip[1] != 1) {
-   close(1);
-   copyfd(pip[1], 1, 1, 0);
-   close(pip[1]);
-   }
+   movefd(pip[1], 1);
eflag = 0;
evaltree(n, EV_EXIT);
/* NOTREACHED */
@@ -970,11 +960,7 @@
FORCEINTON;
}
close(pip[0]);
-   if (pip[1] != 1) {
-   close(1);
-   copyfd(pip[1], 1, 1, 0);
-   close(pip[1]);
-   }
+   movefd(pip[1], 1);
}
flags |= EV_EXIT;
}
Index: input.c
===
RCS file: /cvsroot/src/bin/sh/input.c,v
retrieving revision 1.48
diff -u -u -r1.48 input.c
--- input.c 27 Mar 2016 14:34:46 -  1.48
+++ input.c 29 Apr 2016 20:16:39 -
@@ -411,14 +411,13 @@
error("Cannot rewind the file %s", fname);
}
 
-   if (fd < 10) {
-   fd2 = copyfd(fd, 10, 0, 0);
-   close(fd);
-   if (fd2 < 0)
-   

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:24:47 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
1147, 1154


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/doc/CHANGES-7.0.1

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

Modified files:

Index: src/doc/CHANGES-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.51 src/doc/CHANGES-7.0.1:1.1.2.52
--- src/doc/CHANGES-7.0.1:1.1.2.51	Sat Apr 16 21:01:15 2016
+++ src/doc/CHANGES-7.0.1	Fri Apr 29 19:24:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.51 2016/04/16 21:01:15 snj Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.52 2016/04/29 19:24:46 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -2310,3 +2310,14 @@ libexec/httpd/tilde-luzah-bozo.c
 	o -C option supports now CGI scripts only
 	[mrg, ticket #1141]
 
+external/bsd/ipf/dist/man/ipf.5			1.5
+
+	Correct the example for the port range syntax.
+	[khorben, ticket #1147]
+
+sys/miscfs/specfs/spec_vnops.c			1.161, 1.162
+
+	Avoid a race with spec_revoke when extracting v_rdev.  Fixes
+	PR kern/50467. 
+	[hannken, ticket #1154]
+

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:24:47 UTC 2016

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.1

Log Message:
1147, 1154


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/doc/CHANGES-7.0.1

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

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:17:22 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
1146-1148, 1152-1154


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-7.1

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.81 src/doc/CHANGES-7.1:1.1.2.82
--- src/doc/CHANGES-7.1:1.1.2.81	Sat Apr 16 21:00:49 2016
+++ src/doc/CHANGES-7.1	Fri Apr 29 19:17:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.81 2016/04/16 21:00:49 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.82 2016/04/29 19:17:22 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3783,3 +3783,41 @@ xsrc/external/mit/MesaLib/dist/src/mesa/
 	library is dlopen/dlclose'd !
 	[riastradh, ticket #1158]
 
+lib/libc/time/localtime.c			1.103 via patch
+
+	Use the correct upper bounds for the types array.  The correct
+	upper bound is typecnt not timecnt.  Now perpetual 'standard'
+	time zones will work correctly as they have a typecnt of 1
+	but a timecnt of 0.
+	[christos, ticket #1146]
+
+external/bsd/ipf/dist/man/ipf.5			1.5
+
+	Correct the example for the port range syntax.
+	[khorben, ticket #1147]
+
+sys/external/bsd/ipf/netinet/ip_nat.c		1.16
+
+	Fix matching of ICMP queries when NAT'd through IPF.  This
+	notably fixes MTU updates for hosts issueing ICMP queries
+	through a NAT performed by NetBSD with IPF.
+	[khorben, ticket #1148]
+
+sys/external/bsd/ipf/netinet/fil.c		1.17
+
+	Comment out the mutex calls that protect against concurrent
+	configuration changes and processing. This needs to be done
+	differently since you can't sleep during interrupt processing.
+	[christos, ticket #1152]
+
+usr.bin/ftp/fetch.c1.223
+
+	Use the port number for CONNECT.  PR bin/51043.
+	[nonaka, ticket #1153]
+
+sys/miscfs/specfs/spec_vnops.c			1.161, 1.162
+
+	Avoid a race with spec_revoke when extracting v_rdev.  Fixes
+PR kern/50467.
+	[hannken, ticket #1154]
+

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:17:22 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
1146-1148, 1152-1154


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-7.1

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

CVS commit: [netbsd-7-0] src/sys/miscfs/specfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:09:32 UTC 2016

Modified Files:
src/sys/miscfs/specfs [netbsd-7-0]: spec_vnops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1154):
sys/miscfs/specfs/spec_vnops.c: revision 1.161, 1.162
Whhen spec_strategy() extracts v_rdev take care to avoid a
race with spec_revoke.
Fixes PR kern/50467 Panic from disconnecting phone while reading its contents
--
Avoid a race with spec_revoke for the assertion too.
Final fix for PR kern/50467 Panic from disconnecting phone while reading
its contents


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.145.6.1 src/sys/miscfs/specfs/spec_vnops.c

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

CVS commit: [netbsd-7-0] src/sys/miscfs/specfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:09:32 UTC 2016

Modified Files:
src/sys/miscfs/specfs [netbsd-7-0]: spec_vnops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1154):
sys/miscfs/specfs/spec_vnops.c: revision 1.161, 1.162
Whhen spec_strategy() extracts v_rdev take care to avoid a
race with spec_revoke.
Fixes PR kern/50467 Panic from disconnecting phone while reading its contents
--
Avoid a race with spec_revoke for the assertion too.
Final fix for PR kern/50467 Panic from disconnecting phone while reading
its contents


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.145.6.1 src/sys/miscfs/specfs/spec_vnops.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/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.145 src/sys/miscfs/specfs/spec_vnops.c:1.145.6.1
--- src/sys/miscfs/specfs/spec_vnops.c:1.145	Fri Jul 25 08:20:53 2014
+++ src/sys/miscfs/specfs/spec_vnops.c	Fri Apr 29 19:09:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $	*/
+/*	$NetBSD: spec_vnops.c,v 1.145.6.1 2016/04/29 19:09:32 snj Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.145.6.1 2016/04/29 19:09:32 snj Exp $");
 
 #include 
 #include 
@@ -1051,26 +1051,44 @@ spec_strategy(void *v)
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	struct buf *bp = ap->a_bp;
+	dev_t dev;
 	int error;
 
-	KASSERT(vp == vp->v_specnode->sn_dev->sd_bdevvp);
+	dev = NODEV;
 
-	error = 0;
-	bp->b_dev = vp->v_rdev;
+	/*
+	 * Extract all the info we need from the vnode, taking care to
+	 * avoid a race with VOP_REVOKE().
+	 */
 
-	if (!(bp->b_flags & B_READ))
-		error = fscow_run(bp, false);
+	mutex_enter(vp->v_interlock);
+	if (vdead_check(vp, VDEAD_NOWAIT) == 0 && vp->v_specnode != NULL) {
+		KASSERT(vp == vp->v_specnode->sn_dev->sd_bdevvp);
+		dev = vp->v_rdev;
+	}
+	mutex_exit(vp->v_interlock);
 
-	if (error) {
-		bp->b_error = error;
-		bp->b_resid = bp->b_bcount;
-		biodone(bp);
-		return (error);
+	if (dev == NODEV) {
+		error = ENXIO;
+		goto out;
 	}
+	bp->b_dev = dev;
 
+	if (!(bp->b_flags & B_READ)) {
+		error = fscow_run(bp, false);
+		if (error)
+			goto out;
+	}
 	bdev_strategy(bp);
 
-	return (0);
+	return 0;
+
+out:
+	bp->b_error = error;
+	bp->b_resid = bp->b_bcount;
+	biodone(bp);
+
+	return error;
 }
 
 int

CVS commit: [netbsd-7] src/sys/miscfs/specfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:07:21 UTC 2016

Modified Files:
src/sys/miscfs/specfs [netbsd-7]: spec_vnops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1154):
sys/miscfs/specfs/spec_vnops.c: revisions 1.161, 1.162
Whhen spec_strategy() extracts v_rdev take care to avoid a
race with spec_revoke.
Fixes PR kern/50467 Panic from disconnecting phone while reading its contents
--
Avoid a race with spec_revoke for the assertion too.
Final fix for PR kern/50467 Panic from disconnecting phone while reading
its contents


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.145.2.1 src/sys/miscfs/specfs/spec_vnops.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/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.145 src/sys/miscfs/specfs/spec_vnops.c:1.145.2.1
--- src/sys/miscfs/specfs/spec_vnops.c:1.145	Fri Jul 25 08:20:53 2014
+++ src/sys/miscfs/specfs/spec_vnops.c	Fri Apr 29 19:07:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $	*/
+/*	$NetBSD: spec_vnops.c,v 1.145.2.1 2016/04/29 19:07:21 snj Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.145.2.1 2016/04/29 19:07:21 snj Exp $");
 
 #include 
 #include 
@@ -1051,26 +1051,44 @@ spec_strategy(void *v)
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	struct buf *bp = ap->a_bp;
+	dev_t dev;
 	int error;
 
-	KASSERT(vp == vp->v_specnode->sn_dev->sd_bdevvp);
+	dev = NODEV;
 
-	error = 0;
-	bp->b_dev = vp->v_rdev;
+	/*
+	 * Extract all the info we need from the vnode, taking care to
+	 * avoid a race with VOP_REVOKE().
+	 */
 
-	if (!(bp->b_flags & B_READ))
-		error = fscow_run(bp, false);
+	mutex_enter(vp->v_interlock);
+	if (vdead_check(vp, VDEAD_NOWAIT) == 0 && vp->v_specnode != NULL) {
+		KASSERT(vp == vp->v_specnode->sn_dev->sd_bdevvp);
+		dev = vp->v_rdev;
+	}
+	mutex_exit(vp->v_interlock);
 
-	if (error) {
-		bp->b_error = error;
-		bp->b_resid = bp->b_bcount;
-		biodone(bp);
-		return (error);
+	if (dev == NODEV) {
+		error = ENXIO;
+		goto out;
 	}
+	bp->b_dev = dev;
 
+	if (!(bp->b_flags & B_READ)) {
+		error = fscow_run(bp, false);
+		if (error)
+			goto out;
+	}
 	bdev_strategy(bp);
 
-	return (0);
+	return 0;
+
+out:
+	bp->b_error = error;
+	bp->b_resid = bp->b_bcount;
+	biodone(bp);
+
+	return error;
 }
 
 int

CVS commit: [netbsd-7] src/sys/miscfs/specfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:07:21 UTC 2016

Modified Files:
src/sys/miscfs/specfs [netbsd-7]: spec_vnops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1154):
sys/miscfs/specfs/spec_vnops.c: revisions 1.161, 1.162
Whhen spec_strategy() extracts v_rdev take care to avoid a
race with spec_revoke.
Fixes PR kern/50467 Panic from disconnecting phone while reading its contents
--
Avoid a race with spec_revoke for the assertion too.
Final fix for PR kern/50467 Panic from disconnecting phone while reading
its contents


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.145.2.1 src/sys/miscfs/specfs/spec_vnops.c

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

CVS commit: [netbsd-7] src/usr.bin/ftp

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:03:44 UTC 2016

Modified Files:
src/usr.bin/ftp [netbsd-7]: fetch.c

Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1153):
usr.bin/ftp/fetch.c: revision 1.223
PR/51043: Yorick Hardy: ftp(1) should use the port number for CONNECT


To generate a diff of this commit:
cvs rdiff -u -r1.205.4.3 -r1.205.4.4 src/usr.bin/ftp/fetch.c

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

CVS commit: [netbsd-7] src/usr.bin/ftp

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:03:44 UTC 2016

Modified Files:
src/usr.bin/ftp [netbsd-7]: fetch.c

Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1153):
usr.bin/ftp/fetch.c: revision 1.223
PR/51043: Yorick Hardy: ftp(1) should use the port number for CONNECT


To generate a diff of this commit:
cvs rdiff -u -r1.205.4.3 -r1.205.4.4 src/usr.bin/ftp/fetch.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/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.205.4.3 src/usr.bin/ftp/fetch.c:1.205.4.4
--- src/usr.bin/ftp/fetch.c:1.205.4.3	Sun Mar 13 11:49:14 2016
+++ src/usr.bin/ftp/fetch.c	Fri Apr 29 19:03:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.205.4.3 2016/03/13 11:49:14 martin Exp $	*/
+/*	$NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.205.4.3 2016/03/13 11:49:14 martin Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $");
 #endif /* not lint */
 
 /*
@@ -847,8 +847,8 @@ print_connect(FETCH *fin, const struct u
 	} else
 		h = ui->host;
 
-	fetch_printf(fin, "CONNECT %s:%s HTTP/1.1\r\n", h, ui->port);
-	fetch_printf(fin, "Host: %s:%s\r\n", h, ui->port);
+	fetch_printf(fin, "CONNECT %s:%d HTTP/1.1\r\n", h, ui->portnum);
+	fetch_printf(fin, "Host: %s:%d\r\n", h, ui->portnum);
 }
 #endif
 

CVS commit: [netbsd-7] src/sys/external/bsd/ipf/netinet

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:00:40 UTC 2016

Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-7]: fil.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1152):
sys/external/bsd/ipf/netinet/fil.c: revision 1.17
Comment out the mutex calls that protect against concurrent configuration
changes and processing. This needs to be done differently since you can't
sleep during interrupt processing.


To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/sys/external/bsd/ipf/netinet/fil.c

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

CVS commit: [netbsd-7] src/sys/external/bsd/ipf/netinet

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:00:40 UTC 2016

Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-7]: fil.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1152):
sys/external/bsd/ipf/netinet/fil.c: revision 1.17
Comment out the mutex calls that protect against concurrent configuration
changes and processing. This needs to be done differently since you can't
sleep during interrupt processing.


To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/sys/external/bsd/ipf/netinet/fil.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/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.1 src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.2
--- src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.1	Fri Apr 10 20:26:46 2015
+++ src/sys/external/bsd/ipf/netinet/fil.c	Fri Apr 29 19:00:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fil.c,v 1.15.2.1 2015/04/10 20:26:46 snj Exp $	*/
+/*	$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.1 2015/04/10 20:26:46 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -2916,7 +2916,9 @@ ipf_check(void *ctx, ip_t *ip, int hlen,
 		LBUMPD(ipf_stats[out], fr_short);
 	}
 
+#if 0
 	READ_ENTER(>ipf_mutex);
+#endif
 
 	if (!out) {
 		switch (fin->fin_v)
@@ -3048,9 +3050,10 @@ filterdone:
 		fr->fr_ref++;
 		MUTEX_EXIT(>fr_lock);
 	}
-
+#if 0
 	RWLOCK_EXIT(>ipf_mutex);
 #endif
+#endif
 
 	if ((pass & FR_RETMASK) != 0) {
 		/*
@@ -3146,8 +3149,10 @@ filterdone:
 #endif
 	}
 #if !defined(FASTROUTE_RECURSION)
+#if 0
 	RWLOCK_EXIT(>ipf_mutex);
 #endif
+#endif
 
 finished:
 	if (!FR_ISPASS(pass)) {

CVS commit: [netbsd-7] src/sys/external/bsd/ipf/netinet

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:58:17 UTC 2016

Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-7]: ip_nat.c

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1148):
sys/external/bsd/ipf/netinet/ip_nat.c: revision 1.16
Fix matching of ICMP queries when NAT'd through IPF
This notably fixes MTU updates for hosts issueing ICMP queries through a
NAT performed by NetBSD with IPF.


To generate a diff of this commit:
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/external/bsd/ipf/netinet/ip_nat.c

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

CVS commit: [netbsd-7-0] src/external/bsd/ipf/dist/man

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:55:32 UTC 2016

Modified Files:
src/external/bsd/ipf/dist/man [netbsd-7-0]: ipf.5

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1147):
external/bsd/ipf/dist/man/ipf.5: revision 1.5
Correct the example for the port range syntax


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

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

Modified files:

Index: src/external/bsd/ipf/dist/man/ipf.5
diff -u src/external/bsd/ipf/dist/man/ipf.5:1.3 src/external/bsd/ipf/dist/man/ipf.5:1.3.14.1
--- src/external/bsd/ipf/dist/man/ipf.5:1.3	Sun Jul 22 14:27:50 2012
+++ src/external/bsd/ipf/dist/man/ipf.5	Fri Apr 29 18:55:31 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipf.5,v 1.3 2012/07/22 14:27:50 darrenr Exp $
+.\"	$NetBSD: ipf.5,v 1.3.14.1 2016/04/29 18:55:31 snj Exp $
 .\"
 .TH IPF 5
 .SH NAME
@@ -356,7 +356,7 @@ block in proto tcp from any port >= 1024
 pass in proto tcp from 10.1.0.0/24 to any port = 22
 block out proto udp from any to 10.1.1.1 port = 135
 pass in proto udp from 1.1.1.1 port = 123 to 10.1.1.1 port = 123
-pass in proto tcp from 127.0.0.0/8 to any port = 6000:6009
+pass in proto tcp from 127.0.0.0/8 to any port 6000:6009
 .fi
 .PP
 If there is no desire to mention any specific source or destintion

CVS commit: [netbsd-7-0] src/external/bsd/ipf/dist/man

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:55:32 UTC 2016

Modified Files:
src/external/bsd/ipf/dist/man [netbsd-7-0]: ipf.5

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1147):
external/bsd/ipf/dist/man/ipf.5: revision 1.5
Correct the example for the port range syntax


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

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

CVS commit: [netbsd-7] src/external/bsd/ipf/dist/man

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:54:49 UTC 2016

Modified Files:
src/external/bsd/ipf/dist/man [netbsd-7]: ipf.5

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1147):
external/bsd/ipf/dist/man/ipf.5: revision 1.5
Correct the example for the port range syntax


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

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

CVS commit: [netbsd-7] src/external/bsd/ipf/dist/man

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:54:49 UTC 2016

Modified Files:
src/external/bsd/ipf/dist/man [netbsd-7]: ipf.5

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1147):
external/bsd/ipf/dist/man/ipf.5: revision 1.5
Correct the example for the port range syntax


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

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

Modified files:

Index: src/external/bsd/ipf/dist/man/ipf.5
diff -u src/external/bsd/ipf/dist/man/ipf.5:1.3 src/external/bsd/ipf/dist/man/ipf.5:1.3.12.1
--- src/external/bsd/ipf/dist/man/ipf.5:1.3	Sun Jul 22 14:27:50 2012
+++ src/external/bsd/ipf/dist/man/ipf.5	Fri Apr 29 18:54:49 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipf.5,v 1.3 2012/07/22 14:27:50 darrenr Exp $
+.\"	$NetBSD: ipf.5,v 1.3.12.1 2016/04/29 18:54:49 snj Exp $
 .\"
 .TH IPF 5
 .SH NAME
@@ -356,7 +356,7 @@ block in proto tcp from any port >= 1024
 pass in proto tcp from 10.1.0.0/24 to any port = 22
 block out proto udp from any to 10.1.1.1 port = 135
 pass in proto udp from 1.1.1.1 port = 123 to 10.1.1.1 port = 123
-pass in proto tcp from 127.0.0.0/8 to any port = 6000:6009
+pass in proto tcp from 127.0.0.0/8 to any port 6000:6009
 .fi
 .PP
 If there is no desire to mention any specific source or destintion

CVS commit: [netbsd-7] src/lib/libc/time

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:53:11 UTC 2016

Modified Files:
src/lib/libc/time [netbsd-7]: localtime.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1146):
lib/libc/time/localtime.c: revision 1.103 via patch
Use the correct upper bounds for the types array.  The correct upper
bound is typecnt not timecnt.  Now perpetual 'standard' time zones
will work correctly as they have a typecnt of 1 but a timecnt of 0.


To generate a diff of this commit:
cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/lib/libc/time/localtime.c

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

Modified files:

Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.82.2.2 src/lib/libc/time/localtime.c:1.82.2.3
--- src/lib/libc/time/localtime.c:1.82.2.2	Sun Mar  6 18:01:48 2016
+++ src/lib/libc/time/localtime.c	Fri Apr 29 18:53:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: localtime.c,v 1.82.2.2 2016/03/06 18:01:48 martin Exp $	*/
+/*	$NetBSD: localtime.c,v 1.82.2.3 2016/04/29 18:53:11 snj Exp $	*/
 
 /*
 ** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
 #if 0
 static char	elsieid[] = "@(#)localtime.c	8.17";
 #else
-__RCSID("$NetBSD: localtime.c,v 1.82.2.2 2016/03/06 18:01:48 martin Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.82.2.3 2016/04/29 18:53:11 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -255,7 +255,7 @@ const char *
 tzgetname(const timezone_t sp, int isdst)
 {
 	int i;
-	for (i = 0; i < sp->timecnt; ++i) {
+	for (i = 0; i < sp->typecnt; ++i) {
 		const struct ttinfo *const ttisp = >ttis[sp->types[i]];
 
 		if (ttisp->tt_isdst == isdst)

CVS commit: [netbsd-7] src/lib/libc/time

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:53:11 UTC 2016

Modified Files:
src/lib/libc/time [netbsd-7]: localtime.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1146):
lib/libc/time/localtime.c: revision 1.103 via patch
Use the correct upper bounds for the types array.  The correct upper
bound is typecnt not timecnt.  Now perpetual 'standard' time zones
will work correctly as they have a typecnt of 1 but a timecnt of 0.


To generate a diff of this commit:
cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/lib/libc/time/localtime.c

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

CVS commit: src/tests/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr 29 18:29:17 UTC 2016

Modified Files:
src/tests/bin/sh: t_expand.sh

Log Message:
use "" so ${TEST_SH} is expanded.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/bin/sh/t_expand.sh

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

CVS commit: src/tests/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr 29 18:29:17 UTC 2016

Modified Files:
src/tests/bin/sh: t_expand.sh

Log Message:
use "" so ${TEST_SH} is expanded.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/bin/sh/t_expand.sh

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

Modified files:

Index: src/tests/bin/sh/t_expand.sh
diff -u src/tests/bin/sh/t_expand.sh:1.7 src/tests/bin/sh/t_expand.sh:1.8
--- src/tests/bin/sh/t_expand.sh:1.7	Thu Mar 31 12:21:10 2016
+++ src/tests/bin/sh/t_expand.sh	Fri Apr 29 14:29:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.7 2016/03/31 16:21:10 christos Exp $
+# $NetBSD: t_expand.sh,v 1.8 2016/04/29 18:29:17 christos Exp $
 #
 # Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -340,7 +340,7 @@ shell_params_body() {
 	check "${TEST_SH} -c 'echo 0=\$0 1=\$1 2=\$2' a b c" '0=a 1=b 2=c' 0
 
 	echo 'echo 0="$0" 1="$1" 2="$2"' > helper.sh
-	check '${TEST_SH} helper.sh a b c' '0=helper.sh 1=a 2=b' 0
+	check "${TEST_SH} helper.sh a b c" '0=helper.sh 1=a 2=b' 0
 
 	check 'set -- a bb ccc  e ff ggg  \
 		i jj kkk

CVS commit: src/usr.bin/config

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Fri Apr 29 18:18:22 UTC 2016

Modified Files:
src/usr.bin/config: config.5 gram.y sem.c

Log Message:
Extend syntax of config phrase, a quoted string instead of a device name
is passed as root specification string. This can be used to specify a
wedge by name.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/config/config.5
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/config/gram.y
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/config/sem.c

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

CVS commit: src/usr.bin/config

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Fri Apr 29 18:18:22 UTC 2016

Modified Files:
src/usr.bin/config: config.5 gram.y sem.c

Log Message:
Extend syntax of config phrase, a quoted string instead of a device name
is passed as root specification string. This can be used to specify a
wedge by name.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/config/config.5
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/config/gram.y
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/config/sem.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/config/config.5
diff -u src/usr.bin/config/config.5:1.34 src/usr.bin/config/config.5:1.35
--- src/usr.bin/config/config.5:1.34	Tue Sep  1 13:42:48 2015
+++ src/usr.bin/config/config.5	Fri Apr 29 18:18:22 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: config.5,v 1.34 2015/09/01 13:42:48 uebayasi Exp $
+.\" $NetBSD: config.5,v 1.35 2016/04/29 18:18:22 mlelstv Exp $
 .\"
 .\"  Copyright (c) 2006, 2007 The NetBSD Foundation.
 .\"  All rights reserved.
@@ -662,6 +662,12 @@ and
 parameters can be wildcarded with
 .Dq \&?
 to let the kernel automatically discover those values.
+The
+.Ar device
+can also be specified as a quoted specification string.
+The kernel interprets this string like the console input
+when prompting for a root device. E.g. "wedge:NAME"
+specifies a named disk wedge.
 .Pp
 At least one
 .Ic config

Index: src/usr.bin/config/gram.y
diff -u src/usr.bin/config/gram.y:1.52 src/usr.bin/config/gram.y:1.53
--- src/usr.bin/config/gram.y:1.52	Tue Sep  1 13:42:48 2015
+++ src/usr.bin/config/gram.y	Fri Apr 29 18:18:22 2016
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: gram.y,v 1.52 2015/09/01 13:42:48 uebayasi Exp $	*/
+/*	$NetBSD: gram.y,v 1.53 2016/04/29 18:18:22 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: gram.y,v 1.52 2015/09/01 13:42:48 uebayasi Exp $");
+__RCSID("$NetBSD: gram.y,v 1.53 2016/04/29 18:18:22 mlelstv Exp $");
 
 #include 
 #include 
@@ -103,6 +103,7 @@ DECL_ALLOCWRAP(condexpr);
 #define	new_nx(n, x)	new0(n, NULL, NULL, 0, x)
 #define	new_ns(n, s)	new0(n, s, NULL, 0, NULL)
 #define	new_si(s, i)	new0(NULL, s, NULL, i, NULL)
+#define	new_spi(s, p, i)	new0(NULL, s, p, i, NULL)
 #define	new_nsi(n,s,i)	new0(n, s, NULL, i, NULL)
 #define	new_np(n, p)	new0(n, NULL, p, 0, NULL)
 #define	new_s(s)	new0(NULL, s, NULL, 0, NULL)
@@ -906,9 +907,14 @@ root_spec:
 
 /* device for root fs or dump */
 dev_spec:
-	  '?'{ $$ = new_si(intern("?"),
+	  '?'{ $$ = new_spi(intern("?"),
+	NULL,
 	(long long)NODEV); }
-	| WORD{ $$ = new_si($1,
+	| QSTRING			{ $$ = new_spi($1,
+	__UNCONST("spec"),
+	(long long)NODEV); }
+	| WORD{ $$ = new_spi($1,
+	NULL,
 	(long long)NODEV); }
 	| major_minor			{ $$ = new_si(NULL, $1); }
 ;

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.73 src/usr.bin/config/sem.c:1.74
--- src/usr.bin/config/sem.c:1.73	Sat Aug 29 07:24:49 2015
+++ src/usr.bin/config/sem.c	Fri Apr 29 18:18:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.73 2015/08/29 07:24:49 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.74 2016/04/29 18:18:22 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: sem.c,v 1.73 2015/08/29 07:24:49 uebayasi Exp $");
+__RCSID("$NetBSD: sem.c,v 1.74 2016/04/29 18:18:22 mlelstv Exp $");
 
 #include 
 #include 
@@ -928,6 +928,12 @@ resolve(struct nvlist **nvp, const char 
 		 */
 		return (0);
 
+	if (nv->nv_ptr != NULL && strcmp(nv->nv_ptr, "spec") == 0)
+		/*
+		 * spec string, interpreted by kernel
+		 */
+		return (0);
+
 	/*
 	 * The normal case: things like "ra2b".  Check for partition
 	 * suffix, remove it if there, and split into name ("ra") and

CVS commit: src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Apr 29 16:26:48 UTC 2016

Modified Files:
src/include: locale.h
src/lib/libc/locale: global_locale.c setlocale_local.h

Log Message:
Go back to just using normal visibility for the locale symbols. Without
an actual specifier like dllimport, protected visibility is unusable.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/include/locale.h
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/locale/setlocale_local.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/locale.h
diff -u src/include/locale.h:1.27 src/include/locale.h:1.28
--- src/include/locale.h:1.27	Thu Mar 17 17:36:32 2016
+++ src/include/locale.h	Fri Apr 29 16:26:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locale.h,v 1.27 2016/03/17 17:36:32 christos Exp $	*/
+/*	$NetBSD: locale.h,v 1.28 2016/04/29 16:26:48 joerg Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -106,20 +106,12 @@ void		freelocale(locale_t);
 struct lconv	*localeconv_l(locale_t);
 locale_t	newlocale(int, const char *, locale_t);
 
-#ifdef __clang__
 extern		   struct _locale	_lc_global_locale;
-#else
-extern __dso_protected struct _locale	_lc_global_locale;
-#endif
 #define LC_GLOBAL_LOCALE	(&_lc_global_locale)
 #endif /* _POSIX_SOURCE >= 200809 || _NETBSD_SOURCE */
 
 #if defined(_NETBSD_SOURCE)
-#ifdef __clang__
 extern		   const struct _locale _lc_C_locale;
-#else
-extern __dso_protected const struct _locale _lc_C_locale;
-#endif
 #define LC_C_LOCALE		((locale_t)__UNCONST(&_lc_C_locale))
 #endif
 __END_DECLS

Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.24 src/lib/libc/locale/global_locale.c:1.25
--- src/lib/libc/locale/global_locale.c:1.24	Thu Mar 17 17:38:14 2016
+++ src/lib/libc/locale/global_locale.c	Fri Apr 29 16:26:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.24 2016/03/17 17:38:14 christos Exp $ */
+/* $NetBSD: global_locale.c,v 1.25 2016/04/29 16:26:48 joerg Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.24 2016/03/17 17:38:14 christos Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.25 2016/04/29 16:26:48 joerg Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include 
@@ -143,9 +143,6 @@ __dso_hidden const struct _locale_cache_
 .numeric_name = _lc_C_locale_name,
 };
 
-#ifndef __clang__
-__dso_protected
-#endif
 struct _locale _lc_global_locale = {
 .cache = &_C_cache,
 .query = { _C_LOCALE },
@@ -174,9 +171,6 @@ struct _locale _lc_global_locale = {
 },
 };
 
-#ifndef __clang__
-__dso_protected
-#endif
 const struct _locale _lc_C_locale = {
 .cache = &_C_cache,
 .query = { _C_LOCALE },

Index: src/lib/libc/locale/setlocale_local.h
diff -u src/lib/libc/locale/setlocale_local.h:1.16 src/lib/libc/locale/setlocale_local.h:1.17
--- src/lib/libc/locale/setlocale_local.h:1.16	Fri Jan 29 15:18:08 2016
+++ src/lib/libc/locale/setlocale_local.h	Fri Apr 29 16:26:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale_local.h,v 1.16 2016/01/29 15:18:08 christos Exp $ */
+/* $NetBSD: setlocale_local.h,v 1.17 2016/04/29 16:26:48 joerg Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -85,9 +85,6 @@ int _setlocale_cache(locale_t, struct _l
 __END_DECLS
 
 #ifdef _LIBC
-#if 0
-extern __dso_protected struct _locale	_lc_global_locale;
-#endif
 extern __dso_hidden const struct _locale_cache_t _C_cache;
 
 static __inline struct _locale *

CVS commit: src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Apr 29 16:26:48 UTC 2016

Modified Files:
src/include: locale.h
src/lib/libc/locale: global_locale.c setlocale_local.h

Log Message:
Go back to just using normal visibility for the locale symbols. Without
an actual specifier like dllimport, protected visibility is unusable.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/include/locale.h
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/locale/setlocale_local.h

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

CVS commit: src/external/gpl3/binutils/dist/bfd

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Apr 29 16:25:55 UTC 2016

Modified Files:
src/external/gpl3/binutils/dist/bfd: elflink.c

Log Message:
Revert. For whatever reasons, the ELF visibility attributes are not
meant to be a useful indicator of what an object expects, so for linking
against a protected symbol, it must be declared as normal.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/bfd/elflink.c

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

CVS commit: src/external/gpl3/binutils/dist/bfd

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Apr 29 16:25:55 UTC 2016

Modified Files:
src/external/gpl3/binutils/dist/bfd: elflink.c

Log Message:
Revert. For whatever reasons, the ELF visibility attributes are not
meant to be a useful indicator of what an object expects, so for linking
against a protected symbol, it must be declared as normal.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/bfd/elflink.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/gpl3/binutils/dist/bfd/elflink.c
diff -u src/external/gpl3/binutils/dist/bfd/elflink.c:1.10 src/external/gpl3/binutils/dist/bfd/elflink.c:1.11
--- src/external/gpl3/binutils/dist/bfd/elflink.c:1.10	Fri Mar 25 23:04:41 2016
+++ src/external/gpl3/binutils/dist/bfd/elflink.c	Fri Apr 29 16:25:55 2016
@@ -1252,7 +1252,6 @@ _bfd_elf_merge_symbol (bfd *abfd,
  definition from a dynamic object.  */
   if (newdyn
   && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
-  && ELF_ST_VISIBILITY (h->other) != STV_PROTECTED
   && !bfd_is_und_section (sec))
 {
   *skip = TRUE;
@@ -1270,7 +1269,6 @@ _bfd_elf_merge_symbol (bfd *abfd,
 }
   else if (!newdyn
 	   && ELF_ST_VISIBILITY (sym->st_other) != STV_DEFAULT
-	   && ELF_ST_VISIBILITY (sym->st_other) != STV_PROTECTED
 	   && h->def_dynamic)
 {
   /* If the new symbol with non-default visibility comes from a
@@ -9337,11 +9335,10 @@ elf_link_output_extsym (struct bfd_hash_
   && h->def_dynamic)
 sym.st_size = 0;
 
-  /* If a non-weak symbol with non-public visibility is not defined
+  /* If a non-weak symbol with non-default visibility is not defined
  locally, it is a fatal error.  */
   if (!bfd_link_relocatable (flinfo->info)
   && ELF_ST_VISIBILITY (sym.st_other) != STV_DEFAULT
-  && ELF_ST_VISIBILITY (sym.st_other) != STV_PROTECTED
   && ELF_ST_BIND (sym.st_info) != STB_WEAK
   && h->root.type == bfd_link_hash_undefined
   && !h->def_regular)

CVS commit: src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr 29 16:08:09 UTC 2016

Modified Files:
src: build.sh

Log Message:
Provide the correct system Makefile path to the tools make. This is needed
because although the arch-specific make wrapper sets $MAKEFLAGS to include
the proper system Makefile path, configure clears $MAKEFLAGS before it invokes
$MAKE to figure out which dependency style to use. This made the build fail
during the gcc build.


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/build.sh

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

CVS commit: src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr 29 16:08:09 UTC 2016

Modified Files:
src: build.sh

Log Message:
Provide the correct system Makefile path to the tools make. This is needed
because although the arch-specific make wrapper sets $MAKEFLAGS to include
the proper system Makefile path, configure clears $MAKEFLAGS before it invokes
$MAKE to figure out which dependency style to use. This made the build fail
during the gcc build.


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 src/build.sh

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

Modified files:

Index: src/build.sh
diff -u src/build.sh:1.308 src/build.sh:1.309
--- src/build.sh:1.308	Sat Jun 27 02:00:28 2015
+++ src/build.sh	Fri Apr 29 12:08:09 2016
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.308 2015/06/27 06:00:28 matt Exp $
+#	$NetBSD: build.sh,v 1.309 2016/04/29 16:08:09 christos Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1593,21 +1593,28 @@ rebuildmake()
 	fi
 
 	# Build bootstrap ${toolprefix}make if needed.
-	if ${do_rebuildmake}; then
-		statusmsg "Bootstrapping ${toolprefix}make"
-		${runcmd} cd "${tmpdir}"
-		${runcmd} env CC="${HOST_CC-cc}" CPPFLAGS="${HOST_CPPFLAGS}" \
-			CFLAGS="${HOST_CFLAGS--O}" LDFLAGS="${HOST_LDFLAGS}" \
-			${HOST_SH} "${TOP}/tools/make/configure" ||
-		( cp ${tmpdir}/config.log ${tmpdir}-config.log
-		  bomb "Configure of ${toolprefix}make failed, see ${tmpdir}-config.log for details" )
-		${runcmd} ${HOST_SH} buildmake.sh ||
-		bomb "Build of ${toolprefix}make failed"
-		make="${tmpdir}/${toolprefix}make"
-		${runcmd} cd "${TOP}"
-		${runcmd} rm -f usr.bin/make/*.o usr.bin/make/lst.lib/*.o
-		done_rebuildmake=true
+	if ! ${do_rebuildmake}; then
+		return
 	fi
+
+	statusmsg "Bootstrapping ${toolprefix}make"
+	${runcmd} cd "${tmpdir}"
+	${runcmd} env \
+\
+CC="${HOST_CC-cc}" \
+CPPFLAGS="${HOST_CPPFLAGS} -D_PATH_DEFSYSPATH="'\"'${NETBSDSRCDIR}/share/mk'\"' \
+CFLAGS="${HOST_CFLAGS--O}" \
+LDFLAGS="${HOST_LDFLAGS}" \
+\
+	${HOST_SH} "${TOP}/tools/make/configure" ||
+	( cp ${tmpdir}/config.log ${tmpdir}-config.log
+	  bomb "Configure of ${toolprefix}make failed, see ${tmpdir}-config.log for details" )
+	${runcmd} ${HOST_SH} buildmake.sh ||
+	bomb "Build of ${toolprefix}make failed"
+	make="${tmpdir}/${toolprefix}make"
+	${runcmd} cd "${TOP}"
+	${runcmd} rm -f usr.bin/make/*.o usr.bin/make/lst.lib/*.o
+	done_rebuildmake=true
 }
 
 # validatemakeparams --
@@ -1869,7 +1876,7 @@ createmakewrapper()
 	eval cat <

CVS commit: src/lib/libc/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr 29 13:17:09 UTC 2016

Modified Files:
src/lib/libc/sys: wait.2

Log Message:
move section around.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/sys/wait.2

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

CVS commit: src/lib/libc/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Apr 29 13:17:09 UTC 2016

Modified Files:
src/lib/libc/sys: wait.2

Log Message:
move section around.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/sys/wait.2

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

Modified files:

Index: src/lib/libc/sys/wait.2
diff -u src/lib/libc/sys/wait.2:1.34 src/lib/libc/sys/wait.2:1.35
--- src/lib/libc/sys/wait.2:1.34	Fri Apr 29 08:25:51 2016
+++ src/lib/libc/sys/wait.2	Fri Apr 29 09:17:09 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wait.2,v 1.34 2016/04/29 12:25:51 wiz Exp $
+.\"	$NetBSD: wait.2,v 1.35 2016/04/29 13:17:09 christos Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -301,6 +301,13 @@ of what exit signal they post.
 .It Dv WALTSIG
 If this option is specified, the call will wait only for processes that
 are configured to post a signal other than
+.Dv SIGCHLD
+when they exit.
+If
+.Dv WALTSIG
+is not specified, the call will wait only for processes that
+are configured to post 
+.Dv SIGCHLD .
 .It Dv WCONTINUED
 Report the status of selected processes that
 have continued from a job control stop by receiving a
@@ -328,13 +335,6 @@ there are no processes wishing to report
 .It Dv WNOWAIT
 Keep the process whose status is returned in a waitable state.
 The process may be waited for again after this call completes.
-.Dv SIGCHLD
-when they exit.
-If
-.Dv WALTSIG
-is not specified, the call will wait only for processes that
-are configured to post
-.Dv SIGCHLD .
 .It Dv WSTOPPED
 An alias for
 .Dv WUNTRACED .

CVS commit: src/lib/libc/sys

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Apr 29 12:25:51 UTC 2016

Modified Files:
src/lib/libc/sys: wait.2

Log Message:
Sort a bit more.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/sys/wait.2

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

CVS commit: src/lib/libc/sys

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Fri Apr 29 12:25:51 UTC 2016

Modified Files:
src/lib/libc/sys: wait.2

Log Message:
Sort a bit more.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/sys/wait.2

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

Modified files:

Index: src/lib/libc/sys/wait.2
diff -u src/lib/libc/sys/wait.2:1.33 src/lib/libc/sys/wait.2:1.34
--- src/lib/libc/sys/wait.2:1.33	Thu Apr 28 16:07:26 2016
+++ src/lib/libc/sys/wait.2	Fri Apr 29 12:25:51 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wait.2,v 1.33 2016/04/28 16:07:26 christos Exp $
+.\"	$NetBSD: wait.2,v 1.34 2016/04/29 12:25:51 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -362,18 +362,18 @@ Report the status of selected processes 
 or
 .Dv SIGSTOP
 signal.
-.It Dv __WCLONE
-This is an alias for
-.Dv WALTSIG .
-It is provided for compatibility with the Linux
-.Xr clone 2
-API.
 .It Dv __WALL
 This is an alias for
 .Dv WALLSIG .
 It is provided for compatibility with the Linux
 .Xr clone 2
 API .
+.It Dv __WCLONE
+This is an alias for
+.Dv WALTSIG .
+It is provided for compatibility with the Linux
+.Xr clone 2
+API.
 .El
 .sp
 For the

CVS commit: src/sys/netinet6

[Ignatios Souvatzis]

Module Name:src
Committed By:   is
Date:   Fri Apr 29 11:46:17 UTC 2016

Modified Files:
src/sys/netinet6: nd6_nbr.c

Log Message:
Let non-neighbor NS/NA debug error message include useful information.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/netinet6/nd6_nbr.c

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

CVS commit: src/sys/netinet6

[Ignatios Souvatzis]

Module Name:src
Committed By:   is
Date:   Fri Apr 29 11:46:17 UTC 2016

Modified Files:
src/sys/netinet6: nd6_nbr.c

Log Message:
Let non-neighbor NS/NA debug error message include useful information.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/netinet6/nd6_nbr.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/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.116 src/sys/netinet6/nd6_nbr.c:1.117
--- src/sys/netinet6/nd6_nbr.c:1.116	Mon Apr 11 01:16:20 2016
+++ src/sys/netinet6/nd6_nbr.c	Fri Apr 29 11:46:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.117 2016/04/29 11:46:17 is Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.116 2016/04/11 01:16:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.117 2016/04/29 11:46:17 is Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -149,7 +149,9 @@ nd6_ns_input(struct mbuf *m, int off, in
 		 */
 		sockaddr_in6_init(, , 0, 0, 0);
 		if (nd6_is_addr_neighbor(, ifp) == 0) {
-			nd6log(LOG_INFO, "NS packet from non-neighbor\n");
+			nd6log(LOG_INFO,
+			"NS packet from non-neighbor %s on %s\n",
+			ip6_sprintf(), if_name(ifp));
 			goto bad;
 		}
 	}
@@ -625,7 +627,8 @@ nd6_na_input(struct mbuf *m, int off, in
 	 */
 	sockaddr_in6_init(, , 0, 0, 0);
 	if (nd6_is_addr_neighbor(, ifp) == 0) {
-		nd6log(LOG_INFO, "ND packet from non-neighbor\n");
+		nd6log(LOG_INFO, "ND packet from non-neighbor %s on %s\n",
+		ip6_sprintf(), if_name(ifp));
 		goto bad;
 	}
 

CVS commit: src/tests/kernel/kqueue

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Fri Apr 29 07:12:34 UTC 2016

Modified Files:
src/tests/kernel/kqueue: Makefile

Log Message:
Tab alignment


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/kqueue/Makefile

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

Modified files:

Index: src/tests/kernel/kqueue/Makefile
diff -u src/tests/kernel/kqueue/Makefile:1.4 src/tests/kernel/kqueue/Makefile:1.5
--- src/tests/kernel/kqueue/Makefile:1.4	Wed Jan 14 22:22:32 2015
+++ src/tests/kernel/kqueue/Makefile	Fri Apr 29 07:12:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/01/14 22:22:32 christos Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/29 07:12:34 ryoon Exp $
 
 WARNS?=6
 NOMAN=		# defined
@@ -7,7 +7,7 @@ NOMAN=		# defined
 
 TESTSDIR=	${TESTSBASE}/kernel/kqueue
 
-TESTS_SUBDIRS=		read
+TESTS_SUBDIRS=	read
 TESTS_SUBDIRS+=	write
 
 TESTS_C=	t_ioctl

CVS commit: src/tests/kernel/kqueue

[Ryo ONODERA]

Module Name:src
Committed By:   ryoon
Date:   Fri Apr 29 07:12:34 UTC 2016

Modified Files:
src/tests/kernel/kqueue: Makefile

Log Message:
Tab alignment


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/kernel/kqueue/Makefile

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

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Apr 29 07:11:32 UTC 2016

Modified Files:
src/sys/dev/usb: umass.c

Log Message:
Create the UMASS_INTRIN trasnfer against the correct pipe.  Should fix a
problem reported to me by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/dev/usb/umass.c

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

Modified files:

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.151 src/sys/dev/usb/umass.c:1.152
--- src/sys/dev/usb/umass.c:1.151	Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/umass.c	Fri Apr 29 07:11:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.151 2016/04/23 10:15:32 skrll Exp $	*/
+/*	$NetBSD: umass.c,v 1.152 2016/04/29 07:11:32 skrll Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.151 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.152 2016/04/29 07:11:32 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -649,8 +649,9 @@ umass_attach(device_t parent, device_t s
 		>transfer_xfer[XFER_CBI_DATAOUT]);
 		if (err)
 			goto fail_create;
-		err = usbd_create_xfer(pipe0, sizeof(sc->sbl),
-		0, 0, >transfer_xfer[XFER_CBI_STATUS]);
+		err = usbd_create_xfer(sc->sc_pipe[UMASS_INTRIN],
+		sizeof(sc->sbl), 0, 0,
+		>transfer_xfer[XFER_CBI_STATUS]);
 		if (err)
 			goto fail_create;
 		err = usbd_create_xfer(pipe0, 0, 0, 0,

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Fri Apr 29 07:11:32 UTC 2016

Modified Files:
src/sys/dev/usb: umass.c

Log Message:
Create the UMASS_INTRIN trasnfer against the correct pipe.  Should fix a
problem reported to me by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/dev/usb/umass.c

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