date:20170910

CVS commit: [netbsd-7] src/doc

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:59:06 UTC 2017

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

Log Message:
1498, 1505


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-7.2

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.2
diff -u src/doc/CHANGES-7.2:1.1.2.46 src/doc/CHANGES-7.2:1.1.2.47
--- src/doc/CHANGES-7.2:1.1.2.46	Mon Sep 11 04:55:52 2017
+++ src/doc/CHANGES-7.2	Mon Sep 11 05:59:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.46 2017/09/11 04:55:52 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.47 2017/09/11 05:59:06 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -4656,3 +4656,17 @@ crypto/external/bsd/heimdal/include/roke
 	  getpw*() internal buffers.
 	[mlelstv, ticket #1509]
 
+sys/netinet/tcp_usrreq.c			1.216
+
+	Add some more getsockopt(2) params.  PR lib/52486.
+	[jdolecek, ticket #1498]
+
+sys/arch/x86/x86/procfs_machdep.c		1.15-1.16
+
+	- Print 0x0007:0 ecx leaf bits.
+	- Don't print fdiv_bug on amd64.
+	- Print APIC ID, Initial APIC ID and clflush size.
+  	- Check buffer length correctly to not to print a garbage
+	  character.  Fixes PR#52352.
+	[msaitoh, ticket #1505]
+

CVS commit: [netbsd-7] src/sys/arch/x86/x86

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:50:12 UTC 2017

Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: procfs_machdep.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1505):
sys/arch/x86/x86/procfs_machdep.c: 1.15-1.16
- Print 0x0007:0 ecx leaf bits.
- Don't print fdiv_bug on amd64.
- Print APIC ID, Initial APIC ID and clflush size.
--
Check buffer length correctly to not to print a garbage character.
Fixes PR#52352 reported by Yasushi Oshima.


To generate a diff of this commit:
cvs rdiff -u -r1.6.4.2 -r1.6.4.3 src/sys/arch/x86/x86/procfs_machdep.c

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

Modified files:

Index: src/sys/arch/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.2 src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.3
--- src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.2	Thu Dec  8 08:06:38 2016
+++ src/sys/arch/x86/x86/procfs_machdep.c	Mon Sep 11 05:50:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_machdep.c,v 1.6.4.2 2016/12/08 08:06:38 snj Exp $ */
+/*	$NetBSD: procfs_machdep.c,v 1.6.4.3 2017/09/11 05:50:12 snj Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.2 2016/12/08 08:06:38 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.3 2017/09/11 05:50:12 snj Exp $");
 
 #include 
 #include 
@@ -131,7 +131,7 @@ static const char * const x86_features[]
 	"clwb", NULL, "avx512pf", "avx512er",
 	"avx512cd", "sha_ni", "avx512bw", "avx512vl"},
 
-	{ /* (10) 000d eax */
+	{ /* (10) 0x000d eax */
 	"xsaveopt", "xsavec", "xgetbv1", "xsaves", NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -148,6 +148,38 @@ static const char * const x86_features[]
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+
+	{ /* (13) 0x8008 ebx */
+	"clzero", "irperf", NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+
+	{ /* (14) 0x0006 eax */
+	"dtherm", "ida", "arat", NULL, "pln", NULL, "pts", "hwp",
+	"hwp_notify", "hwp_act_window", "hwp_epp","hwp_pkg_req",
+	NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+
+	{ /* (15) 0x800a edx */
+	"npt", "lbrv", "svm_lock", "nrip_save",
+	"tsc_scale", "vmcb_clean", "flushbyasid", "decodeassists",
+	NULL, NULL, "pausefilter", NULL, "pfthreshold", "avic", NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+
+	{ /* (16) 0x0007:0 ecx */
+	NULL, "avx512vbmi", NULL, "pku", "ospke", NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, "avx512_vpopcntdq", NULL,
+	"la57", NULL, NULL, NULL, NULL, NULL, "rdpid", NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+
+	{ /* (17) 0x8007 ebx */
+	"overflow_recov", "succor", "smca", NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 };
 
 static int	procfs_getonecpu(int, struct cpu_info *, char *, size_t *);
@@ -171,7 +203,7 @@ procfs_getcpuinfstr(char *bf, size_t *le
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		procfs_getonecpu(i++, ci, bf, );
 		total += used + 1;
-		if (used + 1 < size) {
+		if (used + 1 <= size) {
 			bf += used;
 			*bf++ = '\n';
 			size -= used + 1;
@@ -246,9 +278,18 @@ procfs_getonecpufeatures(struct cpu_info
 	left);
 	diff = last - *left;
 
-	/* (10) 000d eax */
+	/* (10) 0x000d eax */
 	/* (11) 0x000f(ecx=0) edx */
 	/* (12) 0x000f(ecx=1) edx */
+	/* (13) 0x8008 ebx */
+	/* (14) 0x0006 eax */
+	/* (15) 0x800a edx */
+
+	procfs_getonefeatreg(ci->ci_feat_val[6], x86_features[16], p + diff,
+	left);
+	diff = last - *left;
+
+	/* (17) 0x8007 ebx */
 
 	return 0; /* XXX */
 }
@@ -318,17 +359,36 @@ procfs_getonecpu(int xcpu, struct cpu_in
 		left = 0;
 
 	l = snprintf(p, left,
+	"apicid\t\t: %d\n"
+	"initial apicid\t: %d\n",
+	ci->ci_acpiid,
+	ci->ci_initapicid
+	);
+	size += l;
+	if (l < left) {
+		left -= l;
+		p += l;
+	} else
+		left = 0;
+
+	l = snprintf(p, left,
+#ifdef __i386__
 	"fdiv_bug\t: %s\n"
+#endif
 	"fpu\t\t: %s\n"
 	"fpu_exception\t: yes\n"
 	"cpuid level\t: %d\n"
 	"wp\t\t: %s\n"
-	"flags\t\t: %s\n",
+	"flags\t\t: %s\n"
+	"clflush size\t: %d\n",
+#ifdef __i386__
 	i386_fpu_fdivbug ? "yes" : "no",	/* an old pentium */
+#endif
 	i386_fpu_present ? "yes" : "no",	/* not a 486SX */
 	cpuid_level,
 	(rcr0() & CR0_WP) ? "yes" :

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

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:46:44 UTC 2017

Modified Files:
src/sys/netinet [netbsd-7]: tcp_usrreq.c

Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #1498):
sys/netinet/tcp_usrreq.c: revision 1.216
add some more getsockopt(2) params


To generate a diff of this commit:
cvs rdiff -u -r1.200.2.2 -r1.200.2.3 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.200.2.2 src/sys/netinet/tcp_usrreq.c:1.200.2.3
--- src/sys/netinet/tcp_usrreq.c:1.200.2.2	Sat Feb 21 13:40:19 2015
+++ src/sys/netinet/tcp_usrreq.c	Mon Sep 11 05:46:43 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_usrreq.c,v 1.200.2.2 2015/02/21 13:40:19 martin Exp $	*/
+/*	$NetBSD: tcp_usrreq.c,v 1.200.2.3 2017/09/11 05:46:43 snj Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.200.2.2 2015/02/21 13:40:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.200.2.3 2017/09/11 05:46:43 snj Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -500,17 +500,14 @@ tcp_ctloutput(int op, struct socket *so,
 #ifdef TCP_SIGNATURE
 		case TCP_MD5SIG:
 			optval = (tp->t_flags & TF_SIGNATURE) ? 1 : 0;
-			error = sockopt_set(sopt, , sizeof(optval));
-			break;
+			goto setval;
 #endif
 		case TCP_NODELAY:
 			optval = tp->t_flags & TF_NODELAY;
-			error = sockopt_set(sopt, , sizeof(optval));
-			break;
+			goto setval;
 		case TCP_MAXSEG:
 			optval = tp->t_peermss;
-			error = sockopt_set(sopt, , sizeof(optval));
-			break;
+			goto setval;
 		case TCP_INFO:
 			tcp_fill_info(tp, );
 			error = sockopt_set(sopt, , sizeof ti);
@@ -519,6 +516,19 @@ tcp_ctloutput(int op, struct socket *so,
 		case TCP_CONGCTL:
 			break;
 #endif
+		case TCP_KEEPIDLE:
+			optval = tp->t_keepidle;
+			goto setval;
+		case TCP_KEEPINTVL:
+			optval = tp->t_keepintvl;
+			goto setval;
+		case TCP_KEEPCNT:
+			optval = tp->t_keepcnt;
+			goto setval;
+		case TCP_KEEPINIT:
+			optval = tp->t_keepcnt;
+setval:			error = sockopt_set(sopt, , sizeof(optval));
+			break;
 		default:
 			error = ENOPROTOOPT;
 			break;

CVS commit: [netbsd-8] src/doc

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:45:47 UTC 2017

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
256, 265, 266-269, 271-274, 277


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.57 -r1.1.2.58 src/doc/CHANGES-8.0

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-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.57 src/doc/CHANGES-8.0:1.1.2.58
--- src/doc/CHANGES-8.0:1.1.2.57	Sat Sep  9 17:38:24 2017
+++ src/doc/CHANGES-8.0	Mon Sep 11 05:45:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.57 2017/09/09 17:38:24 snj Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.58 2017/09/11 05:45:46 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -5806,3 +5806,100 @@ sys/arch/x86/x86/sys_machdep.c			1.38
 	- reject call gates in the LDT, and remove LDT_DEBUG
 	[maxv, ticket #258]
 
+crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 1.1
+crypto/external/bsd/heimdal/dist/configure.ac	1.3
+crypto/external/bsd/heimdal/dist/kcm/client.c	1.3
+crypto/external/bsd/heimdal/dist/kcm/config.c	1.3
+crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c 1.3
+crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in 1.5
+crypto/external/bsd/heimdal/include/config.h	1.9
+crypto/external/bsd/heimdal/include/roken.h	1.8
+
+	- Always use rk_getpwnam_r
+	- Use getpwuid_r instead of getpwuid, so that we don't trash
+	  getpw*() internal buffers.
+	[mlelstv, ticket #277]
+
+sys/arch/i386/conf/GENERIC			1.1159 via patch
+sys/arch/i386/conf/XEN3_DOM0			1.114 via patch
+sys/arch/i386/conf/XEN3_DOMU			1.78 via patch
+sys/kern/kern_exec.c1.443-1.444 via patch
+
+	- Disable ibcs2 by default.
+	- Remove compat_ibcs2 from the list of autoloaded modules.
+	- Remove compat_freebsd from the list of autoloaded modules.
+	[maxv, ticket #256]
+
+sys/arch/amiga/dev/wdc_xsurf.c			1.3
+
+	Fix a panic while ifconfig(8)ing an Xsurf-based ne(4).
+	[phx, ticket #265]
+
+external/bsd/dhcpcd/dist/src/dhcp.c		1.2
+
+	dhcpcd: Fix classless static routes
+	[bsiegert, ticket #266]
+
+sys/arch/mips/include/vmparam.h			1.60
+
+	Don't define UVM_KM_VMFREELIST on mips as it excludes
+	some memory ranges unnecessarily.  PR/52501.
+	[skrll, ticket #267]
+
+usr.sbin/mtree/only.c1.3
+
+	Don't modify strings stored in hash, otherwise filling up of
+	directory hierarchy stops if the same hash value occurs in
+	directory and leaf.
+	[nakayama, ticket #268]
+
+sys/arch/arm/sunxi/sunxi_emac.c			1.6
+
+	Fix a typo that prevented ahb reset from ever being deasserted.
+	[jmcneill, ticket #269]
+
+sys/arch/arm/cortex/gtmr.c			1.20
+
+	gtmr_intr: If the ISTATUS bit is 0, timer condition is not met.
+	In this case, just return 0.
+	[jmcneill, ticket #271]
+
+usr.sbin/veriexecgen/veriexecgen.8		1.18-1.19
+usr.sbin/veriexecgen/veriexecgen.c		1.18
+
+	Remove the ability to generate a signature database with
+	the hash algorithms MD5, SHA1 & RMD160 which are either broken
+	or on their way to being broken.
+	[sevan, ticket #272]
+
+sys/dev/audio.c	1.368, 1.370
+sys/dev/audiovar.h1.57
+
+	audio(4):
+	Fix division by zero when precision < 8 in ifdef
+	AUDIO_INTR_TIME. Improve in #ifdef AUDIO_INTR_TIME.
+	Stop 19 year old weird #define, stop signed/unsigned mixing,
+	use int64_t instead of (u_)long to avoid integer overflow,
+	rearrange definitions in header, and fix indent.
+	[isaki, ticket #273]
+
+sys/dev/audio.c	1.379, 1.380, 1.385, 1.398
+
+	audio(4):
+	Fix error handling of ring buffers allocation in audioattach().
+	NULL dereference, dead code, reference to uninitialized
+	variable, and mutex leak.
+	Fix a resource leak on error handling in audio_alloc_ring().
+	Fix resource leaks on error handling in audio_open().
+	Avoid possibility of integer overflow (and clean up).
+	- On 32bit arch and type argument is int32_t, orig[m] * tomix[m]
+	  is calculated first with int32 (possibility of overflow here)
+	  and then cast to int64_t for assignment.
+	- bigger_type is sufficient for product and result.
+	[isaki, ticket #274]
+

CVS commit: [netbsd-8] src/sys/dev

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:33:23 UTC 2017

Modified Files:
src/sys/dev [netbsd-8]: audio.c

Log Message:
Pull up following revision(s) (requested by isaki in ticket #274):
sys/dev/audio.c: 1.379, 1.380, 1.385, 1.398
Fix error handling of ring buffers allocation in audioattach().
NULL dereference, dead code, reference to uninitialized variable,
and mutex leak.
XXX In the current implementation, if audio_alloc_ring() returns error,
it is not guaranteed that ringbuf->s.start will be NULL.
--
Fix a resource leak on error handling in audio_alloc_ring().
--
Fix resource leaks on error handling in audio_open().
--
Avoid possibility of integer overflow (and clean up).
- On 32bit arch and type argument is int32_t, orig[m] * tomix[m] is
  calculated first with int32 (possibility of overflow here) and then
  cast to int64_t for assignment.
- bigger_type is sufficient for product and result.


To generate a diff of this commit:
cvs rdiff -u -r1.357.2.6 -r1.357.2.7 src/sys/dev/audio.c

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

Modified files:

Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.357.2.6 src/sys/dev/audio.c:1.357.2.7
--- src/sys/dev/audio.c:1.357.2.6	Mon Sep 11 05:29:37 2017
+++ src/sys/dev/audio.c	Mon Sep 11 05:33:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.357.2.6 2017/09/11 05:29:37 snj Exp $	*/
+/*	$NetBSD: audio.c,v 1.357.2.7 2017/09/11 05:33:23 snj Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.357.2.6 2017/09/11 05:29:37 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.357.2.7 2017/09/11 05:33:23 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -275,6 +275,7 @@ void	audio_calc_blksize(struct audio_sof
 void	audio_fill_silence(struct audio_params *, uint8_t *, int);
 int	audio_silence_copyout(struct audio_softc *, int, struct uio *);
 
+static int	audio_allocbufs(struct audio_softc *, struct virtual_channel *);
 void	audio_init_ringbuffer(struct audio_softc *,
 			  struct audio_ringbuffer *, int);
 int	audio_initbufs(struct audio_softc *, struct virtual_channel *);
@@ -483,7 +484,6 @@ audioattach(device_t parent, device_t se
 	mixer_devinfo_t mi;
 	int iclass, mclass, oclass, rclass, props;
 	int record_master_found, record_source_found;
-	bool can_capture, can_playback;
 
 	sc = device_private(self);
 	sc->dev = self;
@@ -571,7 +571,6 @@ audioattach(device_t parent, device_t se
 	hwp->query_devinfo == 0 ||
 	hwp->get_props == 0) {
 		aprint_error(": missing method\n");
-		sc->hw_if = NULL;
 		return;
 	}
 #endif
@@ -602,56 +601,16 @@ audioattach(device_t parent, device_t se
 	aprint_normal("\n");
 
 	mutex_enter(sc->sc_lock);
-	can_playback = audio_can_playback(sc);
-	can_capture = audio_can_capture(sc);
-
-	if (can_playback) {
-		error = audio_alloc_ring(sc, >sc_pr,
-		AUMODE_PLAY, AU_RING_SIZE);
-		if (error)
-			goto bad_play;
-
-		error = audio_alloc_ring(sc, >sc_mpr,
-		AUMODE_PLAY, AU_RING_SIZE);
-bad_play:
-		if (error) {
-			if (sc->sc_pr.s.start != NULL)
-audio_free_ring(sc, >sc_pr);
-			sc->hw_if = NULL;
-			if (vc->sc_mpr.s.start != 0)
-audio_free_ring(sc, >sc_mpr);
-			sc->hw_if = NULL;
-			aprint_error_dev(sc->sc_dev, "could not allocate play "
-			"buffer\n");
-			return;
-		}
-	}
-	if (can_capture) {
-		error = audio_alloc_ring(sc, >sc_rr,
-		AUMODE_RECORD, AU_RING_SIZE);
-		if (error)
-			goto bad_rec;
-
-		error = audio_alloc_ring(sc, >sc_mrr,
-		AUMODE_RECORD, AU_RING_SIZE);
-bad_rec:
-		if (error) {
-			if (vc->sc_mrr.s.start != NULL)
-audio_free_ring(sc, >sc_mrr);
-			if (sc->sc_pr.s.start != NULL)
-audio_free_ring(sc, >sc_pr);
-			if (vc->sc_mpr.s.start != 0)
-audio_free_ring(sc, >sc_mpr);
-			sc->hw_if = NULL;
-			aprint_error_dev(sc->sc_dev, "could not allocate record"
-			   " buffer\n");
-			return;
-		}
+	if (audio_allocbufs(sc, vc) != 0) {
+		aprint_error_dev(sc->sc_dev,
+			"could not allocate ring buffer\n");
+		mutex_exit(sc->sc_lock);
+		return;
 	}
+	mutex_exit(sc->sc_lock);
 
 	sc->sc_lastgain = 128;
 	sc->sc_multiuser = false;
-	mutex_exit(sc->sc_lock);
 
 	error = vchan_autoconfig(sc);
 	if (error != 0) {
@@ -1178,6 +1137,54 @@ audio_print_params(const char *s, struct
 }
 #endif
 
+/* Allocate all ring buffers. called from audioattach() */
+static int
+audio_allocbufs(struct audio_softc *sc, struct virtual_channel *vc)
+{
+	int error;
+
+	sc->sc_pr.s.start = NULL;
+	vc->sc_mpr.s.start = NULL;
+	sc->sc_rr.s.start = NULL;
+	vc->sc_mrr.s.start = NULL;
+
+	if (audio_can_playback(sc)) {
+		error = audio_alloc_ring(sc, >sc_pr,
+		AUMODE_PLAY, AU_RING_SIZE);
+		if (error)
+			goto bad_play1;
+
+		error = audio_alloc_ring(sc, >sc_mpr,
+		AUMODE_PLAY, AU_RING_SIZE);
+		if (error)
+			goto bad_play2;
+	}
+	if (audio_can_capture(sc)) {

CVS commit: [netbsd-8] src/sys/dev

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:29:38 UTC 2017

Modified Files:
src/sys/dev [netbsd-8]: audio.c audiovar.h

Log Message:
Pull up following revision(s) (requested by isaki in ticket #273):
sys/dev/audio.c: 1.368, 1.370
sys/dev/audiovar.h: revision 1.57
Fix division by zero when precision < 8 in ifdef AUDIO_INTR_TIME.
--
Improve in #ifdef AUDIO_INTR_TIME.
Stop 19 years old weird #define, stop signed/unsigned mixing,
use int64_t instead of (u_)long to avoid integer overflow,
rearrange definitions in header, and fix indent.


To generate a diff of this commit:
cvs rdiff -u -r1.357.2.5 -r1.357.2.6 src/sys/dev/audio.c
cvs rdiff -u -r1.55.2.1 -r1.55.2.2 src/sys/dev/audiovar.h

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

Modified files:

Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.357.2.5 src/sys/dev/audio.c:1.357.2.6
--- src/sys/dev/audio.c:1.357.2.5	Thu Aug 31 11:10:37 2017
+++ src/sys/dev/audio.c	Mon Sep 11 05:29:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.357.2.5 2017/08/31 11:10:37 martin Exp $	*/
+/*	$NetBSD: audio.c,v 1.357.2.6 2017/09/11 05:29:37 snj Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.357.2.5 2017/08/31 11:10:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.357.2.6 2017/09/11 05:29:37 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -2059,28 +2059,24 @@ audio_initbufs(struct audio_softc *sc, s
 		sc->sc_pr.blksize = vc->sc_mpr.blksize;
 
 #ifdef AUDIO_INTR_TIME
-#define double u_long
 	if (audio_can_playback(sc)) {
 		sc->sc_pnintr = 0;
-		sc->sc_pblktime = (u_long)(
-		(double)vc->sc_mpr.blksize * 10 /
-		(double)(vc->sc_pparams.precision / NBBY *
-			 vc->sc_pparams.channels *
-			 vc->sc_pparams.sample_rate)) * 10;
-		DPRINTF(("audio: play blktime = %lu for %d\n",
+		sc->sc_pblktime = (int64_t)vc->sc_mpr.blksize * 100 /
+		(vc->sc_pparams.channels *
+		 vc->sc_pparams.sample_rate *
+		 vc->sc_pparams.precision / NBBY);
+		DPRINTF(("audio: play blktime = %" PRId64 " for %d\n",
 			 sc->sc_pblktime, vc->sc_mpr.blksize));
 	}
 	if (audio_can_capture(sc)) {
 		sc->sc_rnintr = 0;
-		sc->sc_rblktime = (u_long)(
-		(double)vc->sc_mrr.blksize * 10 /
-		(double)(vc->sc_rparams.precision / NBBY *
-			 vc->sc_rparams.channels *
-			 vc->sc_rparams.sample_rate)) * 10;
-		DPRINTF(("audio: record blktime = %lu for %d\n",
+		sc->sc_rblktime = (int64_t)vc->sc_mrr.blksize * 100 /
+		(vc->sc_rparams.channels *
+		 vc->sc_rparams.sample_rate *
+		 vc->sc_rparams.precision / NBBY);
+		DPRINTF(("audio: record blktime = %" PRId64 " for %d\n",
 			 sc->sc_rblktime, vc->sc_mrr.blksize));
 	}
-#undef double
 #endif
 
 	return 0;
@@ -3764,26 +3760,28 @@ audio_mix(void *v)
 #ifdef AUDIO_INTR_TIME
 		{
 			struct timeval tv;
-			u_long t;
+			int64_t t;
 			microtime();
-			t = tv.tv_usec + 100 * tv.tv_sec;
+			t = (int64_t)tv.tv_sec * 100 + tv.tv_usec;
 			if (sc->sc_pnintr) {
-long lastdelta, totdelta;
+int64_t lastdelta, totdelta;
 lastdelta = t - sc->sc_plastintr -
 sc->sc_pblktime;
 if (lastdelta > sc->sc_pblktime / 3) {
 	printf("audio: play interrupt(%d) off "
-   "relative by %ld us (%lu)\n",
+	   "relative by %" PRId64 " us "
+	   "(%" PRId64 ")\n",
 	   sc->sc_pnintr, lastdelta,
 	   sc->sc_pblktime);
 }
 totdelta = t - sc->sc_pfirstintr -
-	sc->sc_pblktime * sc->sc_pnintr;
+sc->sc_pblktime * sc->sc_pnintr;
 if (totdelta > sc->sc_pblktime) {
 	printf("audio: play interrupt(%d) "
-	   "off absolute by %ld us (%lu) "
-	   "(LOST)\n", sc->sc_pnintr,
-	   totdelta, sc->sc_pblktime);
+	   "off absolute by %" PRId64 " us "
+	   "(%" PRId64 ") (LOST)\n",
+	   sc->sc_pnintr, totdelta,
+	   sc->sc_pblktime);
 	sc->sc_pnintr++;
 	/* avoid repeated messages */
 }
@@ -3995,25 +3993,27 @@ audio_upmix(void *v)
 #ifdef AUDIO_INTR_TIME
 		{
 			struct timeval tv;
-			u_long t;
+			int64_t t;
 			microtime();
-			t = tv.tv_usec + 100 * tv.tv_sec;
+			t = (int64_t)tv.tv_sec * 100 + tv.tv_usec;
 			if (sc->sc_rnintr) {
-long lastdelta, totdelta;
+int64_t lastdelta, totdelta;
 lastdelta = t - sc->sc_rlastintr -
 sc->sc_rblktime;
 if (lastdelta > sc->sc_rblktime / 5) {
 	printf("audio: record interrupt(%d) "
-	   "off relative by %ld us (%lu)\n",
+	   "off relative by %" PRId64 " us "
+	   "(%" PRId64 ")\n",
 	   sc->sc_rnintr, lastdelta,
 	   sc->sc_rblktime);
 }
 totdelta = t - sc->sc_rfirstintr -
-	sc->sc_rblktime * sc->sc_rnintr;
+sc->sc_rblktime * sc->sc_rnintr;
 if (totdelta > sc->sc_rblktime / 2) {

CVS commit: [netbsd-8] src/usr.sbin/veriexecgen

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:27:19 UTC 2017

Modified Files:
src/usr.sbin/veriexecgen [netbsd-8]: veriexecgen.8 veriexecgen.c

Log Message:
Pull up following revision(s) (requested by sevan in ticket #272):
usr.sbin/veriexecgen/veriexecgen.c: 1.18
usr.sbin/veriexecgen/veriexecgen.8: 1.18-1.19
Remove the ability to generate a signature database with the hash algorithms
MD5, SHA1 & RMD160 which are either broken or on their way to being broken.
Discussed on tech-security
http://mail-index.netbsd.org/tech-security/2017/08/21/msg000936.html
ok riastradh
--
Fix enumeration.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.36.1 src/usr.sbin/veriexecgen/veriexecgen.8
cvs rdiff -u -r1.17 -r1.17.38.1 src/usr.sbin/veriexecgen/veriexecgen.c

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

Modified files:

Index: src/usr.sbin/veriexecgen/veriexecgen.8
diff -u src/usr.sbin/veriexecgen/veriexecgen.8:1.17 src/usr.sbin/veriexecgen/veriexecgen.8:1.17.36.1
--- src/usr.sbin/veriexecgen/veriexecgen.8:1.17	Thu Apr 28 11:24:28 2011
+++ src/usr.sbin/veriexecgen/veriexecgen.8	Mon Sep 11 05:27:19 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexecgen.8,v 1.17 2011/04/28 11:24:28 wiz Exp $
+.\" $NetBSD: veriexecgen.8,v 1.17.36.1 2017/09/11 05:27:19 snj Exp $
 .\"
 .\" Copyright (c) 2006 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 February 18, 2008
+.Dd September 9, 2017
 .Dt VERIEXECGEN 8
 .Os
 .Sh NAME
@@ -102,13 +102,10 @@ Use
 .Ar algorithm
 for the fingerprints.
 Must be one of
-.Dq md5 ,
-.Dq sha1 ,
 .Dq sha256 ,
 .Dq sha384 ,
-.Dq sha512 ,
 or
-.Dq rmd160 .
+.Dq sha512 .
 .It Fl v
 Verbose mode.
 Print messages describing what operations are being done.
@@ -147,11 +144,11 @@ appending to the default fingerprint dat
 .Pp
 Fingerprint files in
 .Pa /path/to/somewhere using
-.Dq rmd160
+.Dq sha512
 as the hashing algorithm, saving to
 .Pa /etc/somewhere.fp :
 .Bd -literal -offset indent
-# veriexecgen -d /path/to/somewhere -t rmd160 -o /etc/somewhere.fp
+# veriexecgen -d /path/to/somewhere -t sha512 -o /etc/somewhere.fp
 .Ed
 .Sh SEE ALSO
 .Xr veriexec 4 ,

Index: src/usr.sbin/veriexecgen/veriexecgen.c
diff -u src/usr.sbin/veriexecgen/veriexecgen.c:1.17 src/usr.sbin/veriexecgen/veriexecgen.c:1.17.38.1
--- src/usr.sbin/veriexecgen/veriexecgen.c:1.17	Fri Aug 21 04:09:41 2009
+++ src/usr.sbin/veriexecgen/veriexecgen.c	Mon Sep 11 05:27:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: veriexecgen.c,v 1.17 2009/08/21 04:09:41 elad Exp $ */
+/* $NetBSD: veriexecgen.c,v 1.17.38.1 2017/09/11 05:27:19 snj Exp $ */
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #ifndef lint
 #ifdef __RCSID
-__RCSID("$NetBSD: veriexecgen.c,v 1.17 2009/08/21 04:09:41 elad Exp $");
+__RCSID("$NetBSD: veriexecgen.c,v 1.17.38.1 2017/09/11 05:27:19 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,10 +57,7 @@ __RCSID("$NetBSD: veriexecgen.c,v 1.17 2
 #include 
 #include 
 
-#include 
-#include 
 #include 
-#include 
 
 #define IS_EXEC(mode) ((mode) & (S_IXUSR | S_IXGRP | S_IXOTH))
 
@@ -100,12 +97,9 @@ TAILQ_HEAD(, fentry) fehead;
 
 /* define the possible hash algorithms */
 static hash_t	 hashes[] = {
-	{ "MD5", MD5File },
-	{ "SHA1", SHA1File },
 	{ "SHA256", SHA256_File },
 	{ "SHA384", SHA384_File },
 	{ "SHA512", SHA512_File },
-	{ "RMD160", RMD160File },
 	{ NULL, NULL },
 };

CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat

2017-09-10 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Mon Sep 11 05:25:53 UTC 2017

Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h

Log Message:
Use common barrier.h rather than separate implementation. NFCI


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.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/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.11 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.12
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.11	Mon Sep 11 00:58:20 2017
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h	Mon Sep 11 05:25:53 2017
@@ -28,10 +28,6 @@
 #ifndef __VCHI_NETBSD_H__
 #define __VCHI_NETBSD_H__
 
-#ifdef _KERNEL_OPT
-#include "opt_multiprocessor.h"
-#endif
-
 #include 
 #include 
 #include 
@@ -49,6 +45,7 @@
 #include 
 
 #include 
+#include 
 
 /*
  * Copy from/to user API
@@ -331,21 +328,6 @@ typedef	off_t	loff_t;
 #define BCM2835_MBOX_CHAN_VCHIQ	3
 #define bcm_mbox_write	bcmmbox_write
 
-#define mb  membar_sync
-#define wmb membar_producer
-#define rmb membar_consumer
-#define dsb	membar_producer
-
-#ifdef MULTIPROCESSOR
-#  define   smp_mb  mb
-#  define   smp_wmb wmb
-#  define   smp_rmb rmb
-#else
-#  define   smp_mb()do {} while (0)
-#  define   smp_wmb()   do {} while (0)
-#  define   smp_rmb()   do {} while (0)
-#endif
-
 #define device_print_prettyname(dev)	device_printf((dev), "")
 
 #endif /* __VCHI_NETBSD_H__ */

CVS commit: [netbsd-8] src/sys/arch/arm/cortex

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:25:20 UTC 2017

Modified Files:
src/sys/arch/arm/cortex [netbsd-8]: gtmr.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #271):
sys/arch/arm/cortex/gtmr.c: revision 1.20
gtmr_intr: If the ISTATUS bit is 0, timer condition is not met. In this
case, just return 0.


To generate a diff of this commit:
cvs rdiff -u -r1.17.2.1 -r1.17.2.2 src/sys/arch/arm/cortex/gtmr.c

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

Modified files:

Index: src/sys/arch/arm/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.17.2.1 src/sys/arch/arm/cortex/gtmr.c:1.17.2.2
--- src/sys/arch/arm/cortex/gtmr.c:1.17.2.1	Wed Jun 21 17:47:48 2017
+++ src/sys/arch/arm/cortex/gtmr.c	Mon Sep 11 05:25:20 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtmr.c,v 1.17.2.1 2017/06/21 17:47:48 snj Exp $	*/
+/*	$NetBSD: gtmr.c,v 1.17.2.2 2017/09/11 05:25:20 snj Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.17.2.1 2017/06/21 17:47:48 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.17.2.2 2017/09/11 05:25:20 snj Exp $");
 
 #include 
 #include 
@@ -292,6 +292,10 @@ gtmr_intr(void *arg)
 
 	arm_isb();
 
+	const uint32_t ctl = armreg_cntv_ctl_read();
+	if ((ctl & ARM_CNTCTL_ISTATUS) == 0)
+		return 0;
+
 	const uint64_t now = armreg_cntv_ct_read();
 	uint64_t delta = now - ci->ci_lastintr;

CVS commit: [netbsd-8] src/sys/arch/arm/sunxi

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:24:16 UTC 2017

Modified Files:
src/sys/arch/arm/sunxi [netbsd-8]: sunxi_emac.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #269):
sys/arch/arm/sunxi/sunxi_emac.c: revision 1.6
Fix a typo that prevented ahb reset from ever being deasserted.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/sys/arch/arm/sunxi/sunxi_emac.c

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

Modified files:

Index: src/sys/arch/arm/sunxi/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.4.4.2 src/sys/arch/arm/sunxi/sunxi_emac.c:1.4.4.3
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.4.4.2	Tue Jul 18 19:13:08 2017
+++ src/sys/arch/arm/sunxi/sunxi_emac.c	Mon Sep 11 05:24:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.4.4.2 2017/07/18 19:13:08 snj Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.4.4.3 2017/09/11 05:24:16 snj Exp $ */
 
 /*-
  * Copyright (c) 2016-2017 Jared McNeill 
@@ -33,7 +33,7 @@
 #include "opt_net_mpsafe.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.4.4.2 2017/07/18 19:13:08 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.4.4.3 2017/09/11 05:24:16 snj Exp $");
 
 #include 
 #include 
@@ -1283,7 +1283,7 @@ sunxi_emac_get_resources(struct sunxi_em
 
 	if ((sc->rst_ahb = fdtbus_reset_get(phandle, "ahb")) == NULL)
 		return ENXIO;
-	sc->rst_ahb = fdtbus_reset_get(phandle, "ephy");
+	sc->rst_ephy = fdtbus_reset_get(phandle, "ephy");
 
 	/* Regulator is optional */
 	sc->reg_phy = fdtbus_regulator_acquire(phandle, "phy-supply");

CVS commit: src/sys/external/bsd/common/include/asm

2017-09-10 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Mon Sep 11 05:22:10 UTC 2017

Modified Files:
src/sys/external/bsd/common/include/asm: barrier.h

Log Message:
add dsb macro from vchiq


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/common/include/asm/barrier.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/external/bsd/common/include/asm/barrier.h
diff -u src/sys/external/bsd/common/include/asm/barrier.h:1.1 src/sys/external/bsd/common/include/asm/barrier.h:1.2
--- src/sys/external/bsd/common/include/asm/barrier.h:1.1	Mon Sep 11 05:20:17 2017
+++ src/sys/external/bsd/common/include/asm/barrier.h	Mon Sep 11 05:22:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: barrier.h,v 1.1 2017/09/11 05:20:17 maya Exp $	*/
+/*	$NetBSD: barrier.h,v 1.2 2017/09/11 05:22:10 maya Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -41,6 +41,7 @@
 #define	mb	membar_sync
 #define	wmb	membar_producer
 #define	rmb	membar_consumer
+#define	dsb	membar_producer
 
 #ifdef __alpha__		/* XXX As if...  */
 #  define	read_barrier_depends	membar_sync

CVS commit: [netbsd-8] src/usr.sbin/mtree

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:22:18 UTC 2017

Modified Files:
src/usr.sbin/mtree [netbsd-8]: only.c

Log Message:
Pull up following revision(s) (requested by nakayama in ticket #268):
usr.sbin/mtree/only.c: revision 1.3
Don't modify strings stored in hash, otherwise filling up of
directory hierarchy stops if the same hash value occurs in
directory and leaf.
Fix the issue that
"./usr/share/locale/pl/LC_MESSAGES/gettext-tools.mo" isn't included
in sets file in the case of MKUNPRIVED=no.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.26.1 src/usr.sbin/mtree/only.c

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

Modified files:

Index: src/usr.sbin/mtree/only.c
diff -u src/usr.sbin/mtree/only.c:1.2 src/usr.sbin/mtree/only.c:1.2.26.1
--- src/usr.sbin/mtree/only.c:1.2	Tue Feb  5 00:59:03 2013
+++ src/usr.sbin/mtree/only.c	Mon Sep 11 05:22:18 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $	*/
+/*	$NetBSD: only.c,v 1.2.26.1 2017/09/11 05:22:18 snj Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 #include 
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $");
+__RCSID("$NetBSD: only.c,v 1.2.26.1 2017/09/11 05:22:18 snj Exp $");
 #endif
 
 #include 
@@ -89,11 +89,14 @@ static void
 hash_insert(char *str, uint32_t h)
 {
 	struct hentry *e;
+	char *x;
 
 	if ((e = malloc(sizeof(*e))) == NULL)
 		mtree_err("memory allocation error");
+	if ((x = strdup(str)) == NULL)
+		mtree_err("memory allocation error");
 
-	e->str = str;
+	e->str = x;
 	e->hash = h;
 	e->next = table[h];
 	table[h] = e;
@@ -110,10 +113,7 @@ fill(char *str)
 
 	*ptr = '\0';
 	if (!hash_find(str, )) {
-		char *x = strdup(str);
-		if (x == NULL)
-			mtree_err("memory allocation error");
-		hash_insert(x, h);
+		hash_insert(str, h);
 		fill(str);
 	}
 	*ptr = '/';
@@ -135,6 +135,7 @@ load_only(const char *fname)
 			err(1, "Duplicate entry %s", line);
 		hash_insert(line, h);
 		fill(line);
+		free(line);
 	}
 
 	fclose(fp);

CVS commit: [netbsd-8] src/sys/arch/mips/include

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:20:26 UTC 2017

Modified Files:
src/sys/arch/mips/include [netbsd-8]: vmparam.h

Log Message:
Pull up following revision(s) (requested by skrll in ticket #267):
sys/arch/mips/include/vmparam.h: revision 1.60
Don't define UVM_KM_VMFREELIST on mips as it excludes some memory
ranges unnecessarily.
PR/52501 - erlite quickly fails to allocate memory and processes wedge


To generate a diff of this commit:
cvs rdiff -u -r1.57.8.1 -r1.57.8.2 src/sys/arch/mips/include/vmparam.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/mips/include/vmparam.h
diff -u src/sys/arch/mips/include/vmparam.h:1.57.8.1 src/sys/arch/mips/include/vmparam.h:1.57.8.2
--- src/sys/arch/mips/include/vmparam.h:1.57.8.1	Thu Aug 31 08:32:39 2017
+++ src/sys/arch/mips/include/vmparam.h	Mon Sep 11 05:20:26 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.57.8.1 2017/08/31 08:32:39 bouyer Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.57.8.2 2017/09/11 05:20:26 snj Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -208,8 +208,6 @@
 #endif
 
 #ifdef _KERNEL
-#define	UVM_KM_VMFREELIST	mips_poolpage_vmfreelist
-extern int mips_poolpage_vmfreelist;
 #ifdef ENABLE_MIPS_16KB_PAGE
 extern vaddr_t mips_vm_maxuser_address;
 #endif

CVS commit: src/sys/external/bsd

2017-09-10 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Mon Sep 11 05:20:17 UTC 2017

Added Files:
src/sys/external/bsd/common/include/asm: barrier.h
Removed Files:
src/sys/external/bsd/drm2/include/asm: barrier.h

Log Message:
Move barrier to common so it can be shared with vchiq


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/include/asm/barrier.h
cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/include/asm/barrier.h

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

Added files:

Index: src/sys/external/bsd/common/include/asm/barrier.h
diff -u /dev/null src/sys/external/bsd/common/include/asm/barrier.h:1.1
--- /dev/null	Mon Sep 11 05:20:17 2017
+++ src/sys/external/bsd/common/include/asm/barrier.h	Mon Sep 11 05:20:17 2017
@@ -0,0 +1,63 @@
+/*	$NetBSD: barrier.h,v 1.1 2017/09/11 05:20:17 maya Exp $	*/
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_BARRIER_H_
+#define _ASM_BARRIER_H_
+
+#include 
+
+#ifdef _KERNEL_OPT
+#include "opt_multiprocessor.h"
+#endif
+
+#define	mb	membar_sync
+#define	wmb	membar_producer
+#define	rmb	membar_consumer
+
+#ifdef __alpha__		/* XXX As if...  */
+#  define	read_barrier_depends	membar_sync
+#else
+#  define	read_barrier_depends()	do {} while (0)
+#endif
+
+#ifdef MULTIPROCESSOR
+#  define	smp_mbmb
+#  define	smp_wmbwmb
+#  define	smp_rmbrmb
+#  define	smp_read_barrier_depends	read_barrier_depends
+#else
+#  define	smp_mb()			do {} while (0)
+#  define	smp_wmb()			do {} while (0)
+#  define	smp_rmb()			do {} while (0)
+#  define	smp_read_barrier_depends()	do {} while (0)
+#endif
+
+#endif  /* _ASM_BARRIER_H_ */

CVS commit: [netbsd-8] src/external/bsd/dhcpcd/dist/src

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:18:34 UTC 2017

Modified Files:
src/external/bsd/dhcpcd/dist/src [netbsd-8]: dhcp.c

Log Message:
Pull up following revision(s) (requested by bsiegert in ticket #266):
external/bsd/dhcpcd/dist/src/dhcp.c: revision 1.2
dhcp: Fix classless static routes
Assign the netwask correctly from the message.
Cherry-picked from upstream in
https://dev.marples.name/rDHC510c760cb24ef4b1b16cc14732c5ffe0fbb0d96d.
This fixes route assignments when running on Google Compute Engine,
which uses classless static routes.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.8.1 src/external/bsd/dhcpcd/dist/src/dhcp.c

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

Modified files:

Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.1.1.3 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.1.1.3.8.1
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.1.1.3	Fri Apr 14 09:53:07 2017
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c	Mon Sep 11 05:18:34 2017
@@ -452,7 +452,7 @@ decode_rfc3442_rt(struct rt_head *routes
 		}
 
 		sa_in_init(>rt_dest, );
-		sa_in_init(>rt_dest, );
+		sa_in_init(>rt_netmask, );
 		sa_in_init(>rt_gateway, );
 
 		/* If CIDR is 32 then it's a host route. */

CVS commit: [netbsd-8] src/sys/arch/amiga/dev

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:14:56 UTC 2017

Modified Files:
src/sys/arch/amiga/dev [netbsd-8]: wdc_xsurf.c

Log Message:
Pull up following revision(s) (requested by phx in ticket #265):
sys/arch/amiga/dev/wdc_xsurf.c: revision 1.3
Set the correct device data size wdc_xsurf_softc instead of wdc_softc.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.34.1 src/sys/arch/amiga/dev/wdc_xsurf.c

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

Modified files:

Index: src/sys/arch/amiga/dev/wdc_xsurf.c
diff -u src/sys/arch/amiga/dev/wdc_xsurf.c:1.2 src/sys/arch/amiga/dev/wdc_xsurf.c:1.2.34.1
--- src/sys/arch/amiga/dev/wdc_xsurf.c:1.2	Wed Nov 21 22:37:03 2012
+++ src/sys/arch/amiga/dev/wdc_xsurf.c	Mon Sep 11 05:14:56 2017
@@ -1,4 +1,4 @@
-/*  $NetBSD: wdc_xsurf.c,v 1.2 2012/11/21 22:37:03 rkujawa Exp $ */
+/*  $NetBSD: wdc_xsurf.c,v 1.2.34.1 2017/09/11 05:14:56 snj Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@ void		wdc_xsurf_attach_channel(struct wd
 void		wdc_xsurf_map_channel(struct wdc_xsurf_softc *, int);
 int		wdc_xsurf_intr(void *arg);
 
-CFATTACH_DECL_NEW(wdc_xsurf, sizeof(struct wdc_softc),
+CFATTACH_DECL_NEW(wdc_xsurf, sizeof(struct wdc_xsurf_softc),
 wdc_xsurf_match, wdc_xsurf_attach, NULL, NULL);
 
 static const unsigned int wdc_xsurf_wdr_offsets[] = {

CVS commit: [netbsd-8] src/sys

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 05:13:46 UTC 2017

Modified Files:
src/sys/arch/i386/conf [netbsd-8]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/kern [netbsd-8]: kern_exec.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #256):
sys/arch/i386/conf/GENERIC: revision 1.1159 via patch
sys/arch/i386/conf/XEN3_DOMU: revision 1.78 via patch
sys/arch/i386/conf/XEN3_DOM0: revision 1.114 via patch
sys/kern/kern_exec.c: 1.443-1.444 via patch
Disable svr4 and ibcs2 by default.
These options are not well-tested, of a limited use case, and the potential
for damage is too high. Vulnerabilities were presented at DEFCON 25 - I see
that at least one of them can be exploited to get ring0 privileges.
--
Remove compat_freebsd from the list of autoloaded modules. Interested users
will now have to type 'modload' to use it, or uncomment the entry in
GENERIC. I should have removed it when I disabled COMPAT_FREEBSD by
default, sorry about that.
--
Remove compat_svr4, compat_svr4_32 and compat_ibcs2 from the list of
autoloaded modules. These options are disabled everywhere (except ibcs2
on Vax, but Vax does not support kernel modules, so doesn't matter),
therefore there is no issue in removing them from the list. Interested
users will now have to do a 'modload' first, or uncomment the entries in
GENERIC.


To generate a diff of this commit:
cvs rdiff -u -r1.1156.2.5 -r1.1156.2.6 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.112.4.4 -r1.112.4.5 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.77.2.3 -r1.77.2.4 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.442.4.1 -r1.442.4.2 src/sys/kern/kern_exec.c

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

Modified files:

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1156.2.5 src/sys/arch/i386/conf/GENERIC:1.1156.2.6
--- src/sys/arch/i386/conf/GENERIC:1.1156.2.5	Thu Aug 31 08:41:33 2017
+++ src/sys/arch/i386/conf/GENERIC	Mon Sep 11 05:13:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1156.2.5 2017/08/31 08:41:33 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1156.2.6 2017/09/11 05:13:45 snj Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1156.2.5 $"
+#ident		"GENERIC-$Revision: 1.1156.2.6 $"
 
 maxusers	64		# estimated number of users
 
@@ -145,7 +145,7 @@ options 	COMPAT_43	# 4.3BSD, 386BSD, and
 
 options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
 #options 	COMPAT_SVR4	# binary compatibility with SVR4
-options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
+#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
 #options 	COMPAT_NDIS	# NDIS network driver

Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.4 src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.5
--- src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.4	Thu Aug 31 08:41:33 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0	Mon Sep 11 05:13:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3_DOM0,v 1.112.4.4 2017/08/31 08:41:33 bouyer Exp $
+#	$NetBSD: XEN3_DOM0,v 1.112.4.5 2017/09/11 05:13:45 snj Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -98,7 +98,7 @@ options 	COMPAT_386BSD_MBRPART # recogni
 
 options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
 #options 	COMPAT_SVR4	# binary compatibility with SVR4
-options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
+#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.

Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.77.2.3 src/sys/arch/i386/conf/XEN3_DOMU:1.77.2.4
--- src/sys/arch/i386/conf/XEN3_DOMU:1.77.2.3	Thu Aug 31 08:41:33 2017
+++ src/sys/arch/i386/conf/XEN3_DOMU	Mon Sep 11 05:13:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.77.2.3 2017/08/31 08:41:33 bouyer Exp $
+# $NetBSD: XEN3_DOMU,v 1.77.2.4 2017/09/11 05:13:45 snj Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -82,7 +82,7 @@ options 	COMPAT_386BSD_MBRPART # recogni
 
 options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
 #options 	COMPAT_SVR4	# binary compatibility with SVR4
-options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
+#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
 options 	COMPAT_LINUX	# binary compatibility with Linux
 #options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.

Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.442.4.1 src/sys/kern/kern_exec.c:1.442.4.2
---

CVS commit: [netbsd-8] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:58:45 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-8]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-8]: client.c config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-8]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-8]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-8]: config_file.c
get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-8]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-8]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-8]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #277):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.14.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2 -r1.2.8.1 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.8 -r1.8.4.1 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.7 -r1.7.4.1 src/crypto/external/bsd/heimdal/include/roken.h

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

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.2 src/crypto/external/bsd/heimdal/dist/configure.ac:1.2.4.1
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.2	Sat Jan 28 21:31:43 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:58:44 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.2 $)
+AC_REVISION($Revision: 1.2.4.1 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then

Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.2.4.1
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.2	Sat Jan 28 21:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:58:44 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.2 2017/01/28 21:31:44 christos Exp $	*/
+/*	$NetBSD: client.c,v 1.2.4.1 2017/09/11 04:58:44 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -174,8 +174,10 @@ kcm_ccache_new_client(krb5_context conte
 	if (matches == 0)
 	matches = sscanf(name,"%ld",);
 	if (matches == 1) {
-	struct

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

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:56:12 UTC 2017

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

Log Message:
1509


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-7.0.3

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.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.63 src/doc/CHANGES-7.0.3:1.1.2.64
--- src/doc/CHANGES-7.0.3:1.1.2.63	Sat Sep  9 16:58:10 2017
+++ src/doc/CHANGES-7.0.3	Mon Sep 11 04:56:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.63 2017/09/09 16:58:10 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.64 2017/09/11 04:56:12 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -4948,3 +4948,22 @@ sys/compat/linux32/arch/amd64/linux32_ma
 	the page fault and get kernel privileges.
 	[maxv, ticket #1507]
 
+crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 1.1
+crypto/external/bsd/heimdal/dist/configure.ac	1.3
+crypto/external/bsd/heimdal/dist/kcm/client.c	1.3
+crypto/external/bsd/heimdal/dist/kcm/config.c	1.3
+crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c 1.3
+crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in 1.5
+crypto/external/bsd/heimdal/include/config.h	1.9
+crypto/external/bsd/heimdal/include/roken.h	1.8
+
+	- Always use rk_getpwnam_r
+	- Use getpwuid_r instead of getpwuid, so that we don't trash
+	  getpw*() internal buffers.
+	[mlelstv, ticket #1509]
+

CVS commit: [netbsd-7] src/doc

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:55:52 UTC 2017

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

Log Message:
1509


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.45 -r1.1.2.46 src/doc/CHANGES-7.2

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.2
diff -u src/doc/CHANGES-7.2:1.1.2.45 src/doc/CHANGES-7.2:1.1.2.46
--- src/doc/CHANGES-7.2:1.1.2.45	Sat Sep  9 16:57:48 2017
+++ src/doc/CHANGES-7.2	Mon Sep 11 04:55:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.45 2017/09/09 16:57:48 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.46 2017/09/11 04:55:52 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -4637,3 +4637,22 @@ sys/compat/linux32/arch/amd64/linux32_ma
 	the page fault and get kernel privileges.
 	[maxv, ticket #1507]
 
+crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 1.1
+crypto/external/bsd/heimdal/dist/configure.ac	1.3
+crypto/external/bsd/heimdal/dist/kcm/client.c	1.3
+crypto/external/bsd/heimdal/dist/kcm/config.c	1.3
+crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c 1.3
+crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in 1.5
+crypto/external/bsd/heimdal/include/config.h	1.9
+crypto/external/bsd/heimdal/include/roken.h	1.8
+
+	- Always use rk_getpwnam_r
+	- Use getpwuid_r instead of getpwuid, so that we don't trash
+	  getpw*() internal buffers.
+	[mlelstv, ticket #1509]
+

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

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:56:02 UTC 2017

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

Log Message:
1509


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-7.1.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.1
diff -u src/doc/CHANGES-7.1.1:1.1.2.31 src/doc/CHANGES-7.1.1:1.1.2.32
--- src/doc/CHANGES-7.1.1:1.1.2.31	Sat Sep  9 16:57:58 2017
+++ src/doc/CHANGES-7.1.1	Mon Sep 11 04:56:02 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.31 2017/09/09 16:57:58 snj Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.32 2017/09/11 04:56:02 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -3646,3 +3646,22 @@ sys/compat/linux32/arch/amd64/linux32_ma
 	the page fault and get kernel privileges.
 	[maxv, ticket #1507]
 
+crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 1.1
+crypto/external/bsd/heimdal/dist/configure.ac	1.3
+crypto/external/bsd/heimdal/dist/kcm/client.c	1.3
+crypto/external/bsd/heimdal/dist/kcm/config.c	1.3
+crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c 1.3
+crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in 1.5
+crypto/external/bsd/heimdal/include/config.h	1.9
+crypto/external/bsd/heimdal/include/roken.h	1.8
+
+	- Always use rk_getpwnam_r
+	- Use getpwuid_r instead of getpwuid, so that we don't trash
+	  getpw*() internal buffers.
+	[mlelstv, ticket #1509]
+

CVS commit: [netbsd-7] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:53:55 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-7]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-7]: client.c config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-7]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-7]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-7]: config_file.c
get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-7]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-7]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-7]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1509):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.12.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2.16.2 -r1.2.16.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 \
src/crypto/external/bsd/heimdal/include/roken.h

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

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.2.1 src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.2.2
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.2.1	Sun Aug 20 05:46:31 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:53:54 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.1.1.2.2.1 $)
+AC_REVISION($Revision: 1.1.1.2.2.2 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then

Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.2.1 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.2.2
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.2.1	Sun Aug 20 05:46:33 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:53:55 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.2.2.1 2017/08/20 05:46:33 snj Exp $	*/
+/*	$NetBSD: client.c,v 1.1.1.2.2.2 2017/09/11 04:53:55 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@

CVS commit: [netbsd-7-1] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:53:52 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-7-1]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-7-1]: client.c
config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-7-1]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-7-1]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-7-1]:
config_file.c get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-7-1]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-7-1]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-7-1]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1509):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.12.1 -r1.1.1.2.12.2 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.10.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.1.1.2.12.1 -r1.1.1.2.12.2 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.1.1.1.18.1 -r1.1.1.1.18.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.1.1.2.12.1 -r1.1.1.2.12.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.1.1.2.12.1 -r1.1.1.2.12.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2.14.2 -r1.2.14.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.3.12.1 -r1.3.12.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.6.12.1 -r1.6.12.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.4.12.1 -r1.4.12.2 \
src/crypto/external/bsd/heimdal/include/roken.h

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

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.12.1 src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.12.2
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.12.1	Sun Aug 20 05:44:12 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:53:52 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.1.1.2.12.1 $)
+AC_REVISION($Revision: 1.1.1.2.12.2 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then

Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.12.1 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.12.2
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.12.1	Sun Aug 20 05:44:14 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:53:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.2.12.1 2017/08/20 05:44:14 snj Exp $	*/
+/*	$NetBSD: client.c,v 1.1.1.2.12.2 2017/09/11 04:53:52 snj Exp $	*/
 
 /*

CVS commit: [netbsd-7-0] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:53:50 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-7-0]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-7-0]: client.c
config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-7-0]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-7-0]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-7-0]:
config_file.c get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-7-0]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-7-0]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-7-0]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1509):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2.4.1 -r1.1.1.2.4.2 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.8.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.1.1.2.4.1 -r1.1.1.2.4.2 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.1.1.1.10.1 -r1.1.1.1.10.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.1.1.2.4.1 -r1.1.1.2.4.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.1.1.2.4.1 -r1.1.1.2.4.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2.12.2 -r1.2.12.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 \
src/crypto/external/bsd/heimdal/include/roken.h

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

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.4.1 src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.4.2
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.2.4.1	Sun Aug 20 05:42:00 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:53:49 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.1.1.2.4.1 $)
+AC_REVISION($Revision: 1.1.1.2.4.2 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then

Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.4.1 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.4.2
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.2.4.1	Sun Aug 20 05:42:01 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:53:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.2.4.1 2017/08/20 05:42:01 snj Exp $	*/
+/*	$NetBSD: client.c,v 1.1.1.2.4.2 2017/09/11 04:53:49 snj Exp $	*/
 
 /*
  * Copyright (c) 2005,

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

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:46:47 UTC 2017

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
1503


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.116 -r1.1.2.117 src/doc/CHANGES-6.0.7

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-6.0.7
diff -u src/doc/CHANGES-6.0.7:1.1.2.116 src/doc/CHANGES-6.0.7:1.1.2.117
--- src/doc/CHANGES-6.0.7:1.1.2.116	Sat Sep  9 16:53:55 2017
+++ src/doc/CHANGES-6.0.7	Mon Sep 11 04:46:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.7,v 1.1.2.116 2017/09/09 16:53:55 snj Exp $
+# $NetBSD: CHANGES-6.0.7,v 1.1.2.117 2017/09/11 04:46:47 snj Exp $
 
 A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7
 release:
@@ -15134,9 +15134,27 @@ sys/arch/sparc64/sparc64/compat_13_machd
 
 sys/compat/linux32/arch/amd64/linux32_machdep.c	1.39
 
-
 	Fix a ring0 escalation vulnerability in compat_linux32 where the
 	index of %cs is controlled by userland, making it easy to trigger
 	the page fault and get kernel privileges.
 	[maxv, ticket #1502]
 
+crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 1.1
+crypto/external/bsd/heimdal/dist/configure.ac	1.3
+crypto/external/bsd/heimdal/dist/kcm/client.c	1.3
+crypto/external/bsd/heimdal/dist/kcm/config.c	1.3
+crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c 1.3
+crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in 1.5
+crypto/external/bsd/heimdal/include/config.h	1.9
+crypto/external/bsd/heimdal/include/roken.h	1.8
+
+	- Always use rk_getpwnam_r
+	- Use getpwuid_r instead of getpwuid, so that we don't trash
+	  getpw*() internal buffers.
+	[mlelstv, ticket #1503]
+

CVS commit: [netbsd-6] src/doc

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:46:22 UTC 2017

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
1503


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.309 -r1.1.2.310 src/doc/CHANGES-6.2

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-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.309 src/doc/CHANGES-6.2:1.1.2.310
--- src/doc/CHANGES-6.2:1.1.2.309	Sat Sep  9 16:54:40 2017
+++ src/doc/CHANGES-6.2	Mon Sep 11 04:46:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.309 2017/09/09 16:54:40 snj Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.310 2017/09/11 04:46:21 snj Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -20902,9 +20902,27 @@ sys/arch/sparc64/sparc64/compat_13_machd
 
 sys/compat/linux32/arch/amd64/linux32_machdep.c	1.39
 
-
 	Fix a ring0 escalation vulnerability in compat_linux32 where the
 	index of %cs is controlled by userland, making it easy to trigger
 	the page fault and get kernel privileges.
 	[maxv, ticket #1502]
 
+crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 1.1
+crypto/external/bsd/heimdal/dist/configure.ac	1.3
+crypto/external/bsd/heimdal/dist/kcm/client.c	1.3
+crypto/external/bsd/heimdal/dist/kcm/config.c	1.3
+crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c 1.3
+crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in 1.5
+crypto/external/bsd/heimdal/include/config.h	1.9
+crypto/external/bsd/heimdal/include/roken.h	1.8
+
+	- Always use rk_getpwnam_r
+	- Use getpwuid_r instead of getpwuid, so that we don't trash
+	  getpw*() internal buffers.
+	[mlelstv, ticket #1503]
+

CVS commit: [netbsd-6-1] src/doc

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:46:35 UTC 2017

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
1503


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.113 -r1.1.2.114 src/doc/CHANGES-6.1.6

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-6.1.6
diff -u src/doc/CHANGES-6.1.6:1.1.2.113 src/doc/CHANGES-6.1.6:1.1.2.114
--- src/doc/CHANGES-6.1.6:1.1.2.113	Sat Sep  9 16:54:15 2017
+++ src/doc/CHANGES-6.1.6	Mon Sep 11 04:46:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.113 2017/09/09 16:54:15 snj Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.114 2017/09/11 04:46:35 snj Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -14807,9 +14807,27 @@ sys/arch/sparc64/sparc64/compat_13_machd
 
 sys/compat/linux32/arch/amd64/linux32_machdep.c	1.39
 
-
 	Fix a ring0 escalation vulnerability in compat_linux32 where the
 	index of %cs is controlled by userland, making it easy to trigger
 	the page fault and get kernel privileges.
 	[maxv, ticket #1502]
 
+crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 1.1
+crypto/external/bsd/heimdal/dist/configure.ac	1.3
+crypto/external/bsd/heimdal/dist/kcm/client.c	1.3
+crypto/external/bsd/heimdal/dist/kcm/config.c	1.3
+crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c 1.3
+crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c 1.3
+crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c 1.3
+crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in 1.5
+crypto/external/bsd/heimdal/include/config.h	1.9
+crypto/external/bsd/heimdal/include/roken.h	1.8
+
+	- Always use rk_getpwnam_r
+	- Use getpwuid_r instead of getpwuid, so that we don't trash
+	  getpw*() internal buffers.
+	[mlelstv, ticket #1503]
+

CVS commit: [netbsd-6] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:43:23 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-6]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-6]: client.c config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-6]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-6]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-6]: config_file.c
get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-6]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-6]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-6]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1503):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.2.12.2 -r1.2.12.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2.22.2 -r1.2.22.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.2.6.1 -r1.2.6.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 \
src/crypto/external/bsd/heimdal/include/roken.h

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

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.6.1 src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.6.2
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.6.1	Wed Aug 30 07:10:48 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:43:22 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.1.1.1.6.1 $)
+AC_REVISION($Revision: 1.1.1.1.6.2 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then

Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.6.1 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.6.2
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.6.1	Wed Aug 30 07:10:50 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:43:22 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.1.6.1 2017/08/30 07:10:50 snj Exp $	*/
+/*	$NetBSD: client.c,v 1.1.1.1.6.2 2017/09/11 04:43:22 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -174,8

CVS commit: [netbsd-6-1] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:43:20 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-6-1]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-6-1]: client.c
config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-6-1]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-6-1]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-6-1]:
config_file.c get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-6-1]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-6-1]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-6-1]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1503):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.20.1 -r1.1.1.1.20.2 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.4.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.1.1.1.20.1 -r1.1.1.1.20.2 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.2.10.2 -r1.2.10.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.1.1.1.20.1 -r1.1.1.1.20.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.1.1.1.20.1 -r1.1.1.1.20.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2.20.2 -r1.2.20.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.2.20.1 -r1.2.20.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.4.16.1 -r1.4.16.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.3.20.1 -r1.3.20.2 \
src/crypto/external/bsd/heimdal/include/roken.h

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

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.20.1 src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.20.2
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.20.1	Wed Aug 30 06:57:22 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:43:19 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.1.1.1.20.1 $)
+AC_REVISION($Revision: 1.1.1.1.20.2 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then

Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.20.1 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.20.2
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.20.1	Wed Aug 30 06:57:24 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:43:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.1.20.1 2017/08/30 06:57:24 snj Exp $	*/
+/*	$NetBSD: client.c,v 1.1.1.1.20.2 2017/09/11 04:43:19 snj Exp $	*/
 
 /*
  *

CVS commit: [netbsd-6-0] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:43:17 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-6-0]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-6-0]: client.c
config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-6-0]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-6-0]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-6-0]:
config_file.c get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-6-0]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-6-0]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-6-0]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1503):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.12.1 -r1.1.1.1.12.2 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.2.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.1.1.1.12.1 -r1.1.1.1.12.2 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.2.8.2 -r1.2.8.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.1.1.1.12.1 -r1.1.1.1.12.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.1.1.1.12.1 -r1.1.1.1.12.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2.18.2 -r1.2.18.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.2.12.1 -r1.2.12.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.4.8.1 -r1.4.8.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.3.12.1 -r1.3.12.2 \
src/crypto/external/bsd/heimdal/include/roken.h

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

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.12.1 src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.12.2
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.12.1	Wed Aug 30 06:54:19 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:43:16 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.1.1.1.12.1 $)
+AC_REVISION($Revision: 1.1.1.1.12.2 $)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
 AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
 rk_DLADDR
 
 AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
 
 dnl detect doors on solaris
 if test "$enable_pthread_support" != no; then

Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.12.1 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.12.2
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.12.1	Wed Aug 30 06:54:21 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:43:16 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.1.12.1 2017/08/30 06:54:21 snj Exp $	*/
+/*	$NetBSD: client.c,v 1.1.1.1.12.2 2017/09/11 04:43:16 snj Exp $	*/
 
 /*
  *

CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat

2017-09-10 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Mon Sep 11 00:58:20 UTC 2017

Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h

Log Message:
Include opt_multiprocessor.h for MULTIPROCESSOR


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.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/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.10 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.11
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.10	Thu Jan 12 05:25:03 2017
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h	Mon Sep 11 00:58:20 2017
@@ -28,6 +28,10 @@
 #ifndef __VCHI_NETBSD_H__
 #define __VCHI_NETBSD_H__
 
+#ifdef _KERNEL_OPT
+#include "opt_multiprocessor.h"
+#endif
+
 #include 
 #include 
 #include

CVS commit: src/sys/arch/evbarm/fdt

2017-09-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Sep 10 23:03:06 UTC 2017

Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c

Log Message:
Allow USB keyboards to attach as console devices.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/fdt/fdt_machdep.c

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

Modified files:

Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.13 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.14
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.13	Thu Aug 24 11:33:28 2017
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c	Sun Sep 10 23:03:06 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.13 2017/08/24 11:33:28 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.14 2017/09/10 23:03:06 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.13 2017/08/24 11:33:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.14 2017/09/10 23:03:06 jmcneill Exp $");
 
 #include "opt_machdep.h"
 #include "opt_ddb.h"
@@ -36,6 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
 #include "opt_multiprocessor.h"
 #include "opt_cpuoptions.h"
 
+#include "ukbd.h"
+
 #include 
 #include 
 #include 
@@ -71,6 +73,10 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
 
 #include 
 
+#if NUKBD > 0
+#include 
+#endif
+
 #ifdef MEMORY_DISK_DYNAMIC
 #include 
 #endif
@@ -504,6 +510,10 @@ consinit(void)
 
 	cons->consinit(, uart_freq);
 
+#if NUKBD > 0
+	ukbd_cnattach();	/* allow USB keyboard to become console */
+#endif
+
 	initialized = true;
 }

CVS commit: src/sys/external/bsd/drm2/include/asm

2017-09-10 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Sun Sep 10 22:51:49 UTC 2017

Modified Files:
src/sys/external/bsd/drm2/include/asm: uaccess.h

Log Message:
sys/errno.h for EFAULT

ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/asm/uaccess.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/external/bsd/drm2/include/asm/uaccess.h
diff -u src/sys/external/bsd/drm2/include/asm/uaccess.h:1.2 src/sys/external/bsd/drm2/include/asm/uaccess.h:1.3
--- src/sys/external/bsd/drm2/include/asm/uaccess.h:1.2	Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/include/asm/uaccess.h	Sun Sep 10 22:51:48 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uaccess.h,v 1.2 2014/03/18 18:20:42 riastradh Exp $	*/
+/*	$NetBSD: uaccess.h,v 1.3 2017/09/10 22:51:48 maya Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,6 +33,7 @@
 #define _ASM_UACCESS_H_
 
 #include 
+#include 
 #include 
 
 /* XXX This is a cop-out.  */

CVS commit: [jdolecek-ncq] src/sys/dev

2017-09-10 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Sun Sep 10 19:31:15 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq ata.c ata_wdc.c atavar.h
src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c mvsata.c siisata.c wdc.c
src/sys/dev/scsipi [jdolecek-ncq]: atapi_wdc.c

Log Message:
refactor code so that xfer c_start() hook is called with channel mutex held,
and hence the controller submit code no longer relies on spl

tested all the affected drivers - wdc (via piixide), ahci, mvsata, siisata,
both disk and atapi I/O


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.132.8.30 -r1.132.8.31 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.105.6.8 -r1.105.6.9 src/sys/dev/ata/ata_wdc.c
cvs rdiff -u -r1.92.8.24 -r1.92.8.25 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.57.6.26 -r1.57.6.27 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.35.6.24 -r1.35.6.25 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.30.4.36 -r1.30.4.37 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.283.2.13 -r1.283.2.14 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.123.4.12 -r1.123.4.13 src/sys/dev/scsipi/atapi_wdc.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.37 src/sys/dev/ata/TODO.ncq:1.1.2.38
--- src/sys/dev/ata/TODO.ncq:1.1.2.37	Tue Aug 29 13:38:38 2017
+++ src/sys/dev/ata/TODO.ncq	Sun Sep 10 19:31:15 2017
@@ -2,11 +2,13 @@ Bugs
 
 test wd* at umass?, confirm the ata_channel kludge works
 
-c_start() needs to be called on splbio to avoid spurious irq during reset,
-is not e.g. in ata thread and may not in atastart() neither
+revise calls to atastart() - now called alsoafter ATASTART_ABORT(), call
+only from intr routine
 - wdc.c never calls atastart() (start always false)
 - ata_wdc.c calls atastart() regardless if error
 
+reconsider freeze/thaw in error recovery - can it screw up with thread?
+
 Other random notes (do outside the NCQ branch):
 -
 do biodone() in wddone() starting the dump to not leak bufs when dumping from

Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.30 src/sys/dev/ata/ata.c:1.132.8.31
--- src/sys/dev/ata/ata.c:1.132.8.30	Sun Sep 10 19:22:56 2017
+++ src/sys/dev/ata/ata.c	Sun Sep 10 19:31:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.132.8.30 2017/09/10 19:22:56 jdolecek Exp $	*/
+/*	$NetBSD: ata.c,v 1.132.8.31 2017/09/10 19:31:15 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.30 2017/09/10 19:22:56 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.31 2017/09/10 19:31:15 jdolecek Exp $");
 
 #include "opt_ata.h"
 
@@ -130,8 +130,12 @@ static bool atabus_suspend(device_t, con
 static void atabusconfig_thread(void *);
 
 static void ata_channel_idle(struct ata_channel *);
+static void ata_channel_thaw_locked(struct ata_channel *);
 static void ata_activate_xfer_locked(struct ata_channel *, struct ata_xfer *);
 static void ata_channel_freeze_locked(struct ata_channel *);
+static struct ata_xfer *ata_queue_get_active_xfer_locked(struct ata_channel *);
+static void ata_thread_wake_locked(struct ata_channel *);
+
 /*
  * atabus_init:
  *
@@ -200,7 +204,7 @@ ata_queue_hwslot_to_xfer(struct ata_chan
 	struct ata_queue *chq = chp->ch_queue;
 	struct ata_xfer *xfer = NULL;
 
-	mutex_enter(>ch_lock);
+	ata_channel_lock(chp);
 
 	KASSERTMSG(hwslot < chq->queue_openings, "hwslot %d > openings %d",
 	hwslot, chq->queue_openings);
@@ -212,7 +216,7 @@ ata_queue_hwslot_to_xfer(struct ata_chan
 			break;
 	}
 
-	mutex_exit(>ch_lock);
+	ata_channel_unlock(chp);
 
 	KASSERTMSG((xfer != NULL),
 	"%s: xfer with slot %d not found (active %x)", __func__,
@@ -221,6 +225,13 @@ ata_queue_hwslot_to_xfer(struct ata_chan
 	return xfer;
 }
 
+static struct ata_xfer *
+ata_queue_get_active_xfer_locked(struct ata_channel *chp)
+{
+	KASSERT(mutex_owned(>ch_lock));
+	return TAILQ_FIRST(>ch_queue->active_xfers);
+}
+
 /*
  * This interface is supposed only to be used when there is exactly
  * one outstanding command, when there is no information about the slot,
@@ -232,12 +243,12 @@ ata_queue_get_active_xfer(struct ata_cha
 {
 	struct ata_xfer *xfer = NULL;
 
-	mutex_enter(>ch_lock);
+	ata_channel_lock(chp);
 
 	KASSERT(chp->ch_queue->queue_active <= 1);
-	xfer = TAILQ_FIRST(>ch_queue->active_xfers);
+	xfer = ata_queue_get_active_xfer_locked(chp);
 
-	mutex_exit(>ch_lock);
+	ata_channel_unlock(chp);
 
 	return xfer;
 }
@@ -247,7 +258,7 @@ ata_queue_drive_active_xfer(struct ata_c
 {
 	struct ata_xfer *xfer = NULL;
 
-	mutex_enter(>ch_lock);
+	ata_channel_lock(chp);
 
 	TAILQ_FOREACH(xfer, >ch_queue->active_xfers, c_activechain) {
 		if (xfer->c_drive == drive)
@@ -255,7 +266,7 @@

CVS commit: [jdolecek-ncq] src/sys/dev/ata

2017-09-10 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Sun Sep 10 19:22:57 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: ata.c

Log Message:
fix regression in atabus_thread() when it was converted from spl to mutex -
the reset and c_start() routines expect to run on splbio; wrap the calls
insite splbio/splx() again for now, since we can't hold the mutex while calling
them

fixes problem experienced by Jonathan, where drive setup triggered
an spurious interrupt and panic due to state < READY


To generate a diff of this commit:
cvs rdiff -u -r1.132.8.29 -r1.132.8.30 src/sys/dev/ata/ata.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/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.29 src/sys/dev/ata/ata.c:1.132.8.30
--- src/sys/dev/ata/ata.c:1.132.8.29	Tue Aug 15 11:21:32 2017
+++ src/sys/dev/ata/ata.c	Sun Sep 10 19:22:56 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.132.8.29 2017/08/15 11:21:32 jdolecek Exp $	*/
+/*	$NetBSD: ata.c,v 1.132.8.30 2017/09/10 19:22:56 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.29 2017/08/15 11:21:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.30 2017/09/10 19:22:56 jdolecek Exp $");
 
 #include "opt_ata.h"
 
@@ -586,7 +586,7 @@ atabus_thread(void *arg)
 	struct ata_channel *chp = sc->sc_chan;
 	struct ata_queue *chq = chp->ch_queue;
 	struct ata_xfer *xfer;
-	int i;
+	int i, s;
 
 	mutex_enter(>ch_lock);
 	chp->ch_flags |= ATACH_TH_RUN;
@@ -630,7 +630,9 @@ atabus_thread(void *arg)
 			 */
 			mutex_exit(>ch_lock);
 			ata_channel_thaw(chp);
+			s = splbio();
 			ata_reset_channel(chp, AT_WAIT | chp->ch_reset_flags);
+			splx(s);
 			mutex_enter(>ch_lock);
 		} else if (chq->queue_active > 0 && chq->queue_freeze == 1) {
 			/*
@@ -644,7 +646,9 @@ atabus_thread(void *arg)
 			ata_channel_thaw(chp);
 			xfer = ata_queue_get_active_xfer(chp);
 			KASSERT(xfer != NULL);
+			s = splbio();
 			(*xfer->c_start)(xfer->c_chp, xfer);
+			splx(s);
 			mutex_enter(>ch_lock);
 		} else if (chq->queue_freeze > 1)
 			panic("%s: queue_freeze", __func__);

CVS commit: src/share/man/man8

2017-09-10 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Sun Sep 10 19:08:18 UTC 2017

Modified Files:
src/share/man/man8: afterboot.8

Log Message:
Update wifi guide to reflect dhcpcd no longer invoking wpa_supplicant


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/share/man/man8/afterboot.8

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

Modified files:

Index: src/share/man/man8/afterboot.8
diff -u src/share/man/man8/afterboot.8:1.59 src/share/man/man8/afterboot.8:1.60
--- src/share/man/man8/afterboot.8:1.59	Fri Jul 21 12:48:01 2017
+++ src/share/man/man8/afterboot.8	Sun Sep 10 19:08:17 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: afterboot.8,v 1.59 2017/07/21 12:48:01 maya Exp $
+.\"	$NetBSD: afterboot.8,v 1.60 2017/09/10 19:08:17 maya Exp $
 .\"	$OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $
 .\"
 .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu
@@ -59,7 +59,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 21, 2017
+.Dd September 10, 2017
 .Dt AFTERBOOT 8
 .Os
 .Sh NAME
@@ -403,21 +403,26 @@ Then, to make the system use it, put the
 nameserver 127.0.0.1
 .Ed
 .Ss Wireless networking
-You may scan for nearby wireless networks using:
+You can scan for nearby wireless networks using:
 .Bd -literal -offset indent
 .Ic ifconfig iwm0 up list scan
 .Ic ifconfig iwm0 down
 .Ed
 .Pp
-To connect to a network using WPA, you may use:
+To connect to a wireless network using WPA and DHCP:
 .Bd -literal -offset indent
-.Ic echo ctrl_interface=/var/run/wpa_supplicant > /etc/wpa_supplicant.conf
-.Ic wpa_passphrase networkname password >> /etc/wpa_supplicant.conf
+.Ic wpa_passphrase networkname password > /etc/wpa_supplicant.conf
+.Ic wpa_supplicant -i iwm0 -c /etc/wpa_supplicant.conf &
+.Ic dhcpcd iwm0
 .Ed
 .Pp
-After creating /etc/wpa_supplicant.conf, using
-.Xr dhcpcd 8
-on the wireless interface will connect to the network.
+To automatically connect at boot, add the following flags to
+.Pa /etc/rc.conf :
+.Pp
+.Dl dhcpcd=YES
+.Dl dhcpcd_flags="-b"
+.Dl wpa_supplicant=YES
+.Dl wpa_supplicant_flags="-i iwm0 -c /etc/wpa_supplicant.conf"
 .Ss RPC-based network services
 Several services depend on the RPC portmapper
 .Xr rpcbind 8

CVS commit: src/sys/arch/arm/dts

2017-09-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Sep 10 18:40:28 UTC 2017

Modified Files:
src/sys/arch/arm/dts: sun50i-a64-pinebook.dts

Log Message:
Correct model and compatible string for Pinebook


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts

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/arm/dts/sun50i-a64-pinebook.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.1 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.2
--- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.1	Sun Sep 10 17:06:58 2017
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts	Sun Sep 10 18:40:27 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pinebook.dts,v 1.1 2017/09/10 17:06:58 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.2 2017/09/10 18:40:27 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -29,6 +29,11 @@
 #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts"
 #include "sun50i-a64.dtsi"
 
+/ {
+	model = "Pine64 Pinebook";
+	compatible = "pine64,pinebook", "allwinner,sun50i-a64";
+};
+
  {
 	status = "okay";
 };

CVS commit: [jdolecek-ncq] src/sys/dev/ic

2017-09-10 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Sun Sep 10 18:37:21 UTC 2017

Modified Files:
src/sys/dev/ic [jdolecek-ncq]: mvsata.c

Log Message:
move mvsata_bio(), mvsata_exec_command() and mvsata_atapi_scsipi_request()
just before their respective hook functions


To generate a diff of this commit:
cvs rdiff -u -r1.35.6.23 -r1.35.6.24 src/sys/dev/ic/mvsata.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/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.35.6.23 src/sys/dev/ic/mvsata.c:1.35.6.24
--- src/sys/dev/ic/mvsata.c:1.35.6.23	Sun Aug 13 11:48:53 2017
+++ src/sys/dev/ic/mvsata.c	Sun Sep 10 18:37:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsata.c,v 1.35.6.23 2017/08/13 11:48:53 jdolecek Exp $	*/
+/*	$NetBSD: mvsata.c,v 1.35.6.24 2017/09/10 18:37:21 jdolecek Exp $	*/
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.35.6.23 2017/08/13 11:48:53 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.35.6.24 2017/09/10 18:37:21 jdolecek Exp $");
 
 #include "opt_mvsata.h"
 
@@ -688,38 +688,6 @@ mvsata_probe_drive(struct ata_channel *c
 }
 
 #ifndef MVSATA_WITHOUTDMA
-static int
-mvsata_bio(struct ata_drive_datas *drvp, struct ata_xfer *xfer)
-{
-	struct ata_channel *chp = drvp->chnl_softc;
-	struct mvsata_port *mvport = (struct mvsata_port *)chp;
-	struct atac_softc *atac = chp->ch_atac;
-	struct ata_bio *ata_bio = >c_bio;
-
-	DPRINTF(DEBUG_FUNCS|DEBUG_XFERS,
-	("%s:%d: mvsata_bio: drive=%d, blkno=%" PRId64
-	", bcount=%ld\n", device_xname(atac->atac_dev), chp->ch_channel,
-	drvp->drive, ata_bio->blkno, ata_bio->bcount));
-
-	mvsata_quetag_get(mvport, xfer->c_slot);
-
-	if (atac->atac_cap & ATAC_CAP_NOIRQ)
-		ata_bio->flags |= ATA_POLL;
-	if (ata_bio->flags & ATA_POLL)
-		xfer->c_flags |= C_POLL;
-	if ((drvp->drive_flags & (ATA_DRIVE_DMA | ATA_DRIVE_UDMA)) &&
-	(ata_bio->flags & ATA_SINGLE) == 0)
-		xfer->c_flags |= C_DMA;
-	xfer->c_drive = drvp->drive;
-	xfer->c_databuf = ata_bio->databuf;
-	xfer->c_bcount = ata_bio->bcount;
-	xfer->c_start = mvsata_bio_start;
-	xfer->c_intr = mvsata_bio_intr;
-	xfer->c_kill_xfer = mvsata_bio_kill_xfer;
-	ata_exec_xfer(chp, xfer);
-	return (ata_bio->flags & ATA_ITSDONE) ? ATACMD_COMPLETE : ATACMD_QUEUED;
-}
-
 static void
 mvsata_reset_drive(struct ata_drive_datas *drvp, int flags, uint32_t *sigp)
 {
@@ -794,55 +762,6 @@ mvsata_reset_channel(struct ata_channel 
 
 
 static int
-mvsata_exec_command(struct ata_drive_datas *drvp, struct ata_xfer *xfer)
-{
-	struct ata_channel *chp = drvp->chnl_softc;
-	struct mvsata_port *mvport = (struct mvsata_port *)chp;
-	struct ata_command *ata_c = >c_ata_c;
-	int rv, s;
-
-	DPRINTF(DEBUG_FUNCS|DEBUG_XFERS,
-	("%s:%d: mvsata_exec_command: drive=%d, bcount=%d,"
-	" r_lba=0x%012"PRIx64", r_count=0x%04x, r_features=0x%04x,"
-	" r_device=0x%02x, r_command=0x%02x\n",
-	device_xname(MVSATA_DEV2(mvport)), chp->ch_channel,
-	drvp->drive, ata_c->bcount, ata_c->r_lba, ata_c->r_count,
-	ata_c->r_features, ata_c->r_device, ata_c->r_command));
-
-	mvsata_quetag_get(mvport, xfer->c_slot);
-
-	if (ata_c->flags & AT_POLL)
-		xfer->c_flags |= C_POLL;
-	if (ata_c->flags & AT_WAIT)
-		xfer->c_flags |= C_WAIT;
-	xfer->c_drive = drvp->drive;
-	xfer->c_databuf = ata_c->data;
-	xfer->c_bcount = ata_c->bcount;
-	xfer->c_start = mvsata_wdc_cmd_start;
-	xfer->c_intr = mvsata_wdc_cmd_intr;
-	xfer->c_kill_xfer = mvsata_wdc_cmd_kill_xfer;
-	s = splbio();
-	ata_exec_xfer(chp, xfer);
-#ifdef DIAGNOSTIC
-	if ((ata_c->flags & AT_POLL) != 0 &&
-	(ata_c->flags & AT_DONE) == 0)
-		panic("mvsata_exec_command: polled command not done");
-#endif
-	if (ata_c->flags & AT_DONE)
-		rv = ATACMD_COMPLETE;
-	else {
-		if (ata_c->flags & AT_WAIT) {
-			while ((ata_c->flags & AT_DONE) == 0)
-tsleep(ata_c, PRIBIO, "mvsatacmd", 0);
-			rv = ATACMD_COMPLETE;
-		} else
-			rv = ATACMD_QUEUED;
-	}
-	splx(s);
-	return rv;
-}
-
-static int
 mvsata_addref(struct ata_drive_datas *drvp)
 {
 
@@ -899,68 +818,6 @@ mvsata_atapibus_attach(struct atabus_sof
 }
 
 static void
-mvsata_atapi_scsipi_request(struct scsipi_channel *chan,
-			scsipi_adapter_req_t req, void *arg)
-{
-	struct scsipi_adapter *adapt = chan->chan_adapter;
-	struct scsipi_periph *periph;
-	struct scsipi_xfer *sc_xfer;
-	struct mvsata_softc *sc = device_private(adapt->adapt_dev);
-	struct atac_softc *atac = >sc_wdcdev.sc_atac;
-	struct ata_channel *chp = atac->atac_channels[chan->chan_channel];
-	struct ata_xfer *xfer;
-	struct mvsata_port *mvport = (struct mvsata_port *)chp;
-	int drive, s;
-
-switch (req) {
-	case ADAPTER_REQ_RUN_XFER:
-		sc_xfer = arg;
-		periph = sc_xfer->xs_periph;
-		drive = periph->periph_target;
-
-		if (!device_is_active(atac->atac_dev)) {
-			sc_xfer->error = XS_DRIVER_STUFFUP;
-			scsipi_done(sc_xfer);
-			return;
-		}
-

CVS commit: src/sys/arch

2017-09-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Sep 10 17:06:58 UTC 2017

Modified Files:
src/sys/arch/evbarm/conf: SUNXI
Added Files:
src/sys/arch/arm/dts: sun50i-a64-pinebook.dts

Log Message:
Add Pinebook support.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/SUNXI

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

Modified files:

Index: src/sys/arch/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.29 src/sys/arch/evbarm/conf/SUNXI:1.30
--- src/sys/arch/evbarm/conf/SUNXI:1.29	Sat Sep  9 12:02:57 2017
+++ src/sys/arch/evbarm/conf/SUNXI	Sun Sep 10 17:06:58 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: SUNXI,v 1.29 2017/09/09 12:02:57 jmcneill Exp $
+#	$NetBSD: SUNXI,v 1.30 2017/09/10 17:06:58 jmcneill Exp $
 #
 #	Allwinner sunxi family
 #
@@ -52,6 +52,7 @@ makeoptions	DTS="
 	sun50i-a64-bananapi-m64.dts
 	sun50i-a64-pine64-plus.dts
 	sun50i-a64-pine64.dts
+	sun50i-a64-pinebook.dts
 "
 
 options 	MULTIPROCESSOR

Added files:

Index: src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
diff -u /dev/null src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.1
--- /dev/null	Sun Sep 10 17:06:58 2017
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts	Sun Sep 10 17:06:58 2017
@@ -0,0 +1,38 @@
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.1 2017/09/10 17:06:58 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2017 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts"
+#include "sun50i-a64.dtsi"
+
+ {
+	status = "okay";
+};
+
+ {
+	status = "okay";
+};

CVS commit: src/usr.sbin/syslogd

2017-09-10 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Sun Sep 10 17:01:07 UTC 2017

Modified Files:
src/usr.sbin/syslogd: syslogd.c

Log Message:
Use looked up remote host for remote message without a hostname

An incoming remote message may not necessarily have a hostname
between the timestamp and the message. The the source of the remote
sender is already looked up so use that hostname/IP address rather
than the local hostname.

XXX: pullup-8
XXX: pullup-7
XXX: pullup-6


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/usr.sbin/syslogd/syslogd.c

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

Modified files:

Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.123 src/usr.sbin/syslogd/syslogd.c:1.124
--- src/usr.sbin/syslogd/syslogd.c:1.123	Sat Jun 11 16:55:10 2016
+++ src/usr.sbin/syslogd/syslogd.c	Sun Sep 10 17:01:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: syslogd.c,v 1.123 2016/06/11 16:55:10 christos Exp $	*/
+/*	$NetBSD: syslogd.c,v 1.124 2017/09/10 17:01:07 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: syslogd.c,v 1.123 2016/06/11 16:55:10 christos Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.124 2017/09/10 17:01:07 ginsbach Exp $");
 #endif
 #endif /* not lint */
 
@@ -1277,7 +1277,7 @@ printline_bsdsyslog(const char *hname, c
 		} else if (*p == '[' || (*p == ':'
 			&& (*(p+1) == ' ' || *(p+1) == '\0'))) {
 			/* no host in message */
-			buffer->host = LocalFQDN;
+			buffer->host = strdup(hname);
 			buffer->prog = strndup(start, p - start);
 			break;
 		} else {

CVS commit: src/sys/arch/amd64/amd64

2017-09-10 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sun Sep 10 10:51:13 UTC 2017

Modified Files:
src/sys/arch/amd64/amd64: gdt.c

Log Message:
simplify


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amd64/amd64/gdt.c

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

Modified files:

Index: src/sys/arch/amd64/amd64/gdt.c
diff -u src/sys/arch/amd64/amd64/gdt.c:1.42 src/sys/arch/amd64/amd64/gdt.c:1.43
--- src/sys/arch/amd64/amd64/gdt.c:1.42	Wed Sep  6 12:39:18 2017
+++ src/sys/arch/amd64/amd64/gdt.c	Sun Sep 10 10:51:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.42 2017/09/06 12:39:18 bouyer Exp $	*/
+/*	$NetBSD: gdt.c,v 1.43 2017/09/10 10:51:13 maxv Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.42 2017/09/06 12:39:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.43 2017/09/10 10:51:13 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -300,12 +300,12 @@ void
 lgdt(struct region_descriptor *desc)
 {
 	paddr_t frames[16];
-	int i;
+	size_t i;
 	vaddr_t va;
 
 	/*
-	 * XXX: Xen even checks descriptors AFTER limit.
-	 * Zero out last frame after limit if needed.
+	 * Xen even checks descriptors AFTER limit. Zero out last frame after
+	 * limit if needed.
 	 */
 	va = desc->rd_base + desc->rd_limit + 1;
 	memset((void *)va, 0, roundup(va, PAGE_SIZE) - va);
@@ -315,11 +315,10 @@ lgdt(struct region_descriptor *desc)
 	 * Xen. Mark pages R/O too, otherwise Xen will refuse to use them.
 	 */
 	for (i = 0; i < roundup(desc->rd_limit, PAGE_SIZE) >> PAGE_SHIFT; i++) {
-		frames[i] = ((paddr_t) xpmap_ptetomach(
-		(pt_entry_t *)(desc->rd_base + (i << PAGE_SHIFT >>
+		va = desc->rd_base + (i << PAGE_SHIFT);
+		frames[i] = ((paddr_t)xpmap_ptetomach((pt_entry_t *)va)) >>
 		PAGE_SHIFT;
-		pmap_pte_clearbits(kvtopte(desc->rd_base + (i << PAGE_SHIFT)),
-		PG_RW);
+		pmap_pte_clearbits(kvtopte(va), PG_RW);
 	}
 
 	if (HYPERVISOR_set_gdt(frames, (desc->rd_limit + 1) >> 3))

CVS commit: src/usr.sbin/veriexecgen

2017-09-10 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sun Sep 10 10:13:47 UTC 2017

Modified Files:
src/usr.sbin/veriexecgen: veriexecgen.8

Log Message:
Fix enumeration.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/veriexecgen/veriexecgen.8

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

Modified files:

Index: src/usr.sbin/veriexecgen/veriexecgen.8
diff -u src/usr.sbin/veriexecgen/veriexecgen.8:1.18 src/usr.sbin/veriexecgen/veriexecgen.8:1.19
--- src/usr.sbin/veriexecgen/veriexecgen.8:1.18	Sat Sep  9 21:27:23 2017
+++ src/usr.sbin/veriexecgen/veriexecgen.8	Sun Sep 10 10:13:47 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexecgen.8,v 1.18 2017/09/09 21:27:23 sevan Exp $
+.\" $NetBSD: veriexecgen.8,v 1.19 2017/09/10 10:13:47 wiz Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -104,7 +104,8 @@ for the fingerprints.
 Must be one of
 .Dq sha256 ,
 .Dq sha384 ,
-.Dq sha512 ,
+or
+.Dq sha512 .
 .It Fl v
 Verbose mode.
 Print messages describing what operations are being done.

CVS commit: src/lib/libc/gen

2017-09-10 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sun Sep 10 10:12:43 UTC 2017

Modified Files:
src/lib/libc/gen: devname.3

Log Message:
Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/devname.3

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

Modified files:

Index: src/lib/libc/gen/devname.3
diff -u src/lib/libc/gen/devname.3:1.16 src/lib/libc/gen/devname.3:1.17
--- src/lib/libc/gen/devname.3:1.16	Sun Sep 10 10:12:21 2017
+++ src/lib/libc/gen/devname.3	Sun Sep 10 10:12:43 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: devname.3,v 1.16 2017/09/10 10:12:21 wiz Exp $
+.\"	$NetBSD: devname.3,v 1.17 2017/09/10 10:12:43 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -105,7 +105,7 @@ Device database file.
 .Sh ERRORS
 The
 .Fn devname_r
-function my fail if:
+function may fail if:
 .Bl -tag -width Er
 .It Bq Er ENOENT
 The corresponding device does not exist.

CVS commit: src/lib/libc/gen

2017-09-10 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sun Sep 10 10:12:21 UTC 2017

Modified Files:
src/lib/libc/gen: devname.3

Log Message:
Sort sections. Make error descriptions complete sentences.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/devname.3

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

Modified files:

Index: src/lib/libc/gen/devname.3
diff -u src/lib/libc/gen/devname.3:1.15 src/lib/libc/gen/devname.3:1.16
--- src/lib/libc/gen/devname.3:1.15	Sun Sep 10 00:49:40 2017
+++ src/lib/libc/gen/devname.3	Sun Sep 10 10:12:21 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: devname.3,v 1.15 2017/09/10 00:49:40 kre Exp $
+.\"	$NetBSD: devname.3,v 1.16 2017/09/10 10:12:21 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -97,20 +97,20 @@ If an error occurs
 will return an error number from
 .In sys/errno.h
 indicating what went wrong.
+.Sh FILES
+.Bl -tag -width /var/run/dev.cdb -compact
+.It Pa /var/run/dev.cdb
+Device database file.
+.El
 .Sh ERRORS
 The
 .Fn devname_r
 function my fail if:
 .Bl -tag -width Er
 .It Bq Er ENOENT
-the corresponding device does not exist
+The corresponding device does not exist.
 .It Bq Er ERANGE
-the passed buffer length is too short
-.El
-.Sh FILES
-.Bl -tag -width /var/run/dev.cdb -compact
-.It Pa /var/run/dev.cdb
-Device database file.
+The passed buffer length is too short.
 .El
 .Sh SEE ALSO
 .Xr stat 2 ,

CVS commit: src/usr.bin/kdump

2017-09-10 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sun Sep 10 10:09:35 UTC 2017

Modified Files:
src/usr.bin/kdump: kdump.1

Log Message:
Sort flags in SYNOPSIS. Remove unnecessary .Tn. Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/kdump/kdump.1

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

Modified files:

Index: src/usr.bin/kdump/kdump.1
diff -u src/usr.bin/kdump/kdump.1:1.27 src/usr.bin/kdump/kdump.1:1.28
--- src/usr.bin/kdump/kdump.1:1.27	Fri Sep  8 21:09:29 2017
+++ src/usr.bin/kdump/kdump.1	Sun Sep 10 10:09:34 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kdump.1,v 1.27 2017/09/08 21:09:29 uwe Exp $
+.\"	$NetBSD: kdump.1,v 1.28 2017/09/10 10:09:34 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -37,7 +37,7 @@
 .Nd display kernel trace data
 .Sh SYNOPSIS
 .Nm
-.Op Fl EdlNnRT
+.Op Fl dElNnRT
 .Op Fl e Ar emulation
 .Op Fl f Ar file
 .Op Fl m Ar maxdata
@@ -75,8 +75,7 @@ more data.
 .It Fl m Ar maxdata
 Display at most
 .Ar maxdata
-bytes when decoding
-.Tn I/O .
+bytes when decoding I/O.
 .It Fl N
 Suppress system call number-to-name translation.
 .It Fl n
@@ -111,12 +110,12 @@ Display GIO data in hex and ascii instea
 .Xr vis 3
 format.
 .It Fl X Ar size
-Same as 
+Same as
 .Fl x
-but display hex values by groups of 
-.Ar size 
+but display hex values by groups of
+.Ar size
 bytes.
-Supported values are 1, 2, 4, 8, and 16. 
+Supported values are 1, 2, 4, 8, and 16.
 .El
 .Sh SEE ALSO
 .Xr ktrace 1

CVS commit: src/usr.bin/kdump

2017-09-10 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sun Sep 10 10:09:40 UTC 2017

Modified Files:
src/usr.bin/kdump: kdump.c

Log Message:
Sync usage with man page.


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/usr.bin/kdump/kdump.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/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.128 src/usr.bin/kdump/kdump.c:1.129
--- src/usr.bin/kdump/kdump.c:1.128	Fri Sep  8 21:45:08 2017
+++ src/usr.bin/kdump/kdump.c	Sun Sep 10 10:09:40 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kdump.c,v 1.128 2017/09/08 21:45:08 uwe Exp $	*/
+/*	$NetBSD: kdump.c,v 1.129 2017/09/10 10:09:40 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)kdump.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: kdump.c,v 1.128 2017/09/08 21:45:08 uwe Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.129 2017/09/10 10:09:40 wiz Exp $");
 #endif
 #endif /* not lint */
 
@@ -1200,7 +1200,7 @@ usage(void)
 		(void)fprintf(stderr, "Usage: %s [-e emulation]  ...\n",
 		getprogname());
 	} else {
-		(void)fprintf(stderr, "Usage: %s [-dlNnRT] [-e emulation] "
+		(void)fprintf(stderr, "Usage: %s [-dElNnRT] [-e emulation] "
 		   "[-f file] [-m maxdata] [-p pid]\n [-t trstr] "
 		   "[-x | -X size] [file]\n", getprogname());
 	}

46 matches

Mail list logo