CVS commit: src/sys/arch

2018-08-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Aug 15 05:58:36 UTC 2018

Modified Files:
src/sys/arch/arm/imx: imx6_board.c
src/sys/arch/evbarm/beagle: beagle_machdep.c

Log Message:
sort #include "opt_..." entries


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/imx/imx6_board.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbarm/beagle/beagle_machdep.c

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

Modified files:

Index: src/sys/arch/arm/imx/imx6_board.c
diff -u src/sys/arch/arm/imx/imx6_board.c:1.10 src/sys/arch/arm/imx/imx6_board.c:1.11
--- src/sys/arch/arm/imx/imx6_board.c:1.10	Wed Jun 20 05:59:22 2018
+++ src/sys/arch/arm/imx/imx6_board.c	Wed Aug 15 05:58:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_board.c,v 1.10 2018/06/20 05:59:22 hkenken Exp $	*/
+/*	$NetBSD: imx6_board.c,v 1.11 2018/08/15 05:58:35 skrll Exp $	*/
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -27,11 +27,11 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: imx6_board.c,v 1.10 2018/06/20 05:59:22 hkenken Exp $");
+__KERNEL_RCSID(1, "$NetBSD: imx6_board.c,v 1.11 2018/08/15 05:58:35 skrll Exp $");
 
-#include "opt_imx.h"
 #include "arml2cc.h"
 #include "opt_cputypes.h"
+#include "opt_imx.h"
 
 #include 
 #include 

Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.72 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.73
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.72	Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c	Wed Aug 15 05:58:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: beagle_machdep.c,v 1.72 2018/07/31 06:46:26 skrll Exp $ */
+/*	$NetBSD: beagle_machdep.c,v 1.73 2018/08/15 05:58:35 skrll Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,14 +125,14 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.72 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.73 2018/08/15 05:58:35 skrll Exp $");
 
 #include "opt_arm_debug.h"
-#include "opt_machdep.h"
+#include "opt_com.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
+#include "opt_machdep.h"
 #include "opt_md.h"
-#include "opt_com.h"
 #include "opt_omap.h"
 
 #include "com.h"



CVS commit: src/sys/arch

2018-08-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Aug 15 05:58:36 UTC 2018

Modified Files:
src/sys/arch/arm/imx: imx6_board.c
src/sys/arch/evbarm/beagle: beagle_machdep.c

Log Message:
sort #include "opt_..." entries


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/imx/imx6_board.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbarm/beagle/beagle_machdep.c

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



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

2018-08-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Aug 15 05:57:01 UTC 2018

Modified Files:
src/sys/arch/arm/arm: arm_machdep.c

Log Message:
sort #include "opt_..." entries


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/arm/arm_machdep.c

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

Modified files:

Index: src/sys/arch/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.53 src/sys/arch/arm/arm/arm_machdep.c:1.54
--- src/sys/arch/arm/arm/arm_machdep.c:1.53	Wed Jan 24 09:04:44 2018
+++ src/sys/arch/arm/arm/arm_machdep.c	Wed Aug 15 05:57:01 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm_machdep.c,v 1.53 2018/01/24 09:04:44 skrll Exp $	*/
+/*	$NetBSD: arm_machdep.c,v 1.54 2018/08/15 05:57:01 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,16 +71,16 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_execfmt.h"
+#include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
-#include "opt_arm_debug.h"
-#include "opt_multiprocessor.h"
+#include "opt_execfmt.h"
 #include "opt_modular.h"
+#include "opt_multiprocessor.h"
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.53 2018/01/24 09:04:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.54 2018/08/15 05:57:01 skrll Exp $");
 
 #include 
 #include 



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

2018-08-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Aug 15 05:57:01 UTC 2018

Modified Files:
src/sys/arch/arm/arm: arm_machdep.c

Log Message:
sort #include "opt_..." entries


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/arm/arm_machdep.c

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



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

2018-08-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Aug 15 05:52:15 UTC 2018

Modified Files:
src/sys/arch/arm/vfp: vfp_init.c

Log Message:
Add __KERNEL_RCSID


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/vfp/vfp_init.c

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



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

2018-08-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Aug 15 05:52:15 UTC 2018

Modified Files:
src/sys/arch/arm/vfp: vfp_init.c

Log Message:
Add __KERNEL_RCSID


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/vfp/vfp_init.c

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

Modified files:

Index: src/sys/arch/arm/vfp/vfp_init.c
diff -u src/sys/arch/arm/vfp/vfp_init.c:1.57 src/sys/arch/arm/vfp/vfp_init.c:1.58
--- src/sys/arch/arm/vfp/vfp_init.c:1.57	Sun Apr  8 09:19:27 2018
+++ src/sys/arch/arm/vfp/vfp_init.c	Wed Aug 15 05:52:15 2018
@@ -1,4 +1,4 @@
-/*  $NetBSD: vfp_init.c,v 1.57 2018/04/08 09:19:27 bouyer Exp $ */
+/*  $NetBSD: vfp_init.c,v 1.58 2018/08/15 05:52:15 skrll Exp $ */
 
 /*
  * Copyright (c) 2008 ARM Ltd
@@ -29,6 +29,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include 
+__KERNEL_RCSID(0, "$NetBSD: vfp_init.c,v 1.58 2018/08/15 05:52:15 skrll Exp $");
+
 #include 
 #include 
 #include 



CVS commit: src/sbin/route

2018-08-14 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Tue Aug 14 20:53:07 UTC 2018

Modified Files:
src/sbin/route: route.c

Log Message:
Resolve every route(4) message type before printing anything more about it
other than the type and length.

This solves the issue where RTM_ONEWADDR is received and it tries to
parse route information from it.


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sbin/route/route.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/route/route.c
diff -u src/sbin/route/route.c:1.159 src/sbin/route/route.c:1.160
--- src/sbin/route/route.c:1.159	Fri Mar 23 11:57:33 2018
+++ src/sbin/route/route.c	Tue Aug 14 20:53:07 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.159 2018/03/23 11:57:33 roy Exp $	*/
+/*	$NetBSD: route.c,v 1.160 2018/08/14 20:53:07 roy Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.159 2018/03/23 11:57:33 roy Exp $");
+__RCSID("$NetBSD: route.c,v 1.160 2018/08/14 20:53:07 roy Exp $");
 #endif
 #endif /* not lint */
 
@@ -1459,11 +1459,14 @@ print_rtmsg(struct rt_msghdr *rtm, int m
 		}
 		printf("\n");
 		break;
-	default:
+	case RTM_ADD:
+	case RTM_DELETE:
+	case RTM_GET:
 		(void)printf("pid %d, seq %d, errno %d, flags: ",
 			rtm->rtm_pid, rtm->rtm_seq, rtm->rtm_errno);
 		bprintf(stdout, rtm->rtm_flags, routeflags);
 		pmsg_common(rtm);
+		break;
 	}
 }
 



CVS commit: src/sbin/route

2018-08-14 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Tue Aug 14 20:53:07 UTC 2018

Modified Files:
src/sbin/route: route.c

Log Message:
Resolve every route(4) message type before printing anything more about it
other than the type and length.

This solves the issue where RTM_ONEWADDR is received and it tries to
parse route information from it.


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sbin/route/route.c

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



CVS commit: src/doc

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 14:56:34 UTC 2018

Modified Files:
src/doc: CHANGES

Log Message:
Note removal of etherip, add entry about ASLR in amd64, and improve the
ipkdb entry.


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

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



CVS commit: src/doc

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 14:56:34 UTC 2018

Modified Files:
src/doc: CHANGES

Log Message:
Note removal of etherip, add entry about ASLR in amd64, and improve the
ipkdb entry.


To generate a diff of this commit:
cvs rdiff -u -r1.2423 -r1.2424 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.2423 src/doc/CHANGES:1.2424
--- src/doc/CHANGES:1.2423	Tue Aug 14 08:54:11 2018
+++ src/doc/CHANGES	Tue Aug 14 14:56:33 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2423 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2424 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -175,7 +175,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	x86: Support for -static -pie binaries. [joerg 20180712]
 	kernel: Remove pmc(9) and X86PMC. [maxv 20180714]
 	tprof(4): Revamped. tpfmt(1) merged into tprof(8). [maxv 20180714]
-	ipkdb(4): Removed. [maxv 20180714]
+	kernel: Remove ipkdb(4). [maxv 20180714]
 	arm: Add support for ARMv8 performance event monitoring with tprof(4).
 		[jmcneill 20180715]
 	arm: Add support for ARMv7 performance event monitoring with tprof(4).
@@ -196,4 +196,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	arm: Add driver for ARM GICv3 interrupt controllers. [jmcneill 20180808]
  	bind: Import version 9.12.2-P1. [christos 20180812]
 	arm: Add support for Rockchip RK3399 SoC. [jmcneill 20180812]
+	amd64: Randomize by default all the randomizable VM areas in the kernel.
+		[maxv 20180812]
 	mdocml: Import 1.14.4. [christos 20180814]
+	kernel: Remove etherip(4), replaced by l2tp(4). [maxv 20180814]



CVS commit: src/sys/external/bsd/drm2/linux

2018-08-14 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Aug 14 14:53:11 UTC 2018

Modified Files:
src/sys/external/bsd/drm2/linux: linux_writecomb.c

Log Message:
Exit, don't reenter, the mutex...!@#*@$!&.

>From mrg@.

XXX pullup-7
XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/linux/linux_writecomb.c

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

Modified files:

