date:20160404

CVS commit: src/usr.bin/make

2016-04-04 Thread Simon J. Gerraty

Module Name:src
Committed By:   sjg
Date:   Tue Apr  5 04:25:43 UTC 2016

Modified Files:
src/usr.bin/make: main.c

Log Message:
Skip looking for .MAKE.JOBS if either of compatMake or forceJob is true.

If -B compatMake will be true and should be honored.
If -j forceJobs will be true and the command line supplied .MAKE.JOBS
should be respected - for consistency with other usage.


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.244 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.243 src/usr.bin/make/main.c:1.244
--- src/usr.bin/make/main.c:1.243	Wed Mar 16 16:04:44 2016
+++ src/usr.bin/make/main.c	Tue Apr  5 04:25:43 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $	*/
+/*	$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $";
 #else
 #include 
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.243 2016/03/16 16:04:44 matthias Exp $");
+__RCSID("$NetBSD: main.c,v 1.244 2016/04/05 04:25:43 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1232,7 +1232,8 @@ main(int argc, char **argv)
 	Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, ), VAR_GLOBAL);
 	free(p1);
 
-	if (Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) {
+	if (!forceJobs && !compatMake &&
+	Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) {
 	char *value;
 	int n;

CVS commit: src/tests/usr.bin/sed

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Apr  5 00:48:53 UTC 2016

Modified Files:
src/tests/usr.bin/sed: t_sed.sh

Log Message:
Add test for PR/49872


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/sed/t_sed.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/usr.bin/sed/t_sed.sh
diff -u src/tests/usr.bin/sed/t_sed.sh:1.5 src/tests/usr.bin/sed/t_sed.sh:1.6
--- src/tests/usr.bin/sed/t_sed.sh:1.5	Thu Mar 14 02:03:44 2013
+++ src/tests/usr.bin/sed/t_sed.sh	Mon Apr  4 20:48:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_sed.sh,v 1.5 2013/03/14 06:03:44 jmmv Exp $
+# $NetBSD: t_sed.sh,v 1.6 2016/04/05 00:48:53 christos Exp $
 #
 # Copyright (c) 2012 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -119,9 +119,24 @@ rangeselection_body() {
 		-x "printf 'A\nB\nA\nC\nD\nC\n' | sed '/A/,/C/d'"
 }
 
+atf_test_case preserve_leading_ws_ia
+preserve_leading_ws_ia_head() {
+	atf_set "descr" "Test that sed(1) preserves leading whitespace " \
+			"in insert and append (PR bin/49872)"
+}
+
+preserve_leading_ws_ia_body() {
+	atf_check -o inline:"1 2 3\n4 5 6\n7 8 9\n\n" \
+		-x 'echo | sed -e "/^$/i\\
+1 2 3\\
+4 5 6\\
+7 8 9"'
+}
+
 atf_init_test_cases() {
 	atf_add_test_case c2048
 	atf_add_test_case emptybackref
 	atf_add_test_case longlines
 	atf_add_test_case rangeselection
+	atf_add_test_case preserve_leading_ws_ia
 }

CVS commit: src/external/gpl3/gcc

2016-04-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Apr  5 00:43:48 UTC 2016

Modified Files:
src/external/gpl3/gcc: README.gcc53

Log Message:
sgimip is big endian, noted by @nisimura.
minor updates.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/README.gcc53

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/gcc/README.gcc53
diff -u src/external/gpl3/gcc/README.gcc53:1.19 src/external/gpl3/gcc/README.gcc53:1.20
--- src/external/gpl3/gcc/README.gcc53:1.19	Mon Apr  4 01:47:18 2016
+++ src/external/gpl3/gcc/README.gcc53	Tue Apr  5 00:43:48 2016
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc53,v 1.19 2016/04/04 01:47:18 mrg Exp $
+$NetBSD: README.gcc53,v 1.20 2016/04/05 00:43:48 mrg Exp $
 
 lib:
 	libasan is disabled currently (haven't tried yet)
@@ -75,7 +75,7 @@ architecture	tools	kernels	libgcc	native
 [2] - -O2 and -Os kernels hang, -O1 SIR reset
 	-- may be a SMP issue; ultra10 works, ultra45 SMP does not
 		-- try sb2000 (particularly with UP kernel.  u45 UP is shitty.)
-[3] - MKCOMPAT=no enabled currently, infact OABI seems to be broken.  the docs say it was only deprecated, but the options make broken crap.
+[3] - MKCOMPAT=no enabled currently, infact OABI seems to be broken.  the docs say it was only deprecated, but the options make broken stuff.
 [5] - sh3eb tries to use sh specific atomic config which doesn't work, has hand edited mknative output
 [6] - crtbeginS.o builds incorrectly with GCC 5.3 and -O2.  a hack for -O1 has been added.
 [8] - sgimips64 release build fails, mdsetimage'd gz'd kernels don't get built?
@@ -83,22 +83,26 @@ architecture	tools	kernels	libgcc	native
 [13] - builds tested:
- m68k: mvm68k amiga atari
- earm : shark evbarm*
-   - mipsel: sgimips
-   - mips64el: sgimips[fail] evbmips
+   - mipseb: sgimips evbmips
+   - mipsel: evbmips
+   - mips64eb: sgimips[fail] evbmips
+   - mips64el: evbmips
 [14] - machines tested:
- sparc ss20 (OK)
- sparc64 ultra45 (FAIL), ultra10 (OK), sb2000 (OK UP, FAIL SMP.)
- powerpc pegasosII (OK)
- alpha UP1000 (OK)
- arm shark (OK)
-   - evbmips gxemul MALTA (FAIL - not gcc problem)
+   - evbmips gxemul MALTA
+		- had to implement some MIPS32 in gxemul to make this work
- pmax gxemul (OK)
- sgimips O2 (OK kernel -- but my O2 is not stable)
- i386/amd64 (OK)
- hppa (OK)
+   - amiga (OK)
 [15] - vax -- switched to GCC 5.3 already as it is less broken
 	- ssh is broken, was broken with 4.8
 	- there are too many -O0's we added because of mis-handled rtl
 	- the eh_frame stuff is probably busted, but it never worked?
-[16] - builds tested:
+[16] - kernels tested:
 	- m68k: amiga

CVS commit: src/usr.bin/sed

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Apr  5 00:13:03 UTC 2016

Modified Files:
src/usr.bin/sed: compile.c

Log Message:
PR/49872:Yorick Hardy: sed functions 'i' and 'a' discard leading white space
FIxed as suggested, behavior now matches gnu-sed.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/sed/compile.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/sed/compile.c
diff -u src/usr.bin/sed/compile.c:1.46 src/usr.bin/sed/compile.c:1.47
--- src/usr.bin/sed/compile.c:1.46	Thu Mar 12 08:40:41 2015
+++ src/usr.bin/sed/compile.c	Mon Apr  4 20:13:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: compile.c,v 1.46 2015/03/12 12:40:41 christos Exp $	*/
+/*	$NetBSD: compile.c,v 1.47 2016/04/05 00:13:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: compile.c,v 1.46 2015/03/12 12:40:41 christos Exp $");
+__RCSID("$NetBSD: compile.c,v 1.47 2016/04/05 00:13:03 christos Exp $");
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/sed/compile.c 259132 2013-12-09 18:57:20Z eadler $");
 #endif
@@ -747,7 +747,6 @@ compile_text(void)
 	while (cu_fgets(lbuf, sizeof(lbuf), NULL)) {
 		op = s = text + size;
 		p = lbuf;
-		EATSPACE();
 		for (esc_nl = 0; *p != '\0'; p++) {
 			if (*p == '\\' && p[1] != '\0' && *++p == '\n')
 esc_nl = 1;

CVS commit: src/usr.bin/ftp

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 23:59:41 UTC 2016

Modified Files:
src/usr.bin/ftp: fetch.c

Log Message:
PR/51043: Yorick Hardy: ftp(1) should use the port number for CONNECT


To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 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.222 src/usr.bin/ftp/fetch.c:1.223
--- src/usr.bin/ftp/fetch.c:1.222	Fri Mar 18 14:42:25 2016
+++ src/usr.bin/ftp/fetch.c	Mon Apr  4 19:59:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.222 2016/03/18 18:42:25 christos Exp $	*/
+/*	$NetBSD: fetch.c,v 1.223 2016/04/04 23:59:41 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.222 2016/03/18 18:42:25 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.223 2016/04/04 23:59:41 christos 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: src/sys/sys

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 23:31:46 UTC 2016

Modified Files:
src/sys/sys: sysctl.h

Log Message:
remove sys/wait.h just added, put it in the file that needed it (kvm_proc.c)


To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 src/sys/sys/sysctl.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/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.220 src/sys/sys/sysctl.h:1.221
--- src/sys/sys/sysctl.h:1.220	Mon Apr  4 19:07:06 2016
+++ src/sys/sys/sysctl.h	Mon Apr  4 19:31:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctl.h,v 1.220 2016/04/04 23:07:06 christos Exp $	*/
+/*	$NetBSD: sysctl.h,v 1.221 2016/04/04 23:31:46 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -38,7 +38,6 @@
 #define	_SYS_SYSCTL_H_
 
 #include  /* precautionary upon removal from ucred.h */
