CVS commit: src/external/mit/xorg/tools

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Feb 13 07:37:19 UTC 2017

Modified Files:
src/external/mit/xorg/tools: Makefile
Removed Files:
src/external/mit/xorg/tools/xkbcomp: Makefile Makefile.xkbcomp
xkbcomp-KeyBind.c xkbcomp-stubs.c xkbfile-xkbmisc.c

Log Message:
delete the xkbcomp tool now that nothing uses it


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/Makefile
cvs rdiff -u -r1.4 -r0 src/external/mit/xorg/tools/xkbcomp/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp \
src/external/mit/xorg/tools/xkbcomp/xkbcomp-KeyBind.c
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/tools/xkbcomp/xkbfile-xkbmisc.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/mit/xorg/tools/Makefile
diff -u src/external/mit/xorg/tools/Makefile:1.7 src/external/mit/xorg/tools/Makefile:1.8
--- src/external/mit/xorg/tools/Makefile:1.7	Thu Jul 23 07:36:54 2015
+++ src/external/mit/xorg/tools/Makefile	Mon Feb 13 07:37:19 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2015/07/23 07:36:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2017/02/13 07:37:19 snj Exp $
 
 .include 
 
@@ -11,7 +11,7 @@
 
 # makekeys is now done src/tools
 SUBDIR+=bdftopcf fc-cache ucs2any
-SUBDIR+=mkfontscale .WAIT xkbcomp
+SUBDIR+=mkfontscale
 
 .include 
 .include 

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Feb 13 07:18:20 UTC 2017

Modified Files:
src/sys/netinet: in_proto.c ip_icmp.c
src/sys/netinet6: icmp6.c in6_proto.c

Log Message:
Protect mtudisc and redirect stuffs of icmp/icmp6 with mutex

We have to run pr_init of icmp and icmp6 prior to tcp and tcp6 ones
for mutex initialization.


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.157 -r1.158 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.208 -r1.209 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.114 -r1.115 src/sys/netinet6/in6_proto.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/in_proto.c
diff -u src/sys/netinet/in_proto.c:1.120 src/sys/netinet/in_proto.c:1.121
--- src/sys/netinet/in_proto.c:1.120	Tue Apr 26 08:44:44 2016
+++ src/sys/netinet/in_proto.c	Mon Feb 13 07:18:20 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_proto.c,v 1.120 2016/04/26 08:44:44 ozaki-r Exp $	*/
+/*	$NetBSD: in_proto.c,v 1.121 2017/02/13 07:18:20 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.120 2016/04/26 08:44:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_proto.c,v 1.121 2017/02/13 07:18:20 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -201,6 +201,16 @@ const struct protosw inetsw[] = {
 	.pr_slowtimo = ip_slowtimo,
 	.pr_drain = ip_drainstub,
 },
+{	.pr_type = SOCK_RAW,
+	.pr_domain = ,
+	.pr_protocol = IPPROTO_ICMP,
+	.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
+	.pr_input = icmp_input,
+	.pr_ctlinput = rip_ctlinput,
+	.pr_ctloutput = rip_ctloutput,
+	.pr_usrreqs = _usrreqs,
+	.pr_init = icmp_init,
+},
 {	.pr_type = SOCK_DGRAM,
 	.pr_domain = ,
 	.pr_protocol = IPPROTO_UDP,
@@ -277,16 +287,6 @@ const struct protosw inetsw[] = {
 	.pr_ctloutput = rip_ctloutput,
 	.pr_usrreqs = _usrreqs,
 },
-{	.pr_type = SOCK_RAW,
-	.pr_domain = ,
-	.pr_protocol = IPPROTO_ICMP,
-	.pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR,
-	.pr_input = icmp_input,
-	.pr_ctlinput = rip_ctlinput,
-	.pr_ctloutput = rip_ctloutput,
-	.pr_usrreqs = _usrreqs,
-	.pr_init = icmp_init,
-},
 #ifdef GATEWAY
 {	.pr_domain = ,
 	.pr_protocol = IPPROTO_IP,

Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.157 src/sys/netinet/ip_icmp.c:1.158
--- src/sys/netinet/ip_icmp.c:1.157	Tue Feb  7 02:38:08 2017
+++ src/sys/netinet/ip_icmp.c	Mon Feb 13 07:18:20 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_icmp.c,v 1.157 2017/02/07 02:38:08 ozaki-r Exp $	*/
+/*	$NetBSD: ip_icmp.c,v 1.158 2017/02/13 07:18:20 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.157 2017/02/07 02:38:08 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.158 2017/02/13 07:18:20 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -171,6 +171,9 @@ static int icmp_rediraccept = 1;
 static int icmp_redirtimeout = 600;
 static struct rttimer_queue *icmp_redirect_timeout_q = NULL;
 
+/* Protect mtudisc and redirect stuffs */
+static kmutex_t icmp_mtx __cacheline_aligned;
+
 static void icmp_mtudisc_timeout(struct rtentry *, struct rttimer *);
 static void icmp_redirect_timeout(struct rtentry *, struct rttimer *);
 
@@ -186,14 +189,17 @@ icmp_init(void)
 
 	sysctl_netinet_icmp_setup(NULL);
 
+	mutex_init(_mtx, MUTEX_DEFAULT, IPL_NONE);
 	/*
 	 * This is only useful if the user initializes redirtimeout to
 	 * something other than zero.
 	 */
+	mutex_enter(_mtx);
 	if (icmp_redirtimeout != 0) {
 		icmp_redirect_timeout_q =
 			rt_timer_queue_create(icmp_redirtimeout);
 	}
+	mutex_exit(_mtx);
 
 	icmpstat_percpu = percpu_alloc(sizeof(uint64_t) * ICMP_NSTATS);
 	icmp_wqinput = wqinput_create("icmp", _icmp_input);