Index: src/sys/external/bsd/drm2/linux/linux_writecomb.c
diff -u src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.4 src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.5
--- src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.4	Sat Oct 17 21:06:42 2015
+++ src/sys/external/bsd/drm2/linux/linux_writecomb.c	Tue Aug 14 14:53:11 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_writecomb.c,v 1.4 2015/10/17 21:06:42 jmcneill Exp $	*/
+/*	$NetBSD: linux_writecomb.c,v 1.5 2018/08/14 14:53:11 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.4 2015/10/17 21:06:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.5 2018/08/14 14:53:11 riastradh Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
 #define HAS_MTRR 1
@@ -136,7 +136,7 @@ arch_phys_wc_del(int id)
 	mutex_spin_enter(_writecomb.lock);
 	mtrr = idr_find(_writecomb.idr, id);
 	idr_remove(_writecomb.idr, id);
-	mutex_spin_enter(_writecomb.lock);
+	mutex_spin_exit(_writecomb.lock);
 
 	if (mtrr != NULL) {
 		mtrr->type = 0;



CVS commit: src/distrib/sets/lists/comp

2018-08-14 Thread Robert Swindells
Module Name:src
Committed By:   rjs
Date:   Tue Aug 14 14:48:01 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: ad.aarch64

Log Message:
Fix gcc build when MKCOMPAT=no.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/comp/ad.aarch64

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



CVS commit: src/sys/external/bsd/drm2/linux

2018-08-14 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Aug 14 14:53:21 UTC 2018

Modified Files:
src/sys/external/bsd/drm2/linux: linux_writecomb.c

Log Message:
Initialize n before mtrr_set in arch_phys_wc_del.

>From mrg@.

XXX pullup-7
XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/linux/linux_writecomb.c

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

Modified files:

Index: src/sys/external/bsd/drm2/linux/linux_writecomb.c
diff -u src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.5 src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.6
--- src/sys/external/bsd/drm2/linux/linux_writecomb.c:1.5	Tue Aug 14 14:53:11 2018
+++ src/sys/external/bsd/drm2/linux/linux_writecomb.c	Tue Aug 14 14:53:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_writecomb.c,v 1.5 2018/08/14 14:53:11 riastradh Exp $	*/
+/*	$NetBSD: linux_writecomb.c,v 1.6 2018/08/14 14:53:21 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.5 2018/08/14 14:53:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_writecomb.c,v 1.6 2018/08/14 14:53:21 riastradh Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
 #define HAS_MTRR 1
@@ -128,7 +128,7 @@ arch_phys_wc_del(int id)
 {
 #if defined(MTRR)
 	struct mtrr *mtrr;
-	int n;
+	int n = 1;
 	int ret __diagused;
 
 	KASSERT(0 <= id);



CVS commit: src/sys/external/bsd/drm2/linux

2018-08-14 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Aug 14 14:53:21 UTC 2018

Modified Files:
src/sys/external/bsd/drm2/linux: linux_writecomb.c

Log Message:
Initialize n before mtrr_set in arch_phys_wc_del.

>From mrg@.

XXX pullup-7
XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/linux/linux_writecomb.c

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



CVS commit: src/sys/external/bsd/drm2/linux

2018-08-14 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Aug 14 14:53:11 UTC 2018

Modified Files:
src/sys/external/bsd/drm2/linux: linux_writecomb.c

Log Message:
Exit, don't reenter, the mutex...!@#*@$!&.

>From mrg@.

XXX pullup-7
XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/linux/linux_writecomb.c

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



CVS commit: src

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 14:49:14 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/doc: TODO.smpnet
src/share/man/man4: Makefile
src/sys/conf: files
src/sys/net: Makefile files.net
src/sys/netinet: in_proto.c
src/sys/netinet6: in6_proto.c
Removed Files:
src/share/man/man4: etherip.4
src/sys/net: if_etherip.c if_etherip.h
src/sys/netinet: ip_etherip.c ip_etherip.h
src/sys/netinet6: ip6_etherip.c ip6_etherip.h
src/sys/rump/include/opt: etherip.h

Log Message:
Retire EtherIP, we have L2TP instead.


To generate a diff of this commit:
cvs rdiff -u -r1.2218 -r1.2219 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1608 -r1.1609 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.22 -r1.23 src/doc/TODO.smpnet
cvs rdiff -u -r1.663 -r1.664 src/share/man/man4/Makefile
cvs rdiff -u -r1.8 -r0 src/share/man/man4/etherip.4
cvs rdiff -u -r1.1202 -r1.1203 src/sys/conf/files
cvs rdiff -u -r1.36 -r1.37 src/sys/net/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/net/files.net
cvs rdiff -u -r1.43 -r0 src/sys/net/if_etherip.c
cvs rdiff -u -r1.12 -r0 src/sys/net/if_etherip.h
cvs rdiff -u -r1.128 -r1.129 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.21 -r0 src/sys/netinet/ip_etherip.c
cvs rdiff -u -r1.1 -r0 src/sys/netinet/ip_etherip.h
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.22 -r0 src/sys/netinet6/ip6_etherip.c
cvs rdiff -u -r1.2 -r0 src/sys/netinet6/ip6_etherip.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/include/opt/etherip.h

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

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2218 src/distrib/sets/lists/comp/mi:1.2219
--- src/distrib/sets/lists/comp/mi:1.2218	Mon Aug 13 08:26:49 2018
+++ src/distrib/sets/lists/comp/mi	Tue Aug 14 14:49:13 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2218 2018/08/13 08:26:49 christos Exp $
+#	$NetBSD: mi,v 1.2219 2018/08/14 14:49:13 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -2299,7 +2299,7 @@
 ./usr/include/net/if_bridgevar.h		comp-c-include
 ./usr/include/net/if_dl.h			comp-c-include
 ./usr/include/net/if_ether.h			comp-c-include
-./usr/include/net/if_etherip.h			comp-c-include
+./usr/include/net/if_etherip.h			comp-obsolete		obsolete
 ./usr/include/net/if_fddi.h			comp-c-include
 ./usr/include/net/if_gif.h			comp-c-include
 ./usr/include/net/if_gre.h			comp-c-include

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1608 src/distrib/sets/lists/man/mi:1.1609
--- src/distrib/sets/lists/man/mi:1.1608	Sun Aug 12 17:11:55 2018
+++ src/distrib/sets/lists/man/mi	Tue Aug 14 14:49:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1608 2018/08/12 17:11:55 christos Exp $
+# $NetBSD: mi,v 1.1609 2018/08/14 14:49:13 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1071,7 +1071,7 @@
 ./usr/share/man/cat4/esp.0			man-sys-catman		.cat
 ./usr/share/man/cat4/ess.0			man-sys-catman		.cat
 ./usr/share/man/cat4/et.0			man-sys-catman		.cat
-./usr/share/man/cat4/etherip.0			man-sys-catman		.cat
+./usr/share/man/cat4/etherip.0			man-obsolete		obsolete
 ./usr/share/man/cat4/etphy.0			man-sys-catman		.cat
 ./usr/share/man/cat4/evbarm/bcmgpio.0		man-sys-catman		.cat
 ./usr/share/man/cat4/evbarm/cpsw.0		man-sys-catman		.cat
@@ -4221,7 +4221,7 @@
 ./usr/share/man/html4/esp.html			man-sys-htmlman		html
 ./usr/share/man/html4/ess.html			man-sys-htmlman		html
 ./usr/share/man/html4/et.html			man-sys-htmlman		html
-./usr/share/man/html4/etherip.html		man-sys-htmlman		html
+./usr/share/man/html4/etherip.html		man-obsolete		obsolete
 ./usr/share/man/html4/etphy.html		man-sys-htmlman		html
 ./usr/share/man/html4/evbarm/bcmgpio.html	man-sys-htmlman		html
 ./usr/share/man/html4/evbarm/cpsw.html		man-sys-htmlman		html
@@ -7143,7 +7143,7 @@
 ./usr/share/man/man4/esp.4			man-sys-man		.man
 ./usr/share/man/man4/ess.4			man-sys-man		.man
 ./usr/share/man/man4/et.4			man-sys-man		.man
-./usr/share/man/man4/etherip.4			man-sys-man		.man
+./usr/share/man/man4/etherip.4			man-obsolete		obsolete
 ./usr/share/man/man4/etphy.4			man-sys-man		.man
 ./usr/share/man/man4/evbarm/bcmgpio.4		man-sys-man		.man
 ./usr/share/man/man4/evbarm/cpsw.4		man-sys-man		.man

Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.22 src/doc/TODO.smpnet:1.23
--- src/doc/TODO.smpnet:1.22	Tue Aug  7 07:19:28 2018
+++ src/doc/TODO.smpnet	Tue Aug 14 14:49:13 2018
@@ -1,4 +1,4 @@
-$NetBSD: TODO.smpnet,v 1.22 2018/08/07 07:19:28 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.23 2018/08/14 14:49:13 maxv Exp $
 
 MP-safe components
 ==
@@ -75,7 +75,6 @@ Unprotected ones
  - Interfaces
- agr(4)
- carp(4)
-   - etherip(4)
- faith(4)
- 

CVS commit: src

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 14:49:14 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/doc: TODO.smpnet
src/share/man/man4: Makefile
src/sys/conf: files
src/sys/net: Makefile files.net
src/sys/netinet: in_proto.c
src/sys/netinet6: in6_proto.c
Removed Files:
src/share/man/man4: etherip.4
src/sys/net: if_etherip.c if_etherip.h
src/sys/netinet: ip_etherip.c ip_etherip.h
src/sys/netinet6: ip6_etherip.c ip6_etherip.h
src/sys/rump/include/opt: etherip.h

Log Message:
Retire EtherIP, we have L2TP instead.


To generate a diff of this commit:
cvs rdiff -u -r1.2218 -r1.2219 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1608 -r1.1609 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.22 -r1.23 src/doc/TODO.smpnet
cvs rdiff -u -r1.663 -r1.664 src/share/man/man4/Makefile
cvs rdiff -u -r1.8 -r0 src/share/man/man4/etherip.4
cvs rdiff -u -r1.1202 -r1.1203 src/sys/conf/files
cvs rdiff -u -r1.36 -r1.37 src/sys/net/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/net/files.net
cvs rdiff -u -r1.43 -r0 src/sys/net/if_etherip.c
cvs rdiff -u -r1.12 -r0 src/sys/net/if_etherip.h
cvs rdiff -u -r1.128 -r1.129 src/sys/netinet/in_proto.c
cvs rdiff -u -r1.21 -r0 src/sys/netinet/ip_etherip.c
cvs rdiff -u -r1.1 -r0 src/sys/netinet/ip_etherip.h
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.22 -r0 src/sys/netinet6/ip6_etherip.c
cvs rdiff -u -r1.2 -r0 src/sys/netinet6/ip6_etherip.h
cvs rdiff -u -r1.1 -r0 src/sys/rump/include/opt/etherip.h

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



CVS commit: src/distrib/sets/lists/comp

2018-08-14 Thread Robert Swindells
Module Name:src
Committed By:   rjs
Date:   Tue Aug 14 14:48:01 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: ad.aarch64

Log Message:
Fix gcc build when MKCOMPAT=no.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/comp/ad.aarch64

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

Modified files:

Index: src/distrib/sets/lists/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.23 src/distrib/sets/lists/comp/ad.aarch64:1.24
--- src/distrib/sets/lists/comp/ad.aarch64:1.23	Tue Jul 17 18:55:24 2018
+++ src/distrib/sets/lists/comp/ad.aarch64	Tue Aug 14 14:48:01 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.23 2018/07/17 18:55:24 joerg Exp $
+# $NetBSD: ad.aarch64,v 1.24 2018/08/14 14:48:01 rjs Exp $
 ./usr/include/aarch64comp-c-include
 ./usr/include/aarch64/ansi.h			comp-c-include
 ./usr/include/aarch64/aout_machdep.h		comp-c-include
@@ -126,10 +126,10 @@
 ./usr/include/evbarm64comp-obsolete		obsolete
 ./usr/include/evbarm64/disklabel.h		comp-obsolete		obsolete
 ./usr/include/evbarm64/intr.h			comp-obsolete		obsolete
-./usr/include/g++/bits/aarch64			comp-c-include		
-./usr/include/g++/bits/aarch64/c++config.h	comp-c-include		gcccmds,gcc=6
-./usr/include/g++/bits/arm			comp-c-include
-./usr/include/g++/bits/arm/c++config.h		comp-c-include		gcccmds,gcc=6
+./usr/include/g++/bits/aarch64			comp-c-include		compat
+./usr/include/g++/bits/aarch64/c++config.h	comp-c-include		gcccmds,gcc=6,compat
+./usr/include/g++/bits/arm			comp-c-include		compat
+./usr/include/g++/bits/arm/c++config.h		comp-c-include		gcccmds,gcc=6,compat
 ./usr/include/gcc-4.8/arm_neon.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/mmintrin.h		comp-c-include		gcccmds,gcc=48
 ./usr/include/gcc-4.8/tgmath.h			comp-c-include		gcccmds,gcc=48



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:37:05 UTC 2018

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

Log Message:
Ticket #1630


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.109 -r1.1.2.110 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.109 src/doc/CHANGES-7.0.3:1.1.2.110
--- src/doc/CHANGES-7.0.3:1.1.2.109	Thu Jul 12 14:59:58 2018
+++ src/doc/CHANGES-7.0.3	Tue Aug 14 14:37:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.109 2018/07/12 14:59:58 martin Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.110 2018/08/14 14:37:05 martin Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -5479,3 +5479,8 @@ usr.bin/printf/printf.c1.37-1.39
 	conversion.
 	[kre, ticket #1619]
 
+sys/netinet6/frag6.c1.64
+
+	Ignore zero-sized fragments.
+	[maxv, ticket #1630]
+



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:36:37 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-7-0]: frag6.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1630):

sys/netinet6/frag6.c: revision 1.64

Kick zero-sized fragments. We can't allow them to enter; two fragments
could be put at the same offset.


To generate a diff of this commit:
cvs rdiff -u -r1.55.6.2 -r1.55.6.3 src/sys/netinet6/frag6.c

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

Modified files:

Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.55.6.2 src/sys/netinet6/frag6.c:1.55.6.3
--- src/sys/netinet6/frag6.c:1.55.6.2	Thu Apr  5 11:53:02 2018
+++ src/sys/netinet6/frag6.c	Tue Aug 14 14:36:37 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: frag6.c,v 1.55.6.2 2018/04/05 11:53:02 martin Exp $	*/
+/*	$NetBSD: frag6.c,v 1.55.6.3 2018/08/14 14:36:37 martin Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.55.6.2 2018/04/05 11:53:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.55.6.3 2018/08/14 14:36:37 martin Exp $");
 
 #include 
 #include 
@@ -152,13 +152,14 @@ frag6_input(struct mbuf **mp, int *offp,
 	}
 
 	/*
-	 * check whether fragment packet's fragment length is
+	 * Check whether fragment packet's fragment length is non-zero and
 	 * multiple of 8 octets.
 	 * sizeof(struct ip6_frag) == 8
 	 * sizeof(struct ip6_hdr) = 40
 	 */
 	if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