-#include   /* WCOREFLAG */
 #include   /* Needed for things like P_ZOMBIE() and LW_SINTR */
 #include

CVS commit: src/sys

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 23:07:07 UTC 2016

Modified Files:
src/sys/compat/svr4_32: svr4_32_signal.c
src/sys/kern: kern_exec.c kern_exit.c kern_lwp.c kern_sig.c
src/sys/sys: proc.h sysctl.h

Log Message:
no need to pass the coredump flag to exit1() since it is set and known
in one place.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/svr4_32/svr4_32_signal.c
cvs rdiff -u -r1.425 -r1.426 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.252 -r1.253 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.183 -r1.184 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.322 -r1.323 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.328 -r1.329 src/sys/sys/proc.h
cvs rdiff -u -r1.219 -r1.220 src/sys/sys/sysctl.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/compat/svr4_32/svr4_32_signal.c
diff -u src/sys/compat/svr4_32/svr4_32_signal.c:1.27 src/sys/compat/svr4_32/svr4_32_signal.c:1.28
--- src/sys/compat/svr4_32/svr4_32_signal.c:1.27	Mon Apr  4 17:21:49 2016
+++ src/sys/compat/svr4_32/svr4_32_signal.c	Mon Apr  4 19:07:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_signal.c,v 1.27 2016/04/04 21:21:49 christos Exp $	 */
+/*	$NetBSD: svr4_32_signal.c,v 1.28 2016/04/04 23:07:06 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.27 2016/04/04 21:21:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.28 2016/04/04 23:07:06 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_svr4.h"
@@ -630,7 +630,7 @@ svr4_32_sys_context(struct lwp *l, const
 	case SVR4_SETCONTEXT:
 		DPRINTF(("setcontext(%p)\n", SCARG(uap, uc)));
 		if (!SCARG_P32(uap, uc))
-			exit1(l, 0, 0, 0);
+			exit1(l, 0, 0);
 		else if ((error = copyin(SCARG_P32(uap, uc),
 	 , sizeof(uc))) != 0)
 			return error;

Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.425 src/sys/kern/kern_exec.c:1.426
--- src/sys/kern/kern_exec.c:1.425	Mon Apr  4 16:47:57 2016
+++ src/sys/kern/kern_exec.c	Mon Apr  4 19:07:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.425 2016/04/04 20:47:57 christos Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.426 2016/04/04 23:07:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.425 2016/04/04 20:47:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.426 2016/04/04 23:07:06 christos Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1350,7 +1350,7 @@ execve_runproc(struct lwp *l, struct exe
 	/* Acquire the sched-state mutex (exit1() will release it). */
 	if (!is_spawn) {
 		mutex_enter(p->p_lock);
-		exit1(l, error, SIGABRT, 0);
+		exit1(l, error, SIGABRT);
 	}
 
 	return error;
@@ -2229,7 +2229,7 @@ spawn_return(void *arg)
 	 * A NetBSD specific workaround is POSIX_SPAWN_RETURNERROR as
 	 * flag bit in the attrp argument to posix_spawn(2), see above.
 	 */
-	exit1(l, 127, 0, 0);
+	exit1(l, 127, 0);
 }
 
 void

Index: src/sys/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.252 src/sys/kern/kern_exit.c:1.253
--- src/sys/kern/kern_exit.c:1.252	Mon Apr  4 16:47:57 2016
+++ src/sys/kern/kern_exit.c	Mon Apr  4 19:07:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exit.c,v 1.252 2016/04/04 20:47:57 christos Exp $	*/
+/*	$NetBSD: kern_exit.c,v 1.253 2016/04/04 23:07:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.252 2016/04/04 20:47:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.253 2016/04/04 23:07:06 christos Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
@@ -183,7 +183,7 @@ sys_exit(struct lwp *l, const struct sys
 	}
 
 	/* exit1() will release the mutex. */
-	exit1(l, SCARG(uap, rval), 0, 0);
+	exit1(l, SCARG(uap, rval), 0);
 	/* NOTREACHED */
 	return (0);
 }