@@ -205,17 +211,23 @@ icmp_init(void)
 void
 icmp_mtudisc_callback_register(void (*func)(struct in_addr))
 {
-	struct icmp_mtudisc_callback *mc;
+	struct icmp_mtudisc_callback *mc, *new;
+
+	new = kmem_alloc(sizeof(*mc), KM_SLEEP);
 
+	mutex_enter(_mtx);
 	for (mc = LIST_FIRST(_mtudisc_callbacks); mc != NULL;
 	 mc = LIST_NEXT(mc, mc_list)) {
-		if (mc->mc_func == func)
+		if (mc->mc_func == func) {
+			mutex_exit(_mtx);
+			kmem_free(new, sizeof(*mc));
 			return;
+		}
 	}
 
-	mc = kmem_alloc(sizeof(*mc), KM_SLEEP);
-	mc->mc_func = func;
-	LIST_INSERT_HEAD(_mtudisc_callbacks, mc, mc_list);
+	new->mc_func = func;
+	LIST_INSERT_HEAD(_mtudisc_callbacks, new, mc_list);
+	mutex_exit(_mtx);
 }
 
 /*
@@ -640,6 +652,7 @@ reflect:
 		rt = NULL;
 		rtredirect(sintosa(), sintosa(),
 		NULL, RTF_GATEWAY | RTF_HOST, sintosa(), );
+		mutex_enter(_mtx);
 		if (rt != NULL && icmp_redirtimeout != 0) {
 			i = rt_timer_add(rt, icmp_redirect_timeout,
 	 icmp_redirect_timeout_q);
@@ -651,6 +664,7 @@ reflect:
 IN_PRINT(buf, >icmp_ip.ip_dst), i);
 			

CVS commit: src/sys/dev/pci/ixgbe

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Feb 13 06:38:45 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 Fix a bug that ix*_start_locked() is called in interrput context
(ix*_msix_que). The function is called in softint(ix*_handle_que()). OK'd by
k-nakahara.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/ixgbe/ixv.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/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.73 src/sys/dev/pci/ixgbe/ixgbe.c:1.74
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.73	Fri Feb 10 08:41:13 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Mon Feb 13 06:38:45 2017
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.73 2017/02/10 08:41:13 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.74 2017/02/13 06:38:45 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -1700,9 +1700,6 @@ ixgbe_msix_que(void *arg)
 #ifdef IXGBE_LEGACY_TX
 	if (!IFQ_IS_EMPTY(>ifp->if_snd))
 		ixgbe_start_locked(txr, ifp);
-#else
-	if (pcq_peek(txr->txr_interq) != NULL)
-		ixgbe_mq_start_locked(ifp, txr);
 #endif
 	IXGBE_TX_UNLOCK(txr);
 
@@ -3005,11 +3002,10 @@ ixgbe_setup_interface(device_t dev, stru
 
 	if_initialize(ifp);
 	ether_ifattach(ifp, adapter->hw.mac.addr);
-#ifndef IXGBE_LEGACY_TX
-#if 0	/* We use per TX queue softint */
-	if_deferred_start_init(ifp, ixgbe_deferred_mq_start);
-#endif
-#endif
+	/*
+	 * We use per TX queue softint, so if_deferred_start_init() isn't
+	 * used.
+	 */
 	if_register(ifp);
 	ether_set_ifflags_cb(ec, ixgbe_ifflags_cb);
 

Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.50 src/sys/dev/pci/ixgbe/ixv.c:1.51
--- src/sys/dev/pci/ixgbe/ixv.c:1.50	Fri Feb 10 08:41:13 2017
+++ src/sys/dev/pci/ixgbe/ixv.c	Mon Feb 13 06:38:45 2017
@@ -31,7 +31,7 @@
 
 **/
 /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixv.c,v 1.50 2017/02/10 08:41:13 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.51 2017/02/13 06:38:45 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -912,7 +912,9 @@ ixv_msix_que(void *arg)
 {
 	struct ix_queue	*que = arg;
 	struct adapter  *adapter = que->adapter;
+#ifdef IXGBE_LEGACY_TX
 	struct ifnet*ifp = adapter->ifp;
+#endif
 	struct tx_ring	*txr = que->txr;
 	struct rx_ring	*rxr = que->rxr;
 	bool		more;
@@ -938,9 +940,6 @@ ixv_msix_que(void *arg)
 #ifdef IXGBE_LEGACY_TX
 	if (!IFQ_IS_EMPTY(>ifp->if_snd))
 		ixgbe_start_locked(txr, ifp);
-#else
-	if (pcq_peek(txr->txr_interq) != NULL)
-		ixgbe_mq_start_locked(ifp, txr);
 #endif
 	IXGBE_TX_UNLOCK(txr);
 
@@ -1678,11 +1677,10 @@ ixv_setup_interface(device_t dev, struct
 
 	if_initialize(ifp);
 	ether_ifattach(ifp, adapter->hw.mac.addr);
-#ifndef IXGBE_LEGACY_TX
-#if 0	/* We use per TX queue softint */
-	if_deferred_start_init(ifp, ixgbe_deferred_mq_start);
-#endif
-#endif
+	/*
+	 * We use per TX queue softint, so if_deferred_start_init() isn't
+	 * used.
+	 */
 	if_register(ifp);
 	ether_set_ifflags_cb(ec, ixv_ifflags_cb);
 

CVS commit: src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Feb 13 06:11:01 UTC 2017

Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/xkeyboard-config: Makefile.xkbdata
src/external/mit/xorg/lib/xkeyboard-config/compat: Makefile
src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile
src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile
src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile
src/external/mit/xorg/lib/xkeyboard-config/types: Makefile

Log Message:
catch up with 2012 xkeyboard-config and stop generating *.dir


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/types/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.142 src/distrib/sets/lists/xbase/mi:1.143
--- src/distrib/sets/lists/xbase/mi:1.142	Mon Feb 13 04:23:19 2017
+++ src/distrib/sets/lists/xbase/mi	Mon Feb 13 06:11:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.142 2017/02/13 04:23:19 snj Exp $
+# $NetBSD: mi,v 1.143 2017/02/13 06:11:01 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -612,7 +612,7 @@
 ./usr/X11R7/lib/X11/xkb/README.config			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/README.enhancing		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/compatbase-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/compat.dir			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/compat.dir			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/compat/README			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/accessx			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/basic			-unknown-	xorg
@@ -636,7 +636,7 @@
 ./usr/X11R7/lib/X11/xkb/compat/xtest			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compiled			base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/geometry			base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/geometry.dir			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/geometry.dir			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/README			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/amiga			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/ataritt		-unknown-	xorg
@@ -680,7 +680,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/typematrix		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/winbook		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes			base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/keycodes.dir			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/keycodes.dir			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/README			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/aliases		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/amiga			-unknown-	xorg
@@ -829,7 +829,7 @@
 ./usr/X11R7/lib/X11/xkb/semantics/default		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/semantics/xtest			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbolsbase-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/symbols.dir			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/symbols.dir			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/README			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/ad			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/af			-unknown-	xorg
@@ -1224,7 +1224,7 @@
 ./usr/X11R7/lib/X11/xkb/torture/sym_interp4		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/torture/types			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/typesbase-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/types.dir			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/types.dir			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/types/README			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/types/basic			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/types/cancel			-unknown-	xorg

Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.2 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.2	Sat Dec 24 21:17:16 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata	Mon Feb 13 06:11:01 2017
@@ -1,27 +1,7 @@
-#	$NetBSD: Makefile.xkbdata,v 1.2 2016/12/24 21:17:16 christos Exp $
+#	$NetBSD: Makefile.xkbdata,v 1.3 2017/02/13 06:11:01 snj Exp $
 
 XKBDISTDIR=	${X11SRCDIR.xkeyboard-config}/${XKBNAME}
 
 .PATH:		${XKBDISTDIR}
 
 FILESDIR=	${X11LIBDIR}/xkb/${XKBNAME}
-
-
-.if defined(XKBDIR)			# {
-FILES+=			${XKBNAME}.dir

CVS commit: src/sys/dev/pci

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Mon Feb 13 05:02:21 UTC 2017

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.477 -r1.478 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.477 src/sys/dev/pci/if_wm.c:1.478
--- src/sys/dev/pci/if_wm.c:1.477	Thu Feb  9 23:30:46 2017
+++ src/sys/dev/pci/if_wm.c	Mon Feb 13 05:02:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.477 2017/02/09 23:30:46 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.478 2017/02/13 05:02:21 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.477 2017/02/09 23:30:46 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.478 2017/02/13 05:02:21 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -6114,7 +6114,7 @@ wm_init_rx_regs(struct wm_softc *sc, str
 
 		if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
 			if (MCLBYTES & ((1 << SRRCTL_BSIZEPKT_SHIFT) - 1))
-panic("%s: MCLBYTES %d unsupported for i2575 or higher\n", __func__, MCLBYTES);
+panic("%s: MCLBYTES %d unsupported for 82575 or higher\n", __func__, MCLBYTES);
 
 			/* Currently, support SRRCTL_DESCTYPE_ADV_ONEBUF only. */
 			CSR_WRITE(sc, WMREG_SRRCTL(qid), SRRCTL_DESCTYPE_ADV_ONEBUF

CVS commit: src/sys/dev

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Feb 13 04:47:59 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Fix build of ALL of amd64


To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 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.304 src/sys/dev/audio.c:1.305
--- src/sys/dev/audio.c:1.304	Mon Feb 13 01:59:14 2017
+++ src/sys/dev/audio.c	Mon Feb 13 04:47:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.304 2017/02/13 01:59:14 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.305 2017/02/13 04:47:59 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.304 2017/02/13 01:59:14 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.305 2017/02/13 04:47:59 ozaki-r Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1158,7 +1158,7 @@ audio_printsc(struct audio_softc *sc)
 {
 	struct audio_chan *chan;
 	
-	chan = SIMPLEQ_FIRST(sc->sc_audiochan);
+	chan = SIMPLEQ_FIRST(>sc_audiochan);
 	
 	if (chan == NULL)
 		return;
@@ -2262,7 +2262,7 @@ audio_drain(struct audio_softc *sc, stru
 	
 	error = 0;
 	vc = chan->vc;
-	DPRINTF(("audio_drain: enter busy=%d\n", sc->sc_vchan[n]->sc_pbus));
+	DPRINTF(("audio_drain: enter busy=%d\n", vc->sc_pbus));
 	cb = >vc->sc_mpr;
 	if (cb->mmapped)
 		return 0;
@@ -2320,7 +2320,8 @@ audio_drain(struct audio_softc *sc, stru
 	drops = cb->drops;
 	error = 0;
 	while (cb->drops == drops && !error) {
-		DPRINTF(("audio_drain: n=%d, used=%d, drops=%ld\n", n,
+		DPRINTF(("audio_drain: chan=%d used=%d, drops=%ld\n",
+			chan->chan,
 			audio_stream_get_used(>sc_mpr.s),
 			cb->drops));
 		mutex_exit(sc->sc_intr_lock);
@@ -2960,7 +2961,7 @@ audio_ioctl(dev_t dev, struct audio_soft
 			else
 sc->sc_async_audio = pchan->chan;
 			DPRINTF(("audio_ioctl: FIOASYNC chan %d\n",
-			sc->sc_audiochan[n].chan));
+			pchan->chan));
 		} else
 			sc->sc_async_audio = 0;
 		break;

CVS commit: src/sys/dev/pci

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Mon Feb 13 04:42:15 UTC 2017

Modified Files:
src/sys/dev/pci: nvme_pci.c

Log Message:
remove extra crlf.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/nvme_pci.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/pci/nvme_pci.c
diff -u src/sys/dev/pci/nvme_pci.c:1.17 src/sys/dev/pci/nvme_pci.c:1.18
--- src/sys/dev/pci/nvme_pci.c:1.17	Fri Nov 25 12:14:49 2016
+++ src/sys/dev/pci/nvme_pci.c	Mon Feb 13 04:42:15 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme_pci.c,v 1.17 2016/11/25 12:14:49 knakahara Exp $	*/
+/*	$NetBSD: nvme_pci.c,v 1.18 2017/02/13 04:42:15 nonaka Exp $	*/
 /*	$OpenBSD: nvme_pci.c,v 1.3 2016/04/14 11:18:32 dlg Exp $ */
 
 /*
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.17 2016/11/25 12:14:49 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme_pci.c,v 1.18 2017/02/13 04:42:15 nonaka Exp $");
 
 #include 
 #include 
@@ -463,7 +463,6 @@ retry:
 	sc->sc_use_mq = alloced_counts[intr_type] > 1;
 	sc->sc_nq = sc->sc_use_mq ? alloced_counts[intr_type] - 1 : 1;
 
-
 	return 0;
 }
 

CVS commit: src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Feb 13 04:23:19 UTC 2017

Modified Files:
src/distrib/sets/lists/xbase: mi
src/etc/mtree: NetBSD.dist.Xorg
Removed Files:
src/external/mit/xorg/lib/xkeyboard-config/torture: Makefile

Log Message:
prune /usr/X11R7/lib/X11/xkb/torture, a ghost from the days of xkbdata


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.20 -r1.21 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.1 -r0 \
src/external/mit/xorg/lib/xkeyboard-config/torture/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.141 src/distrib/sets/lists/xbase/mi:1.142
--- src/distrib/sets/lists/xbase/mi:1.141	Mon Feb 13 02:34:11 2017
+++ src/distrib/sets/lists/xbase/mi	Mon Feb 13 04:23:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.141 2017/02/13 02:34:11 snj Exp $
+# $NetBSD: mi,v 1.142 2017/02/13 04:23:19 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1207,7 +1207,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr/ataritt	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/yu			-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/za			-unknown-	xorg
-./usr/X11R7/lib/X11/xkb/torturebase-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/torturebase-x11-root	obsolete
 ./usr/X11R7/lib/X11/xkb/torture/indicator		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/torture/indicator1		-unknown-	obsolete
 ./usr/X11R7/lib/X11/xkb/torture/indicator2		-unknown-	obsolete

Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.20 src/etc/mtree/NetBSD.dist.Xorg:1.21
--- src/etc/mtree/NetBSD.dist.Xorg:1.20	Tue Nov 22 19:51:37 2016
+++ src/etc/mtree/NetBSD.dist.Xorg	Mon Feb 13 04:23:19 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.Xorg,v 1.20 2016/11/22 19:51:37 snj Exp $
+#	$NetBSD: NetBSD.dist.Xorg,v 1.21 2017/02/13 04:23:19 snj Exp $
 ./usr/X11R7
 ./usr/X11R7/bin
 ./usr/X11R7/include
@@ -139,7 +139,6 @@
 ./usr/X11R7/lib/X11/xkb/symbols/sony_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr
-./usr/X11R7/lib/X11/xkb/torture
 ./usr/X11R7/lib/X11/xkb/types
 ./usr/X11R7/lib/modules
 ./usr/X11R7/lib/modules/dri

CVS commit: src/sys/netinet

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Feb 13 04:06:39 UTC 2017

Modified Files:
src/sys/netinet: ip_output.c

Log Message:
Use IFQ_LOCK instead of splnet for if_snd


To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/sys/netinet/ip_output.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/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.269 src/sys/netinet/ip_output.c:1.270
--- src/sys/netinet/ip_output.c:1.269	Mon Jan 16 15:14:16 2017
+++ src/sys/netinet/ip_output.c	Mon Feb 13 04:06:39 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_output.c,v 1.269 2017/01/16 15:14:16 christos Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.270 2017/02/13 04:06:39 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.269 2017/01/16 15:14:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.270 2017/02/13 04:06:39 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -794,7 +794,6 @@ ip_fragment(struct mbuf *m, struct ifnet
 	struct mbuf **mnext;
 	int sw_csum = m->m_pkthdr.csum_flags;
 	int fragments = 0;
-	int s;
 	int error = 0;
 
 	ip = mtod(m, struct ip *);
@@ -901,14 +900,14 @@ sendorfree:
 	 * any of them.
 	 */
 	if (ifp != NULL) {
-		s = splnet();
+		IFQ_LOCK(>if_snd);
 		if (ifp->if_snd.ifq_maxlen - ifp->if_snd.ifq_len < fragments &&
 		error == 0) {
 			error = ENOBUFS;
 			IP_STATINC(IP_STAT_ODROPPED);
 			IFQ_INC_DROPS(>if_snd);
 		}
-		splx(s);
+		IFQ_UNLOCK(>if_snd);
 	}
 	if (error) {
 		for (m = m0; m; m = m0) {

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Feb 13 04:05:58 UTC 2017

Modified Files:
src/sys/netinet: in_pcb.c
src/sys/netinet6: in6_pcb.c

Log Message:
Replace splnet with splsoftnet


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.156 -r1.157 src/sys/netinet6/in6_pcb.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/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.174 src/sys/netinet/in_pcb.c:1.175
--- src/sys/netinet/in_pcb.c:1.174	Mon Jan 23 09:14:24 2017
+++ src/sys/netinet/in_pcb.c	Mon Feb 13 04:05:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_pcb.c,v 1.174 2017/01/23 09:14:24 ozaki-r Exp $	*/
+/*	$NetBSD: in_pcb.c,v 1.175 2017/02/13 04:05:58 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.174 2017/01/23 09:14:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.175 2017/02/13 04:05:58 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -212,7 +212,7 @@ in_pcballoc(struct socket *so, void *v)
 	}
 #endif
 	so->so_pcb = inp;
-	s = splnet();
+	s = splsoftnet();
 	TAILQ_INSERT_HEAD(>inpt_queue, >inp_head, inph_queue);
 	LIST_INSERT_HEAD(INPCBHASH_PORT(table, inp->inp_lport), >inp_head,
 	inph_lhash);
@@ -621,7 +621,7 @@ in_pcbdetach(void *v)
 #endif
 	so->so_pcb = NULL;
 
-	s = splnet();
+	s = splsoftnet();
 	in_pcbstate(inp, INP_ATTACHED);
 	LIST_REMOVE(>inp_head, inph_lhash);
 	TAILQ_REMOVE(>inp_table->inpt_queue, >inp_head, inph_queue);

Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.156 src/sys/netinet6/in6_pcb.c:1.157
--- src/sys/netinet6/in6_pcb.c:1.156	Mon Jan 23 09:14:24 2017
+++ src/sys/netinet6/in6_pcb.c	Mon Feb 13 04:05:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_pcb.c,v 1.156 2017/01/23 09:14:24 ozaki-r Exp $	*/
+/*	$NetBSD: in6_pcb.c,v 1.157 2017/02/13 04:05:58 ozaki-r Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.156 2017/01/23 09:14:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.157 2017/02/13 04:05:58 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -178,7 +178,7 @@ in6_pcballoc(struct socket *so, void *v)
 		}
 	}
 #endif /* IPSEC */
-	s = splnet();
+	s = splsoftnet();
 	TAILQ_INSERT_HEAD(>inpt_queue, (struct inpcb_hdr*)in6p,
 	inph_queue);
 	LIST_INSERT_HEAD(IN6PCBHASH_PORT(table, in6p->in6p_lport),
@@ -627,7 +627,7 @@ in6_pcbdetach(struct in6pcb *in6p)
 #endif
 	so->so_pcb = NULL;
 
-	s = splnet();
+	s = splsoftnet();
 	in6_pcbstate(in6p, IN6P_ATTACHED);
 	LIST_REMOVE(>in6p_head, inph_lhash);
 	TAILQ_REMOVE(>in6p_table->inpt_queue, >in6p_head,

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Feb 13 04:05:19 UTC 2017

Modified Files:
src/sys/net: if_gif.c

Log Message:
Remove unnecessary splnet

ok @knakahara


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/net/if_gif.c

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

Modified files:

Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.124 src/sys/net/if_gif.c:1.125
--- src/sys/net/if_gif.c:1.124	Wed Dec 14 11:19:15 2016
+++ src/sys/net/if_gif.c	Mon Feb 13 04:05:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gif.c,v 1.124 2016/12/14 11:19:15 knakahara Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.125 2017/02/13 04:05:19 ozaki-r Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.124 2016/12/14 11:19:15 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.125 2017/02/13 04:05:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -448,22 +448,13 @@ gif_start(struct ifnet *ifp)
 	struct mbuf *m;
 	int family;
 	int len;
-#ifndef GIF_MPSAFE
-	int s;
-#endif
 	int error;
 
 	sc = ifp->if_softc;
 
 	/* output processing */
 	while (1) {
-#ifndef GIF_MPSAFE
-		s = splnet();
-#endif
 		IFQ_DEQUEUE(>gif_if.if_snd, m);
-#ifndef GIF_MPSAFE
-		splx(s);
-#endif
 		if (m == NULL)
 			break;
 
@@ -587,9 +578,6 @@ gif_input(struct mbuf *m, int af, struct
 {
 	pktqueue_t *pktq;
 	size_t pktlen;
-#ifndef GIF_MPSAFE
-	int s;
-#endif
 
 	if (ifp == NULL) {
 		/* just in case */
@@ -624,18 +612,12 @@ gif_input(struct mbuf *m, int af, struct
 		return;
 	}
 
-#ifndef GIF_MPSAFE
-	s = splnet();
-#endif
 	if (__predict_true(pktq_enqueue(pktq, m, 0))) {
 		ifp->if_ibytes += pktlen;
 		ifp->if_ipackets++;
 	} else {
 		m_freem(m);
 	}
-#ifndef GIF_MPSAFE
-	splx(s);
-#endif
 }
 
 /* XXX how should we handle IPv6 scope on SIOC[GS]IFPHYADDR? */

CVS commit: src/doc

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Feb 13 04:01:11 UTC 2017

Modified Files:
src/doc: TODO.smpnet

Log Message:
Add BRIDGE_IPF


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/doc/TODO.smpnet

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

Modified files:

Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.2 src/doc/TODO.smpnet:1.3
--- src/doc/TODO.smpnet:1.2	Fri Feb 10 03:59:02 2017
+++ src/doc/TODO.smpnet	Mon Feb 13 04:01:11 2017
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.2 2017/02/10 03:59:02 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.3 2017/02/13 04:01:11 ozaki-r Exp $
 
 MP-safe components
 ==
@@ -67,6 +67,7 @@ Non MP-safe components and kernel option
  - SCTP
  - TCP
  - UDP
+ - BRIDGE_IPF
 
  - Layer 4
  - IP multicast

CVS commit: src/sys/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Mon Feb 13 03:44:45 UTC 2017

Modified Files:
src/sys/net: bpf.c

Log Message:
Update comments to reflect bpf MP-ification


To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/net/bpf.c

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

Modified files:

Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.213 src/sys/net/bpf.c:1.214
--- src/sys/net/bpf.c:1.213	Thu Feb  9 09:30:26 2017
+++ src/sys/net/bpf.c	Mon Feb 13 03:44:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bpf.c,v 1.213 2017/02/09 09:30:26 ozaki-r Exp $	*/
+/*	$NetBSD: bpf.c,v 1.214 2017/02/13 03:44:45 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.213 2017/02/09 09:30:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.214 2017/02/13 03:44:45 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_bpf.h"
@@ -439,7 +439,6 @@ bad:
 
 /*
  * Attach file to the bpf interface, i.e. make d listen on bp.
- * Must be called at splnet.
  */
 static void
 bpf_attachd(struct bpf_d *d, struct bpf_if *bp)
@@ -871,7 +870,7 @@ out_bindx:
 
 /*
  * Reset a descriptor by flushing its packet buffer and clearing the
- * receive and drop counts.  Should be called at splnet.
+ * receive and drop counts.
  */
 static void
 reset_d(struct bpf_d *d)

CVS commit: src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Feb 13 02:34:11 UTC 2017

Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr:
Makefile

Log Message:
update for xkeyboard-config 2.20


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.140 src/distrib/sets/lists/xbase/mi:1.141
--- src/distrib/sets/lists/xbase/mi:1.140	Thu Jan  5 13:45:51 2017
+++ src/distrib/sets/lists/xbase/mi	Mon Feb 13 02:34:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.140 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: mi,v 1.141 2017/02/13 02:34:11 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -990,8 +990,10 @@
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/fi	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/fr	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/gb	-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/is	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/it	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/jp	-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/latam	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/nl	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/no	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/pt	-unknown-	xorg

Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.1 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.2
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.1	Thu Dec 15 09:17:26 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man	Mon Feb 13 02:34:11 2017
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.19" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.20" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -250,7 +250,7 @@ ara(mac)	Arabic (Macintosh)
 
 _
 al	Albanian
-al(plisi-d1)	Albanian (Plisi D1)
+al(plisi)	Albanian (Plisi)
 
 _
 am	Armenian

Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile:1.2	Fri May 28 12:38:35 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile	Mon Feb 13 02:34:11 2017
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2010/05/28 12:38:35 ghen Exp $
+#	$NetBSD: Makefile,v 1.3 2017/02/13 02:34:11 snj Exp $
 
 .include 
 
 FILESDIR=	${X11LIBDIR}/xkb/symbols/macintosh_vndr
-FILES=		apple ch de dk fi fr gb it jp nl no pt se us
+FILES=		apple ch de dk fi fr gb is it jp latam nl no pt se us
 
 .PATH:		${X11SRCDIR.xkeyboard-config}/symbols/macintosh_vndr
 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

[Soren Jacobsen]

Module Name:xsrc
Committed By:   snj
Date:   Mon Feb 13 02:33:22 UTC 2017

Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in

Log Message:
merge xkeyboard-config 2.20


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in

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

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.12 xsrc/external/mit/xkeyboard-config/dist/configure:1.13
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.12	Tue Nov 22 19:45:29 2016
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Mon Feb 13 02:33:21 2017
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.19.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.20.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.19'
-PACKAGE_STRING='xkeyboard-config 2.19'
+PACKAGE_VERSION='2.20'
+PACKAGE_STRING='xkeyboard-config 2.20'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -598,9 +598,6 @@ INTLLIBS
 LTLIBICONV
 LIBICONV
 INTL_MACOSX_LIBS
-EGREP
-GREP
-CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -693,9 +690,6 @@ build_os
 build_vendor
 build_cpu
 build
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -765,7 +759,6 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
-enable_maintainer_mode
 with_xsltproc
 with_xkb_base
 with_xkb_rules_symlink
@@ -791,8 +784,7 @@ CC
 CFLAGS
 LDFLAGS
 LIBS
-CPPFLAGS
-CPP'
+CPPFLAGS'
 
 
 # Initialize some variables set by options.
@@ -1333,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.19 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.20 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1404,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.19:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.20:";;
esac
   cat <<\_ACEOF
 
@@ -1414,9 +1406,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-maintainer-mode
-  enable make rules and dependencies not useful (and
-  sometimes confusing) to the casual installer
   --enable-compat-rules  create compatibility rules
  --enable-runtime-depsuse run-time dependencies as build-time dependencies
   --disable-nls   do not use Native Language Support
@@ -1455,7 +1444,6 @@ Some influential environment variables:
   LIBSlibraries to pass to the linker, e.g. -l
   CPPFLAGS(Objective) C/C++ preprocessor flags, e.g. -I if
   you have headers in a nonstandard directory 
-  CPP C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1523,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.19
+xkeyboard-config configure 2.20
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1575,43 +1563,6 @@ fi
 
 } # ac_fn_c_try_compile
 
-# ac_fn_c_try_cpp LINENO
-# --
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-grep -v '^ *+' conftest.err >conftest.er1
-cat 

CVS import: xsrc/external/mit/xkeyboard-config/dist

[Soren Jacobsen]

Module Name:xsrc
Committed By:   snj
Date:   Mon Feb 13 02:31:45 UTC 2017

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8386

Log Message:
initial import of xkeyboard-config 2.20

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-2-20

U xsrc/external/mit/xkeyboard-config/dist/install-sh
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/compile
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
C xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/config.sub
U xsrc/external/mit/xkeyboard-config/dist/COPYING
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/config.guess
U xsrc/external/mit/xkeyboard-config/dist/configure.ac
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/symbols/gb
U xsrc/external/mit/xkeyboard-config/dist/symbols/eu
U xsrc/external/mit/xkeyboard-config/dist/symbols/tw
U xsrc/external/mit/xkeyboard-config/dist/symbols/uz
U xsrc/external/mit/xkeyboard-config/dist/symbols/tg
U xsrc/external/mit/xkeyboard-config/dist/symbols/ara
U xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock
U xsrc/external/mit/xkeyboard-config/dist/symbols/inet
U xsrc/external/mit/xkeyboard-config/dist/symbols/se
U xsrc/external/mit/xkeyboard-config/dist/symbols/fr
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/by
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
U xsrc/external/mit/xkeyboard-config/dist/symbols/cm
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/tj
U xsrc/external/mit/xkeyboard-config/dist/symbols/empty
U xsrc/external/mit/xkeyboard-config/dist/symbols/level3
U xsrc/external/mit/xkeyboard-config/dist/symbols/us
U xsrc/external/mit/xkeyboard-config/dist/symbols/es
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/apl
U xsrc/external/mit/xkeyboard-config/dist/symbols/ph
U xsrc/external/mit/xkeyboard-config/dist/symbols/it
U xsrc/external/mit/xkeyboard-config/dist/symbols/bd
U xsrc/external/mit/xkeyboard-config/dist/symbols/tr
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
U xsrc/external/mit/xkeyboard-config/dist/symbols/gh
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/kg
U xsrc/external/mit/xkeyboard-config/dist/symbols/is
U xsrc/external/mit/xkeyboard-config/dist/symbols/ee
U xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/si
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/id
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/za
U xsrc/external/mit/xkeyboard-config/dist/symbols/au
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/bn
U xsrc/external/mit/xkeyboard-config/dist/symbols/ca
U xsrc/external/mit/xkeyboard-config/dist/symbols/shift
U xsrc/external/mit/xkeyboard-config/dist/symbols/mt
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/ru
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
U 

CVS commit: src/sys/dev

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Mon Feb 13 01:59:14 UTC 2017

Modified Files:
src/sys/dev: audio.c

Log Message:
Use fnullop_fcntl instead of audiofcntl.


To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 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.303 src/sys/dev/audio.c:1.304
--- src/sys/dev/audio.c:1.303	Sat Feb 11 08:36:30 2017
+++ src/sys/dev/audio.c	Mon Feb 13 01:59:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.303 2017/02/11 08:36:30 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.304 2017/02/13 01:59:14 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.303 2017/02/11 08:36:30 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.304 2017/02/13 01:59:14 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -346,7 +346,6 @@ int audioread(struct file *, off_t *, st
 int audiowrite(struct file *, off_t *, struct uio *, kauth_cred_t, int);
 int audioioctl(struct file *, u_long, void *);
 int audiopoll(struct file *, int);
-int audiofcntl(struct file *, u_int, void *);
 int audiokqfilter(struct file *, struct knote *);
 int audiostat(struct file *, struct stat *);
 
@@ -430,7 +429,7 @@ const struct fileops audio_fileops = {
 	.fo_read = audioread,
 	.fo_write = audiowrite,
 	.fo_ioctl = audioioctl,
-	.fo_fcntl = audiofcntl,
+	.fo_fcntl = fnullop_fcntl,
 	.fo_stat = audiostat,
 	.fo_poll = audiopoll,
 	.fo_close = audioclose,
@@ -1741,13 +1740,6 @@ audioioctl(struct file *fp, u_long cmd, 
 }
 
 int
-audiofcntl(struct file *fp, u_int cmd, void *data)
-{
-
-	return EOPNOTSUPP;
-}
-
-int
 audiostat(struct file *fp, struct stat *st)
 {
 	memset(st, 0, sizeof(*st));

CVS commit: src/lib/libc/gen

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Feb 12 22:37:49 UTC 2017

Modified Files:
src/lib/libc/gen: vis.c

Log Message:
fix off-by-one, found by asan.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/lib/libc/gen/vis.c

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

Modified files:

Index: src/lib/libc/gen/vis.c
diff -u src/lib/libc/gen/vis.c:1.71 src/lib/libc/gen/vis.c:1.72
--- src/lib/libc/gen/vis.c:1.71	Thu Jan 14 15:41:23 2016
+++ src/lib/libc/gen/vis.c	Sun Feb 12 17:37:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $	*/
+/*	$NetBSD: vis.c,v 1.72 2017/02/12 22:37:49 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.71 2016/01/14 20:41:23 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.72 2017/02/12 22:37:49 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
@@ -405,6 +405,14 @@ istrsenvisx(char **mbdstp, size_t *dlen,
 	_DIAGASSERT(mbsrc != NULL || mblength == 0);
 	_DIAGASSERT(mbextra != NULL);
 
+	mbslength = (ssize_t)mblength;
+	/*
+	 * When inputing a single character, must also read in the
+	 * next character for nextc, the look-ahead character.
+	 */
+	if (mbslength == 1)
+		mbslength++;
+
 	/*
 	 * Input (mbsrc) is a char string considered to be multibyte
 	 * characters.  The input loop will read this string pulling
@@ -421,12 +429,12 @@ istrsenvisx(char **mbdstp, size_t *dlen,
 	/* Allocate space for the wide char strings */
 	psrc = pdst = extra = NULL;
 	mdst = NULL;
-	if ((psrc = calloc(mblength + 1, sizeof(*psrc))) == NULL)
+	if ((psrc = calloc(mbslength + 1, sizeof(*psrc))) == NULL)
 		return -1;
-	if ((pdst = calloc((4 * mblength) + 1, sizeof(*pdst))) == NULL)
+	if ((pdst = calloc((4 * mbslength) + 1, sizeof(*pdst))) == NULL)
 		goto out;
 	if (*mbdstp == NULL) {
-		if ((mdst = calloc((4 * mblength) + 1, sizeof(*mdst))) == NULL)
+		if ((mdst = calloc((4 * mbslength) + 1, sizeof(*mdst))) == NULL)
 			goto out;
 		*mbdstp = mdst;
 	}
@@ -449,13 +457,6 @@ istrsenvisx(char **mbdstp, size_t *dlen,
 	 * stop at NULs because we may be processing a block of data
 	 * that includes NULs.
 	 */
-	mbslength = (ssize_t)mblength;
-	/*
-	 * When inputing a single character, must also read in the
-	 * next character for nextc, the look-ahead character.
-	 */
-	if (mbslength == 1)
-		mbslength++;
 	while (mbslength > 0) {
 		/* Convert one multibyte character to wchar_t. */
 		if (!cerr)
@@ -481,6 +482,7 @@ istrsenvisx(char **mbdstp, size_t *dlen,
 	}
 	len = src - psrc;
 	src = psrc;
+
 	/*
 	 * In the single character input case, we will have actually
 	 * processed two characters, c and nextc.  Reset len back to

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Feb 12 22:09:51 UTC 2017

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

Log Message:
1357


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.149 src/doc/CHANGES-7.1:1.1.2.150
--- src/doc/CHANGES-7.1:1.1.2.149	Mon Feb  6 07:31:50 2017
+++ src/doc/CHANGES-7.1	Sun Feb 12 22:09:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.149 2017/02/06 07:31:50 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.150 2017/02/12 22:09:51 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7958,3 +7958,23 @@ crypto/external/bsd/openssl/dist/crypto/
 	Fix CVE-2016-7056 and CVE-2017-3731.
 	[spz, ticket #1352]
 
+libexec/httpd/CHANGES1.25
+libexec/httpd/bozohttpd.8			1.63-1.65
+libexec/httpd/bozohttpd.c			1.85, 1.86
+libexec/httpd/bozohttpd.h			1.47
+libexec/httpd/cgi-bozo.c			1.36, 1.37
+libexec/httpd/libbozohttpd/libbozohttpd.3	1.4
+libexec/httpd/testsuite/Makefile		1.7
+libexec/httpd/testsuite/cgi-bin/empty		1.1
+libexec/httpd/testsuite/html_cmp		1.5
+libexec/httpd/testsuite/t11.in			1.1
+libexec/httpd/testsuite/t11.out			1.1
+libexec/httpd/testsuite/test-bigfile		1.4
+libexec/httpd/testsuite/test-simple		1.3, 1.4
+
+	Update to bozohttpd 20170201:
+	- fix an infinite loop in cgi processing
+	- fixes and clean up for the testsuite
+	-  no longer sends encoding header for compressed form
+	[mrg, ticket #1357]
+

CVS commit: [netbsd-7] src/libexec/httpd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Feb 12 22:07:17 UTC 2017

Modified Files:
src/libexec/httpd [netbsd-7]: CHANGES bozohttpd.8 bozohttpd.c
bozohttpd.h cgi-bozo.c
src/libexec/httpd/libbozohttpd [netbsd-7]: libbozohttpd.3
src/libexec/httpd/testsuite [netbsd-7]: Makefile html_cmp test-bigfile
test-simple
Added Files:
src/libexec/httpd/testsuite [netbsd-7]: t11.in t11.out
src/libexec/httpd/testsuite/cgi-bin [netbsd-7]: empty

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1357):
libexec/httpd/CHANGES: revision 1.25
libexec/httpd/bozohttpd.8: revisions 1.63-1.65
libexec/httpd/bozohttpd.c: revisions 1.85, 1.86
libexec/httpd/bozohttpd.h: revision 1.47
libexec/httpd/cgi-bozo.c: revisions 1.36, 1.37
libexec/httpd/libbozohttpd/libbozohttpd.3: revision 1.4
libexec/httpd/testsuite/Makefile: revision 1.7
libexec/httpd/testsuite/html_cmp: revision 1.5
libexec/httpd/testsuite/test-bigfile: revision 1.4
libexec/httpd/testsuite/test-simple: revisions 1.3, 1.4
libexec/httpd/testsuite/t11.in: revision 1.1
libexec/httpd/testsuite/t11.out: revision 1.1
libexec/httpd/testsuite/cgi-bin/empty: revision 1.1
Update bozohttpd to 20170201:
- fix an infinite loop in cgi processing
- fixes and clean up for the testsuite
- no longer sends encoding header for compressed formats


To generate a diff of this commit:
cvs rdiff -u -r1.19.2.4 -r1.19.2.5 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.46.4.7 -r1.46.4.8 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.56.2.7 -r1.56.2.8 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.33.2.5 -r1.33.2.6 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.25.2.6 -r1.25.2.7 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.3 -r1.3.10.1 src/libexec/httpd/libbozohttpd/libbozohttpd.3
cvs rdiff -u -r1.4.24.2 -r1.4.24.3 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r1.4 -r1.4.18.1 src/libexec/httpd/testsuite/html_cmp
cvs rdiff -u -r0 -r1.1.4.2 src/libexec/httpd/testsuite/t11.in \
src/libexec/httpd/testsuite/t11.out
cvs rdiff -u -r1.1.1.1.30.2 -r1.1.1.1.30.3 \
src/libexec/httpd/testsuite/test-bigfile
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/libexec/httpd/testsuite/test-simple
cvs rdiff -u -r0 -r1.1.4.2 src/libexec/httpd/testsuite/cgi-bin/empty

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

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.19.2.4 src/libexec/httpd/CHANGES:1.19.2.5
--- src/libexec/httpd/CHANGES:1.19.2.4	Fri Dec 23 07:42:09 2016
+++ src/libexec/httpd/CHANGES	Sun Feb 12 22:07:17 2017
@@ -1,7 +1,12 @@
-$NetBSD: CHANGES,v 1.19.2.4 2016/12/23 07:42:09 snj Exp $
+$NetBSD: CHANGES,v 1.19.2.5 2017/02/12 22:07:17 snj Exp $
+
+changes in bozohttpd 20170201:
+	o  fix an infinite loop in cgi processing
+	o  fixes and clean up for the testsuite
+	o  no longer sends encoding header for compressed formats
 
 changes in bozohttpd 20160517:
-	o add a bozo_get_version() function which returns the version number
+	o  add a bozo_get_version() function which returns the version number
 
 changes in bozohttpd 20160415:
 	o  add search-word support for CGI

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.46.4.7 src/libexec/httpd/bozohttpd.8:1.46.4.8
--- src/libexec/httpd/bozohttpd.8:1.46.4.7	Fri Dec 23 07:42:09 2016
+++ src/libexec/httpd/bozohttpd.8	Sun Feb 12 22:07:17 2017
@@ -1,8 +1,8 @@
-.\"	$NetBSD: bozohttpd.8,v 1.46.4.7 2016/12/23 07:42:09 snj Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.46.4.8 2017/02/12 22:07:17 snj Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
-.\" Copyright (c) 1997-2016 Matthew R. Green
+.\" Copyright (c) 1997-2017 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 11, 2016
+.Dd February 1, 2017
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -190,7 +190,7 @@ when a URL in the form
 is being accessed.
 The function is passed three tables as arguments, the server
 environment, the request headers, and the decoded query string
-plus any data that was send as application/x-www-form-urlencoded.
+plus any data that was sent as application/x-www-form-urlencoded.
 .It Fl M Ar suffix type encoding encoding11
 Adds a new entry to the table that converts file suffixes to
 content type and encoding.
@@ -384,7 +384,7 @@ user transformations (NO_USER_SUPPORT),
 directory index support (NO_DIRINDEX_SUPPORT),
 daemon mode support (NO_DAEMON_MODE),
 dynamic MIME content (NO_DYNAMIC_CONTENT),
-Lua suport (NO_LUA_SUPPORT),
+Lua support (NO_LUA_SUPPORT),
 and SSL support (NO_SSL_SUPPORT)
 by defining the listed macros when building
 .Nm .
@@ -446,7 +446,7 @@ 

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Feb 12 22:03:49 UTC 2017

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

Log Message:
bah, combine revisions for ticket 1357


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.24 -r1.1.2.25 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.24 src/doc/CHANGES-7.0.3:1.1.2.25
--- src/doc/CHANGES-7.0.3:1.1.2.24	Sun Feb 12 22:00:49 2017
+++ src/doc/CHANGES-7.0.3	Sun Feb 12 22:03:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.24 2017/02/12 22:00:49 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.25 2017/02/12 22:03:49 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -351,14 +351,10 @@ crypto/external/bsd/openssl/dist/crypto/
 	[spz, ticket #1352]
 
 libexec/httpd/CHANGES1.25
-libexec/httpd/bozohttpd.8			1.63
-libexec/httpd/bozohttpd.8			1.64
-libexec/httpd/bozohttpd.8			1.65
-libexec/httpd/bozohttpd.c			1.85
-libexec/httpd/bozohttpd.c			1.86
+libexec/httpd/bozohttpd.8			1.63-1.65
+libexec/httpd/bozohttpd.c			1.85, 1.86
 libexec/httpd/bozohttpd.h			1.47
-libexec/httpd/cgi-bozo.c			1.36
-libexec/httpd/cgi-bozo.c			1.37
+libexec/httpd/cgi-bozo.c			1.36, 1.37
 libexec/httpd/libbozohttpd/libbozohttpd.3	1.4
 libexec/httpd/testsuite/Makefile		1.7
 libexec/httpd/testsuite/cgi-bin/empty		1.1
@@ -366,8 +362,7 @@ libexec/httpd/testsuite/html_cmp		1.5
 libexec/httpd/testsuite/t11.in			1.1
 libexec/httpd/testsuite/t11.out			1.1
 libexec/httpd/testsuite/test-bigfile		1.4
-libexec/httpd/testsuite/test-simple		1.3
-libexec/httpd/testsuite/test-simple		1.4
+libexec/httpd/testsuite/test-simple		1.3, 1.4
 
 	Update bozohttpd to 20170201:
 	- fix an infinite loop in cgi processing

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Feb 12 22:00:49 UTC 2017

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

Log Message:
1357


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.23 -r1.1.2.24 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.23 src/doc/CHANGES-7.0.3:1.1.2.24
--- src/doc/CHANGES-7.0.3:1.1.2.23	Mon Feb  6 07:28:39 2017
+++ src/doc/CHANGES-7.0.3	Sun Feb 12 22:00:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.23 2017/02/06 07:28:39 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.24 2017/02/12 22:00:49 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -350,3 +350,28 @@ crypto/external/bsd/openssl/dist/crypto/
 	Fix CVE-2016-7056 and CVE-2017-3731.
 	[spz, ticket #1352]
 
+libexec/httpd/CHANGES1.25
+libexec/httpd/bozohttpd.8			1.63
+libexec/httpd/bozohttpd.8			1.64
+libexec/httpd/bozohttpd.8			1.65
+libexec/httpd/bozohttpd.c			1.85
+libexec/httpd/bozohttpd.c			1.86
+libexec/httpd/bozohttpd.h			1.47
+libexec/httpd/cgi-bozo.c			1.36
+libexec/httpd/cgi-bozo.c			1.37
+libexec/httpd/libbozohttpd/libbozohttpd.3	1.4
+libexec/httpd/testsuite/Makefile		1.7
+libexec/httpd/testsuite/cgi-bin/empty		1.1
+libexec/httpd/testsuite/html_cmp		1.5
+libexec/httpd/testsuite/t11.in			1.1
+libexec/httpd/testsuite/t11.out			1.1
+libexec/httpd/testsuite/test-bigfile		1.4
+libexec/httpd/testsuite/test-simple		1.3
+libexec/httpd/testsuite/test-simple		1.4
+
+	Update bozohttpd to 20170201:
+	- fix an infinite loop in cgi processing
+	- fixes and clean up for the testsuite
+	- no longer sends encoding header for compressed formats
+	[mrg, ticket #1357]
+

CVS commit: [netbsd-7-0] src/libexec/httpd

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Feb 12 21:59:45 UTC 2017

Modified Files:
src/libexec/httpd [netbsd-7-0]: CHANGES bozohttpd.8 bozohttpd.c
bozohttpd.h cgi-bozo.c
src/libexec/httpd/libbozohttpd [netbsd-7-0]: libbozohttpd.3
src/libexec/httpd/testsuite [netbsd-7-0]: Makefile html_cmp
test-bigfile test-simple
Added Files:
src/libexec/httpd/testsuite [netbsd-7-0]: t11.in t11.out
src/libexec/httpd/testsuite/cgi-bin [netbsd-7-0]: empty

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1357):
libexec/httpd/CHANGES: revision 1.25
libexec/httpd/bozohttpd.8: revisions 1.63-1.65
libexec/httpd/bozohttpd.c: revisions 1.85, 1.86
libexec/httpd/bozohttpd.h: revision 1.47
libexec/httpd/cgi-bozo.c: revisions 1.36, 1.37
libexec/httpd/libbozohttpd/libbozohttpd.3: revision 1.4
libexec/httpd/testsuite/Makefile: revision 1.7
libexec/httpd/testsuite/html_cmp: revision 1.5
libexec/httpd/testsuite/test-bigfile: revision 1.4
libexec/httpd/testsuite/test-simple: revisions 1.3, 1.4
libexec/httpd/testsuite/t11.in: revision 1.1
libexec/httpd/testsuite/t11.out: revision 1.1
libexec/httpd/testsuite/cgi-bin/empty: revision 1.1
Update bozohttpd to 20170201:
- fix an infinite loop in cgi processing
- fixes and clean up for the testsuite
- no longer sends encoding header for compressed formats


To generate a diff of this commit:
cvs rdiff -u -r1.19.2.1.2.2 -r1.19.2.1.2.3 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.46.4.4.2.2 -r1.46.4.4.2.3 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.56.2.4.2.2 -r1.56.2.4.2.3 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.33.2.2.2.2 -r1.33.2.2.2.3 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.25.2.2.2.3 -r1.25.2.2.2.4 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.3 -r1.3.12.1 src/libexec/httpd/libbozohttpd/libbozohttpd.3
cvs rdiff -u -r1.4.26.2 -r1.4.26.3 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r1.4 -r1.4.20.1 src/libexec/httpd/testsuite/html_cmp
cvs rdiff -u -r0 -r1.1.2.2 src/libexec/httpd/testsuite/t11.in \
src/libexec/httpd/testsuite/t11.out
cvs rdiff -u -r1.1.1.1.32.2 -r1.1.1.1.32.3 \
src/libexec/httpd/testsuite/test-bigfile
cvs rdiff -u -r1.2.6.2 -r1.2.6.3 src/libexec/httpd/testsuite/test-simple
cvs rdiff -u -r0 -r1.1.2.2 src/libexec/httpd/testsuite/cgi-bin/empty

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

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.19.2.1.2.2 src/libexec/httpd/CHANGES:1.19.2.1.2.3
--- src/libexec/httpd/CHANGES:1.19.2.1.2.2	Fri Dec 23 07:47:40 2016
+++ src/libexec/httpd/CHANGES	Sun Feb 12 21:59:44 2017
@@ -1,7 +1,12 @@
-$NetBSD: CHANGES,v 1.19.2.1.2.2 2016/12/23 07:47:40 snj Exp $
+$NetBSD: CHANGES,v 1.19.2.1.2.3 2017/02/12 21:59:44 snj Exp $
+
+changes in bozohttpd 20170201:
+	o  fix an infinite loop in cgi processing
+	o  fixes and clean up for the testsuite
+	o  no longer sends encoding header for compressed formats
 
 changes in bozohttpd 20160517:
-	o add a bozo_get_version() function which returns the version number
+	o  add a bozo_get_version() function which returns the version number
 
 changes in bozohttpd 20160415:
 	o  add search-word support for CGI

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.46.4.4.2.2 src/libexec/httpd/bozohttpd.8:1.46.4.4.2.3
--- src/libexec/httpd/bozohttpd.8:1.46.4.4.2.2	Fri Dec 23 07:47:40 2016
+++ src/libexec/httpd/bozohttpd.8	Sun Feb 12 21:59:44 2017
@@ -1,8 +1,8 @@
-.\"	$NetBSD: bozohttpd.8,v 1.46.4.4.2.2 2016/12/23 07:47:40 snj Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.46.4.4.2.3 2017/02/12 21:59:44 snj Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
-.\" Copyright (c) 1997-2016 Matthew R. Green
+.\" Copyright (c) 1997-2017 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 11, 2016
+.Dd February 1, 2017
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -190,7 +190,7 @@ when a URL in the form
 is being accessed.
 The function is passed three tables as arguments, the server
 environment, the request headers, and the decoded query string
-plus any data that was send as application/x-www-form-urlencoded.
+plus any data that was sent as application/x-www-form-urlencoded.
 .It Fl M Ar suffix type encoding encoding11
 Adds a new entry to the table that converts file suffixes to
 content type and encoding.
@@ -384,7 +384,7 @@ user transformations (NO_USER_SUPPORT),
 directory index support (NO_DIRINDEX_SUPPORT),
 daemon mode support (NO_DAEMON_MODE),
 dynamic MIME content (NO_DYNAMIC_CONTENT),
-Lua suport (NO_LUA_SUPPORT),
+Lua support (NO_LUA_SUPPORT),
 and SSL support 

CVS commit: src/sys/kern

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Sun Feb 12 21:52:46 UTC 2017

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

Log Message:
netbsd_elf_signature - look at note segments (phdrs) not note
sections.  They point to the same data in the file, but sections are
for linkers and are not necessarily present in an executable.

The original switch from phdrs to shdrs seems to be just a cop-out to
avoid parsing multiple notes per segment, which doesn't really avoid
the problem b/c sections also can contain multiple notes.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/kern/exec_elf.c

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

Modified files:

Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.87 src/sys/kern/exec_elf.c:1.88
--- src/sys/kern/exec_elf.c:1.87	Thu Sep 15 18:40:34 2016
+++ src/sys/kern/exec_elf.c	Sun Feb 12 21:52:46 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_elf.c,v 1.87 2016/09/15 18:40:34 christos Exp $	*/
+/*	$NetBSD: exec_elf.c,v 1.88 2017/02/12 21:52:46 uwe Exp $	*/
 
 /*-
  * Copyright (c) 1994, 2000, 2005, 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.87 2016/09/15 18:40:34 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.88 2017/02/12 21:52:46 uwe Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pax.h"
@@ -93,6 +93,7 @@ extern struct emul emul_netbsd;
 #define elf_load_psection	ELFNAME(load_psection)
 #define exec_elf_makecmds	ELFNAME2(exec,makecmds)
 #define netbsd_elf_signature	ELFNAME2(netbsd,signature)
+#define netbsd_elf_note   	ELFNAME2(netbsd,note)
 #define netbsd_elf_probe	ELFNAME2(netbsd,probe)
 #define	coredump		ELFNAMEEND(coredump)
 #define	elf_free_emul_arg	ELFNAME(free_emul_arg)
@@ -105,6 +106,8 @@ elf_load_psection(struct exec_vmcmd_set 
 Elf_Addr *, u_long *, int);
 
 int	netbsd_elf_signature(struct lwp *, struct exec_package *, Elf_Ehdr *);
+int	netbsd_elf_note(struct exec_package *, const Elf_Nhdr *, const char *,
+	const char *);
 int	netbsd_elf_probe(struct lwp *, struct exec_package *, void *, char *,
 	vaddr_t *);
 
@@ -851,195 +854,209 @@ netbsd_elf_signature(struct lwp *l, stru
 Elf_Ehdr *eh)
 {
 	size_t i;
-	Elf_Shdr *sh;
-	Elf_Nhdr *np;
-	size_t shsize, nsize;
+	Elf_Phdr *ph;
+	size_t phsize;
+	char *nbuf;
 	int error;
 	int isnetbsd = 0;
-	char *ndata, *ndesc;
-	
-#ifdef DIAGNOSTIC
-	const char *badnote;
-#define BADNOTE(n) badnote = (n)
-#else
-#define BADNOTE(n)
-#endif
 
 	epp->ep_pax_flags = 0;
-	if (eh->e_shnum > ELF_MAXSHNUM || eh->e_shnum == 0) {
-		DPRINTF("no signature %#x", eh->e_shnum);
+
+	if (eh->e_phnum > ELF_MAXPHNUM || eh->e_phnum == 0) {
+		DPRINTF("no signature %#x", eh->e_phnum);
 		return ENOEXEC;
 	}
 
-	shsize = eh->e_shnum * sizeof(Elf_Shdr);
-	sh = kmem_alloc(shsize, KM_SLEEP);
-	error = exec_read_from(l, epp->ep_vp, eh->e_shoff, sh, shsize);
+	phsize = eh->e_phnum * sizeof(Elf_Phdr);
+	ph = kmem_alloc(phsize, KM_SLEEP);
+	error = exec_read_from(l, epp->ep_vp, eh->e_phoff, ph, phsize);
 	if (error)
 		goto out;
 
-	np = kmem_alloc(ELF_MAXNOTESIZE, KM_SLEEP);
-	for (i = 0; i < eh->e_shnum; i++) {
-		Elf_Shdr *shp = [i];
-
-		if (shp->sh_type != SHT_NOTE ||
-		shp->sh_size > ELF_MAXNOTESIZE ||
-		shp->sh_size < sizeof(Elf_Nhdr) + ELF_NOTE_NETBSD_NAMESZ)
+	nbuf = kmem_alloc(ELF_MAXNOTESIZE, KM_SLEEP);
+	for (i = 0; i < eh->e_phnum; i++) {
+		const char *nptr;
+		size_t nlen;
+
+		if (ph[i].p_type != PT_NOTE ||
+		ph[i].p_filesz > ELF_MAXNOTESIZE)
 			continue;
 
-		error = exec_read_from(l, epp->ep_vp, shp->sh_offset, np,
-		shp->sh_size);
+		nlen = ph[i].p_filesz;
+		error = exec_read_from(l, epp->ep_vp, ph[i].p_offset,
+   nbuf, nlen);
 		if (error)
 			continue;
 
-		/* Point to the note, skip the header */
-		ndata = (char *)(np + 1);
-
-		/*
-		 * Padding is present if necessary to ensure 4-byte alignment.
-		 * The actual section size is therefore:
-		 *header size + 4-byte aligned name + 4-byte aligned desc
-		 * Ensure this size is consistent with what is indicated
-		 * in sh_size. The first check avoids integer overflows.
-		 *
-		 * Binaries from before NetBSD 1.6 have two notes in the same
-		 * note section.  The second note was never used, so as long as
-		 * the section is at least as big as it should be, it's ok.
-		 * These binaries also have a second note section with a note of
-		 * type ELF_NOTE_TYPE_NETBSD_TAG, which can be ignored as well.
-		 */
-		if (np->n_namesz > shp->sh_size || np->n_descsz > shp->sh_size) {
-			BADNOTE("note size limit");
-			goto bad;
-		}
-		nsize = sizeof(*np) + roundup(np->n_namesz, 4) +
-		roundup(np->n_descsz, 4);
-		if (nsize > shp->sh_size) {
-			BADNOTE("note size");
-			goto bad;
-		}
-		ndesc = ndata + roundup(np->n_namesz, 4);
-
-		switch (np->n_type) {
-		case ELF_NOTE_TYPE_NETBSD_TAG:
-			/* It is us */
-			if (np->n_namesz == 

CVS commit: src/doc

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sun Feb 12 21:06:46 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
note accept4


To generate a diff of this commit:
cvs rdiff -u -r1.2251 -r1.2252 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.2251 src/doc/CHANGES:1.2252
--- src/doc/CHANGES:1.2251	Sun Feb 12 20:59:23 2017
+++ src/doc/CHANGES	Sun Feb 12 21:06:46 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2251 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2252 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -465,6 +465,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		[msaitoh 20170208]
 	bind: Import version 9.10.4-P6. [christos 20170208]
 	openldap: Import 2.4.44. [christos 20170208]
+	libc: Add accept4 function for compatibility [maya 20170208]
 	file(1): Upgraded to 5.30. [christos 20170210]
 	byacc: update to 20170201 [christos 20170211]
 	ptrace(2): Add signal mask information accessors API:

CVS commit: src/sys/compat

[Chuck Silvers]

Module Name:src
Committed By:   chs
Date:   Sun Feb 12 21:02:20 UTC 2017

Modified Files:
src/sys/compat/linux/arch/alpha: linux_exec.h
src/sys/compat/linux/arch/arm: linux_exec.h
src/sys/compat/linux/arch/i386: linux_exec.h
src/sys/compat/linux/arch/m68k: linux_exec.h
src/sys/compat/linux/arch/mips: linux_exec.h
src/sys/compat/linux/arch/powerpc: linux_exec.h
src/sys/compat/linux/common: linux_exec.h
src/sys/compat/osf1: osf1_mod.c
src/sys/compat/svr4_32: svr4_32_exec.h

Log Message:
es_arglen is now in units of bytes, update the emulations accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/linux/arch/alpha/linux_exec.h
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux/arch/arm/linux_exec.h
cvs rdiff -u -r1.12 -r1.13 src/sys/compat/linux/arch/i386/linux_exec.h
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/linux/arch/m68k/linux_exec.h
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/linux/arch/mips/linux_exec.h
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/linux/arch/powerpc/linux_exec.h
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/linux/common/linux_exec.h
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/osf1/osf1_mod.c
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/svr4_32/svr4_32_exec.h

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

Modified files:

Index: src/sys/compat/linux/arch/alpha/linux_exec.h
diff -u src/sys/compat/linux/arch/alpha/linux_exec.h:1.12 src/sys/compat/linux/arch/alpha/linux_exec.h:1.13
--- src/sys/compat/linux/arch/alpha/linux_exec.h:1.12	Sun Feb  9 16:41:42 2014
+++ src/sys/compat/linux/arch/alpha/linux_exec.h	Sun Feb 12 21:02:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_exec.h,v 1.12 2014/02/09 16:41:42 chs Exp $	*/
+/*	$NetBSD: linux_exec.h,v 1.13 2017/02/12 21:02:19 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  * Alpha specific ELF defines.
  */
 #define LINUX_ELF_AUX_ARGSIZ \
-	(howmany(sizeof(Aux64Info) * LINUX_ELF_AUX_ENTRIES, sizeof(char *)) + LINUX_RANDOM_BYTES)
+	(LINUX_ELF_AUX_ENTRIES * sizeof(Aux64Info) + LINUX_RANDOM_BYTES)
 
 #define linux_exec_setup_stack	exec_setup_stack
 

Index: src/sys/compat/linux/arch/arm/linux_exec.h
diff -u src/sys/compat/linux/arch/arm/linux_exec.h:1.9 src/sys/compat/linux/arch/arm/linux_exec.h:1.10
--- src/sys/compat/linux/arch/arm/linux_exec.h:1.9	Sun Feb  9 16:41:42 2014
+++ src/sys/compat/linux/arch/arm/linux_exec.h	Sun Feb 12 21:02:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_exec.h,v 1.9 2014/02/09 16:41:42 chs Exp $	*/
+/*	$NetBSD: linux_exec.h,v 1.10 2017/02/12 21:02:19 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #define LINUX_MID_MACHINE	LINUX_M_ARM
 
 #define LINUX_ELF_AUX_ARGSIZ \
-	(howmany(LINUX_ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof(Elf32_Addr)) + LINUX_RANDOM_BYTES)
+	(LINUX_ELF_AUX_ENTRIES * sizeof(Aux32Info) + LINUX_RANDOM_BYTES)
 
 #define linux_exec_setup_stack	exec_setup_stack
 

Index: src/sys/compat/linux/arch/i386/linux_exec.h
diff -u src/sys/compat/linux/arch/i386/linux_exec.h:1.12 src/sys/compat/linux/arch/i386/linux_exec.h:1.13
--- src/sys/compat/linux/arch/i386/linux_exec.h:1.12	Sun Feb  9 16:41:42 2014
+++ src/sys/compat/linux/arch/i386/linux_exec.h	Sun Feb 12 21:02:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_exec.h,v 1.12 2014/02/09 16:41:42 chs Exp $	*/
+/*	$NetBSD: linux_exec.h,v 1.13 2017/02/12 21:02:19 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #define LINUX_USRSTACK		0xC000
 
 #define LINUX_ELF_AUX_ARGSIZ 	\
-	(howmany(LINUX_ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof(Elf32_Addr)) + LINUX_RANDOM_BYTES)
+	(LINUX_ELF_AUX_ENTRIES * sizeof(Aux32Info) + LINUX_RANDOM_BYTES)
 
 #define LINUX_DEBUGLINK_SIGNATURE
 

Index: src/sys/compat/linux/arch/m68k/linux_exec.h
diff -u src/sys/compat/linux/arch/m68k/linux_exec.h:1.11 src/sys/compat/linux/arch/m68k/linux_exec.h:1.12
--- src/sys/compat/linux/arch/m68k/linux_exec.h:1.11	Sun Feb  9 16:41:42 2014
+++ src/sys/compat/linux/arch/m68k/linux_exec.h	Sun Feb 12 21:02:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_exec.h,v 1.11 2014/02/09 16:41:42 chs Exp $	*/
+/*	$NetBSD: linux_exec.h,v 1.12 2017/02/12 21:02:19 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 #define LINUX_GCC_SIGNATURE	1
 
 #define LINUX_ELF_AUX_ARGSIZ \
-	(howmany(LINUX_ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof(Elf32_Addr)) + LINUX_RANDOM_BYTES)
+	(LINUX_ELF_AUX_ENTRIES * sizeof(Aux32Info) + LINUX_RANDOM_BYTES)
 
 #define linux_exec_setup_stack	exec_setup_stack
 

Index: src/sys/compat/linux/arch/mips/linux_exec.h
diff -u src/sys/compat/linux/arch/mips/linux_exec.h:1.15 src/sys/compat/linux/arch/mips/linux_exec.h:1.16
--- src/sys/compat/linux/arch/mips/linux_exec.h:1.15	Sun Feb  9 16:41:42 2014
+++ src/sys/compat/linux/arch/mips/linux_exec.h	Sun Feb 12 21:02:19 2017
@@ -1,4 

CVS commit: src/doc

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Sun Feb 12 20:59:23 UTC 2017

Modified Files:
src/doc: CHANGES

Log Message:
Add new entry in doc/CHANGES

ptrace(2): Add signal mask information accessors API:
PT_GET_SIGMASK and PT_SET_SIGMASK

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.2250 -r1.2251 src/doc/CHANGES

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
diff -u src/doc/CHANGES:1.2250 src/doc/CHANGES:1.2251
--- src/doc/CHANGES:1.2250	Sat Feb 11 19:34:23 2017
+++ src/doc/CHANGES	Sun Feb 12 20:59:23 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2250 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2251 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -467,3 +467,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	openldap: Import 2.4.44. [christos 20170208]
 	file(1): Upgraded to 5.30. [christos 20170210]
 	byacc: update to 20170201 [christos 20170211]
+	ptrace(2): Add signal mask information accessors API:
+		PT_GET_SIGMASK and PT_SET_SIGMASK [kamil 20170212]

CVS commit: src/sys/arch/sparc64/sparc64

[Palle Lyckegaard]

Module Name:src
Committed By:   palle
Date:   Sun Feb 12 19:35:54 UTC 2017

Modified Files:
src/sys/arch/sparc64/sparc64: trap.c

Log Message:
sun4v: Revert previous - paddr_t is not a pointer... noted by nakayama@


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/arch/sparc64/sparc64/trap.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/sparc64/sparc64/trap.c
diff -u src/sys/arch/sparc64/sparc64/trap.c:1.187 src/sys/arch/sparc64/sparc64/trap.c:1.188
--- src/sys/arch/sparc64/sparc64/trap.c:1.187	Sat Feb 11 23:41:36 2017
+++ src/sys/arch/sparc64/sparc64/trap.c	Sun Feb 12 19:35:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.187 2017/02/11 23:41:36 palle Exp $ */
+/*	$NetBSD: trap.c,v 1.188 2017/02/12 19:35:54 palle Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.187 2017/02/11 23:41:36 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.188 2017/02/12 19:35:54 palle Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -738,8 +738,8 @@ badtrap:
 			if (dsfsr & SFSR_FV)
 dsfar = ldxa(SFAR, ASI_DMMU);
 		} else {
-			paddr_t mmu_fsa_dfa = cpus->ci_mmufsa +
-			  (offsetof(struct mmufsa, dfa) / sizeof(paddr_t));
+			paddr_t mmu_fsa_dfa = cpus->ci_mmufsa
+			  + offsetof(struct mmufsa, dfa);
 			dsfar = ldxa(mmu_fsa_dfa, ASI_PHYS_CACHED);
 		}
 #ifdef DEBUG

CVS commit: src/sys/kern

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sun Feb 12 18:43:56 UTC 2017

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

Log Message:
Add a KASSERT, otherwise it looks like a NULL deref; from Mootja.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/kern/kern_clock.c

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

Modified files:

Index: src/sys/kern/kern_clock.c
diff -u src/sys/kern/kern_clock.c:1.134 src/sys/kern/kern_clock.c:1.135
--- src/sys/kern/kern_clock.c:1.134	Wed Apr 22 16:46:58 2015
+++ src/sys/kern/kern_clock.c	Sun Feb 12 18:43:56 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_clock.c,v 1.134 2015/04/22 16:46:58 pooka Exp $	*/
+/*	$NetBSD: kern_clock.c,v 1.135 2017/02/12 18:43:56 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.134 2015/04/22 16:46:58 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.135 2017/02/12 18:43:56 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dtrace.h"
@@ -394,6 +394,7 @@ statclock(struct clockframe *frame)
 	}
 
 	if (CLKF_USERMODE(frame)) {
+		KASSERT(p != NULL);
 		if ((p->p_stflag & PST_PROFIL) && profsrc == PROFSRC_CLOCK)
 			addupc_intr(l, CLKF_PC(frame));
 		if (--spc->spc_pscnt > 0) {

CVS commit: src/sys/nfs

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sun Feb 12 18:24:31 UTC 2017

Modified Files:
src/sys/nfs: nfs_syscalls.c

Log Message:
Memory leak, found by Mootja; not tested, but obvious enough.


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/nfs/nfs_syscalls.c

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

Modified files:

Index: src/sys/nfs/nfs_syscalls.c
diff -u src/sys/nfs/nfs_syscalls.c:1.157 src/sys/nfs/nfs_syscalls.c:1.158
--- src/sys/nfs/nfs_syscalls.c:1.157	Fri Jun 10 13:27:16 2016
+++ src/sys/nfs/nfs_syscalls.c	Sun Feb 12 18:24:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_syscalls.c,v 1.157 2016/06/10 13:27:16 ozaki-r Exp $	*/
+/*	$NetBSD: nfs_syscalls.c,v 1.158 2017/02/12 18:24:31 maxv Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.157 2016/06/10 13:27:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.158 2017/02/12 18:24:31 maxv Exp $");
 
 #include 
 #include 
@@ -325,6 +325,7 @@ do_nfssvc(struct nfssvc_copy_ops *ops, s
 	 M_COPYALL, M_WAIT);
 	break;
 default:
+	kmem_free(nuidp, sizeof(*nuidp));
 	return EAFNOSUPPORT;
 };
 }

CVS commit: src/sys/arch/amiga/stand/bootblock/installboot

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sun Feb 12 18:21:50 UTC 2017

Modified Files:
src/sys/arch/amiga/stand/bootblock/installboot: installboot.c

Log Message:
Uninitialized var, found by Mootja; not tested, but obvious enough.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/amiga/stand/bootblock/installboot/installboot.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/stand/bootblock/installboot/installboot.c
diff -u src/sys/arch/amiga/stand/bootblock/installboot/installboot.c:1.5 src/sys/arch/amiga/stand/bootblock/installboot/installboot.c:1.6
--- src/sys/arch/amiga/stand/bootblock/installboot/installboot.c:1.5	Tue Jul  6 06:09:57 2010
+++ src/sys/arch/amiga/stand/bootblock/installboot/installboot.c	Sun Feb 12 18:21:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: installboot.c,v 1.5 2010/07/06 06:09:57 mrg Exp $	*/
+/*	$NetBSD: installboot.c,v 1.6 2017/02/12 18:21:50 maxv Exp $	*/
 
 #include 
 #include 
@@ -17,7 +17,7 @@ int main(int argc, char *argv[]);
 
 int main(int argc, char *argv[]){
 
-	char *line;
+	char *line = NULL;
 	char *progname;
 	char *bootnam, *devnam;
 	char *dline;

CVS commit: src/lib/libc/string

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Sun Feb 12 17:19:00 UTC 2017

Modified Files:
src/lib/libc/string: stresep.c

Log Message:
overlapping strcpy is UB. use memmove
from asan+ubsan


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/string/stresep.c

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

Modified files:

Index: src/lib/libc/string/stresep.c
diff -u src/lib/libc/string/stresep.c:1.2 src/lib/libc/string/stresep.c:1.3
--- src/lib/libc/string/stresep.c:1.2	Thu Dec  6 22:07:07 2007
+++ src/lib/libc/string/stresep.c	Sun Feb 12 17:19:00 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: stresep.c,v 1.2 2007/12/06 22:07:07 seb Exp $	*/
+/*	$NetBSD: stresep.c,v 1.3 2017/02/12 17:19:00 maya Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: stresep.c,v 1.2 2007/12/06 22:07:07 seb Exp $");
+__RCSID("$NetBSD: stresep.c,v 1.3 2017/02/12 17:19:00 maya Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -76,7 +76,7 @@ stresep(char **stringp, const char *deli
 	for (tok = s;;) {
 		c = *s++;
 		while (esc != '\0' && c == esc) {
-			(void)strcpy(s - 1, s);
+			memmove(s - 1, s, strlen(s));
 			c = *s++;
 		}
 		spanp = delim;

CVS commit: src/sbin/gpt

[Aymeric Vincent]

Module Name:src
Committed By:   aymeric
Date:   Sun Feb 12 16:54:06 UTC 2017

Modified Files:
src/sbin/gpt: main.c

Log Message:
Make gpt(8) work when compiled on a glibc-based OS.

This restores the ability to build amd64 install-image's under Linux.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/main.c

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

Modified files:

Index: src/sbin/gpt/main.c
diff -u src/sbin/gpt/main.c:1.7 src/sbin/gpt/main.c:1.8
--- src/sbin/gpt/main.c:1.7	Tue Dec 29 16:45:04 2015
+++ src/sbin/gpt/main.c	Sun Feb 12 16:54:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.7 2015/12/29 16:45:04 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.8 2017/02/12 16:54:06 aymeric Exp $	*/
 
 /*-
  * Copyright (c) 2002 Marcel Moolenaar
@@ -34,7 +34,7 @@
 
 #include 
 #ifdef __RCSID
-__RCSID("$NetBSD: main.c,v 1.7 2015/12/29 16:45:04 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.8 2017/02/12 16:54:06 aymeric Exp $");
 #endif
 
 #include 
@@ -145,8 +145,14 @@ main(int argc, char *argv[])
 		dev = argv[--argc];
 	}
 
+#ifdef __GLIBC__
+#define GETOPT_BE_POSIX		"+"
+#else
+#define GETOPT_BE_POSIX		""
+#endif
+
 	/* Get the generic options */
-	while ((ch = getopt(argc, argv, "m:nqrs:v")) != -1) {
+	while ((ch = getopt(argc, argv, GETOPT_BE_POSIX "m:nqrs:v")) != -1) {
 		switch(ch) {
 		case 'm':
 			if (mediasz > 0)

CVS commit: src/common/lib/libprop

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Sun Feb 12 16:18:48 UTC 2017

Modified Files:
src/common/lib/libprop: prop_ingest.3

Log Message:
Add entry for prop_ingest in the NAME section.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libprop/prop_ingest.3

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

Modified files:

Index: src/common/lib/libprop/prop_ingest.3
diff -u src/common/lib/libprop/prop_ingest.3:1.7 src/common/lib/libprop/prop_ingest.3:1.8
--- src/common/lib/libprop/prop_ingest.3:1.7	Sun Feb 12 16:00:53 2017
+++ src/common/lib/libprop/prop_ingest.3	Sun Feb 12 16:18:48 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prop_ingest.3,v 1.7 2017/02/12 16:00:53 abhinav Exp $
+.\"	$NetBSD: prop_ingest.3,v 1.8 2017/02/12 16:18:48 abhinav Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -31,6 +31,7 @@
 .Dt PROP_INGEST 3
 .Os
 .Sh NAME
+.Nm prop_ingest ,
 .Nm prop_ingest_context_alloc ,
 .Nm prop_ingest_context_free ,
 .Nm prop_ingest_context_error ,

CVS commit: src/common/lib/libprop

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Sun Feb 12 16:00:53 UTC 2017

Modified Files:
src/common/lib/libprop: prop_array.3 prop_array_util.3 prop_bool.3
prop_data.3 prop_dictionary.3 prop_dictionary_util.3 prop_ingest.3
prop_number.3 prop_object.3 prop_send_ioctl.3 prop_send_syscall.3
prop_string.3

Log Message:
Use .Fn to refer a function name instead of Nm.
Also, use Xr to refer problib(3) in the HISTORY section instead of Nm.

While parsing the man pages, any .Nm occurrence gets replaced by the
value specified in the NAME section. Referencing individual function
names with .Nm was causing makemandb(8) to replicate the complete
NAME section for every such occurrence. This was leading to an
ugly looking snippet in apropos(1)'s output when searched for
any of these man pages.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/common/lib/libprop/prop_array.3
cvs rdiff -u -r1.9 -r1.10 src/common/lib/libprop/prop_array_util.3 \
src/common/lib/libprop/prop_send_ioctl.3
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libprop/prop_bool.3 \
src/common/lib/libprop/prop_ingest.3
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libprop/prop_data.3
cvs rdiff -u -r1.18 -r1.19 src/common/lib/libprop/prop_dictionary.3
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libprop/prop_dictionary_util.3 \
src/common/lib/libprop/prop_object.3 src/common/lib/libprop/prop_string.3
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libprop/prop_number.3
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libprop/prop_send_syscall.3

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

Modified files:

Index: src/common/lib/libprop/prop_array.3
diff -u src/common/lib/libprop/prop_array.3:1.13 src/common/lib/libprop/prop_array.3:1.14
--- src/common/lib/libprop/prop_array.3:1.13	Fri Sep 30 22:08:18 2011
+++ src/common/lib/libprop/prop_array.3	Sun Feb 12 16:00:53 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prop_array.3,v 1.13 2011/09/30 22:08:18 jym Exp $
+.\"	$NetBSD: prop_array.3,v 1.14 2017/02/12 16:00:53 abhinav Exp $
 .\"
 .\" Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -113,7 +113,7 @@
 .Fn prop_array_equals "prop_array_t array1" "prop_array_t array2"
 .Sh DESCRIPTION
 The
-.Nm prop_array
+.Fn prop_array
 family of functions operate on the array property collection object type.
 An array is an ordered set; an iterated array will return objects in the
 same order with which they were stored.
@@ -303,6 +303,6 @@ Note: Objects contained in the array are
 .Xr proplib 3
 .Sh HISTORY
 The
-.Nm proplib
+.Xr proplib 3
 property container object library first appeared in
 .Nx 4.0 .

Index: src/common/lib/libprop/prop_array_util.3
diff -u src/common/lib/libprop/prop_array_util.3:1.9 src/common/lib/libprop/prop_array_util.3:1.10
--- src/common/lib/libprop/prop_array_util.3:1.9	Tue May 31 09:31:13 2016
+++ src/common/lib/libprop/prop_array_util.3	Sun Feb 12 16:00:53 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prop_array_util.3,v 1.9 2016/05/31 09:31:13 wiz Exp $
+.\"	$NetBSD: prop_array_util.3,v 1.10 2017/02/12 16:00:53 abhinav Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -176,7 +176,7 @@
 "prop_object_t obj"
 .Sh DESCRIPTION
 The
-.Nm prop_array_util
+.Fn prop_array_util
 family of functions are provided to make getting and setting values in
 arrays more convenient in some applications.
 .Pp
@@ -211,7 +211,7 @@ function adds the object to the end of t
 The object is also released on failure.
 .Sh RETURN VALUES
 The
-.Nm prop_array_util
+.Fn prop_array_util
 getter functions return
 .Dv true
 if the object exists in the array and the value is in-range, or
@@ -219,7 +219,7 @@ if the object exists in the array and th
 otherwise.
 .Pp
 The
-.Nm prop_array_util
+.Fn prop_array_util
 setter functions return
 .Dv true
 if creating the object and storing it in the array is successful, or
@@ -232,6 +232,6 @@ otherwise.
 .Xr proplib 3
 .Sh HISTORY
 The
-.Nm proplib
+.Xr proplib 3
 property container object library first appeared in
 .Nx 4.0 .
Index: src/common/lib/libprop/prop_send_ioctl.3
diff -u src/common/lib/libprop/prop_send_ioctl.3:1.9 src/common/lib/libprop/prop_send_ioctl.3:1.10
--- src/common/lib/libprop/prop_send_ioctl.3:1.9	Thu Aug 20 15:55:09 2015
+++ src/common/lib/libprop/prop_send_ioctl.3	Sun Feb 12 16:00:53 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: prop_send_ioctl.3,v 1.9 2015/08/20 15:55:09 phx Exp $
+.\"	$NetBSD: prop_send_ioctl.3,v 1.10 2017/02/12 16:00:53 abhinav Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -54,12 +54,12 @@
 "unsigned long cmd" "prop_dictionary_t *dictp"
 .Sh DESCRIPTION
 The
-.Nm prop_array_send_ioctl ,
-.Nm prop_array_recv_ioctl ,
-.Nm prop_dictionary_send_ioctl ,
-.Nm prop_dictionary_recv_ioctl ,
+.Fn prop_array_send_ioctl ,
+.Fn prop_array_recv_ioctl ,
+.Fn prop_dictionary_send_ioctl ,
+.Fn 

CVS commit: src/usr.sbin/makefs

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Feb 12 14:45:09 UTC 2017

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

Log Message:
file system police.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.sbin/makefs/makefs.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/makefs/makefs.8
diff -u src/usr.sbin/makefs/makefs.8:1.60 src/usr.sbin/makefs/makefs.8:1.61
--- src/usr.sbin/makefs/makefs.8:1.60	Sat Feb 11 16:04:59 2017
+++ src/usr.sbin/makefs/makefs.8	Sun Feb 12 14:45:09 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: makefs.8,v 1.60 2017/02/11 16:04:59 christos Exp $
+.\"	$NetBSD: makefs.8,v 1.61 2017/02/12 14:45:09 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -215,7 +215,7 @@ value interpreted as the number of secon
 Note that timestamps specified in an
 .Xr mtree 5
 spec file, override the default timestamp.
-When this option is enabled, filesystems that regularly use
+When this option is enabled, file systems that regularly use
 .Xr localtime 3
 to convert times to the native format (such as udf and cd9660), use
 .Xr gmtime 3

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Feb 12 14:44:20 UTC 2017

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

Log Message:
Sort sections.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/share/man/man4/audio.4

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

Modified files:

Index: src/share/man/man4/audio.4
diff -u src/share/man/man4/audio.4:1.74 src/share/man/man4/audio.4:1.75
--- src/share/man/man4/audio.4:1.74	Fri Feb 10 19:31:42 2017
+++ src/share/man/man4/audio.4	Sun Feb 12 14:44:20 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: audio.4,v 1.74 2017/02/10 19:31:42 nat Exp $
+.\"	$NetBSD: audio.4,v 1.75 2017/02/12 14:44:20 wiz Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -786,9 +786,9 @@ string values.
 .Xr bba 4
 .Ss USB
 .Xr uaudio 4
-.Sh BUGS
-.Xr mmap 2
-currently does not work and should be avoided.
 .Sh HISTORY
 Support for virtual channels and mixing first appeared in
 .Nx 8.0 .
+.Sh BUGS
+.Xr mmap 2
+currently does not work and should be avoided.

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Feb 12 09:47:32 UTC 2017

Modified Files:
src/sys/net: if_tap.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/net/if_tap.c

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

Modified files:

Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.98 src/sys/net/if_tap.c:1.99
--- src/sys/net/if_tap.c:1.98	Sun Feb 12 08:51:45 2017
+++ src/sys/net/if_tap.c	Sun Feb 12 09:47:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.98 2017/02/12 08:51:45 skrll Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.99 2017/02/12 09:47:31 skrll Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.98 2017/02/12 08:51:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.99 2017/02/12 09:47:31 skrll Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -251,13 +251,13 @@ tapattach(int n)
 static void
 tapinit(void)
 {
-int error = config_cfattach_attach(tap_cd.cd_name, _ca);
-if (error) {
-aprint_error("%s: unable to register cfattach\n",
-tap_cd.cd_name);
-(void)config_cfdriver_detach(_cd);
-return;
-}
+	int error = config_cfattach_attach(tap_cd.cd_name, _ca);
+	if (error) {
+		aprint_error("%s: unable to register cfattach\n",
+		tap_cd.cd_name);
+		(void)config_cfdriver_detach(_cd);
+		return;
+	}
 
 	if_clone_attach(_cloners);
 	sysctl_tap_setup(_sysctl_clog);
@@ -653,7 +653,7 @@ tap_clone_create(struct if_clone *ifc, i
 {
 	if (tap_clone_creator(unit) == NULL) {
 		aprint_error("%s%d: unable to attach an instance\n",
-tap_cd.cd_name, unit);
+		tap_cd.cd_name, unit);
 		return ENXIO;
 	}
 	atomic_inc_uint(_count);

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Feb 12 09:36:05 UTC 2017

Modified Files:
src/sys/net: if_ethersubr.c

Log Message:
Remove redundant splnet/splx calls - ec_lock is IPL_NET.


To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/net/if_ethersubr.c

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

Modified files:

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.236 src/sys/net/if_ethersubr.c:1.237
--- src/sys/net/if_ethersubr.c:1.236	Tue Jan 24 18:37:20 2017
+++ src/sys/net/if_ethersubr.c	Sun Feb 12 09:36:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.236 2017/01/24 18:37:20 maxv Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.237 2017/02/12 09:36:05 skrll Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.236 2017/01/24 18:37:20 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.237 2017/02/12 09:36:05 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -991,7 +991,6 @@ ether_ifdetach(struct ifnet *ifp)
 {
 	struct ethercom *ec = (void *) ifp;
 	struct ether_multi *enm;
-	int s;
 
 	/*
 	 * Prevent further calls to ioctl (for example turning off
@@ -1014,7 +1013,6 @@ ether_ifdetach(struct ifnet *ifp)
 		vlan_ifdetach(ifp);
 #endif
 
-	s = splnet();
 	mutex_enter(ec->ec_lock);
 	while ((enm = LIST_FIRST(>ec_multiaddrs)) != NULL) {
 		LIST_REMOVE(enm, enm_list);
@@ -1022,7 +1020,6 @@ ether_ifdetach(struct ifnet *ifp)
 		ec->ec_multicnt--;
 	}
 	mutex_exit(ec->ec_lock);
-	splx(s);
 
 	mutex_destroy(ec->ec_lock);
 
@@ -1234,7 +1231,7 @@ ether_addmulti(const struct sockaddr *sa
 	struct ether_multi *enm, *_enm;
 	u_char addrlo[ETHER_ADDR_LEN];
 	u_char addrhi[ETHER_ADDR_LEN];
-	int s, error = 0;
+	int error = 0;
 
 	/* Allocate out of lock */
 	/* XXX still can be called in softint */
@@ -1242,7 +1239,6 @@ ether_addmulti(const struct sockaddr *sa
 	if (enm == NULL)
 		return ENOBUFS;
 
-	s = splnet();
 	mutex_enter(ec->ec_lock);
 	error = ether_multiaddr(sa, addrlo, addrhi);
 	if (error != 0)
@@ -1284,7 +1280,6 @@ ether_addmulti(const struct sockaddr *sa
 	enm = NULL;
 out:
 	mutex_exit(ec->ec_lock);
-	splx(s);
 	if (enm != NULL)
 		kmem_free(enm, sizeof(*enm));
 	return error;
@@ -1299,9 +1294,8 @@ ether_delmulti(const struct sockaddr *sa
 	struct ether_multi *enm;
 	u_char addrlo[ETHER_ADDR_LEN];
 	u_char addrhi[ETHER_ADDR_LEN];
-	int s, error;
+	int error;
 
-	s = splnet();
 	mutex_enter(ec->ec_lock);
 	error = ether_multiaddr(sa, addrlo, addrhi);
 	if (error != 0)
@@ -1328,7 +1322,6 @@ ether_delmulti(const struct sockaddr *sa
 	LIST_REMOVE(enm, enm_list);
 	ec->ec_multicnt--;
 	mutex_exit(ec->ec_lock);
-	splx(s);
 
 	kmem_free(enm, sizeof(*enm));
 	/*
@@ -1338,7 +1331,6 @@ ether_delmulti(const struct sockaddr *sa
 	return ENETRESET;
 error:
 	mutex_exit(ec->ec_lock);
-	splx(s);
 	return error;
 }
 
@@ -1537,7 +1529,7 @@ ether_multicast_sysctl(SYSCTLFN_ARGS)
 	int error = 0;
 	size_t written;
 	struct psref psref;
-	int bound, s;
+	int bound;
 	unsigned int multicnt;
 	struct ether_multi_sysctl *addrs;
 	int i;
@@ -1573,12 +1565,10 @@ retry:
 	multicnt = ec->ec_multicnt;
 	addrs = kmem_alloc(sizeof(*addrs) * multicnt, KM_SLEEP);
 
-	s = splnet();
 	mutex_enter(ec->ec_lock);
 	if (multicnt < ec->ec_multicnt) {
 		/* The number of multicast addresses have increased */
 		mutex_exit(ec->ec_lock);
-		splx(s);
 		kmem_free(addrs, sizeof(*addrs) * multicnt);
 		goto retry;
 	}
@@ -1592,7 +1582,6 @@ retry:
 		i++;
 	}
 	mutex_exit(ec->ec_lock);
-	splx(s);
 
 	error = 0;
 	written = 0;

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Feb 12 08:51:45 UTC 2017

Modified Files:
src/sys/net: if_tap.c

Log Message:
Convert to kmem(9)


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/net/if_tap.c

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

Modified files:

Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.97 src/sys/net/if_tap.c:1.98
--- src/sys/net/if_tap.c:1.97	Sun Feb 12 08:47:12 2017
+++ src/sys/net/if_tap.c	Sun Feb 12 08:51:45 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.97 2017/02/12 08:47:12 skrll Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.98 2017/02/12 08:51:45 skrll Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.97 2017/02/12 08:47:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.98 2017/02/12 08:51:45 skrll Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -670,9 +670,9 @@ tap_clone_create(struct if_clone *ifc, i
 static struct tap_softc *
 tap_clone_creator(int unit)
 {
-	struct cfdata *cf;
+	cfdata_t cf;
 
-	cf = malloc(sizeof(*cf), M_DEVBUF, M_WAITOK);
+	cf = kmem_alloc(sizeof(*cf), KM_SLEEP);
 	cf->cf_name = tap_cd.cd_name;
 	cf->cf_atname = tap_ca.ca_name;
 	if (unit == -1) {
@@ -711,7 +711,7 @@ tap_clone_destroyer(device_t dev)
 
 	if ((error = config_detach(dev, 0)) != 0)
 		aprint_error_dev(dev, "unable to detach instance\n");
-	free(cf, M_DEVBUF);
+	kmem_free(cf, sizeof(*cf));
 
 	return error;
 }

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Feb 12 08:47:12 UTC 2017

Modified Files:
src/sys/net: if_tap.c

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/net/if_tap.c

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

Modified files:

Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.96 src/sys/net/if_tap.c:1.97
--- src/sys/net/if_tap.c:1.96	Sun Feb 12 08:40:19 2017
+++ src/sys/net/if_tap.c	Sun Feb 12 08:47:12 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.96 2017/02/12 08:40:19 skrll Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.97 2017/02/12 08:47:12 skrll Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.96 2017/02/12 08:40:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.97 2017/02/12 08:47:12 skrll Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -226,7 +226,7 @@ struct if_clone tap_cloners = IF_CLONE_I
 	tap_clone_create,
 	tap_clone_destroy);
 
-/* Helper functionis shared by the two cloning code paths */
+/* Helper functions shared by the two cloning code paths */
 static struct tap_softc *	tap_clone_creator(int);
 int	tap_clone_destroyer(device_t);
 

CVS commit: src/sys/net

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Feb 12 08:40:19 UTC 2017

Modified Files:
src/sys/net: if_tap.c

Log Message:
KNF (sort #include ) and remove a duplicate


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/net/if_tap.c

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

Modified files:

Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.95 src/sys/net/if_tap.c:1.96
--- src/sys/net/if_tap.c:1.95	Tue Feb  7 11:17:50 2017
+++ src/sys/net/if_tap.c	Sun Feb 12 08:40:19 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.95 2017/02/07 11:17:50 skrll Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.96 2017/02/12 08:40:19 skrll Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.95 2017/02/07 11:17:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.96 2017/02/12 08:40:19 skrll Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -42,26 +42,25 @@ __KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1
 #endif
 
 #include 
-#include 
-#include 
-#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 #include 

CVS commit: src/usr.sbin/bta2dpd/bta2dpd

[Nathanial Sloss]

Module Name:src
Committed By:   nat
Date:   Sun Feb 12 08:25:32 UTC 2017

Modified Files:
src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.c sbc_encode.c

Log Message:
RTP timestamp is now set correctly.  The streaming socket is set to non
block blocking and connection state machinre improvement.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c \
src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.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/bta2dpd/bta2dpd/bta2dpd.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.1 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.2
--- src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.1	Sat Jan 28 16:55:54 2017
+++ src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c	Sun Feb 12 08:25:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bta2dpd.c,v 1.1 2017/01/28 16:55:54 nat Exp $ */
+/* $NetBSD: bta2dpd.c,v 1.2 2017/02/12 08:25:31 nat Exp $ */
 
 /*-
  * Copyright (c) 2015 - 2016 Nathanial Sloss 
@@ -615,7 +615,7 @@ do_ctlreq(int fd, short ev, void *arg)
 	static uint8_t trans;
 	uint8_t buff[1024];
 	static size_t offset = 0;
-	int result;
+	int result, flags;
 
 	if(avdtpCheckResponse(fd, , , , NULL, buff,
 	, ) == ENOMEM) {
@@ -674,6 +674,7 @@ do_ctlreq(int fd, short ev, void *arg)
 		case AVDTP_SUSPEND:
 		case AVDTP_START:
 			avdtpSendAccept(fd, fd, trans, signal);
+			state = 6;
 			break;
 		default:
 			avdtpSendReject(fd, fd, trans, signal);
@@ -703,17 +704,20 @@ do_ctlreq(int fd, short ev, void *arg)
 
 			if (!result && verbose)
 fprintf(stderr, "Bitpool value = %d\n",bitpool);
+			state = 3;
 			break;
 		case AVDTP_SET_CONFIGURATION:
-			if (state < 5 && !asSpeaker)
+			if (state == 3 && !asSpeaker)
 avdtpOpen(fd, fd, mySepInfo.sep);
+			state = 4;
 			break;
 		case AVDTP_OPEN:
-			if (state < 5)
+			if (state == 4)
 state = 5;
 			break;
 		case AVDTP_SUSPEND:
 		case AVDTP_START:
+			state = 6;
 			break;
 		default:
 			avdtpSendReject(fd, fd, trans, signal);
@@ -723,7 +727,7 @@ do_ctlreq(int fd, short ev, void *arg)
 	}
 
 
-	if (state != 5)
+	if (state < 5 || state > 7)
 		return;
 
 	if (asSpeaker) {
@@ -731,8 +735,9 @@ do_ctlreq(int fd, short ev, void *arg)
 		if ((sc = accept(orighc,(struct sockaddr*), )) < 0)
 			err(EXIT_FAILURE, "stream accept");
 
-		goto opened_connection;
 	}
+	if (state == 6)
+		goto opened_connection;
 
 	memset(, 0, sizeof(addr));
 
@@ -758,31 +763,34 @@ do_ctlreq(int fd, short ev, void *arg)
 	if (connect(sc,(struct sockaddr*), sizeof(addr)) < 0)
 		return;
 
+	if (!asSpeaker)
+		avdtpStart(fd, fd, mySepInfo.sep); 
+
+	return;
+
 opened_connection:
 	if (asSpeaker) {
 		event_set(_ev, sc, EV_READ | EV_PERSIST, do_recv, NULL);
 		if (event_add(_ev, NULL) < 0)
 			err(EXIT_FAILURE, "recv_ev");
+		state = 7;
 	} else {
+		flags = fcntl(sc, F_GETFL, 0);
+		fcntl(sc, F_SETFL, flags | O_NONBLOCK);
 		event_set(_ev, audfile, EV_READ | EV_PERSIST,
 		do_interrupt, NULL);
 		if (event_add(_ev, NULL) < 0)
 			err(EXIT_FAILURE, "interrupt_ev");
+		state = 7;
 	}
 
-	mtusize = sizeof(uint16_t);
 	getsockopt(sc, BTPROTO_L2CAP, SO_L2CAP_OMTU, , );
-
 	if (userset_mtu != 0 && userset_mtu > 100 && userset_mtu < mtu)
 		mtu = userset_mtu;
 	else if (userset_mtu == 0 && mtu >= 500)
 		mtu /= 2;
 
-	if (!asSpeaker)
-		avdtpStart(fd, fd, mySepInfo.sep); 
-
-	state = 6;
-
+	mtusize = sizeof(uint16_t);
 }
 
 static void
Index: src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.1 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.2
--- src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.1	Sat Jan 28 16:55:54 2017
+++ src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c	Sun Feb 12 08:25:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sbc_encode.c,v 1.1 2017/01/28 16:55:54 nat Exp $ */
+/* $NetBSD: sbc_encode.c,v 1.2 2017/02/12 08:25:31 nat Exp $ */
 
 /*-
  * Copyright (c) 2015 - 2016 Nathanial Sloss 
@@ -822,9 +822,10 @@ stream(int in, int outfd, uint8_t mode, 
 	ssize_t len, mySize[16], offset, next_pkt;
 	ssize_t pkt_len;
 	size_t readsize, totalSize;
+	size_t frequency;
 	static size_t ts = 0;
 	static uint16_t seqnumber = 0;
-	int numpkts;
+	int numpkts, tries;
 
 	global_mode = mode;
 	global_bitpool = bitpool;
@@ -855,6 +856,15 @@ stream(int in, int outfd, uint8_t mode, 
 	if (global_mode == MODE_MONO)
 		global_chan = 1;
 
+	if (global_freq == FREQ_16K)
+		frequency = 16000;
+	else if (global_freq == FREQ_32K)
+		frequency = 32000;
+	else if (global_freq == FREQ_48K)
+		frequency = 48000;
+	else
+		frequency = 44100;
+
 	memset(, 0, sizeof(myHeader));
 	myHeader.id = 0x80;	/* RTP v2 */
 	myHeader.id2 = 0x60; 	/* payload type 96. */
@@ -911,16 +921,31 @@ stream(int in, int outfd, uint8_t mode, 
 	memcpy(whole + offset, frameData, (size_t)next_pkt);
 	free(frameData);
 
+	tries = 1;
 send_again:
 	len = write(outfd, whole, totalSize);
 
-	if