-	(((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+	(((ntohs(ip6->ip6_plen) - offset) == 0) ||
+	 ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
 		icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
 		offsetof(struct ip6_hdr, ip6_plen));
 		in6_ifstat_inc(dstifp, ifs6_reass_fail);



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:37:05 UTC 2018

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

Log Message:
Ticket #1630


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.109 -r1.1.2.110 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.



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:36:37 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-7-0]: frag6.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1630):

sys/netinet6/frag6.c: revision 1.64

Kick zero-sized fragments. We can't allow them to enter; two fragments
could be put at the same offset.


To generate a diff of this commit:
cvs rdiff -u -r1.55.6.2 -r1.55.6.3 src/sys/netinet6/frag6.c

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



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:36:09 UTC 2018

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

Log Message:
Ticket #1630


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-7.1.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.1.3
diff -u src/doc/CHANGES-7.1.3:1.1.2.16 src/doc/CHANGES-7.1.3:1.1.2.17
--- src/doc/CHANGES-7.1.3:1.1.2.16	Thu Jul 12 14:59:03 2018
+++ src/doc/CHANGES-7.1.3	Tue Aug 14 14:36:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.3,v 1.1.2.16 2018/07/12 14:59:03 martin Exp $
+# $NetBSD: CHANGES-7.1.3,v 1.1.2.17 2018/08/14 14:36:09 martin Exp $
 
 A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3
 release:
@@ -171,3 +171,8 @@ usr.bin/printf/printf.c1.37-1.39
 	conversion.
 	[kre, ticket #1619]
 
+sys/netinet6/frag6.c1.64
+
+	Ignore zero-sized fragments.
+	[maxv, ticket #1630]
+



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:36:09 UTC 2018

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

Log Message:
Ticket #1630


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/CHANGES-7.1.3

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



CVS commit: [netbsd-7-1] src/sys/netinet6

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:35:44 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-7-1]: frag6.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1630):

sys/netinet6/frag6.c: revision 1.64

Kick zero-sized fragments. We can't allow them to enter; two fragments
could be put at the same offset.


To generate a diff of this commit:
cvs rdiff -u -r1.55.10.2 -r1.55.10.3 src/sys/netinet6/frag6.c

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

Modified files:

Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.55.10.2 src/sys/netinet6/frag6.c:1.55.10.3
--- src/sys/netinet6/frag6.c:1.55.10.2	Thu Apr  5 11:50:17 2018
+++ src/sys/netinet6/frag6.c	Tue Aug 14 14:35:44 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: frag6.c,v 1.55.10.2 2018/04/05 11:50:17 martin Exp $	*/
+/*	$NetBSD: frag6.c,v 1.55.10.3 2018/08/14 14:35:44 martin Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.55.10.2 2018/04/05 11:50:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.55.10.3 2018/08/14 14:35:44 martin Exp $");
 
 #include 
 #include 
@@ -152,13 +152,14 @@ frag6_input(struct mbuf **mp, int *offp,
 	}
 
 	/*
-	 * check whether fragment packet's fragment length is
+	 * Check whether fragment packet's fragment length is non-zero and
 	 * multiple of 8 octets.
 	 * sizeof(struct ip6_frag) == 8
 	 * sizeof(struct ip6_hdr) = 40
 	 */
 	if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
-	(((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+	(((ntohs(ip6->ip6_plen) - offset) == 0) ||
+	 ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
 		icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
 		offsetof(struct ip6_hdr, ip6_plen));
 		in6_ifstat_inc(dstifp, ifs6_reass_fail);



CVS commit: [netbsd-7] src/doc

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:35:23 UTC 2018

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

Log Message:
Ticket #1630


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

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

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.104 src/doc/CHANGES-7.2:1.1.2.105
--- src/doc/CHANGES-7.2:1.1.2.104	Mon Aug 13 16:15:44 2018
+++ src/doc/CHANGES-7.2	Tue Aug 14 14:35:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.104 2018/08/13 16:15:44 martin Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.105 2018/08/14 14:35:23 martin Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -5997,3 +5997,8 @@ sbin/gpt/unset.cup to 1.14
 	- Check device parameter to avoid segfaults
 	[sborrill, #1629]
 
+sys/netinet6/frag6.c1.64
+
+	Ignore zero-sized fragments.
+	[maxv, ticket #1630]
+



CVS commit: [netbsd-7-1] src/sys/netinet6

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:35:44 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-7-1]: frag6.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1630):

sys/netinet6/frag6.c: revision 1.64

Kick zero-sized fragments. We can't allow them to enter; two fragments
could be put at the same offset.


To generate a diff of this commit:
cvs rdiff -u -r1.55.10.2 -r1.55.10.3 src/sys/netinet6/frag6.c

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



CVS commit: [netbsd-7] src/doc

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:35:23 UTC 2018

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

Log Message:
Ticket #1630


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

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



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:34:42 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-7]: frag6.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1630):

sys/netinet6/frag6.c: revision 1.64

Kick zero-sized fragments. We can't allow them to enter; two fragments
could be put at the same offset.


To generate a diff of this commit:
cvs rdiff -u -r1.55.4.2 -r1.55.4.3 src/sys/netinet6/frag6.c

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

Modified files:

Index: src/sys/netinet6/frag6.c
diff -u src/sys/netinet6/frag6.c:1.55.4.2 src/sys/netinet6/frag6.c:1.55.4.3
--- src/sys/netinet6/frag6.c:1.55.4.2	Thu Apr  5 11:48:13 2018
+++ src/sys/netinet6/frag6.c	Tue Aug 14 14:34:42 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: frag6.c,v 1.55.4.2 2018/04/05 11:48:13 martin Exp $	*/
+/*	$NetBSD: frag6.c,v 1.55.4.3 2018/08/14 14:34:42 martin Exp $	*/
 /*	$KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.55.4.2 2018/04/05 11:48:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.55.4.3 2018/08/14 14:34:42 martin Exp $");
 
 #include 
 #include 
@@ -152,13 +152,14 @@ frag6_input(struct mbuf **mp, int *offp,
 	}
 
 	/*
-	 * check whether fragment packet's fragment length is
+	 * Check whether fragment packet's fragment length is non-zero and
 	 * multiple of 8 octets.
 	 * sizeof(struct ip6_frag) == 8
 	 * sizeof(struct ip6_hdr) = 40
 	 */
 	if ((ip6f->ip6f_offlg & IP6F_MORE_FRAG) &&
-	(((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
+	(((ntohs(ip6->ip6_plen) - offset) == 0) ||
+	 ((ntohs(ip6->ip6_plen) - offset) & 0x7) != 0)) {
 		icmp6_error(m, ICMP6_PARAM_PROB, ICMP6_PARAMPROB_HEADER,
 		offsetof(struct ip6_hdr, ip6_plen));
 		in6_ifstat_inc(dstifp, ifs6_reass_fail);



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

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:34:42 UTC 2018

Modified Files:
src/sys/netinet6 [netbsd-7]: frag6.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #1630):

sys/netinet6/frag6.c: revision 1.64

Kick zero-sized fragments. We can't allow them to enter; two fragments
could be put at the same offset.


To generate a diff of this commit:
cvs rdiff -u -r1.55.4.2 -r1.55.4.3 src/sys/netinet6/frag6.c

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



CVS commit: [netbsd-7] src/sys/dev/pci

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:29:04 UTC 2018

Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h

Log Message:
Regen for ticket #1628


To generate a diff of this commit:
cvs rdiff -u -r1.1192.2.11 -r1.1192.2.12 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1191.2.11 -r1.1191.2.12 src/sys/dev/pci/pcidevs_data.h

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

Modified files:

Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1192.2.11 src/sys/dev/pci/pcidevs.h:1.1192.2.12
--- src/sys/dev/pci/pcidevs.h:1.1192.2.11	Wed Jan  3 21:40:28 2018
+++ src/sys/dev/pci/pcidevs.h	Tue Aug 14 14:28:34 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1192.2.11 2018/01/03 21:40:28 snj Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1192.2.12 2018/08/14 14:28:34 martin Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1199.2.11 2018/01/03 21:37:36 snj Exp
+ *	NetBSD: pcidevs,v 1.1199.2.12 2018/08/11 13:34:21 martin Exp
  */
 
 /*
@@ -3061,6 +3061,10 @@
 #define	PCI_PRODUCT_INTEL_I219_LM2	0x15b7		/* I219-LM Ethernet Connection */
 #define	PCI_PRODUCT_INTEL_I219_V2	0x15b8		/* I219-V Ethernet Connection */
 #define	PCI_PRODUCT_INTEL_I219_LM3	0x15b9		/* I219-LM Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_LM7	0x15bb		/* I219-LM Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_V7	0x15bc		/* I219-V Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_LM6	0x15bd		/* I219-LM Ethernet Connection */
+#define	PCI_PRODUCT_INTEL_I219_V6	0x15be		/* I219-V Ethernet Connection */
 #define	PCI_PRODUCT_INTEL_X550T1	0x15d1		/* X550 10G Ethernet */
 #define	PCI_PRODUCT_INTEL_I219_V5	0x15d6		/* I219-V Ethernet Connection */
 #define	PCI_PRODUCT_INTEL_I219_LM4	0x15d7		/* I219-LM Ethernet Connection */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1191.2.11 src/sys/dev/pci/pcidevs_data.h:1.1191.2.12
--- src/sys/dev/pci/pcidevs_data.h:1.1191.2.11	Wed Jan  3 21:40:28 2018
+++ src/sys/dev/pci/pcidevs_data.h	Tue Aug 14 14:28:35 2018
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1191.2.11 2018/01/03 21:40:28 snj Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1191.2.12 2018/08/14 14:28:35 martin Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1199.2.11 2018/01/03 21:37:36 snj Exp
+ *	NetBSD: pcidevs,v 1.1199.2.12 2018/08/11 13:34:21 martin Exp
  */
 
 /*
@@ -4858,6 +4858,14 @@ static const uint16_t pci_products[] = {
 	19671, , 18507, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM3, 
 	19663, , 18507, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM7, 
+	19663, , 18507, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V7, 
+	19671, , 18507, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM6, 
+	19663, , 18507, 0,
+	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V6, 
+	19671, , 18507, 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550T1, 
 	10326, 18711, , 0,
 	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_V5, 
@@ -12234,7 +12242,7 @@ static const char pci_words[] = { "." 
 	"ID\0" /* 1 refs @ 5538 */
 	"3c985\0" /* 1 refs @ 5541 */
 	"Gigabit\0" /* 119 refs @ 5547 */
-	"Ethernet\0" /* 463 refs @  */
+	"Ethernet\0" /* 467 refs @  */
 	"3c996\0" /* 1 refs @ 5564 */
 	"10/100/1000\0" /* 48 refs @ 5570 */
 	"3c556\0" /* 2 refs @ 5582 */
@@ -14049,7 +14057,7 @@ static const char pci_words[] = { "." 
 	"(AMT)\0" /* 3 refs @ 18484 */
 	"(IFE)\0" /* 1 refs @ 18490 */
 	"82801EB/ER\0" /* 10 refs @ 18496 */
-	"Connection\0" /* 37 refs @ 18507 */
+	"Connection\0" /* 41 refs @ 18507 */
 	"M\0" /* 1 refs @ 18518 */
 	"i82571EB\0" /* 7 refs @ 18520 */
 	"82801FB\0" /* 4 refs @ 18529 */
@@ -14198,8 +14206,8 @@ static const char pci_words[] = { "." 
 	"I218-V\0" /* 3 refs @ 19641 */
 	"I218-LM\0" /* 3 refs @ 19648 */
 	"Bypass\0" /* 2 refs @ 19656 */
-	"I219-LM\0" /* 5 refs @ 19663 */
-	"I219-V\0" /* 4 refs @ 19671 */
+	"I219-LM\0" /* 7 refs @ 19663 */
+	"I219-V\0" /* 6 refs @ 19671 */
 	"SFP+\0" /* 2 refs @ 19678 */
 	"KX\0" /* 3 refs @ 19683 */
 	"40GbE\0" /* 3 refs @ 19686 */



CVS commit: [netbsd-7] src/sys/dev/pci

2018-08-14 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Aug 14 14:29:04 UTC 2018

Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h

Log Message:
Regen for ticket #1628


To generate a diff of this commit:
cvs rdiff -u -r1.1192.2.11 -r1.1192.2.12 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1191.2.11 -r1.1191.2.12 src/sys/dev/pci/pcidevs_data.h

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



CVS commit: src/bin/sh

2018-08-14 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Tue Aug 14 13:36:42 UTC 2018

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

Log Message:
PR bin/42184 PR bin/52687  (detailing the same bug).

Fix "command not found" handling so that the error message
goes to stderr (after any redirections are applied).

More importantly, in

foo > /tmp/junk

/tmp/junk should be created, before any attempt is made
to execute (the assumed non-existing) "foo".

All this was always true for any command (not found command)
containing a / in its name

foo/bar >/tmp/junk  2>>/tmp/errs

would have created /tmp/junk, then complained (in /tmp/errs)
about foo/bar not being found.   Now that happens for ordinary
commands as well.

The fix (which I found when I saw differences between our
code and FreeBSD's, where, for the benefit of PR 42184,
this has been fixed, sometime in the past 9 years) is
frighteningly simple.   Simply do not short circuit execution
(or print any error) when the initial lookup fails to
find the command - it will fail anyway when we actually
try running it.   The cost is a (seemingly unnecessary,
except that it really is) fork in this case.

This is what I had been planning, but I expected it would
be much more difficult than it turned out

XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/bin/sh/eval.c

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

Modified files:

Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.156 src/bin/sh/eval.c:1.157
--- src/bin/sh/eval.c:1.156	Wed Jul 25 14:42:50 2018
+++ src/bin/sh/eval.c	Tue Aug 14 13:36:42 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.156 2018/07/25 14:42:50 kre Exp $	*/
+/*	$NetBSD: eval.c,v 1.157 2018/08/14 13:36:42 kre Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.156 2018/07/25 14:42:50 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.157 2018/08/14 13:36:42 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -904,7 +904,7 @@ evalcommand(union node *cmd, int flgs, s
 		cmdentry.u.bltin = bltincmd;
 	} else {
 		static const char PATH[] = "PATH=";
-		int cmd_flags = DO_ERR;
+		int cmd_flags = 0;
 
 		/*
 		 * Modify the command lookup path, if a PATH= assignment
@@ -918,11 +918,20 @@ evalcommand(union node *cmd, int flgs, s
 			int argsused, use_syspath;
 
 			find_command(argv[0], , cmd_flags, path);
+#if 0
+			/*
+			 * This short circuits all of the processing that
+			 * should be done (including processing the
+			 * redirects), so just don't ...
+			 *
+			 * (eventually this whole #if'd block will vanish)
+			 */
 			if (cmdentry.cmdtype == CMDUNKNOWN) {
 exitstatus = 127;
 flushout();
 goto out;
 			}
+#endif
 
 			/* implement the 'command' builtin here */
 			if (cmdentry.cmdtype != CMDBUILTIN ||
@@ -948,9 +957,10 @@ evalcommand(union node *cmd, int flgs, s
 
 	/* Fork off a child process if necessary. */
 	if (cmd->ncmd.backgnd || (trap[0] && (flags & EV_EXIT) != 0)
-	 || (cmdentry.cmdtype == CMDNORMAL && (flags & EV_EXIT) == 0)
-	 || ((flags & EV_BACKCMD) != 0
-	&& ((cmdentry.cmdtype != CMDBUILTIN && cmdentry.cmdtype != CMDSPLBLTIN)
+	 || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
+	 && (flags & EV_EXIT) == 0)
+	 || ((flags & EV_BACKCMD) != 0 &&
+	((cmdentry.cmdtype != CMDBUILTIN && cmdentry.cmdtype != CMDSPLBLTIN)
 		 || cmdentry.u.bltin == dotcmd
 		 || cmdentry.u.bltin == evalcmd))) {
 		INTOFF;



CVS commit: src/bin/sh

2018-08-14 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Tue Aug 14 13:36:42 UTC 2018

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

Log Message:
PR bin/42184 PR bin/52687  (detailing the same bug).

Fix "command not found" handling so that the error message
goes to stderr (after any redirections are applied).

More importantly, in

foo > /tmp/junk

/tmp/junk should be created, before any attempt is made
to execute (the assumed non-existing) "foo".

All this was always true for any command (not found command)
containing a / in its name

foo/bar >/tmp/junk  2>>/tmp/errs

would have created /tmp/junk, then complained (in /tmp/errs)
about foo/bar not being found.   Now that happens for ordinary
commands as well.

The fix (which I found when I saw differences between our
code and FreeBSD's, where, for the benefit of PR 42184,
this has been fixed, sometime in the past 9 years) is
frighteningly simple.   Simply do not short circuit execution
(or print any error) when the initial lookup fails to
find the command - it will fail anyway when we actually
try running it.   The cost is a (seemingly unnecessary,
except that it really is) fork in this case.

This is what I had been planning, but I expected it would
be much more difficult than it turned out

XXX pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/bin/sh/eval.c

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



CVS commit: src/external/bsd/mdocml/dist

2018-08-14 Thread Andreas Gustafsson
Module Name:src
Committed By:   gson
Date:   Tue Aug 14 13:21:52 UTC 2018

Modified Files:
src/external/bsd/mdocml/dist: configure

Log Message:
remove stray "fi" to unbreak build


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/mdocml/dist/configure

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

Modified files:

Index: src/external/bsd/mdocml/dist/configure
diff -u src/external/bsd/mdocml/dist/configure:1.11 src/external/bsd/mdocml/dist/configure:1.12
--- src/external/bsd/mdocml/dist/configure:1.11	Tue Aug 14 08:53:06 2018
+++ src/external/bsd/mdocml/dist/configure	Tue Aug 14 13:21:52 2018
@@ -510,7 +510,6 @@ fi
 
 [ ${HAVE_STRSEP} -eq 0 ] && \
 	echo "extern	char	 *strsep(char **, const char *);"
-fi
 
 [ ${HAVE_STRTONUM} -eq 0 ] && \
 	echo "extern	long long strtonum(const char *, long long, long long, const char **);"



CVS commit: src/external/bsd/mdocml/dist

2018-08-14 Thread Andreas Gustafsson
Module Name:src
Committed By:   gson
Date:   Tue Aug 14 13:21:52 UTC 2018

Modified Files:
src/external/bsd/mdocml/dist: configure

Log Message:
remove stray "fi" to unbreak build


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/mdocml/dist/configure

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



CVS commit: src/external/mpl/bind/bin/named

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 11:52:56 UTC 2018

Modified Files:
src/external/mpl/bind/bin/named: Makefile

Log Message:
prepend libns


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/named/Makefile

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

Modified files:

Index: src/external/mpl/bind/bin/named/Makefile
diff -u src/external/mpl/bind/bin/named/Makefile:1.1 src/external/mpl/bind/bin/named/Makefile:1.2
--- src/external/mpl/bind/bin/named/Makefile:1.1	Sun Aug 12 09:02:26 2018
+++ src/external/mpl/bind/bin/named/Makefile	Tue Aug 14 07:52:56 2018
@@ -1,4 +1,7 @@
-#	$NetBSD: Makefile,v 1.1 2018/08/12 13:02:26 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2018/08/14 11:52:56 christos Exp $
+
+LDADD+=-lns
+DPADD+=${LIBNS}
 
 .include 
 
@@ -37,8 +40,6 @@ SRCS=	builtin.c config.c control.c contr
 
 main.o: ${VERSIONFILE}
 
-LDADD+=-lns
-DPADD+=${LIBNS}
 LDADD+=-lblacklist
 DPADD+=${LIBBLACKLIST}
 .include 



CVS commit: src/external/mpl/bind/bin/check

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 11:52:41 UTC 2018

Modified Files:
src/external/mpl/bind/bin/check: Makefile.inc

Log Message:
prepend libns


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/check/Makefile.inc

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



CVS commit: src/external/mpl/bind/bin/named

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 11:52:56 UTC 2018

Modified Files:
src/external/mpl/bind/bin/named: Makefile

Log Message:
prepend libns


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/named/Makefile

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



CVS commit: src/external/mpl/bind/bin/check

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 11:52:41 UTC 2018

Modified Files:
src/external/mpl/bind/bin/check: Makefile.inc

Log Message:
prepend libns


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/bin/check/Makefile.inc

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

Modified files:

Index: src/external/mpl/bind/bin/check/Makefile.inc
diff -u src/external/mpl/bind/bin/check/Makefile.inc:1.1 src/external/mpl/bind/bin/check/Makefile.inc:1.2
--- src/external/mpl/bind/bin/check/Makefile.inc:1.1	Sun Aug 12 09:02:24 2018
+++ src/external/mpl/bind/bin/check/Makefile.inc	Tue Aug 14 07:52:41 2018
@@ -1,4 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.1 2018/08/12 13:02:24 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2018/08/14 11:52:41 christos Exp $
+
+LDADD+=-lns
+DPADD+=${LIBNS}
 
 .include 
 
@@ -7,8 +10,6 @@
 CPPFLAGS+=-DNAMED_CONFFILE=\"${SYSCONFDIR}/named.conf\"
 BINDIR=/usr/sbin
 CHECK=${IDIST}/bin/check
-LDADD+=-lns
-DPADD+=${LIBNS}
 
 .PATH: ${CHECK}
 



CVS commit: src/sys/sys

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 11:39:10 UTC 2018

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

Log Message:
make things compile.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/sys/kernhist.h

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

Modified files:

Index: src/sys/sys/kernhist.h
diff -u src/sys/sys/kernhist.h:1.24 src/sys/sys/kernhist.h:1.25
--- src/sys/sys/kernhist.h:1.24	Sun Aug 12 23:20:19 2018
+++ src/sys/sys/kernhist.h	Tue Aug 14 07:39:10 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernhist.h,v 1.24 2018/08/13 03:20:19 mrg Exp $	*/
+/*	$NetBSD: kernhist.h,v 1.25 2018/08/14 11:39:10 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -252,7 +252,7 @@ do { \
 	uint32_t _kernhist_call = 0;
 
 #ifdef DDB
-#define KERNHIST_DUMP(NAME)	kernhist_dump(, printf)
+#define KERNHIST_DUMP(NAME)	kernhist_dump(, 0, printf)
 #else
 #define KERNHIST_DUMP(NAME)
 #endif



CVS commit: src/sys/sys

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 11:39:10 UTC 2018

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

Log Message:
make things compile.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/sys/kernhist.h

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



CVS commit: src/doc

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 08:54:11 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new mdocml


To generate a diff of this commit:
cvs rdiff -u -r1.1544 -r1.1545 src/doc/3RDPARTY
cvs rdiff -u -r1.2422 -r1.2423 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/3RDPARTY
diff -u src/doc/3RDPARTY:1.1544 src/doc/3RDPARTY:1.1545
--- src/doc/3RDPARTY:1.1544	Mon Aug 13 21:10:47 2018
+++ src/doc/3RDPARTY	Tue Aug 14 04:54:11 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1544 2018/08/14 01:10:47 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.1545 2018/08/14 08:54:11 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -859,7 +859,7 @@ Location:	external/apache2/mDNSResponder
 Notes:
 
 Package:	mandoc
-Version:	1.14.1
+Version:	1.14.4
 Current Vers:	1.14.4
 Maintainer:	Kristaps Džonsons
 Archive Site:	http://mdocml.bsd.lv/snapshots/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2422 src/doc/CHANGES:1.2423
--- src/doc/CHANGES:1.2422	Sun Aug 12 13:14:42 2018
+++ src/doc/CHANGES	Tue Aug 14 04:54:11 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2422 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2423 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -196,3 +196,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	arm: Add driver for ARM GICv3 interrupt controllers. [jmcneill 20180808]
  	bind: Import version 9.12.2-P1. [christos 20180812]
 	arm: Add support for Rockchip RK3399 SoC. [jmcneill 20180812]
+	mdocml: Import 1.14.4. [christos 20180814]



CVS commit: src/doc

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 08:54:11 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new mdocml


To generate a diff of this commit:
cvs rdiff -u -r1.1544 -r1.1545 src/doc/3RDPARTY
cvs rdiff -u -r1.2422 -r1.2423 src/doc/CHANGES

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



CVS commit: src/external/bsd/mdocml

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 08:53:07 UTC 2018

Modified Files:
src/external/bsd/mdocml: Makefile.inc
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/mdocml/dist: Makefile configure eqn.c lib.in
libmandoc.h main.c main.h man.c man_macro.c man_term.c mandoc.h
mandoc_aux.h mandocdb.c mansearch.c mdoc.7 mdoc_argv.c mdoc_macro.c
mdoc_term.c mdoc_validate.c msec.in out.c read.c roff.c roff.h
st.in tag.c tbl.c tbl_data.c tbl_layout.c term.c term_ascii.c
src/external/bsd/mdocml/include: config.h
src/external/bsd/mdocml/lib/libmandoc: Makefile
Removed Files:
src/external/bsd/mdocml/dist: man_hash.c manpage.c mdoc_hash.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/mdocml/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/mdocml/dist/Makefile \
src/external/bsd/mdocml/dist/main.c src/external/bsd/mdocml/dist/man.c \
src/external/bsd/mdocml/dist/man_macro.c \
src/external/bsd/mdocml/dist/mansearch.c \
src/external/bsd/mdocml/dist/roff.h src/external/bsd/mdocml/dist/term.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/mdocml/dist/configure
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/mdocml/dist/eqn.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/mdocml/dist/lib.in
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/mdocml/dist/libmandoc.h \
src/external/bsd/mdocml/dist/tbl_layout.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/main.h \
src/external/bsd/mdocml/dist/mandocdb.c \
src/external/bsd/mdocml/dist/mdoc.7 \
src/external/bsd/mdocml/dist/mdoc_macro.c
cvs rdiff -u -r1.3 -r0 src/external/bsd/mdocml/dist/man_hash.c \
src/external/bsd/mdocml/dist/mdoc_hash.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/mdocml/dist/man_term.c \
src/external/bsd/mdocml/dist/mdoc_term.c \
src/external/bsd/mdocml/dist/mdoc_validate.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/mdocml/dist/mandoc.h \
src/external/bsd/mdocml/dist/msec.in src/external/bsd/mdocml/dist/st.in \
src/external/bsd/mdocml/dist/tbl.c \
src/external/bsd/mdocml/dist/tbl_data.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/dist/mandoc_aux.h \
src/external/bsd/mdocml/dist/tag.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/mdocml/dist/manpage.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/mdocml/dist/mdoc_argv.c
cvs rdiff -u -r1.1.1.15 -r1.2 src/external/bsd/mdocml/dist/out.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/mdocml/dist/read.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/mdocml/dist/roff.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/mdocml/dist/term_ascii.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/mdocml/include/config.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/mdocml/lib/libmandoc/Makefile

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



CVS import: src/external/bsd/mdocml/dist

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 08:41:20 UTC 2018

Update of /cvsroot/src/external/bsd/mdocml/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18590

Log Message:
Import 1.14.4

This file lists the most important changes in the mandoc.bsd.lv distribution.

Changes in version 1.14.4, released on August 8, 2018

--- MAJOR NEW FEATURES ---
 * In ASCII output, render mathematical symbols and greek letters
   as transliterations conveying the characters' meanings rather
   than trying to imitate their shape.  Consequently, such characters
   can now be used in portable manual pages.  All the same, please
   limit their use to contexts where they really matter, for example
   when showing complicated mathematical formulae.
 * First steps towards better support for small screens in HTML
   output (responsive design): avoid most style= attributes, in
   particular all hard-coded indentations and column widths, and
   provide a better mandoc.css style sheet with a @media query,
   using em units throughout, and avoiding redundancy in selectors.
 * Better HTML output with some more fitting HTML elements, eliminating
   needless class= attributes, and avoiding various HTML syntax errors
   (element nesting, URL-fragment syntax, duplicate id= attributes).
--- MINOR NEW FEATURES ---
 * When a man(1) argument contains a slash, imply -l like in man-db.
 * Use TIOCGWINSZ to reduce the default -Owidth and -Oindent during
   interactive use on terminals narrower than 79 columns.
 * Generated PostScript files are now more than 50% smaller.
 * Terminal rendering of eqn(7) is improved in several respects.
 * Simplified and nicer output from the mdoc(7) .Lk macro, formatting
   all links in-line, even long ones.
 * roff(7) \n+ and \n- numerical register auto-increment and -decrement
 * roff(7) .nr optional third argument (auto-increment step size)
 * Autodetect in ./configure whether the compiler can use -W and -static,
   allowing to build on Solaris 10 and 11 without any configure.local.
--- RELIABILITY BUGFIXES ---
 * Only activate UTF-8 output when the user really selected UTF-8,
   not some other multibyte character encoding.
 * Prevent excessive .ll arguments from generating infinite output.
 * Fix out of bounds accesses to parse buffers that could happen when
   using renamed or user defined macros after roff(7) conditionals.
 * Avoid an assertion failure in certain .Bl -column lists.
 * Avoid a NULL pointer access on deroff() failure after '.SS ""'.
 * Fix a segfault that could be triggered by two invalid .Dt macros.
 * Fix two syntax errors in generated PDF files.
 * Properly state the page size in generated PostScript files.
 * Close a memory leak caused by missing gzclose(3).
 * Fix misformatting of man(7) documents lacking .SH macros
   in PostScript and PDF output.
 * And many minor bugfixes.
--- THANKS TO ---
 * Marc Espie (OpenBSD) for implementing the size reduction of
   PostScript files, one additional patch for code simplification,
   and two bug reports.
 * Theo Buehler (OpenBSD) for a bugfix patch,
   and Theo de Raadt (OpenBSD) for checking it.
 * John Gardner for more than a dozen suggestions regarding HTML output.
 * Mike Williams for teaching me how to use %%DocumentMedia and
   setpagedevice in PostScript files.
 * Werner Lemberg (groff) for feedback on mdoc(7) language changes.
 * Colin Watson (man-db) for feedback on man-db semantics.
 * Jason McIntyre (OpenBSD) for lots of feedback and suggestions
   on diagnostic messages and on the documentation.
 * Thomas Klausner (NetBSD) for suggesting two new style messages
   and one new feature, for two bug reports, and for release testing.
 * Leah Neukirchen (Void Linux) for suggesting a new style message,
   five bug reports, and release testing.
 * Anthony Bentley (OpenBSD) for reporting multiple bugs and missing
   features.
 * Paul Irofti (OpenBSD) and Nate Bargmann for suggesting new features.
 * Michael Stapelberg (Debian) for bug reports and release testing.
 * Christian Weisgerber, Jonathan Gray, Stuart Henderson,
   Ted Unangst (OpenBSD), Takeshi Nakayama (NetBSD),
   Anton Lazarov, Jakub Klinkovsky, Jan Stary, Jesper Wallin,
   Will Backmam, and Wolfgang Mueller for bug reports.
 * Sevan Janiyan (NetBSD) for additions to lib.in.
 * George Brown for suggesting code simplifications.
 * David Coppa, Igor Sobrado (OpenBSD), and Alexander Kuleshov
   for documentation improvements.
 * Laura Morales and Raf Czlonka for questions resulting in better
   documentation.
 * Yuri Pankov (illumos) for release testing.

Changes in version 1.14.3, released on August 5, 2017

--- BUG FIXES ---
 * man(7): Do not crash with out-of-bounds read access to a constant
   array if .sp or a blank line immediately precedes .SS or .SH.
 * mdoc(7): Do not crash with out-of-bounds read access to a constant
   array if .sp or a blank line precede the first .Sh macro.
 * tbl(7): Ignore explicitly specified negative 

CVS import: src/external/bsd/mdocml/dist

2018-08-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Aug 14 08:41:20 UTC 2018

Update of /cvsroot/src/external/bsd/mdocml/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18590

Log Message:
Import 1.14.4

This file lists the most important changes in the mandoc.bsd.lv distribution.

Changes in version 1.14.4, released on August 8, 2018

--- MAJOR NEW FEATURES ---
 * In ASCII output, render mathematical symbols and greek letters
   as transliterations conveying the characters' meanings rather
   than trying to imitate their shape.  Consequently, such characters
   can now be used in portable manual pages.  All the same, please
   limit their use to contexts where they really matter, for example
   when showing complicated mathematical formulae.
 * First steps towards better support for small screens in HTML
   output (responsive design): avoid most style= attributes, in
   particular all hard-coded indentations and column widths, and
   provide a better mandoc.css style sheet with a @media query,
   using em units throughout, and avoiding redundancy in selectors.
 * Better HTML output with some more fitting HTML elements, eliminating
   needless class= attributes, and avoiding various HTML syntax errors
   (element nesting, URL-fragment syntax, duplicate id= attributes).
--- MINOR NEW FEATURES ---
 * When a man(1) argument contains a slash, imply -l like in man-db.
 * Use TIOCGWINSZ to reduce the default -Owidth and -Oindent during
   interactive use on terminals narrower than 79 columns.
 * Generated PostScript files are now more than 50% smaller.
 * Terminal rendering of eqn(7) is improved in several respects.
 * Simplified and nicer output from the mdoc(7) .Lk macro, formatting
   all links in-line, even long ones.
 * roff(7) \n+ and \n- numerical register auto-increment and -decrement
 * roff(7) .nr optional third argument (auto-increment step size)
 * Autodetect in ./configure whether the compiler can use -W and -static,
   allowing to build on Solaris 10 and 11 without any configure.local.
--- RELIABILITY BUGFIXES ---
 * Only activate UTF-8 output when the user really selected UTF-8,
   not some other multibyte character encoding.
 * Prevent excessive .ll arguments from generating infinite output.
 * Fix out of bounds accesses to parse buffers that could happen when
   using renamed or user defined macros after roff(7) conditionals.
 * Avoid an assertion failure in certain .Bl -column lists.
 * Avoid a NULL pointer access on deroff() failure after '.SS ""'.
 * Fix a segfault that could be triggered by two invalid .Dt macros.
 * Fix two syntax errors in generated PDF files.
 * Properly state the page size in generated PostScript files.
 * Close a memory leak caused by missing gzclose(3).
 * Fix misformatting of man(7) documents lacking .SH macros
   in PostScript and PDF output.
 * And many minor bugfixes.
--- THANKS TO ---
 * Marc Espie (OpenBSD) for implementing the size reduction of
   PostScript files, one additional patch for code simplification,
   and two bug reports.
 * Theo Buehler (OpenBSD) for a bugfix patch,
   and Theo de Raadt (OpenBSD) for checking it.
 * John Gardner for more than a dozen suggestions regarding HTML output.
 * Mike Williams for teaching me how to use %%DocumentMedia and
   setpagedevice in PostScript files.
 * Werner Lemberg (groff) for feedback on mdoc(7) language changes.
 * Colin Watson (man-db) for feedback on man-db semantics.
 * Jason McIntyre (OpenBSD) for lots of feedback and suggestions
   on diagnostic messages and on the documentation.
 * Thomas Klausner (NetBSD) for suggesting two new style messages
   and one new feature, for two bug reports, and for release testing.
 * Leah Neukirchen (Void Linux) for suggesting a new style message,
   five bug reports, and release testing.
 * Anthony Bentley (OpenBSD) for reporting multiple bugs and missing
   features.
 * Paul Irofti (OpenBSD) and Nate Bargmann for suggesting new features.
 * Michael Stapelberg (Debian) for bug reports and release testing.
 * Christian Weisgerber, Jonathan Gray, Stuart Henderson,
   Ted Unangst (OpenBSD), Takeshi Nakayama (NetBSD),
   Anton Lazarov, Jakub Klinkovsky, Jan Stary, Jesper Wallin,
   Will Backmam, and Wolfgang Mueller for bug reports.
 * Sevan Janiyan (NetBSD) for additions to lib.in.
 * George Brown for suggesting code simplifications.
 * David Coppa, Igor Sobrado (OpenBSD), and Alexander Kuleshov
   for documentation improvements.
 * Laura Morales and Raf Czlonka for questions resulting in better
   documentation.
 * Yuri Pankov (illumos) for release testing.

Changes in version 1.14.3, released on August 5, 2017

--- BUG FIXES ---
 * man(7): Do not crash with out-of-bounds read access to a constant
   array if .sp or a blank line immediately precedes .SS or .SH.
 * mdoc(7): Do not crash with out-of-bounds read access to a constant
   array if .sp or a blank line precede the first .Sh macro.
 * tbl(7): Ignore explicitly specified negative 

CVS commit: src/sys/arch

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:37:59 UTC 2018

Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbmips/conf: LINKITSMART7688
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/ia64/conf: GENERIC.SKI

Log Message:
Replace references to etherip by l2tp. Etherip was already not enabled
anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.502 -r1.503 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/LINKITSMART7688
cvs rdiff -u -r1.446 -r1.447 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1189 -r1.1190 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/conf/GENERIC.SKI

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

Modified files:

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.96 src/sys/arch/amd64/conf/ALL:1.97
--- src/sys/arch/amd64/conf/ALL:1.96	Wed Aug  1 18:36:13 2018
+++ src/sys/arch/amd64/conf/ALL	Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.96 2018/08/01 18:36:13 khorben Exp $
+# $NetBSD: ALL,v 1.97 2018/08/14 06:37:59 maxv Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.96 $"
+#ident		"ALL-$Revision: 1.97 $"
 
 maxusers	64		# estimated number of users
 
@@ -1631,7 +1631,6 @@ pseudo-device	l2tp			# L2TPv3 interface
 #pseudo-device	pfsync			# PF sync if
 pseudo-device	npf			# NPF packet filter
 pseudo-device	kttcp
-pseudo-device	etherip			# EtherIP
 # srt is EXPERIMENTAL
 pseudo-device	srt			# source-address-based routing
 

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.502 src/sys/arch/amd64/conf/GENERIC:1.503
--- src/sys/arch/amd64/conf/GENERIC:1.502	Mon Aug 13 17:37:52 2018
+++ src/sys/arch/amd64/conf/GENERIC	Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.502 2018/08/13 17:37:52 mrg Exp $
+# $NetBSD: GENERIC,v 1.503 2018/08/14 06:37:59 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.502 $"
+#ident		"GENERIC-$Revision: 1.503 $"
 
 maxusers	64		# estimated number of users
 
@@ -1118,7 +1118,6 @@ pseudo-device	bridge			# simple inter-ne
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	agr			# IEEE 802.3ad link aggregation
 pseudo-device	l2tp			# L2TPv3 interface
-#pseudo-device	etherip			# Tunnel Ethernet over IP
 pseudo-device	npf			# NPF packet filter
 
 #pseudo-device	canloop			# CAN loopback interface

Index: src/sys/arch/evbmips/conf/LINKITSMART7688
diff -u src/sys/arch/evbmips/conf/LINKITSMART7688:1.7 src/sys/arch/evbmips/conf/LINKITSMART7688:1.8
--- src/sys/arch/evbmips/conf/LINKITSMART7688:1.7	Wed Aug  1 20:04:11 2018
+++ src/sys/arch/evbmips/conf/LINKITSMART7688	Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: LINKITSMART7688,v 1.7 2018/08/01 20:04:11 maxv Exp $
+#	$NetBSD: LINKITSMART7688,v 1.8 2018/08/14 06:37:59 maxv Exp $
 #
 # MediaTek MT7688
 #
@@ -249,7 +249,7 @@ pseudo-device	bridge			# simple inter-ne
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	agr			# IEEE 802.3ad link aggregation
 pseudo-device	npf			# NPF packet filter
-#pseudo-device	etherip			# Tunnel Ethernet over IP
+#pseudo-device	l2tp			# L2TPv3 interface
 # srt is EXPERIMENTAL
 #pseudo-device	srt			# source-address-based routing
 

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.446 src/sys/arch/i386/conf/ALL:1.447
--- src/sys/arch/i386/conf/ALL:1.446	Tue Aug 14 06:04:24 2018
+++ src/sys/arch/i386/conf/ALL	Tue Aug 14 06:37:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.446 2018/08/14 06:04:24 maxv Exp $
+# $NetBSD: ALL,v 1.447 2018/08/14 06:37:59 maxv Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.446 $"
+#ident		"ALL-$Revision: 1.447 $"
 
 maxusers	64		# estimated number of users
 
@@ -1768,7 +1768,6 @@ pseudo-device	pflog			# PF log if
 pseudo-device	pfsync			# PF sync if
 #pseudo-device	npf			# NPF packet filter
 pseudo-device	kttcp
-pseudo-device	etherip			# EtherIP
 pseudo-device	l2tp			# L2TPv3 interface
 # srt is EXPERIMENTAL
 pseudo-device	srt			# source-address-based routing

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1189 src/sys/arch/i386/conf/GENERIC:1.1190
--- src/sys/arch/i386/conf/GENERIC:1.1189	Tue Aug 14 06:04:24 2018
+++ src/sys/arch/i386/conf/GENERIC	Tue Aug 14 

CVS commit: src/sys/arch

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:37:59 UTC 2018

Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbmips/conf: LINKITSMART7688
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/ia64/conf: GENERIC.SKI

Log Message:
Replace references to etherip by l2tp. Etherip was already not enabled
anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.502 -r1.503 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/LINKITSMART7688
cvs rdiff -u -r1.446 -r1.447 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1189 -r1.1190 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/conf/GENERIC.SKI

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



CVS commit: src/share/man/man4

2018-08-14 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Aug 14 06:27:44 UTC 2018

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

Log Message:
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/share/man/man4/gif.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/gif.4
diff -u src/share/man/man4/gif.4:1.33 src/share/man/man4/gif.4:1.34
--- src/share/man/man4/gif.4:1.33	Tue Aug 14 06:21:36 2018
+++ src/share/man/man4/gif.4	Tue Aug 14 06:27:44 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: gif.4,v 1.33 2018/08/14 06:21:36 maxv Exp $
+.\"	$NetBSD: gif.4,v 1.34 2018/08/14 06:27:44 wiz Exp $
 .\"	$KAME: gif.4,v 1.24 2001/02/20 12:54:01 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -201,9 +201,9 @@ you have to have an alias on Host A for 
 and on the cisco
 .Ic ip Ar route Y mask tunnelX .
 .Sh SEE ALSO
-.Xr l2tp 4 ,
 .Xr inet 4 ,
 .Xr inet6 4 ,
+.Xr l2tp 4 ,
 .Xr ifconfig 8
 .Rs
 .%A C. Perkins



CVS commit: src/share/man/man4

2018-08-14 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Aug 14 06:27:44 UTC 2018

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

Log Message:
Sort SEE ALSO.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/share/man/man4/gif.4

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



CVS commit: src/share/man/man4

2018-08-14 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Aug 14 06:26:52 UTC 2018

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

Log Message:
Remove superfluous Pps.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/l2tp.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/l2tp.4
diff -u src/share/man/man4/l2tp.4:1.3 src/share/man/man4/l2tp.4:1.4
--- src/share/man/man4/l2tp.4:1.3	Tue Aug 14 06:18:46 2018
+++ src/share/man/man4/l2tp.4	Tue Aug 14 06:26:52 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: l2tp.4,v 1.3 2018/08/14 06:18:46 maxv Exp $
+.\"	$NetBSD: l2tp.4,v 1.4 2018/08/14 06:26:52 wiz Exp $
 .\"
 .\" Copyright (C) 2017 Internet Initiative Japan Inc.
 .\" All rights reserved.
@@ -94,7 +94,6 @@ wm0 = 192.168.0.1/24
 ++++
 .Ed
 .Ss Configuration example without cookies
-.Pp
 On NetBSD_A:
 .Bd -literal
 # ifconfig wm0 inet 192.168.0.1/24
@@ -122,9 +121,7 @@ On NetBSD_B:
 # ifconfig wm1 up
 # ifconfig bridge0 up
 .Ed
-.Pp
 .Ss Configuration example with cookies
-.Pp
 On NetBSD_A:
 .Bd -literal
 # ifconfig wm0 inet 192.168.0.1/24



CVS commit: src/share/man/man4

2018-08-14 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Aug 14 06:26:52 UTC 2018

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

Log Message:
Remove superfluous Pps.


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

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



CVS commit: src/share/man/man4

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:21:36 UTC 2018

Modified Files:
src/share/man/man4: bridge.4 gif.4 tap.4

Log Message:
Replace etherip by l2tp in the "see also" sections.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/bridge.4 \
src/share/man/man4/tap.4
cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/gif.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/bridge.4
diff -u src/share/man/man4/bridge.4:1.11 src/share/man/man4/bridge.4:1.12
--- src/share/man/man4/bridge.4:1.11	Sat Nov 21 09:02:31 2015
+++ src/share/man/man4/bridge.4	Tue Aug 14 06:21:36 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bridge.4,v 1.11 2015/11/21 09:02:31 wiz Exp $
+.\"	$NetBSD: bridge.4,v 1.12 2018/08/14 06:21:36 maxv Exp $
 .\"
 .\" Copyright 2001 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 20, 2015
+.Dd August 14, 2018
 .Dt BRIDGE 4
 .Os
 .Sh NAME
@@ -101,7 +101,7 @@ interfaces support it.
 This is to facilitate XEN network configurations with
 .Xr xennet 4 .
 .Sh SEE ALSO
-.Xr etherip 4 ,
+.Xr l2tp 4 ,
 .Xr options 4 ,
 .Xr xennet 4 ,
 .Xr brconfig 8 ,
Index: src/share/man/man4/tap.4
diff -u src/share/man/man4/tap.4:1.11 src/share/man/man4/tap.4:1.12
--- src/share/man/man4/tap.4:1.11	Thu Mar 12 13:14:18 2009
+++ src/share/man/man4/tap.4	Tue Aug 14 06:21:36 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: tap.4,v 1.11 2009/03/12 13:14:18 wiz Exp $
+.\" $NetBSD: tap.4,v 1.12 2018/08/14 06:21:36 maxv Exp $
 .\"
 .\"  Copyright (c) 2004, 2005 The NetBSD Foundation.
 .\"  All rights reserved.
@@ -24,7 +24,7 @@
 .\"  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\"  POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 10, 2009
+.Dd August 14, 2018
 .Dt TAP 4
 .Os
 .Sh NAME
@@ -168,7 +168,7 @@ individual character device nodes
 .El
 .Sh SEE ALSO
 .Xr bridge 4 ,
-.Xr etherip 4 ,
+.Xr l2tp 4 ,
 .Xr tun 4 ,
 .Xr ifconfig 8
 .Sh HISTORY

Index: src/share/man/man4/gif.4
diff -u src/share/man/man4/gif.4:1.32 src/share/man/man4/gif.4:1.33
--- src/share/man/man4/gif.4:1.32	Wed Aug  1 00:07:27 2018
+++ src/share/man/man4/gif.4	Tue Aug 14 06:21:36 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: gif.4,v 1.32 2018/08/01 00:07:27 sevan Exp $
+.\"	$NetBSD: gif.4,v 1.33 2018/08/14 06:21:36 maxv Exp $
 .\"	$KAME: gif.4,v 1.24 2001/02/20 12:54:01 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 1, 2018
+.Dd August 14, 2018
 .Dt GIF 4
 .Os
 .Sh NAME
@@ -201,7 +201,7 @@ you have to have an alias on Host A for 
 and on the cisco
 .Ic ip Ar route Y mask tunnelX .
 .Sh SEE ALSO
-.Xr etherip 4 ,
+.Xr l2tp 4 ,
 .Xr inet 4 ,
 .Xr inet6 4 ,
 .Xr ifconfig 8



CVS commit: src/share/man/man4

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:21:36 UTC 2018

Modified Files:
src/share/man/man4: bridge.4 gif.4 tap.4

Log Message:
Replace etherip by l2tp in the "see also" sections.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/bridge.4 \
src/share/man/man4/tap.4
cvs rdiff -u -r1.32 -r1.33 src/share/man/man4/gif.4

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



CVS commit: src/share/man/man4

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:18:46 UTC 2018

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

Log Message:
Enlighten a little.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/l2tp.4

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



CVS commit: src/share/man/man4

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:18:46 UTC 2018

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

Log Message:
Enlighten a little.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/l2tp.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/l2tp.4
diff -u src/share/man/man4/l2tp.4:1.2 src/share/man/man4/l2tp.4:1.3
--- src/share/man/man4/l2tp.4:1.2	Thu Feb 16 14:00:26 2017
+++ src/share/man/man4/l2tp.4	Tue Aug 14 06:18:46 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: l2tp.4,v 1.2 2017/02/16 14:00:26 wiz Exp $
+.\"	$NetBSD: l2tp.4,v 1.3 2018/08/14 06:18:46 maxv Exp $
 .\"
 .\" Copyright (C) 2017 Internet Initiative Japan Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 19, 2017
+.Dd August 14, 2018
 .Dt L2TP 4
 .Os
 .Sh NAME
@@ -38,12 +38,11 @@
 .Sh DESCRIPTION
 The
 .Nm
-interface is a version 3 of the Layer Two Tunneling Protocol (L2TPv3)
-pseudo device.
+interface implements version 3 of the Layer Two Tunneling Protocol (L2TPv3).
 It can tunnel layer 2 protocol traffic over IPv4 or IPv6, as specified in
 .Li RFC3931 .
 .Pp
-The L2TPv3 protocol is comprised of two types of messages, control messages
+The L2TPv3 protocol is comprised of two types of messages: control messages
 and data messages.
 Control messages are used in the establishment,
 maintenace, and clearing of control connections and sessions.
@@ -79,16 +78,24 @@ which may be either an IPv4 or IPv6 pack
 .Sh EXAMPLES
 Configuration example:
 .Bd -literal
-Host X--NetBSD A  tunnel-- NetBSD B--Host E
-   \\  |
-\\/
- +-Router BRouter C-+
+wm0 = 192.168.0.1/24wm0 = 192.168.0.2/24
+
+++++
+|  NetBSD_A  ||  NetBSD_B  |
+||||
+|   [l2tp0] - - - - - - - - (tunnel) - - - - - - - - [l2tp0]   |
+|  [wm0]- ... --[wm0]  |
+||||
++---[wm1]++[wm1]---+
+  |  |
+  |  |
+++++
+|   Host_X   ||   Host_Y   |
+++++
 .Ed
-configuration example without cookies,
+.Ss Configuration example without cookies
 .Pp
-On
-.Nx
-system A
+On NetBSD_A:
 .Bd -literal
 # ifconfig wm0 inet 192.168.0.1/24
 # ifconfig l2tp0 create
@@ -102,9 +109,7 @@ system A
 # ifconfig bridge0 up
 .Ed
 .Pp
-On
-.Nx
-system B
+On NetBSD_B:
 .Bd -literal
 # ifconfig wm0 inet 192.168.0.2/24
 # ifconfig l2tp0 create
@@ -118,11 +123,9 @@ system B
 # ifconfig bridge0 up
 .Ed
 .Pp
-configuration example with cookies,
+.Ss Configuration example with cookies
 .Pp
-On
-.Nx
-system A
+On NetBSD_A:
 .Bd -literal
 # ifconfig wm0 inet 192.168.0.1/24
 # ifconfig l2tp0 create
@@ -137,9 +140,7 @@ system A
 # ifconfig bridge0 up
 .Ed
 .Pp
-On
-.Nx
-system B
+On NetBSD_B:
 .Bd -literal
 # ifconfig wm0 inet 192.168.0.2/24
 # ifconfig l2tp0 create



CVS commit: src/sys/arch

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:04:24 UTC 2018

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: ALL GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU

Log Message:
Enable L2TP on all x86 configurations, not just native amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.445 -r1.446 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1188 -r1.1189 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/XEN3PAE_DOMU

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

Modified files:

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.154 src/sys/arch/amd64/conf/XEN3_DOM0:1.155
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.154	Wed Aug  1 16:59:09 2018
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Tue Aug 14 06:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.154 2018/08/01 16:59:09 maxv Exp $
+# $NetBSD: XEN3_DOM0,v 1.155 2018/08/14 06:04:24 maxv Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@ options 	INCLUDE_CONFIG_FILE	# embed con
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 
-#ident		"XEN3_DOM0-$Revision: 1.154 $"
+#ident		"XEN3_DOM0-$Revision: 1.155 $"
 
 maxusers	32		# estimated number of users
 
@@ -871,6 +871,7 @@ pseudo-device	stf			# 6to4 IPv6 over IPv
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
+pseudo-device	l2tp			# L2TPv3 interface
 pseudo-device	npf			# NPF packet filter
 
 # miscellaneous pseudo-devices

Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.86 src/sys/arch/amd64/conf/XEN3_DOMU:1.87
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.86	Wed Aug  1 16:59:09 2018
+++ src/sys/arch/amd64/conf/XEN3_DOMU	Tue Aug 14 06:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.86 2018/08/01 16:59:09 maxv Exp $
+# $NetBSD: XEN3_DOMU,v 1.87 2018/08/14 06:04:24 maxv Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@ options 	INCLUDE_CONFIG_FILE	# embed con
 #options 	UVMHIST_PRINT
 #options 	SYSCALL_DEBUG
 
-#ident		"XEN3_DOMU-$Revision: 1.86 $"
+#ident		"XEN3_DOMU-$Revision: 1.87 $"
 
 maxusers	32		# estimated number of users
 
@@ -217,6 +217,7 @@ pseudo-device	stf			# 6to4 IPv6 over IPv
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
+pseudo-device	l2tp			# L2TPv3 interface
 pseudo-device	npf			# NPF packet filter
 
 options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.445 src/sys/arch/i386/conf/ALL:1.446
--- src/sys/arch/i386/conf/ALL:1.445	Wed Aug  1 18:36:14 2018
+++ src/sys/arch/i386/conf/ALL	Tue Aug 14 06:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.445 2018/08/01 18:36:14 khorben Exp $
+# $NetBSD: ALL,v 1.446 2018/08/14 06:04:24 maxv Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.445 $"
+#ident		"ALL-$Revision: 1.446 $"
 
 maxusers	64		# estimated number of users
 
@@ -1769,6 +1769,7 @@ pseudo-device	pfsync			# PF sync if
 #pseudo-device	npf			# NPF packet filter
 pseudo-device	kttcp
 pseudo-device	etherip			# EtherIP
+pseudo-device	l2tp			# L2TPv3 interface
 # srt is EXPERIMENTAL
 pseudo-device	srt			# source-address-based routing
 

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1188 src/sys/arch/i386/conf/GENERIC:1.1189
--- src/sys/arch/i386/conf/GENERIC:1.1188	Mon Aug 13 18:48:53 2018
+++ src/sys/arch/i386/conf/GENERIC	Tue Aug 14 06:04:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1188 2018/08/13 18:48:53 mrg Exp $
+# $NetBSD: GENERIC,v 1.1189 2018/08/14 06:04:24 maxv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1188 $"
+#ident		"GENERIC-$Revision: 1.1189 $"
 
 maxusers	64		# estimated number of users
 
@@ -1477,6 +1477,7 @@ pseudo-device	vlan			# IEEE 802.1q encap
 pseudo-device	bridge			# simple inter-network bridging
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	agr			# IEEE 802.3ad link aggregation
+pseudo-device	l2tp			# L2TPv3 interface
 pseudo-device	npf			# NPF packet filter
 #pseudo-device	etherip 		# Tunnel Ethernet over IP
 # srt is EXPERIMENTAL

Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u 

CVS commit: src/sys/arch

2018-08-14 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Tue Aug 14 06:04:24 UTC 2018

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: ALL GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU

Log Message:
Enable L2TP on all x86 configurations, not just native amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.445 -r1.446 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1188 -r1.1189 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/XEN3PAE_DOMU

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