@@ -196,7 +196,7 @@ sys_exit(struct lwp *l, const struct sys
  * Must be called with p->p_lock held.  Does not return.
  */
 void
-exit1(struct lwp *l, int exitcode, int signo, int coredump)
+exit1(struct lwp *l, int exitcode, int signo)
 {
 	struct proc	*p, *child, *next_child, *old_parent, *new_parent;
 	struct pgrp	*pgrp;
@@ -307,8 +307,6 @@ exit1(struct lwp *l, int exitcode, int s
 
 	p->p_xexit = exitcode;
 	p->p_xsig = signo;
-	if (coredump)
-		p->p_sflag |= PS_COREDUMP;
 
 	/*
 	 * If emulation has process exit hook, call it now.

Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.183 src/sys/kern/kern_lwp.c:1.184
--- src/sys/kern/kern_lwp.c:1.183	Mon Apr  4 16:47:57 2016
+++ src/sys/kern/kern_lwp.c	Mon Apr  4 19:07:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lwp.c,v 1.183 2016/04/04 20:47:57 christos Exp $	*/
+/*	$NetBSD: kern_lwp.c,v 1.184

CVS commit: src/lib/libkvm

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 22:14:38 UTC 2016

Modified Files:
src/lib/libkvm: kvm_proc.c

Log Message:
some ports need 


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/lib/libkvm/kvm_proc.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/libkvm/kvm_proc.c
diff -u src/lib/libkvm/kvm_proc.c:1.91 src/lib/libkvm/kvm_proc.c:1.92
--- src/lib/libkvm/kvm_proc.c:1.91	Mon Apr  4 17:08:44 2016
+++ src/lib/libkvm/kvm_proc.c	Mon Apr  4 18:14:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_proc.c,v 1.91 2016/04/04 21:08:44 christos Exp $	*/
+/*	$NetBSD: kvm_proc.c,v 1.92 2016/04/04 22:14:38 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #else
-__RCSID("$NetBSD: kvm_proc.c,v 1.91 2016/04/04 21:08:44 christos Exp $");
+__RCSID("$NetBSD: kvm_proc.c,v 1.92 2016/04/04 22:14:38 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -80,6 +80,7 @@ __RCSID("$NetBSD: kvm_proc.c,v 1.91 2016
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include

CVS commit: src/sys/compat/svr4_32

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 21:21:49 UTC 2016

Modified Files:
src/sys/compat/svr4_32: svr4_32_signal.c

Log Message:
catch up with exit1() change


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/compat/svr4_32/svr4_32_signal.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/compat/svr4_32/svr4_32_signal.c
diff -u src/sys/compat/svr4_32/svr4_32_signal.c:1.26 src/sys/compat/svr4_32/svr4_32_signal.c:1.27
--- src/sys/compat/svr4_32/svr4_32_signal.c:1.26	Mon Apr 28 16:23:46 2008
+++ src/sys/compat/svr4_32/svr4_32_signal.c	Mon Apr  4 17:21:49 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_signal.c,v 1.26 2008/04/28 20:23:46 martin Exp $	 */
+/*	$NetBSD: svr4_32_signal.c,v 1.27 2016/04/04 21:21:49 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.26 2008/04/28 20:23:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.27 2016/04/04 21:21:49 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_svr4.h"
@@ -630,7 +630,7 @@ svr4_32_sys_context(struct lwp *l, const
 	case SVR4_SETCONTEXT:
 		DPRINTF(("setcontext(%p)\n", SCARG(uap, uc)));
 		if (!SCARG_P32(uap, uc))
-			exit1(l, W_EXITCODE(0, 0));
+			exit1(l, 0, 0, 0);
 		else if ((error = copyin(SCARG_P32(uap, uc),
 	 , sizeof(uc))) != 0)
 			return error;

CVS commit: src/lib/libkvm

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 21:08:44 UTC 2016

Modified Files:
src/lib/libkvm: kvm_proc.c

Log Message:
catch up with p_xstat split.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/lib/libkvm/kvm_proc.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/libkvm/kvm_proc.c
diff -u src/lib/libkvm/kvm_proc.c:1.90 src/lib/libkvm/kvm_proc.c:1.91
--- src/lib/libkvm/kvm_proc.c:1.90	Wed Feb 19 15:21:22 2014
+++ src/lib/libkvm/kvm_proc.c	Mon Apr  4 17:08:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_proc.c,v 1.90 2014/02/19 20:21:22 dsl Exp $	*/
+/*	$NetBSD: kvm_proc.c,v 1.91 2016/04/04 21:08:44 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #else
-__RCSID("$NetBSD: kvm_proc.c,v 1.90 2014/02/19 20:21:22 dsl Exp $");
+__RCSID("$NetBSD: kvm_proc.c,v 1.91 2016/04/04 21:08:44 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -638,7 +638,7 @@ again:
 			kp2p->p_usrpri = kl[0].l_priority;
 			kp2p->p_nice = kp->kp_proc.p_nice;
 
-			kp2p->p_xstat = kp->kp_proc.p_xstat;
+			kp2p->p_xstat = P_WAITSTATUS(>kp_proc);
 			kp2p->p_acflag = kp->kp_proc.p_acflag;
 
 			/*CONSTCOND*/

CVS commit: src/sys

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 20:47:57 UTC 2016

Modified Files:
src/sys/kern: kern_event.c kern_exec.c kern_exit.c kern_lwp.c
kern_proc.c kern_sig.c kern_synch.c sys_process.c
src/sys/miscfs/procfs: procfs_ctl.c
src/sys/rump/librump/rumpkern: lwproc.c
src/sys/sys: proc.h

Log Message:
Split p_xstat (composite wait(2) status code, or signal number depending
on context) into:
1. p_xexit: exit code
2. p_xsig:  signal number
3. p_sflag & WCOREFLAG  bit to indicated that the process core-dumped.

Fix the documentation of the flag bits in 


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/kern/kern_event.c
cvs rdiff -u -r1.424 -r1.425 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.251 -r1.252 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.182 -r1.183 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.194 -r1.195 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.321 -r1.322 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.309 -r1.310 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.167 -r1.168 src/sys/kern/sys_process.c
cvs rdiff -u -r1.47 -r1.48 src/sys/miscfs/procfs/procfs_ctl.c
cvs rdiff -u -r1.38 -r1.39 src/sys/rump/librump/rumpkern/lwproc.c
cvs rdiff -u -r1.327 -r1.328 src/sys/sys/proc.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/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.85 src/sys/kern/kern_event.c:1.86
--- src/sys/kern/kern_event.c:1.85	Sat Jan 30 23:40:01 2016
+++ src/sys/kern/kern_event.c	Mon Apr  4 16:47:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_event.c,v 1.85 2016/01/31 04:40:01 christos Exp $	*/
+/*	$NetBSD: kern_event.c,v 1.86 2016/04/04 20:47:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,11 +58,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.85 2016/01/31 04:40:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.86 2016/04/04 20:47:57 christos Exp $");
 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -551,7 +552,7 @@ filt_proc(struct knote *kn, long hint)
 		struct proc *p = kn->kn_obj;
 
 		if (p != NULL)
-			kn->kn_data = p->p_xstat;
+			kn->kn_data = P_WAITSTATUS(p);
 		/*
 		 * Process is gone, so flag the event as finished.
 		 *

Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.424 src/sys/kern/kern_exec.c:1.425
--- src/sys/kern/kern_exec.c:1.424	Sun Mar 20 10:58:10 2016
+++ src/sys/kern/kern_exec.c	Mon Apr  4 16:47:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.424 2016/03/20 14:58:10 khorben Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.425 2016/04/04 20:47:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.424 2016/03/20 14:58:10 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.425 2016/04/04 20:47:57 christos Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1350,7 +1350,7 @@ execve_runproc(struct lwp *l, struct exe
 	/* Acquire the sched-state mutex (exit1() will release it). */
 	if (!is_spawn) {
 		mutex_enter(p->p_lock);
-		exit1(l, W_EXITCODE(error, SIGABRT));
+		exit1(l, error, SIGABRT, 0);
 	}
 
 	return error;
@@ -2229,7 +2229,7 @@ spawn_return(void *arg)
 	 * A NetBSD specific workaround is POSIX_SPAWN_RETURNERROR as
 	 * flag bit in the attrp argument to posix_spawn(2), see above.
 	 */
-	exit1(l, W_EXITCODE(127, 0));
+	exit1(l, 127, 0, 0);
 }
 
 void

Index: src/sys/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.251 src/sys/kern/kern_exit.c:1.252
--- src/sys/kern/kern_exit.c:1.251	Sun Apr  3 19:50:49 2016
+++ src/sys/kern/kern_exit.c	Mon Apr  4 16:47:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exit.c,v 1.251 2016/04/03 23:50:49 christos Exp $	*/
+/*	$NetBSD: kern_exit.c,v 1.252 2016/04/04 20:47:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.251 2016/04/03 23:50:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.252 2016/04/04 20:47:57 christos Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
@@ -138,14 +138,19 @@ exit_psignal(struct proc *p, struct proc
 
 	KSI_INIT(ksi);
 	if ((ksi->ksi_signo = P_EXITSIG(p)) == SIGCHLD) {
-		if (WIFSIGNALED(p->p_xstat)) {
-			if (WCOREDUMP(p->p_xstat))
+		if (p->p_xsig) {
+			if (p->p_sflag & PS_COREDUMP)
 ksi->ksi_code = CLD_DUMPED;
 			else
 ksi->ksi_code = CLD_KILLED;
+			ksi->ksi_status = p->p_xsig;
 		} else {
 			ksi->ksi_code = CLD_EXITED;
+			ksi->ksi_status = p->p_xexit;
 		}
+	} else {
+		ksi->ksi_code = SI_USER;
+		ksi->ksi_status = p->p_xsig;
 	}
 	/*
 	 * We fill those in, even for non-SIGCHLD.
@@ -153,7 +158,6 @@ exit_psignal(struct proc *p, struct proc
 	 */
 	ksi->ksi_pid = p->p_pid;

CVS commit: src/share/man/man2

2016-04-04 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Mon Apr  4 20:43:31 UTC 2016

Modified Files:
src/share/man/man2: siginfo.2

Log Message:
I do like the idea of April 43, 2016, but it's just not standardized enough.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/man/man2/siginfo.2

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/man2/siginfo.2
diff -u src/share/man/man2/siginfo.2:1.8 src/share/man/man2/siginfo.2:1.9
--- src/share/man/man2/siginfo.2:1.8	Mon Apr  4 17:29:04 2016
+++ src/share/man/man2/siginfo.2	Mon Apr  4 20:43:31 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: siginfo.2,v 1.8 2016/04/04 17:29:04 christos Exp $
+.\"	$NetBSD: siginfo.2,v 1.9 2016/04/04 20:43:31 wiz Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 43, 2016
+.Dd April 4, 2016
 .Dt SIGINFO 2
 .Os
 .Sh NAME

CVS commit: src

2016-04-04 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Mon Apr  4 18:29:07 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: stl.mi
src/lib/csu/common: Makefile.inc

Log Message:
For the benefit of compilers not using our native C runtime environment,
install a "sysident.o" file providing the note identifying NetBSD
executables (and marking the currently installed version).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/comp/stl.mi
cvs rdiff -u -r1.27 -r1.28 src/lib/csu/common/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/distrib/sets/lists/comp/stl.mi
diff -u src/distrib/sets/lists/comp/stl.mi:1.4 src/distrib/sets/lists/comp/stl.mi:1.5
--- src/distrib/sets/lists/comp/stl.mi:1.4	Sun Feb 28 19:18:41 2016
+++ src/distrib/sets/lists/comp/stl.mi	Mon Apr  4 18:29:07 2016
@@ -1,6 +1,8 @@
-# $NetBSD: stl.mi,v 1.4 2016/02/28 19:18:41 christos Exp $
+# $NetBSD: stl.mi,v 1.5 2016/04/04 18:29:07 martin Exp $
 ./usr/lib/crtbegin.ocomp-c-lib	compatfile
 ./usr/lib/crtend.ocomp-c-lib	compatfile
 ./usr/lib/crti.ocomp-c-lib	compatfile
 ./usr/lib/crtn.ocomp-c-lib	compatfile
 ./usr/lib/dtrace/drti.ocomp-c-lib	dtrace
+./usr/lib/sysident.ocomp-c-lib	compatfile
+

Index: src/lib/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.27 src/lib/csu/common/Makefile.inc:1.28
--- src/lib/csu/common/Makefile.inc:1.27	Tue Mar 29 21:23:05 2016
+++ src/lib/csu/common/Makefile.inc	Mon Apr  4 18:29:07 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.27 2016/03/29 21:23:05 skrll Exp $
+#	$NetBSD: Makefile.inc,v 1.28 2016/04/04 18:29:07 martin Exp $
 
 .include 
 
@@ -12,6 +12,7 @@ CPPFLAGS+=	-I${NETBSDSRCDIR}/libexec/ld.
 
 OBJS+=		crt0.o gcrt0.o crti.o crtn.o
 OBJS+=		crtbegin.o crtend.o
+OBJS+=		sysident.o
 
 .if ${MKPIC} == "yes"
 OBJS+=		crtbeginS.o
@@ -129,6 +130,7 @@ CLEANFILES+=	sysident_assym.h
 
 crti.o: crti.S sysident_assym.h sysident.S
 crtn.o: crtn.S
+sysident.o:	sysident.S sysident_assym.h
 
 FILES=${OBJS}
 FILESDIR=${LIBDIR}

CVS commit: src/share/man/man2

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 17:29:04 UTC 2016

Modified Files:
src/share/man/man2: siginfo.2

Log Message:
Fix description of si_status.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/share/man/man2/siginfo.2

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/man2/siginfo.2
diff -u src/share/man/man2/siginfo.2:1.7 src/share/man/man2/siginfo.2:1.8
--- src/share/man/man2/siginfo.2:1.7	Fri Feb 27 10:21:54 2015
+++ src/share/man/man2/siginfo.2	Mon Apr  4 13:29:04 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: siginfo.2,v 1.7 2015/02/27 15:21:54 riastradh Exp $
+.\"	$NetBSD: siginfo.2,v 1.8 2016/04/04 17:29:04 christos Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 23, 2012
+.Dd April 43, 2016
 .Dt SIGINFO 2
 .Os
 .Sh NAME
@@ -321,7 +321,10 @@ field contains the pid of the process wh
 .Fa si_uid
 field contains the user id of the that process, the
 .Fa si_status
-field contains a status code described in
+field contains either the exit code of the process (for
+.Dv CLD_EXITED ) ,
+or the signal number received by the process.
+.Xr waitid 2 ,
 .Xr waitpid 2 ,
 and the
 .Fa si_utime

CVS commit: src/sys/kern

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 16:47:39 UTC 2016

Modified Files:
src/sys/kern: kern_pax.c

Log Message:
Add some diagnostic printf's when we reset permissions.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/kern_pax.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_pax.c
diff -u src/sys/kern/kern_pax.c:1.36 src/sys/kern/kern_pax.c:1.37
--- src/sys/kern/kern_pax.c:1.36	Sun Mar 20 12:39:36 2016
+++ src/sys/kern/kern_pax.c	Mon Apr  4 12:47:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_pax.c,v 1.36 2016/03/20 16:39:36 christos Exp $	*/
+/*	$NetBSD: kern_pax.c,v 1.37 2016/04/04 16:47:39 christos Exp $	*/
 
 /*
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.36 2016/03/20 16:39:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.37 2016/04/04 16:47:39 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -363,9 +363,19 @@ pax_mprotect(struct lwp *l, vm_prot_t *p
 		return;
 
 	if ((*prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) != VM_PROT_EXECUTE) {
+#ifdef DIAGNOSTIC
+		struct proc *p = l->l_proc;
+		printf("%s: %d.%d (%s): clearing execute bit\n", __func__,
+		p->p_pid, l->l_lid, p->p_comm);
+#endif
 		*prot &= ~VM_PROT_EXECUTE;
 		*maxprot &= ~VM_PROT_EXECUTE;
 	} else {
+#ifdef DIAGNOSTIC
+		struct proc *p = l->l_proc;
+		printf("%s: %d.%d (%s): clearing write bit\n", __func__,
+		p->p_pid, l->l_lid, p->p_comm);
+#endif
 		*prot &= ~VM_PROT_WRITE;
 		*maxprot &= ~VM_PROT_WRITE;
 	}

CVS commit: src/external/bsd/blacklist/bin

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 15:52:56 UTC 2016

Modified Files:
src/external/bsd/blacklist/bin: blacklistctl.c blacklistd.c conf.c
internal.h run.c state.c support.c support.h

Log Message:
FreeBSD patches from Kurt Lidl.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/blacklist/bin/blacklistctl.c
cvs rdiff -u -r1.33 -r1.34 src/external/bsd/blacklist/bin/blacklistd.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/blacklist/bin/conf.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/blacklist/bin/internal.h \
src/external/bsd/blacklist/bin/run.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/blacklist/bin/state.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/blacklist/bin/support.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/blacklist/bin/support.h

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/blacklist/bin/blacklistctl.c
diff -u src/external/bsd/blacklist/bin/blacklistctl.c:1.19 src/external/bsd/blacklist/bin/blacklistctl.c:1.20
--- src/external/bsd/blacklist/bin/blacklistctl.c:1.19	Wed Nov  4 11:21:52 2015
+++ src/external/bsd/blacklist/bin/blacklistctl.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: blacklistctl.c,v 1.19 2015/11/04 16:21:52 christos Exp $	*/
+/*	$NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,10 +33,13 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: blacklistctl.c,v 1.19 2015/11/04 16:21:52 christos Exp $");
+__RCSID("$NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $");
 
 #include 
 #include 
+#ifdef HAVE_LIBUTIL_H
+#include 
+#endif
 #ifdef HAVE_UTIL_H
 #include 
 #endif

Index: src/external/bsd/blacklist/bin/blacklistd.c
diff -u src/external/bsd/blacklist/bin/blacklistd.c:1.33 src/external/bsd/blacklist/bin/blacklistd.c:1.34
--- src/external/bsd/blacklist/bin/blacklistd.c:1.33	Sat Jun 20 21:13:21 2015
+++ src/external/bsd/blacklist/bin/blacklistd.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: blacklistd.c,v 1.33 2015/06/21 01:13:21 christos Exp $	*/
+/*	$NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,12 +32,15 @@
 #include "config.h"
 #endif
 #include 
-__RCSID("$NetBSD: blacklistd.c,v 1.33 2015/06/21 01:13:21 christos Exp $");
+__RCSID("$NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $");
 
 #include 
 #include 
 #include 
 
+#ifdef HAVE_LIBUTIL_H
+#include 
+#endif
 #ifdef HAVE_UTIL_H
 #include 
 #endif

Index: src/external/bsd/blacklist/bin/conf.c
diff -u src/external/bsd/blacklist/bin/conf.c:1.23 src/external/bsd/blacklist/bin/conf.c:1.24
--- src/external/bsd/blacklist/bin/conf.c:1.23	Wed Jun  3 11:11:40 2015
+++ src/external/bsd/blacklist/bin/conf.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.23 2015/06/03 15:11:40 christos Exp $	*/
+/*	$NetBSD: conf.c,v 1.24 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,9 +33,15 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: conf.c,v 1.23 2015/06/03 15:11:40 christos Exp $");
+__RCSID("$NetBSD: conf.c,v 1.24 2016/04/04 15:52:56 christos Exp $");
 
 #include 
+#ifdef HAVE_LIBUTIL_H
+#include 
+#endif
+#ifdef HAVE_UTIL_H
+#include 
+#endif
 #include 
 #include 
 #include 
@@ -43,9 +49,6 @@ __RCSID("$NetBSD: conf.c,v 1.23 2015/06/
 #include 
 #include 
 #include 
-#ifdef HAVE_UTIL_H
-#include 
-#endif
 #include 
 #include 
 #include 
@@ -495,8 +498,8 @@ out:
 	if (debug > 1) {
 		char b1[256], b2[256];
 		len <<= 2;
-		hexdump(b1, sizeof(b1), "a1", v1, len);
-		hexdump(b2, sizeof(b2), "a2", v2, len);
+		blhexdump(b1, sizeof(b1), "a1", v1, len);
+		blhexdump(b2, sizeof(b2), "a2", v2, len);
 		(*lfun)(LOG_DEBUG, "%s: %s != %s [0x%x]", __func__,
 		b1, b2, omask);
 	}

Index: src/external/bsd/blacklist/bin/internal.h
diff -u src/external/bsd/blacklist/bin/internal.h:1.13 src/external/bsd/blacklist/bin/internal.h:1.14
--- src/external/bsd/blacklist/bin/internal.h:1.13	Wed Oct 14 12:01:29 2015
+++ src/external/bsd/blacklist/bin/internal.h	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: internal.h,v 1.13 2015/10/14 16:01:29 christos Exp $	*/
+/*	$NetBSD: internal.h,v 1.14 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@ extern struct ifaddrs *ifas;
 #define __syslog__ __printf__
 #endif
 
-void (*lfun)(int, const char *, ...)
+extern void (*lfun)(int, const char *, ...)
 __attribute__((__format__(__syslog__, 2, 3)));
 
 #endif /* _INTERNAL_H */
Index: src/external/bsd/blacklist/bin/run.c
diff -u src/external/bsd/blacklist/bin/run.c:1.13 src/external/bsd/blacklist/bin/run.c:1.14
--- src/external/bsd/blacklist/bin/run.c:1.13	Tue Jun  2 10:02:10 2015
+++ src/external/bsd/blacklist/bin/run.c	Mon Apr  4 11:52:56

CVS commit: src/share/mk

2016-04-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Mon Apr  4 15:06:17 UTC 2016

Modified Files:
src/share/mk: bsd.prog.mk

Log Message:
If the per-target LDSTATIC flag is set, don't include the PIE linker
flags as we currently don't support static PIE.


To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/share/mk/bsd.prog.mk

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

Modified files:

Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.298 src/share/mk/bsd.prog.mk:1.299
--- src/share/mk/bsd.prog.mk:1.298	Wed Mar 30 13:05:09 2016
+++ src/share/mk/bsd.prog.mk	Mon Apr  4 15:06:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.298 2016/03/30 13:05:09 martin Exp $
+#	$NetBSD: bsd.prog.mk,v 1.299 2016/04/04 15:06:16 joerg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -51,7 +51,7 @@ CLEANFILES+=strings
 .if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
 CFLAGS+=	${PIE_CFLAGS}
 AFLAGS+=	${PIE_AFLAGS}
-LDFLAGS+=	${PIE_LDFLAGS}
+LDFLAGS+=	${"${LDSTATIC.${.TARGET}}" == "-static" :? : ${PIE_LDFLAGS}}
 .endif
 
 CFLAGS+=	${COPTS}

CVS commit: src/external/gpl3/binutils/lib/libbfd/arch/alpha

2016-04-04 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Apr  4 13:45:40 UTC 2016

Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/alpha: bfd_stdint.h config.h

Log Message:
binutils 2.26 mknative for alpha


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd_stdint.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/binutils/lib/libbfd/arch/alpha/config.h

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/lib/libbfd/arch/alpha/bfd_stdint.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd_stdint.h:1.3 src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd_stdint.h:1.4
--- src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd_stdint.h:1.3	Fri Jan 29 17:30:22 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/alpha/bfd_stdint.h	Mon Apr  4 13:45:40 2016
@@ -2,7 +2,7 @@
 /* Generated from: NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
-/* generated for  alpha--netbsd-gcc (NetBSD nb3 20151015) 4.8.5 */
+/* generated for  alpha--netbsd-gcc (NetBSD nb1 20160317) 5.3.0 */
 
 #ifndef GCC_GENERATED_STDINT_H
 #define GCC_GENERATED_STDINT_H 1

Index: src/external/gpl3/binutils/lib/libbfd/arch/alpha/config.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/alpha/config.h:1.4 src/external/gpl3/binutils/lib/libbfd/arch/alpha/config.h:1.5
--- src/external/gpl3/binutils/lib/libbfd/arch/alpha/config.h:1.4	Fri Jan 29 17:30:22 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/alpha/config.h	Mon Apr  4 13:45:40 2016
@@ -352,7 +352,7 @@
 /* #undef USE_MMAP */
 
 /* Define if we should default to creating read-only plt entries */
-#define USE_SECUREPLT 1
+/* #undef USE_SECUREPLT */
 
 /* Define if we may generate symbols with ELF's STT_COMMON type */
 /* #undef USE_STT_COMMON */

CVS commit: src/usr.sbin/arp

2016-04-04 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Mon Apr  4 13:32:37 UTC 2016

Modified Files:
src/usr.sbin/arp: arp.4

Log Message:
Sort sections.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/arp/arp.4

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/arp/arp.4
diff -u src/usr.sbin/arp/arp.4:1.11 src/usr.sbin/arp/arp.4:1.12
--- src/usr.sbin/arp/arp.4:1.11	Mon Apr  4 07:37:08 2016
+++ src/usr.sbin/arp/arp.4	Mon Apr  4 13:32:37 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: arp.4,v 1.11 2016/04/04 07:37:08 ozaki-r Exp $
+.\"	$NetBSD: arp.4,v 1.12 2016/04/04 13:32:37 wiz Exp $
 .\"
 .\" Copyright (c) 1985, 1986, 1988, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -91,10 +91,6 @@ mapping requests for its own Internet ad
 address, generally indicating that two hosts are attempting to use the
 same Internet address.
 .El
-.Sh HISTORY
-Since
-.Nx 8.0 ,
-the ARP cache was not stored in the routing table.
 .Sh SEE ALSO
 .Xr inet 4 ,
 .Xr route 4 ,
@@ -113,3 +109,7 @@ the ARP cache was not stored in the rout
 .%B "Trailer Encapsulations"
 .%T RFC 893
 .Re
+.Sh HISTORY
+Since
+.Nx 8.0 ,
+the ARP cache was not stored in the routing table.

CVS commit: src/share/man/man4

2016-04-04 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Mon Apr  4 13:29:12 UTC 2016

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

Log Message:
Sort sections.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/share/man/man4/route.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/route.4
diff -u src/share/man/man4/route.4:1.26 src/share/man/man4/route.4:1.27
--- src/share/man/man4/route.4:1.26	Mon Apr  4 07:37:07 2016
+++ src/share/man/man4/route.4	Mon Apr  4 13:29:12 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: route.4,v 1.26 2016/04/04 07:37:07 ozaki-r Exp $
+.\"	$NetBSD: route.4,v 1.27 2016/04/04 13:29:12 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -349,6 +349,9 @@ Flags for IPv6 addresses:
 #define IN6_IFF_AUTOCONF	0x40	/* autoconfigurable address. */
 #define IN6_IFF_TEMPORARY	0x80	/* temporary (anonymous) address. */
 .Ed
+.Sh SEE ALSO
+.Xr socket 2 ,
+.Xr sysctl 3
 .Sh HISTORY
 Since
 .Nx 8.0 ,
@@ -364,6 +367,3 @@ and
 .Cm RTF_LLDATA
 appeared in
 .Nx 8.0 .
-.Sh SEE ALSO
-.Xr socket 2 ,
-.Xr sysctl 3

CVS commit: src/lib/libc/sys

2016-04-04 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Mon Apr  4 13:13:09 UTC 2016

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

Log Message:
Use more markup, fix a typo.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 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.28 src/lib/libc/sys/wait.2:1.29
--- src/lib/libc/sys/wait.2:1.28	Sun Apr  3 00:19:42 2016
+++ src/lib/libc/sys/wait.2	Mon Apr  4 13:13:09 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wait.2,v 1.28 2016/04/03 00:19:42 christos Exp $
+.\"	$NetBSD: wait.2,v 1.29 2016/04/04 13:13:09 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -224,7 +224,7 @@ The separate
 and
 .Fa id
 arguments support many other types of
-identifers in addition to process IDs and process group IDs.
+identifiers in addition to process IDs and process group IDs.
 .Bl -bullet -offset indent
 .It
 If
@@ -309,7 +309,7 @@ argument specifies the set of child proc
 .It
 If
 .Fa wpid
-is -1, the call waits for any child process.
+is \-1, the call waits for any child process.
 .It
 If
 .Fa wpid
@@ -323,7 +323,7 @@ is greater than zero, the call waits for
 .It
 If
 .Fa wpid
-is less than -1, the call waits for any process whose process group ID
+is less than \-1, the call waits for any process whose process group ID
 equals the absolute value of
 .Fa wpid .
 .El
@@ -406,24 +406,30 @@ or
 must be specified.
 Otherwise there will be no events for the call to report.
 To avoid hanging indefinitely in such a case these functions
-return -1 with
+return \-1 with
 .Dv errno
 set to
 .Dv EINVAL .
 .Pp
 If
 .Fa rusage
-is non-NULL, a summary of the resources used by the terminated
+is
+.Pf non- Dv NULL ,
+a summary of the resources used by the terminated
 process and all its children is returned.
 .Pp
 If
 .Fa wrusage
-is non-NULL, separate summaries are returned for the resources used
+is
+.Pf non- Dv NULL ,
+separate summaries are returned for the resources used
 by the terminated process and the resources used by all its children.
 .Pp
 If
 .Fa infop
-is non-NULL, a
+is
+.Pf non- Dv NULL ,
+a
 .Dv siginfo_t
 structure is returned with the
 .Fa si_signo
@@ -612,9 +618,8 @@ must be checked against zero to determin
 will fail and return immediately if:
 .Bl -tag -width Er
 .It Bq Er ECHILD
-The calling process has no existing unwaited-for child processes.
-.It Bq Er ECHILD
-No status from the terminated child process is available
+The calling process has no existing unwaited-for child processes; or
+no status from the terminated child process is available
 because the calling process has asked the system to discard
 such status by ignoring the signal
 .Dv SIGCHLD
@@ -662,7 +667,7 @@ functions conform to
 .St -p1003.1-90 ;
 the
 .Fn waitid
-function conforms to 
+function conforms to
 .St -p1003.1-2004 ;
 the
 .Fn wait3

CVS commit: src/bin/sh

2016-04-04 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Mon Apr  4 13:05:56 UTC 2016

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

Log Message:
Remove some double quotes.

Parity is kept.


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 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/sh/sh.1
diff -u src/bin/sh/sh.1:1.120 src/bin/sh/sh.1:1.121
--- src/bin/sh/sh.1:1.120	Thu Mar 31 16:18:22 2016
+++ src/bin/sh/sh.1	Mon Apr  4 13:05:56 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.120 2016/03/31 16:18:22 christos Exp $
+.\"	$NetBSD: sh.1,v 1.121 2016/04/04 13:05:56 wiz Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -880,7 +880,7 @@ which may be of any of the normal forms,
 is given, it is applied each time the
 function is called.
 This means that a simple
-.Dq "Hello World
+.Dq Hello World
 function might be written (in the extended syntax) as:
 .Dl hello() cat <

CVS commit: src/tests/bin/sh

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 12:40:13 UTC 2016

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

Log Message:
Add a test case for here documents positioned outside `` with the
redirect operator inside the ``.   Move the one similar test using
$( ) into its own test case (and expand that test as well.
The `` case was omitted before, as no shells (including NetBSD) were
parsing it correctly,  Now the NetBSD shell does, so ... (from kre@)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/bin/sh/t_cmdsub.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_cmdsub.sh
diff -u src/tests/bin/sh/t_cmdsub.sh:1.3 src/tests/bin/sh/t_cmdsub.sh:1.4
--- src/tests/bin/sh/t_cmdsub.sh:1.3	Thu Mar 31 12:20:39 2016
+++ src/tests/bin/sh/t_cmdsub.sh	Mon Apr  4 08:40:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_cmdsub.sh,v 1.3 2016/03/31 16:20:39 christos Exp $
+# $NetBSD: t_cmdsub.sh,v 1.4 2016/04/04 12:40:13 christos Exp $
 #
 # Copyright (c) 2016 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -433,13 +433,6 @@ r_heredoc_in_cmdsub_body() {
 	2 * 7 = $(( 2 * 7 ))
 			EOF
 			)"'
-
-	atf_check -s exit:0 -o inline:'Line 1\nLine 2\n' -e empty \
-	${TEST_SH} -c 'echo "$( cat <<- "EOF" )"
-Line 1
-Line 2
-EOF
-			'
 }
 
 atf_test_case s_heredoc_in_backticks
@@ -629,6 +622,89 @@ v_cmdsub_paren_tests_body() {
 		${TEST_SH} -c 'echo H: empty command-substitution $( )'
 }
 
+atf_test_case w_heredoc_outside_cmdsub
+w_heredoc_outside_cmdsub_head() {
+	atf_set "descr" "Checks that here docs work inside cmd subs"
+}
+w_heredoc_outside_cmdsub_body() {
+	atf_require_prog cat
+
+	atf_check -s exit:0 -o inline:'Mary had a\nlittle\nlamb\n' -e empty \
+	${TEST_SH} -c 'echo "$( cat <<- \EOF )"
+Mary had a
+little
+lamb
+			EOF
+			'
+
+	atf_check -s exit:0 -e empty \
+	-o inline:'Mary had 1\nlittle\nlamb\nMary had 4\nlittle\nlambs\n' \
+	${TEST_SH} -c 'for N in 1 4; do echo "$( cat <<- EOF )"
+Mary had ${N}
+little
+lamb$( [ $N -gt 1 ] && echo s )
+			EOF
+			done'
+
+
+	atf_check -s exit:0 -o inline:'A Calculation:\n2 * 7 = 14\n' -e empty \
+	${TEST_SH} -c 'echo "$( cat <<- EOF)"
+A Calculation:
+	2 * 7 = $(( 2 * 7 ))
+			EOF
+			'
+}
+
+atf_test_case x_heredoc_outside_backticks
+x_heredoc_outside_backticks_head() {
+	atf_set "descr" "Checks that here docs work inside old style cmd subs"
+}
+x_heredoc_outside_backticks_body() {
+	atf_require_prog cat
+
+	atf_check -s exit:0 -o inline:'Mary had a little lamb\n' -e empty \
+	${TEST_SH} -c 'echo ` cat <<- \EOF `
+Mary had a
+little
+lamb
+			EOF
+			'
+
+	atf_check -s exit:0 -o inline:'A Calculation:\n17 / 3 = 5\n' -e empty \
+	${TEST_SH} -c 'echo "` cat <<- EOF `"
+A Calculation:
+	17 / 3 = $(( 17 / 3 ))
+			EOF
+			'
+}
+
+atf_test_case t_nested_cmdsubs_in_heredoc
+t_nested_cmdsubs_in_heredoc_head() {
+	atf_set "descr" "Checks nested command substitutions in here docs"
+}
+t_nested_cmdsubs_in_heredoc_body() {
+	atf_require_prog cat
+	atf_require_prog rm
+
+	rm -f * 2>/dev/null || :
+	echo "Hello" > File
+
+	atf_check -s exit:0 -o inline:'Hello U\nHelp me!\n' -e empty \
+	${TEST_SH} -c 'cat <<- EOF
+		$(cat File) U
+		$( V=$(cat File); echo "${V%lo}p" ) me!
+		EOF'
+
+	rm -f * 2>/dev/null || :
+	echo V>V ; echo A>A; echo R>R
+	echo Value>VAR
+
+	atf_check -s exit:0 -o inline:'$2.50\n' -e empty \
+	${TEST_SH} -c 'cat <<- EOF
+	$(Value='\''$2.50'\'';eval echo $(eval $(cat V)$(cat A)$(cat R)=\'\''\$$(cat $(cat V)$(cat A)$(cat R))\'\''; eval echo \$$(set -- *;echo ${3}${1}${2})))
+		EOF'
+}
+
 atf_test_case z_absurd_heredoc_cmdsub_combos
 z_absurd_heredoc_cmdsub_combos_head() {
 	atf_set "descr" "perverse and unusual cmd substitutions & more"
@@ -701,5 +777,7 @@ atf_init_test_cases() {
 	atf_add_test_case t_nested_cmdsubs_in_heredoc
 	atf_add_test_case u_nested_backticks_in_heredoc
 	atf_add_test_case v_cmdsub_paren_tests
+	atf_add_test_case w_heredoc_outside_cmdsub
+	atf_add_test_case x_heredoc_outside_backticks
 	atf_add_test_case z_absurd_heredoc_cmdsub_combos
 }

CVS commit: src/bin/sh

2016-04-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr  4 12:39:08 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
Allow a heredoc to be positioned outside a `` command substitution.
POSIX just says "here docs begin after the next newline [token]".
Nothing about "provided it is inside any `` the redirect operator
appears in...As best I can tell, NetBSD now has the only shell to
handle this "correctly" (which raises the question whether it is
correct - but if not, only erroneous scripts are affected.)
This is required by some (probably broken) autoconfigure related
scripts. (from kre@)


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/bin/sh/parser.c

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

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.115 src/bin/sh/parser.c:1.116
--- src/bin/sh/parser.c:1.115	Thu Mar 31 19:11:05 2016
+++ src/bin/sh/parser.c	Mon Apr  4 08:39:08 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.115 2016/03/31 23:11:05 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.116 2016/04/04 12:39:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.115 2016/03/31 23:11:05 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.116 2016/04/04 12:39:08 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -81,6 +81,7 @@ struct heredoc {
 	union node *here;		/* redirection node */
 	char *eofmark;		/* string indicating end of input */
 	int striptabs;		/* if set, strip leading tabs */
+	int startline;		/* line number where << seen */
 };
 
 
@@ -133,6 +134,7 @@ union node *
 parsecmd(int interact)
 {
 	int t;
+	union node *n;
 
 	tokpushback = 0;
 	doprompt = interact;
@@ -147,7 +149,11 @@ parsecmd(int interact)
 	if (t == TNL)
 		return NULL;
 	tokpushback++;
-	return list(1, 0);
+	n = list(1, 0);
+	if (heredoclist)
+		error("%d: Here document (<<%s) expected but not present",
+			heredoclist->startline, heredoclist->eofmark);
+	return n;
 }
 
 
@@ -206,10 +212,7 @@ list(int nlflag, int erflag)
 return n1;
 			break;
 		case TEOF:
-			if (heredoclist)
-readheredocs();
-			else
-pungetc();	/* push back EOF on input */
+			pungetc();	/* push back EOF on input */
 			return n1;
 		default:
 			if (nlflag || erflag)
@@ -1407,6 +1410,7 @@ parseredir(const char *out,  int c)
 			np->type = NHERE;
 			heredoc = stalloc(sizeof(struct heredoc));
 			heredoc->here = np;
+			heredoc->startline = plinno;
 			if ((c = pgetc()) == '-') {
 heredoc->striptabs = 1;
 			} else {

CVS commit: src/sys/netinet6

2016-04-04 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Mon Apr  4 12:05:40 UTC 2016

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

Log Message:
all1_sa is no longer used.


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/netinet6/nd6.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.c
diff -u src/sys/netinet6/nd6.c:1.188 src/sys/netinet6/nd6.c:1.189
--- src/sys/netinet6/nd6.c:1.188	Mon Apr  4 07:37:07 2016
+++ src/sys/netinet6/nd6.c	Mon Apr  4 12:05:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.188 2016/04/04 07:37:07 ozaki-r Exp $	*/
+/*	$NetBSD: nd6.c,v 1.189 2016/04/04 12:05:40 roy Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.188 2016/04/04 07:37:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.189 2016/04/04 12:05:40 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -106,14 +106,6 @@ struct nd_drhead nd_defrouter;
 struct nd_prhead nd_prefix = { 0 };
 
 int nd6_recalc_reachtm_interval = ND6_RECALC_REACHTM_INTERVAL;
-static const struct sockaddr_in6 all1_sa = {
-	  .sin6_family = AF_INET6
-	, .sin6_len = sizeof(struct sockaddr_in6)
-	, .sin6_addr = {.s6_addr = {0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff}}
-};
 
 static void nd6_setmtu0(struct ifnet *, struct nd_ifinfo *);
 static void nd6_slowtimo(void *);

CVS commit: [netbsd-7] src/doc

2016-04-04 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Apr  4 10:05:18 UTC 2016

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

Log Message:
1151


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.73 -r1.1.2.74 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.73 src/doc/CHANGES-7.1:1.1.2.74
--- src/doc/CHANGES-7.1:1.1.2.73	Tue Mar 22 09:05:07 2016
+++ src/doc/CHANGES-7.1	Mon Apr  4 10:05:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.73 2016/03/22 09:05:07 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.74 2016/04/04 10:05:18 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3631,3 +3631,9 @@ lib/librt/shm.c	1.2, 1.3
 	Allow /var/shm to be a symlink to a properly set up directory.
 	[martin, ticket #1144]
 
+external/bsd/bind/include/config.h		patch
+external/bsd/bind/include/isc/platform.h	patch
+
+	Disable SIT (Source Identity Token).
+	[spz, ticket #1151]
+

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

2016-04-04 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Apr  4 10:04:35 UTC 2016

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

Log Message:
1151


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.44 -r1.1.2.45 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.44 src/doc/CHANGES-7.0.1:1.1.2.45
--- src/doc/CHANGES-7.0.1:1.1.2.44	Sun Mar 13 08:02:22 2016
+++ src/doc/CHANGES-7.0.1	Mon Apr  4 10:04:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.44 2016/03/13 08:02:22 martin Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.45 2016/04/04 10:04:34 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -2224,3 +2224,9 @@ external/bsd/bind/lib/liblwres/shlib_ver
 	Update BIND to 9.10.3-P4.
 	[snj, ticket #1140]
 
+external/bsd/bind/include/config.h		patch
+external/bsd/bind/include/isc/platform.h	patch
+
+	Disable SIT (Source Identity Token).
+	[spz, ticket #1151]
+

CVS commit: [netbsd-7] src/external/bsd/bind/include

2016-04-04 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Apr  4 10:03:48 UTC 2016

Modified Files:
src/external/bsd/bind/include [netbsd-7]: config.h
src/external/bsd/bind/include/isc [netbsd-7]: platform.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1151):
external/bsd/bind/include/config.h: patch
external/bsd/bind/include/isc/platform.h: patch
Disable SIT (Source Identity Token).


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/external/bsd/bind/include/config.h
cvs rdiff -u -r1.16.2.4 -r1.16.2.5 \
src/external/bsd/bind/include/isc/platform.h

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/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.14.2.3 src/external/bsd/bind/include/config.h:1.14.2.4
--- src/external/bsd/bind/include/config.h:1.14.2.3	Sun Mar 13 08:06:16 2016
+++ src/external/bsd/bind/include/config.h	Mon Apr  4 10:03:47 2016
@@ -162,7 +162,7 @@ int sigwait(const unsigned int *set, int
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Use AES for Source Identity Token generation */
-#define AES_SIT 1
+/* #undef AES_SIT */
 
 /* Define to enable the "filter--on-v4" and "filter--on-v6" options.
*/

Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.16.2.4 src/external/bsd/bind/include/isc/platform.h:1.16.2.5
--- src/external/bsd/bind/include/isc/platform.h:1.16.2.4	Sun Mar 13 08:06:17 2016
+++ src/external/bsd/bind/include/isc/platform.h	Mon Apr  4 10:03:48 2016
@@ -346,7 +346,7 @@
 /*
  * Defined if we are enabling SIT (Source Identity Token).
  */
-#define ISC_PLATFORM_USESIT 1
+#undef ISC_PLATFORM_USESIT
 
 /***
  ***	Windows dll support.

CVS commit: [netbsd-7-0] src/external/bsd/bind/include

2016-04-04 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Apr  4 10:02:46 UTC 2016

Modified Files:
src/external/bsd/bind/include [netbsd-7-0]: config.h
src/external/bsd/bind/include/isc [netbsd-7-0]: platform.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1151):
external/bsd/bind/include/config.h: patch
external/bsd/bind/include/isc/platform.h: patch
Disable SIT (Source Identity Token).


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.2.2.1 -r1.14.2.2.2.2 \
src/external/bsd/bind/include/config.h
cvs rdiff -u -r1.16.2.3.2.1 -r1.16.2.3.2.2 \
src/external/bsd/bind/include/isc/platform.h

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/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.14.2.2.2.1 src/external/bsd/bind/include/config.h:1.14.2.2.2.2
--- src/external/bsd/bind/include/config.h:1.14.2.2.2.1	Sun Mar 13 08:00:39 2016
+++ src/external/bsd/bind/include/config.h	Mon Apr  4 10:02:46 2016
@@ -162,7 +162,7 @@ int sigwait(const unsigned int *set, int
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Use AES for Source Identity Token generation */
-#define AES_SIT 1
+/* #undef AES_SIT */
 
 /* Define to enable the "filter--on-v4" and "filter--on-v6" options.
*/

Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.16.2.3.2.1 src/external/bsd/bind/include/isc/platform.h:1.16.2.3.2.2
--- src/external/bsd/bind/include/isc/platform.h:1.16.2.3.2.1	Sun Mar 13 08:00:39 2016
+++ src/external/bsd/bind/include/isc/platform.h	Mon Apr  4 10:02:46 2016
@@ -346,7 +346,7 @@
 /*
  * Defined if we are enabling SIT (Source Identity Token).
  */
-#define ISC_PLATFORM_USESIT 1
+#undef ISC_PLATFORM_USESIT
 
 /***
  ***	Windows dll support.

CVS commit: src/tests/lib/csu

2016-04-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Mon Apr  4 09:52:03 UTC 2016

Modified Files:
src/tests/lib/csu: Makefile

Log Message:
Replace LDADD with LDSTATIC.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/csu/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/lib/csu/Makefile
diff -u src/tests/lib/csu/Makefile:1.4 src/tests/lib/csu/Makefile:1.5
--- src/tests/lib/csu/Makefile:1.4	Sun Jan  2 09:33:45 2011
+++ src/tests/lib/csu/Makefile	Mon Apr  4 09:52:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/01/02 09:33:45 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/04 09:52:02 joerg Exp $
 
 NOMAN=			# defined
 
@@ -19,7 +19,7 @@ SRCS.h_initfini1=	h_initfini1.cxx h_init
 			${SRCS_CHECK_STACK}
 SRCS.h_initfini2=	h_initfini1.cxx h_initfini_common.cxx \
 			${SRCS_CHECK_STACK}
-LDADD.h_initfini2+=	-static
+LDSTATIC.h_initfini2+=	-static
 SRCS.h_initfini3=	h_initfini3.cxx h_initfini_common.cxx \
 			${SRCS_CHECK_STACK}
 LDADD.h_initfini3+=	-Wl,-rpath,${TESTSDIR}

CVS commit: src/sys/sys

2016-04-04 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Mon Apr  4 08:42:54 UTC 2016

Modified Files:
src/sys/sys: param.h

Log Message:
Bump kernel version for nexthop cache separation


To generate a diff of this commit:
cvs rdiff -u -r1.491 -r1.492 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/sys/sys/param.h
diff -u src/sys/sys/param.h:1.491 src/sys/sys/param.h:1.492
--- src/sys/sys/param.h:1.491	Sun Jan 24 22:50:23 2016
+++ src/sys/sys/param.h	Mon Apr  4 08:42:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.491 2016/01/24 22:50:23 pooka Exp $	*/
+/*	$NetBSD: param.h,v 1.492 2016/04/04 08:42:53 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	799002600	/* NetBSD 7.99.26 */
+#define	__NetBSD_Version__	799002700	/* NetBSD 7.99.27 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: src/sys/miscfs/specfs

2016-04-04 Thread Juergen Hannken-Illjes

Module Name:src
Committed By:   hannken
Date:   Mon Apr  4 08:03:54 UTC 2016

Modified Files:
src/sys/miscfs/specfs: spec_vnops.c

Log Message:
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.161 -r1.162 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.161 src/sys/miscfs/specfs/spec_vnops.c:1.162
--- src/sys/miscfs/specfs/spec_vnops.c:1.161	Sat Mar 26 14:58:13 2016
+++ src/sys/miscfs/specfs/spec_vnops.c	Mon Apr  4 08:03:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec_vnops.c,v 1.161 2016/03/26 14:58:13 hannken Exp $	*/
+/*	$NetBSD: spec_vnops.c,v 1.162 2016/04/04 08:03:53 hannken Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.161 2016/03/26 14:58:13 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.162 2016/04/04 08:03:53 hannken Exp $");
 
 #include 
 #include 
@@ -1041,6 +1041,7 @@ spec_strategy(void *v)
 
 	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);
@@ -1051,8 +1052,6 @@ spec_strategy(void *v)
 	}
 	bp->b_dev = dev;
 
-	KASSERT(vp == vp->v_specnode->sn_dev->sd_bdevvp);
-
 	if (!(bp->b_flags & B_READ)) {
 		error = fscow_run(bp, false);
 		if (error)

CVS commit: [nick-nhusb] src/sys/dev/usb

2016-04-04 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Apr  4 07:43:12 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c ehcivar.h ohci.c uhci.c

Log Message:
Rework {alloc,reset}_*_chain functions to perform all of TD setup in
reset chain.  The initial motivation for this was to fix ZLP.


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.95 -r1.234.2.96 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.42.14.24 -r1.42.14.25 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.254.2.69 -r1.254.2.70 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.264.4.69 -r1.264.4.70 src/sys/dev/usb/uhci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.95 src/sys/dev/usb/ehci.c:1.234.2.96
--- src/sys/dev/usb/ehci.c:1.234.2.95	Sat Mar 26 11:42:44 2016
+++ src/sys/dev/usb/ehci.c	Mon Apr  4 07:43:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.95 2016/03/26 11:42:44 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.96 2016/04/04 07:43:12 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.95 2016/03/26 11:42:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.96 2016/04/04 07:43:12 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -235,12 +235,13 @@ Static void		ehci_free_sqh(ehci_softc_t 
 
 Static ehci_soft_qtd_t *ehci_alloc_sqtd(ehci_softc_t *);
 Static void		ehci_free_sqtd(ehci_softc_t *, ehci_soft_qtd_t *);
-Static usbd_status	ehci_alloc_sqtd_chain(ehci_softc_t *, struct usbd_xfer *,
-			int, int, ehci_soft_qtd_t **, ehci_soft_qtd_t **);
+Static usbd_status	ehci_alloc_sqtd_chain(ehci_softc_t *,
+			struct usbd_xfer *, int, int, ehci_soft_qtd_t **);
 Static void		ehci_free_sqtds(ehci_softc_t *, struct ehci_xfer *);
 
 Static void		ehci_reset_sqtd_chain(ehci_softc_t *, struct usbd_xfer *,
 			int, int, int *, ehci_soft_qtd_t **);
+Static void		ehci_append_sqtd(ehci_soft_qtd_t *, ehci_soft_qtd_t *);
 
 Static ehci_soft_itd_t *ehci_alloc_itd(ehci_softc_t *);
 Static ehci_soft_sitd_t *
@@ -2823,130 +2824,38 @@ ehci_free_sqtd(ehci_softc_t *sc, ehci_so
 
 Static usbd_status
 ehci_alloc_sqtd_chain(ehci_softc_t *sc, struct usbd_xfer *xfer,
-int alen, int rd, ehci_soft_qtd_t **sp, ehci_soft_qtd_t **ep)
+int alen, int rd, ehci_soft_qtd_t **sp)
 {
 	struct ehci_xfer *exfer = EHCI_XFER2EXFER(xfer);
-	ehci_soft_qtd_t *next, *cur;
-	ehci_physaddr_t nextphys;
-	uint32_t qtdstatus;
-	int len, curlen, mps;
-	int i, tog;
-	int pages, pageoffs;
-	size_t curoffs;
-	vaddr_t va, va_offs;
-	usb_dma_t *dma = >ux_dmabuf;
 	uint16_t flags = xfer->ux_flags;
-	paddr_t a;
 
 	EHCIHIST_FUNC(); EHCIHIST_CALLED();
-	DPRINTF("start len=%d", alen, 0, 0, 0);
 
 	ASSERT_SLEEPABLE();
 	KASSERT(sp);
-	KASSERT(alen != 0 || (flags & USBD_FORCE_SHORT_XFER));
-
-	len = alen;
-	qtdstatus = EHCI_QTD_ACTIVE |
-	EHCI_QTD_SET_PID(rd ? EHCI_QTD_PID_IN : EHCI_QTD_PID_OUT) |
-	EHCI_QTD_SET_CERR(3)
-	;
+	KASSERT(alen != 0 || (!rd && (flags & USBD_FORCE_SHORT_XFER)));
 
-	size_t nsqtd = (flags & USBD_FORCE_SHORT_XFER) ? 1 : 0;
-	nsqtd += ((len + EHCI_QTD_MAXTRANSFER - 1) / EHCI_QTD_MAXTRANSFER);
+	size_t nsqtd = (!rd && (flags & USBD_FORCE_SHORT_XFER)) ? 1 : 0;
+	nsqtd += ((alen + EHCI_PAGE_SIZE - 1) / EHCI_PAGE_SIZE);
 	exfer->ex_sqtds = kmem_zalloc(sizeof(ehci_soft_qtd_t *) * nsqtd,
 	KM_SLEEP);
 	exfer->ex_nsqtd = nsqtd;
 
-	mps = UGETW(xfer->ux_pipe->up_endpoint->ue_edesc->wMaxPacketSize);
-	cur = ehci_alloc_sqtd(sc);
-	*sp = cur;
-	if (cur == NULL)
-		goto nomem;
-
-	curoffs = 0;
-	for (size_t j = 0;;) {
-		KASSERT(j < nsqtd);
-		exfer->ex_sqtds[j++] = cur;
-
-		/* The EHCI hardware can handle at most 5 pages. */
-		va = (vaddr_t)KERNADDR(dma, curoffs);
-		va_offs = EHCI_PAGE_OFFSET(va);
-		if (len - curoffs < EHCI_QTD_MAXTRANSFER - va_offs) {
-			/* we can handle it in this QTD */
-			curlen = len - curoffs;
-		} else {
-			/* must use multiple TDs, fill as much as possible. */
-			curlen = EHCI_QTD_MAXTRANSFER - va_offs;
+	DPRINTF("xfer %p len %d nsqtd %d flags %x", xfer, alen, nsqtd, flags);
 
-			/* the length must be a multiple of the max size */
-			curlen -= curlen % mps;
-			DPRINTF("multiple QTDs, curlen=%d", curlen, 0, 0, 0);
-			KASSERT(curlen != 0);
-		}
-		DPRINTF("len=%d curlen=%d curoffs=%zu", len, curlen, curoffs,
-		0);
-
-		/*
-		 * Allocate another transfer if there's more data left,
-		 * or if force last short transfer flag is set and we're
-		 * allocating a multiple of the max packet size.
-		 */
-
-		if (curoffs + curlen != len ||
-		((curlen % mps) == 0 && !rd && curlen != 0 &&
-		 (flags & USBD_FORCE_SHORT_XFER))) {
-			next = ehci_alloc_sqtd(sc);
-			if (next == NULL)
-goto nomem;
-			nextphys = htole32(next->physaddr);
-		} else {
-			next = NULL;
-			nextphys = EHCI_NULL;
-		}
-
-		/* Find number of

CVS commit: src/share/mk

2016-04-04 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Apr  4 07:02:31 UTC 2016

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Switch alpha to binutils 2.26


To generate a diff of this commit:
cvs rdiff -u -r1.917 -r1.918 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.917 src/share/mk/bsd.own.mk:1.918
--- src/share/mk/bsd.own.mk:1.917	Sun Apr  3 06:13:28 2016
+++ src/share/mk/bsd.own.mk	Mon Apr  4 07:02:31 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.917 2016/04/03 06:13:28 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.918 2016/04/04 07:02:31 skrll Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -162,10 +162,11 @@ EXTERNAL_GDB_SUBDIR=		gdb
 #
 # What binutils is used?
 #
-.if ${MACHINE} == "amd64" || \
+.if ${MACHINE} == "alpha" || \
+${MACHINE} == "amd64" || \
 ${MACHINE} == "evbarm" || \
-${MACHINE} == "i386" || \
 ${MACHINE} == "hppa" || \
+${MACHINE} == "i386" || \
 ${MACHINE} == "playstation2" || \
 ${MACHINE} == "sparc" || \
 ${MACHINE} == "sparc64" || \

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

2016-04-04 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Mon Apr  4 06:58:48 UTC 2016

Modified Files:
src/external/gpl3/binutils/dist/bfd: configure configure.ac

Log Message:
Don't use secureplt on alpha yet


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/bfd/configure
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/dist/bfd/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/external/gpl3/binutils/dist/bfd/configure
diff -u src/external/gpl3/binutils/dist/bfd/configure:1.9 src/external/gpl3/binutils/dist/bfd/configure:1.10
--- src/external/gpl3/binutils/dist/bfd/configure:1.9	Fri Jan 29 18:05:18 2016
+++ src/external/gpl3/binutils/dist/bfd/configure	Mon Apr  4 06:58:48 2016
@@ -12147,7 +12147,7 @@ if test "${enable_secureplt+set}" = set;
   *)as_fn_error "bad value ${enableval} for secureplt option" "$LINENO" 5 ;;
 esac
 else
-  use_secureplt=true
+  use_secureplt=false
 fi
 if test $use_secureplt = true; then
 

Index: src/external/gpl3/binutils/dist/bfd/configure.ac
diff -u src/external/gpl3/binutils/dist/bfd/configure.ac:1.2 src/external/gpl3/binutils/dist/bfd/configure.ac:1.3
--- src/external/gpl3/binutils/dist/bfd/configure.ac:1.2	Fri Jan 29 18:05:18 2016
+++ src/external/gpl3/binutils/dist/bfd/configure.ac	Mon Apr  4 06:58:48 2016
@@ -82,7 +82,7 @@ AC_ARG_ENABLE(secureplt,
   yes)  use_secureplt=true  ;;
   no)   use_secureplt=false ;;
   *)AC_MSG_ERROR(bad value ${enableval} for secureplt option) ;;
-esac],[use_secureplt=true])dnl
+esac],[use_secureplt=false])dnl
 if test $use_secureplt = true; then
   AC_DEFINE(USE_SECUREPLT, 1,
 [Define if we should default to creating read-only plt entries])

CVS commit: src/usr.bin/make

CVS commit: src/tests/usr.bin/sed

CVS commit: src/external/gpl3/gcc

CVS commit: src/usr.bin/sed

CVS commit: src/usr.bin/ftp

CVS commit: src/sys/sys

CVS commit: src/sys

CVS commit: src/lib/libkvm

CVS commit: src/sys/compat/svr4_32

CVS commit: src/lib/libkvm

CVS commit: src/sys

CVS commit: src/share/man/man2

CVS commit: src

CVS commit: src/share/man/man2

CVS commit: src/sys/kern

CVS commit: src/external/bsd/blacklist/bin

CVS commit: src/share/mk

CVS commit: src/external/gpl3/binutils/lib/libbfd/arch/alpha

CVS commit: src/usr.sbin/arp

CVS commit: src/share/man/man4

CVS commit: src/lib/libc/sys

CVS commit: src/bin/sh

CVS commit: src/tests/bin/sh

CVS commit: src/bin/sh

CVS commit: src/sys/netinet6

CVS commit: [netbsd-7] src/doc

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

CVS commit: [netbsd-7] src/external/bsd/bind/include

CVS commit: [netbsd-7-0] src/external/bsd/bind/include

CVS commit: src/tests/lib/csu

CVS commit: src/sys/sys

CVS commit: src/sys/miscfs/specfs

CVS commit: [nick-nhusb] src/sys/dev/usb

CVS commit: src/share/mk

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

35 matches

Site Navigation

Mail list logo

Footer information