CVS commit: [pgoyette-compat] src

2018-05-20 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Mon May 21 04:36:21 UTC 2018

Modified Files:
src [pgoyette-compat]: Makefile Makefile.inc UPDATING build.sh
src/bin/ksh [pgoyette-compat]: c_ksh.c c_sh.c emacs.c eval.c exec.c
expand.h expr.c history.c io.c lex.c mail.c main.c misc.c syn.c
table.c trap.c tree.c var.c vi.c
src/bin/sh [pgoyette-compat]: sh.1
src/crypto/dist/ipsec-tools [pgoyette-compat]: README
src/crypto/dist/ipsec-tools/src/racoon [pgoyette-compat]: admin.c
backupsa.c cfparse.y evt.c grabmyaddr.c handler.c ipsec_doi.c
isakmp.c isakmp_agg.c isakmp_base.c isakmp_cfg.c isakmp_frag.c
isakmp_ident.c isakmp_inf.c isakmp_var.h isakmp_xauth.c localconf.c
main.c misc.c nattraversal.c nattraversal.h oakley.c pfkey.c
privsep.c remoteconf.c sainfo.c session.c vendorid.c vmbuf.c
vmbuf.h
src/crypto/external/bsd/netpgp/bindings/lua [pgoyette-compat]: Makefile
src/crypto/external/bsd/netpgp/dist/bindings/lua [pgoyette-compat]:
glue.c
src/crypto/external/bsd/netpgp/dist/src/lib [pgoyette-compat]:
libnetpgp.3
src/distrib/sets/lists/base [pgoyette-compat]: mi shl.mi
src/distrib/sets/lists/comp [pgoyette-compat]: mi shl.mi
src/distrib/sets/lists/debug [pgoyette-compat]: mi shl.mi
src/distrib/sets/lists/man [pgoyette-compat]: mi
src/distrib/sets/lists/modules [pgoyette-compat]: mi
src/distrib/sets/lists/tests [pgoyette-compat]: mi
src/distrib/sets/lists/xcomp [pgoyette-compat]: mi
src/doc [pgoyette-compat]: 3RDPARTY CHANGES TODO.modules
src/etc [pgoyette-compat]: MAKEDEV.tmpl
src/external/apache2/mDNSResponder/dist/mDNSShared [pgoyette-compat]:
PlatformCommon.c
src/external/broadcom/bwfm [pgoyette-compat]: Makefile
src/external/bsd/bind/include/isc [pgoyette-compat]: platform.h
src/external/bsd/byacc/dist [pgoyette-compat]: btyaccpar.c
btyaccpar.skel skel2c yaccpar.c
src/external/bsd/dhcpcd/dist/src [pgoyette-compat]: auth.c auth.h
defs.h dhcp6.c dhcp6.h dhcpcd-definitions.conf dhcpcd.8.in
dhcpcd.conf.5.in if-bsd.c if-linux.c if-options.c ipv6nd.c route.c
src/external/bsd/elftosb/usr.sbin/elftosb [pgoyette-compat]: Makefile
src/external/bsd/openpam/dist/lib/libpam [pgoyette-compat]:
openpam_configure.c
src/external/gpl2/groff/dist/src/preproc/grn [pgoyette-compat]: hdb.cpp
hgraph.cpp hpoint.cpp main.cpp
src/external/gpl2/texinfo/makedoc [pgoyette-compat]: Makefile
src/external/gpl3/binutils/dist/bfd [pgoyette-compat]: elflink.c
src/external/gpl3/gdb/dist/bfd [pgoyette-compat]: config.bfd
src/external/gpl3/gdb/dist/gdb [pgoyette-compat]: Makefile.in
configure.host configure.tgt dwarf2read.c
src/external/gpl3/gdb/lib/libgdb [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/fonttosfnt [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/mkfontscale [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/x11perf [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xclock [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xditview [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xdm [pgoyette-compat]: Makefile.xdm
src/external/mit/xorg/bin/xfd [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xlogo [pgoyette-compat]: Makefile
src/external/mit/xorg/bin/xterm [pgoyette-compat]: Makefile
src/external/mit/xorg/lib/fontconfig/src [pgoyette-compat]: Makefile
Makefile.fcarch
src/external/mit/xorg/lib/freetype [pgoyette-compat]: Makefile
shlib_version
src/external/mit/xorg/lib/freetype/freetype [pgoyette-compat]: Makefile
src/external/mit/xorg/lib/libXdmGreet [pgoyette-compat]: Makefile
src/external/mit/xorg/lib/libXfont [pgoyette-compat]: Makefile
src/external/mit/xorg/lib/libXfont2 [pgoyette-compat]: Makefile
src/external/mit/xorg/lib/libXft [pgoyette-compat]: Makefile
src/external/mit/xorg/tools/fc-cache [pgoyette-compat]: Makefile
src/external/mit/xorg/tools/mkfontscale [pgoyette-compat]: Makefile
src/external/public-domain/tz/dist [pgoyette-compat]: Makefile NEWS
TZDATA_VERSION africa asia australasia europe theory.html version
ziguard.awk
src/games/fortune/datfiles [pgoyette-compat]: fortunes
src/lib [pgoyette-compat]: Makefile
src/lib/libc/gen [pgoyette-compat]: sysctl.c
src/lib/libc/sys [pgoyette-compat]: mmap.2 mremap.2 vfork.2
src/lib/libc/time [pgoyette-compat]: CONTRIBUTING Makefile NEWS
asctime.c ctime.3 localtime.c private.h strftime.c theory.html
tzset.3 version zdump.c zic.8 zic.c
 

CVS commit: src/sys/dev/pci

2018-05-20 Thread John Nemeth
Module Name:src
Committed By:   jnemeth
Date:   Mon May 21 03:56:21 UTC 2018

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

Log Message:
add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.101 src/sys/dev/pci/pucdata.c:1.102
--- src/sys/dev/pci/pucdata.c:1.101	Fri Apr 13 07:57:04 2018
+++ src/sys/dev/pci/pucdata.c	Mon May 21 03:56:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pucdata.c,v 1.101 2018/04/13 07:57:04 msaitoh Exp $	*/
+/*	$NetBSD: pucdata.c,v 1.102 2018/05/21 03:56:21 jnemeth Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Christopher G. Demetriou.  All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.101 2018/04/13 07:57:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.102 2018/05/21 03:56:21 jnemeth Exp $");
 
 #include 
 #include 
@@ -1108,6 +1108,19 @@ const struct puc_device_description puc_
 	},
 	},
 
+	/* Oxford Semiconductor OXPCIe954 PCIe UARTs */
+	{   "Oxford Semiconductor OXPCIe954 UART",
+	{	PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE954,
+		0, 0 },
+	{	0x,	0x,	0,	0	},
+	{
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
+		{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
+	},
+	},
+
 	/* Oxford Semiconductor OXmPCI952 PCI UARTs */
 	{   "Oxford Semiconductor OXmPCI952 UARTs",
 	{	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41092,



CVS commit: src/sys/dev/pci

2018-05-20 Thread John Nemeth
Module Name:src
Committed By:   jnemeth
Date:   Mon May 21 03:45:50 UTC 2018

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card


To generate a diff of this commit:
cvs rdiff -u -r1.1333 -r1.1334 src/sys/dev/pci/pcidevs

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
diff -u src/sys/dev/pci/pcidevs:1.1333 src/sys/dev/pci/pcidevs:1.1334
--- src/sys/dev/pci/pcidevs:1.1333	Thu May  3 04:21:10 2018
+++ src/sys/dev/pci/pcidevs	Mon May 21 03:45:50 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1333 2018/05/03 04:21:10 maya Exp $
+$NetBSD: pcidevs,v 1.1334 2018/05/21 03:45:50 jnemeth Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -6280,6 +6280,7 @@ product OXFORDSEMI OXPCIE952_3	0xc140	OX
 product OXFORDSEMI OXPCIE952_4	0xc141	OXPCIe952
 product OXFORDSEMI OXPCIE952_5	0xc144	OXPCIe952
 product OXFORDSEMI OXPCIE952_6	0xc145	OXPCIe952
+product OXFORDSEMI OXPCIE954	0xc208	OXPCIe954
 
 /* Packet Engines products */
 product PACKETENGINES GNICII	0x0911	G-NIC II Ethernet



CVS commit: src/external/gpl3/gdb/dist

2018-05-20 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 21 02:10:47 UTC 2018

Modified Files:
src/external/gpl3/gdb/dist/bfd: config.bfd
src/external/gpl3/gdb/dist/gdb: Makefile.in configure.host
configure.tgt
Added Files:
src/external/gpl3/gdb/dist/gdb: aarch64-nbsd-nat.c aarch64-nbsd-tdep.c
aarch64-nbsd-tdep.h
src/external/gpl3/gdb/dist/gdb/config/aarch64: nbsd.mh

Log Message:
add minimal glue to make gdb compile on aarch-64; now configure in gdb/dist
and gmake creates a gdb binary.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gdb/dist/bfd/config.bfd
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/gpl3/gdb/dist/gdb/Makefile.in
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-tdep.h
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/dist/gdb/configure.host
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gdb/dist/gdb/configure.tgt
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/dist/gdb/config/aarch64/nbsd.mh

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

Modified files:

Index: src/external/gpl3/gdb/dist/bfd/config.bfd
diff -u src/external/gpl3/gdb/dist/bfd/config.bfd:1.17 src/external/gpl3/gdb/dist/bfd/config.bfd:1.18
--- src/external/gpl3/gdb/dist/bfd/config.bfd:1.17	Tue Nov 28 17:04:52 2017
+++ src/external/gpl3/gdb/dist/bfd/config.bfd	Sun May 20 22:10:46 2018
@@ -260,6 +260,11 @@ case "${targ}" in
 targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
 want64=true
 ;;
+  aarch64-*-netbsd*)
+targ_defvec=aarch64_elf64_le_vec
+targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"
+want64=true
+;;
   aarch64-*-fuchsia*)
 targ_defvec=aarch64_elf64_le_vec
 targ_selvecs="aarch64_elf64_be_vec arm_elf32_le_vec arm_elf32_be_vec"

Index: src/external/gpl3/gdb/dist/gdb/Makefile.in
diff -u src/external/gpl3/gdb/dist/gdb/Makefile.in:1.1.1.7 src/external/gpl3/gdb/dist/gdb/Makefile.in:1.2
--- src/external/gpl3/gdb/dist/gdb/Makefile.in:1.1.1.7	Tue Nov 28 13:18:04 2017
+++ src/external/gpl3/gdb/dist/gdb/Makefile.in	Sun May 20 22:10:47 2018
@@ -2460,6 +2460,8 @@ MAKEOVERRIDES =
 ALLDEPFILES = \
 	aarch64-linux-nat.c \
 	aarch64-linux-tdep.c \
+	aarch64-nbsd-nat.c \
+	aarch64-nbsd-tdep.c \
 	aarch64-newlib-tdep.c \
 	aarch64-tdep.c \
 	aix-thread.c \

Index: src/external/gpl3/gdb/dist/gdb/configure.host
diff -u src/external/gpl3/gdb/dist/gdb/configure.host:1.9 src/external/gpl3/gdb/dist/gdb/configure.host:1.10
--- src/external/gpl3/gdb/dist/gdb/configure.host:1.9	Tue Nov 28 17:04:52 2017
+++ src/external/gpl3/gdb/dist/gdb/configure.host	Sun May 20 22:10:47 2018
@@ -84,6 +84,7 @@ case "${host}" in
 *-*-darwin*)		gdb_host=darwin ;;
 
 aarch64*-*-linux*)	gdb_host=linux ;;
+aarch64*-*-netbsd*)	gdb_host=nbsd ;;
 
 alpha*-*-linux*)	gdb_host=alpha-linux ;;
 alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)

Index: src/external/gpl3/gdb/dist/gdb/configure.tgt
diff -u src/external/gpl3/gdb/dist/gdb/configure.tgt:1.18 src/external/gpl3/gdb/dist/gdb/configure.tgt:1.19
--- src/external/gpl3/gdb/dist/gdb/configure.tgt:1.18	Mon Jan  8 13:56:20 2018
+++ src/external/gpl3/gdb/dist/gdb/configure.tgt	Sun May 20 22:10:47 2018
@@ -56,8 +56,8 @@ aarch64*-*-linux*)
 
 aarch64*-*-netbsd*)
 	# Target: AArch64 NetBSD
-	#gdb_target_obs="aarch64-tdep.o aarch64-netbsd-tdep.o"
-	gdb_target_obs="aarch64-tdep.o aarch64-insn.o solib-svr4.o"
+	gdb_target_obs="aarch64-tdep.o aarch64-nbsd-tdep.o \
+			aarch64-insn.o solib-svr4.o"
 	;;
 
 alpha*-*-osf*)

Added files:

Index: src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c
diff -u /dev/null src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c:1.1
--- /dev/null	Sun May 20 22:10:47 2018
+++ src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c	Sun May 20 22:10:47 2018
@@ -0,0 +1,136 @@
+/* Native-dependent code for NetBSD/aarch64.
+
+   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .  */
+
+#include "defs.h"
+#include "target.h"
+
+#include 
+#include 
+#include 
+
+#include "nbsd-nat.h"
+#include "aarch64-tdep.h"
+#include "aarch64-nbsd-tdep.h"
+#include "regcache.h"
+#include "gdbcore.h"

CVS commit: src/tests/lib/libc/sys

2018-05-20 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Sun May 20 23:47:16 UTC 2018

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Refactor and enable the signal3 ATF ptrace(2) test

Adapt the test to be independent from the software breakpoint trap
behavior, whether the Program Counter is moved or not. Just kill the
process after catching the expected signal, instead of pretending to resume
it.

This test passes.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/tests/lib/libc/sys/t_ptrace_wait.c

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

Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.48 src/tests/lib/libc/sys/t_ptrace_wait.c:1.49
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.48	Sun May 20 03:51:31 2018
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Sun May 20 23:47:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.48 2018/05/20 03:51:31 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.49 2018/05/20 23:47:16 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.48 2018/05/20 03:51:31 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.49 2018/05/20 23:47:16 kamil Exp $");
 
 #include 
 #include 
@@ -5786,18 +5786,6 @@ ATF_TC_BODY(signal3, tc)
 #endif
 	sigset_t intmask;
 
-	atf_tc_expect_fail("PR kern/51918");
-
-	// This test breaks now on some ports, temporarily disable it
-	ATF_REQUIRE(0 && "In order to get reliable failure, abort");
-
-#if defined(__sparc__)
-	atf_tc_expect_timeout("PR kern/52167");
-
-	// timeout wins, failure still valid
-	// atf_tc_expect_fail("PR kern/51918");
-#endif
-
 	DPRINTF("Before forking process PID=%d\n", getpid());
 	SYSCALL_REQUIRE((child = fork()) != -1);
 	if (child == 0) {
@@ -5840,12 +5828,12 @@ ATF_TC_BODY(signal3, tc)
 
 	DPRINTF("Before resuming the child process where it left off and "
 	"without signal to be sent\n");
-	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+	SYSCALL_REQUIRE(ptrace(PT_KILL, child, NULL, 0) != -1);
 
 	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, , 0), child);
 
-	validate_status_exited(status, exitval);
+	validate_status_signaled(status, SIGKILL, 0);
 
 	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, , 0));



CVS commit: src/share/man/man4

2018-05-20 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sun May 20 15:28:28 UTC 2018

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

Log Message:
End sentence with a dot.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/gpiopps.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/gpiopps.4
diff -u src/share/man/man4/gpiopps.4:1.1 src/share/man/man4/gpiopps.4:1.2
--- src/share/man/man4/gpiopps.4:1.1	Sun May 20 15:15:40 2018
+++ src/share/man/man4/gpiopps.4	Sun May 20 15:28:27 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpiopps.4,v 1.1 2018/05/20 15:15:40 thorpej Exp $
+.\" $NetBSD: gpiopps.4,v 1.2 2018/05/20 15:28:27 wiz Exp $
 .\"
 .\" Copyright (c) 2016 Brad Spencer 
 .\"
@@ -103,4 +103,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Brad Spencer Aq Mt b...@anduin.eldar.org
+.An Brad Spencer Aq Mt b...@anduin.eldar.org .



CVS commit: src

2018-05-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sun May 20 15:15:41 UTC 2018

Added Files:
src/share/man/man4: gpiopps.4
src/sys/modules/gpiopps: Makefile gpiopps.ioconf

Log Message:
Add a 1PPS-over-GPIO driver, originally by Brad Spencer, with changes by
me to adapt to the new GPIO interrupt interface and support a wider variety
of GPIO pin configuations.

PR kern/51676

(Oops, forgot to "cvs add" these items previously.)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/share/man/man4/gpiopps.4
cvs rdiff -u -r0 -r1.1 src/sys/modules/gpiopps/Makefile \
src/sys/modules/gpiopps/gpiopps.ioconf

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

Added files:

Index: src/share/man/man4/gpiopps.4
diff -u /dev/null src/share/man/man4/gpiopps.4:1.1
--- /dev/null	Sun May 20 15:15:41 2018
+++ src/share/man/man4/gpiopps.4	Sun May 20 15:15:40 2018
@@ -0,0 +1,106 @@
+.\" $NetBSD: gpiopps.4,v 1.1 2018/05/20 15:15:40 thorpej Exp $
+.\"
+.\" Copyright (c) 2016 Brad Spencer 
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd May 11, 2018
+.Dt GPIOPPS 4
+.Os
+.Sh NAME
+.Nm gpiopps
+.Nd install a PPS handler on GPIO pins
+.Sh SYNOPSIS
+.Cd "gpiopps* at gpio? offset 0 mask 0x1 flag 0x0"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides a 1PPS handler using the PPSAPI on one or two GPIO pins.
+.Pp
+The base pin number is specified in the kernel configuration file with the
+.Ar offset
+locator.
+The
+.Ar mask
+should have 1 or 2 bits set, indicating which pins offset from the
+base pin should be used
+.Pq 0 .. 31 .
+Pin configurations are discussed below.
+.Pp
+The
+.Ar flag
+locator modifies the pin configuraiton:
+.Bl -tag -width ""
+.It Dv 0x01
+The PPS ASSERT signal should be triggered on the negative
+.Pq falling
+edge of the
+assert pin.
+The default is to trigger on the positive
+.Pq rising
+edge of the pin.
+.It Dv 0x02
+By default,
+.Nm
+will use double-edge triggering when only a single pin is specified
+and the underlying GPIO hardware supports it.
+This flag disables the use of double-edge triggering.
+.El
+.Pp
+If a single pin is specified,
+.Nm
+uses double-edge triggering to support ASSERT and CLEAR PPS signals.
+If the underlying GPIO hardware does not support double-edge triggering,
+or if this feature is diabled in the
+.Ar flag
+locator, then only ASSERT will be signaled on the specified edge.
+.Pp
+If two pins are specified, the first pin is used to trigger the
+ASSERT signal and the second pin is used to trigger the CLEAR
+signal.
+The ASSERT pin's trigger edge is specified by by the
+.Ar flag
+locator, and the CLEAR pin triggers on the opposite edge.
+This allows ASSERT and CLEAR signals to be triggered even if the underlying
+GPIO hardware does not support double-edge triggering.
+In this scenario, both GPIO pins would be connected in parallel to the
+device sending the 1PPS signals.
+.Pp
+The
+.Ar offset ,
+.Ar mask ,
+and
+.Ar flag
+locators can also be specified when
+.Nm
+is attached at runtime using the
+.Dv GPIOATTACH
+.Xr ioctl 2
+on the
+.Xr gpio 4
+device.
+.Sh SEE ALSO
+.Xr gpio 4 ,
+.Xr drvctl 8 ,
+.Xr gpioctl 8
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Nx 9.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Brad Spencer Aq Mt b...@anduin.eldar.org

Index: src/sys/modules/gpiopps/Makefile
diff -u /dev/null src/sys/modules/gpiopps/Makefile:1.1
--- /dev/null	Sun May 20 15:15:41 2018
+++ src/sys/modules/gpiopps/Makefile	Sun May 20 15:15:41 2018
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.1 2018/05/20 15:15:41 thorpej Exp $
+
+.include "../Makefile.inc"
+
+.PATH:		${S}/dev/gpio
+
+KMOD=   	gpiopps
+IOCONF=		gpiopps.ioconf
+SRCS=		gpiopps.c
+
+CPPFLAGS+=	-I${S}/gpio
+
+.include 
Index: src/sys/modules/gpiopps/gpiopps.ioconf
diff -u /dev/null src/sys/modules/gpiopps/gpiopps.ioconf:1.1
--- /dev/null	Sun May 20 15:15:41 2018
+++ src/sys/modules/gpiopps/gpiopps.ioconf	Sun May 20 15:15:41 2018
@@ -0,0 +1,8 @@
+#	$NetBSD: gpiopps.ioconf,v 1.1 2018/05/20 15:15:41 thorpej Exp $
+
+ioconf		gpiopps
+
+include		"conf/files"
+
+pseudo-root	gpio*
+gpiopps*	at gpio? offset ? mask ? flag ?



CVS commit: src/share/mk

2018-05-20 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 20 14:39:53 UTC 2018

Modified Files:
src/share/mk: sys.mk

Log Message:
Also substitute ${X11SRCDIR} for the random seed for reproducible builds so
that the random seed is consistent.
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/share/mk/sys.mk

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

Modified files:

Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.130 src/share/mk/sys.mk:1.131
--- src/share/mk/sys.mk:1.130	Sun Feb 25 13:53:23 2018
+++ src/share/mk/sys.mk	Sun May 20 10:39:53 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: sys.mk,v 1.130 2018/02/25 18:53:23 chs Exp $
+#	$NetBSD: sys.mk,v 1.131 2018/05/20 14:39:53 christos Exp $
 #	@(#)sys.mk	8.2 (Berkeley) 3/21/94
 #
 # This file contains the basic rules for make(1) and is read first
@@ -55,7 +55,8 @@ CXXFLAGS?=	${CFLAGS:N-Wno-traditional:N-
 __ALLSRC1=	${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
 __ALLSRC2=	${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
 __ALLSRC3=	${empty(NETBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${NETBSDSRCDIR}|^src|}}
-__BUILDSEED=	${BUILDSEED}/${__ALLSRC3:O}/${.TARGET}
+__ALLSRC4=	${empty(X11SRCDIR):?${__ALLSRC3}:${__ALLSRC3:S|^${X11SRCDIR}|^xsrc|}}
+__BUILDSEED=	${BUILDSEED}/${__ALLSRC4:O}/${.TARGET}
 _CXXSEED?=	${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
 
 COMPILE.cc?=	${CXX} ${_CXXSEED} ${CXXFLAGS} ${DTRACE_OPTS} ${CPPFLAGS} -c



CVS commit: src

2018-05-20 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Sun May 20 14:08:33 UTC 2018

Modified Files:
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/modules: mi
src/etc: MAKEDEV.tmpl
src/share/man/man4: Makefile
src/share/man/man8: MAKEDEV.8
src/sys/conf: majors
src/sys/dev/gpio: files.gpio
src/sys/modules: Makefile
Added Files:
src/sys/dev/gpio: gpiopps.c

Log Message:
Add a 1PPS-over-GPIO driver, originally by Brad Spencer, with changes by
me to adapt to the new GPIO interrupt interface and support a wider variety
of GPIO pin configuations.

PR kern/51676


To generate a diff of this commit:
cvs rdiff -u -r1.1587 -r1.1588 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.115 -r1.116 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.189 -r1.190 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.653 -r1.654 src/share/man/man4/Makefile
cvs rdiff -u -r1.47 -r1.48 src/share/man/man8/MAKEDEV.8
cvs rdiff -u -r1.78 -r1.79 src/sys/conf/majors
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/gpio/files.gpio
cvs rdiff -u -r0 -r1.1 src/sys/dev/gpio/gpiopps.c
cvs rdiff -u -r1.203 -r1.204 src/sys/modules/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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1587 src/distrib/sets/lists/man/mi:1.1588
--- src/distrib/sets/lists/man/mi:1.1587	Sat May 19 14:15:39 2018
+++ src/distrib/sets/lists/man/mi	Sun May 20 14:08:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1587 2018/05/19 14:15:39 thorpej Exp $
+# $NetBSD: mi,v 1.1588 2018/05/20 14:08:32 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1124,6 +1124,7 @@
 ./usr/share/man/cat4/gpiolock.0			man-sys-catman		.cat
 ./usr/share/man/cat4/gpioow.0			man-sys-catman		.cat
 ./usr/share/man/cat4/gpioirq.0			man-sys-catman		.cat
+./usr/share/man/cat4/gpiopps.0			man-sys-catman		.cat
 ./usr/share/man/cat4/gpiopwm.0			man-sys-catman		.cat
 ./usr/share/man/cat4/gpiosim.0			man-sys-catman		.cat
 ./usr/share/man/cat4/gre.0			man-sys-catman		.cat
@@ -4265,6 +4266,7 @@
 ./usr/share/man/html4/gpiolock.html		man-sys-htmlman		html
 ./usr/share/man/html4/gpioow.html		man-sys-htmlman		html
 ./usr/share/man/html4/gpioirq.html		man-sys-htmlman		html
+./usr/share/man/html4/gpiopps.html		man-sys-htmlman		html
 ./usr/share/man/html4/gpiopwm.html		man-sys-htmlman		html
 ./usr/share/man/html4/gpiosim.html		man-sys-htmlman		html
 ./usr/share/man/html4/gre.html			man-sys-htmlman		html
@@ -7180,6 +7182,7 @@
 ./usr/share/man/man4/gpiolock.4			man-sys-man		.man
 ./usr/share/man/man4/gpioow.4			man-sys-man		.man
 ./usr/share/man/man4/gpioirq.4			man-sys-man		.man
+./usr/share/man/man4/gpiopps.4			man-sys-man		.man
 ./usr/share/man/man4/gpiopwm.4			man-sys-man		.man
 ./usr/share/man/man4/gpiosim.4			man-sys-man		.man
 ./usr/share/man/man4/gre.4			man-sys-man		.man

Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.115 src/distrib/sets/lists/modules/mi:1.116
--- src/distrib/sets/lists/modules/mi:1.115	Sat May 19 14:15:39 2018
+++ src/distrib/sets/lists/modules/mi	Sun May 20 14:08:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.115 2018/05/19 14:15:39 thorpej Exp $
+# $NetBSD: mi,v 1.116 2018/05/20 14:08:33 thorpej Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -136,6 +136,8 @@
 ./@MODULEDIR@/gpioirq/gpioirq.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/gpioowbase-kernel-modules	kmod
 ./@MODULEDIR@/gpioow/gpioow.kmod		base-kernel-modules	kmod
+./@MODULEDIR@/gpioppsbase-kernel-modules	kmod
+./@MODULEDIR@/gpiopps/gpiopps.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/gpiosimbase-kernel-modules	kmod
 ./@MODULEDIR@/gpiosim/gpiosim.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/hfsbase-kernel-modules	kmod

Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.189 src/etc/MAKEDEV.tmpl:1.190
--- src/etc/MAKEDEV.tmpl:1.189	Tue Jan  9 03:31:14 2018
+++ src/etc/MAKEDEV.tmpl	Sun May 20 14:08:33 2018
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$NetBSD: MAKEDEV.tmpl,v 1.189 2018/01/09 03:31:14 christos Exp $
+#	$NetBSD: MAKEDEV.tmpl,v 1.190 2018/05/20 14:08:33 thorpej Exp $
 #
 # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -242,6 +242,7 @@
 #	dtv*	Digital TV interface
 #	fb*	PMAX generic framebuffer pseudo-device
 #	fd	file descriptors
+#	gpiopps* 1PPS signals on GPIO pins
 #	grf*	graphics frame buffer device
 #	hdaudio* High Definition audio control device
 #	hdmicec* HDMI CEC devices
@@ -829,6 +830,7 @@ all)
 	makedev atabus0 atabus1 atabus2 atabus3 atabus4 atabus5 atabus6 atabus7
 	makedev tap tap0 tap1 tap2 tap3
 	makedev gpio gpio0 gpio1 gpio2 gpio3 gpio4 gpio5 gpio6 gpio7
+	makedev gpiopps0
 	makedev pad pad0 pad1 pad2 pad3
 	makedev bthub
 	makedev putter
@@ -866,6 +868,11 @@ gpio)
 	lndev gpio0 gpio
 	;;
 
+gpiopps)
+	makedev 

CVS commit: src/share/man/man4

2018-05-20 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Sun May 20 12:08:46 UTC 2018

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

Log Message:
End sentence with a dot.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/gpioirq.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/gpioirq.4
diff -u src/share/man/man4/gpioirq.4:1.1 src/share/man/man4/gpioirq.4:1.2
--- src/share/man/man4/gpioirq.4:1.1	Sat May 19 14:15:39 2018
+++ src/share/man/man4/gpioirq.4	Sun May 20 12:08:46 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpioirq.4,v 1.1 2018/05/19 14:15:39 thorpej Exp $
+.\" $NetBSD: gpioirq.4,v 1.2 2018/05/20 12:08:46 wiz Exp $
 .\"
 .\" Copyright (c) 2016 Brad Spencer 
 .\"
@@ -94,4 +94,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Brad Spencer Aq Mt b...@anduin.eldar.org
+.An Brad Spencer Aq Mt b...@anduin.eldar.org .



CVS commit: src/crypto/dist/ipsec-tools

2018-05-20 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sun May 20 09:14:18 UTC 2018

Modified Files:
src/crypto/dist/ipsec-tools: README

Log Message:
Add a note about FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/dist/ipsec-tools/README

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

Modified files:

Index: src/crypto/dist/ipsec-tools/README
diff -u src/crypto/dist/ipsec-tools/README:1.3 src/crypto/dist/ipsec-tools/README:1.4
--- src/crypto/dist/ipsec-tools/README:1.3	Sun May 20 08:55:25 2018
+++ src/crypto/dist/ipsec-tools/README	Sun May 20 09:14:18 2018
@@ -41,6 +41,11 @@ source code was moved into NetBSD's CVS 
 However, many distributions still take their tarballs from SourceForge, and
 each distribution maintains local patches.
 
+FreeBSD maintains its own libipsec and setkey tools, in:
+
+	head/lib/libipsec/
+	head/sbin/setkey/
+
 A Trac used to exist, at the following address:
 
 	https://trac.ipsec-tools.net/



CVS commit: src/crypto/dist/ipsec-tools

2018-05-20 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sun May 20 08:55:25 UTC 2018

Modified Files:
src/crypto/dist/ipsec-tools: README

Log Message:
Update, after ten years. Importantly, add a "History" section, to explain
what's going on.

We have now become "upstream", and most of the ipsec-tools development is
done in NetBSD's CVS. However, many distributions still take their
tarballs from SourceForge (which is defunct, and not maintained).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/dist/ipsec-tools/README

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

Modified files:

Index: src/crypto/dist/ipsec-tools/README
diff -u src/crypto/dist/ipsec-tools/README:1.2 src/crypto/dist/ipsec-tools/README:1.3
--- src/crypto/dist/ipsec-tools/README:1.2	Tue Dec 16 06:48:38 2008
+++ src/crypto/dist/ipsec-tools/README	Sun May 20 08:55:25 2018
@@ -9,30 +9,47 @@ in the Linux 2.6+ kernel. It works as we
 	- racoon, an IKEv1 keying daemon
 
 IPsec-tools were ported to Linux from the KAME project 
-(http://www.kame.net) by Derek Atkins  .
+(http://www.kame.net) by Derek Atkins .
+
+Authors
+===
+
+The ipsec-tools code has been maintained and developed by: 
 
-Currently the package is actively maintained and developed by: 
 	Emmanuel Dreyfus 
 	VANHULLEBUS Yvan 
 	Matthew Grooms 
 	Timo Teräs 
+	IHTFP Consulting 
+	SUSE Linux AG 
+
+Under the NetBSD CVS repository, several other people maintain it.
+
+History
+===
+
+Ipsec-tools was originally developed by the KAME project. It was then moved
+on SourfeForge, at the following address:
 
-Sources can be found at the IPsec-Tools home page at:
 	http://ipsec-tools.sourceforge.net/
 
-And CVS repository is hosted at NetBSD tree:
-	cvs -danon...@anoncvs.netbsd.org:/cvsroot co ipsec-tools
+Due to too restricted commit accesses, the development stalled, and the
+source code was moved into NetBSD's CVS repository, in:
+
+	src/crypto/dist/ipsec-tools
+
+However, many distributions still take their tarballs from SourceForge, and
+each distribution maintains local patches.
+
+A Trac used to exist, at the following address:
 
-Bug reports and project wiki is located at:
 	https://trac.ipsec-tools.net/
 
-Please report any problems to the mailing list:
+but the domain expired and was not renewed.
+
+The mailing lists from SourceForge still exist:
+
 	ipsec-tools-de...@lists.sourceforge.net
 	ipsec-tools-us...@lists.sourceforge.net
-
-You can also browse the list archive:
 	http://sf.net/mailarchive/forum.php?forum_name=ipsec-tools-devel
 
-Credits:
-	IHTFP Consulting, see http://www.ihtfp.com/
-	SUSE Linux AG, see http://www.suse.com/



CVS commit: src/sys/arch/aarch64/aarch64

2018-05-20 Thread Ryo Shimizu
Module Name:src
Committed By:   ryo
Date:   Sun May 20 06:45:00 UTC 2018

Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c

Log Message:
pmap_enter() must update modified/referenced flags by 'flags' not 'prot'.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.6 src/sys/arch/aarch64/aarch64/pmap.c:1.7
--- src/sys/arch/aarch64/aarch64/pmap.c:1.6	Wed May 16 08:32:07 2018
+++ src/sys/arch/aarch64/aarch64/pmap.c	Sun May 20 06:45:00 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.6 2018/05/16 08:32:07 ryo Exp $	*/
+/*	$NetBSD: pmap.c,v 1.7 2018/05/20 06:45:00 ryo Exp $	*/
 
 /*
  * Copyright (c) 2017 Ryo Shimizu 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.6 2018/05/16 08:32:07 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.7 2018/05/20 06:45:00 ryo Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
@@ -1436,17 +1436,10 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
 			"pmap_enter: failed to allocate pv_entry");
 		}
 
-		if (flags & PMAP_WIRED) {
-			/*
-			 * initial value of ref/mod are equal to prot,
-			 * and pte RW are same as prot.
-			 */
-			VM_PAGE_TO_MD(pg)->mdpg_flags |=
-			(prot & mdattr);
-		} else {
-			/* pte RW will be masked by ref/mod for ref/mod emul */
-			mdattr &= VM_PAGE_TO_MD(pg)->mdpg_flags;
-		}
+		/* update referenced/modified flags */
+		VM_PAGE_TO_MD(pg)->mdpg_flags |=
+		(flags & (VM_PROT_READ | VM_PROT_WRITE));
+		mdattr &= VM_PAGE_TO_MD(pg)->mdpg_flags;
 	}
 
 #ifdef PMAPCOUNTERS



CVS commit: src/sys/netinet6

2018-05-20 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sun May 20 06:29:43 UTC 2018

Modified Files:
src/sys/netinet6: ip6_mroute.c ip6_mroute.h

Log Message:
Remove notyet, we've never had this.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet6/ip6_mroute.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/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.127 src/sys/netinet6/ip6_mroute.c:1.128
--- src/sys/netinet6/ip6_mroute.c:1.127	Tue May  1 07:21:39 2018
+++ src/sys/netinet6/ip6_mroute.c	Sun May 20 06:29:43 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_mroute.c,v 1.127 2018/05/01 07:21:39 maxv Exp $	*/
+/*	$NetBSD: ip6_mroute.c,v 1.128 2018/05/20 06:29:43 maxv Exp $	*/
 /*	$KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $	*/
 
 /*
@@ -117,7 +117,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.127 2018/05/01 07:21:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.128 2018/05/20 06:29:43 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -685,10 +685,6 @@ add_m6if(struct mif6ctl *mifcp)
 	s = splsoftnet();
 	mifp->m6_flags = mifcp->mif6c_flags;
 	mifp->m6_ifp   = ifp;
-#ifdef notyet
-	/* scaling up here allows division by 1024 in critical code */
-	mifp->m6_rate_limit = mifcp->mif6c_rate_limit * 1024 / 1000;
-#endif
 	/* initialize per mif pkt counters */
 	mifp->m6_pkt_in= 0;
 	mifp->m6_pkt_out   = 0;

Index: src/sys/netinet6/ip6_mroute.h
diff -u src/sys/netinet6/ip6_mroute.h:1.18 src/sys/netinet6/ip6_mroute.h:1.19
--- src/sys/netinet6/ip6_mroute.h:1.18	Tue Feb  6 06:32:25 2018
+++ src/sys/netinet6/ip6_mroute.h	Sun May 20 06:29:43 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_mroute.h,v 1.18 2018/02/06 06:32:25 maxv Exp $	*/
+/*	$NetBSD: ip6_mroute.h,v 1.19 2018/05/20 06:29:43 maxv Exp $	*/
 /*	$KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $	*/
 
 /*
@@ -103,9 +103,6 @@ struct mif6ctl {
 	mifi_t	mif6c_mifi;		/* the index of the mif to be added  */
 	u_char	mif6c_flags; 	/* MIFF_ flags defined below */
 	u_short	mif6c_pifi;		/* the index of the physical IF */
-#ifdef notyet
-	u_int	mif6c_rate_limit;/* max rate   		 */
-#endif
 };
 
 #define	MIFF_REGISTER	0x1	/* mif represents a register end-point */



CVS commit: src/crypto/dist/ipsec-tools/src/racoon

2018-05-20 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Sun May 20 06:15:45 UTC 2018

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: vmbuf.c vmbuf.h

Log Message:
Style.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c \
src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h

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

Modified files:

Index: src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c:1.4 src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c:1.5
--- src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c:1.4	Sat Sep  9 16:22:10 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/vmbuf.c	Sun May 20 06:15:45 2018
@@ -1,11 +1,11 @@
-/*	$NetBSD: vmbuf.c,v 1.4 2006/09/09 16:22:10 manu Exp $	*/
+/*	$NetBSD: vmbuf.c,v 1.5 2018/05/20 06:15:45 maxv Exp $	*/
 
 /*	$KAME: vmbuf.c,v 1.11 2001/11/26 16:54:29 sakane Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -17,7 +17,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *may be used to endorse or promote products derived from this software
  *without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,8 +50,7 @@
 #include "gcmalloc.h"
 
 vchar_t *
-vmalloc(size)
-	size_t size;
+vmalloc(size_t size)
 {
 	vchar_t *var;
 
@@ -73,12 +72,10 @@ vmalloc(size)
 }
 
 vchar_t *
-vrealloc(ptr, size)
-	vchar_t *ptr;
-	size_t size;
+vrealloc(vchar_t *ptr, size_t size)
 {
 	caddr_t v;
-	
+
 	if (ptr != NULL) {
 		if (ptr->l == 0) {
 			(void)vfree(ptr);
@@ -103,8 +100,7 @@ vrealloc(ptr, size)
 }
 
 void
-vfree(var)
-	vchar_t *var;
+vfree(vchar_t *var)
 {
 	if (var == NULL)
 		return;
@@ -118,8 +114,7 @@ vfree(var)
 }
 
 vchar_t *
-vdup(src)
-	vchar_t *src;
+vdup(vchar_t *src)
 {
 	vchar_t *new;
 
Index: src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h
diff -u src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h:1.4 src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h:1.5
--- src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h:1.4	Sat Sep  9 16:22:10 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/vmbuf.h	Sun May 20 06:15:45 2018
@@ -1,11 +1,11 @@
-/*	$NetBSD: vmbuf.h,v 1.4 2006/09/09 16:22:10 manu Exp $	*/
+/*	$NetBSD: vmbuf.h,v 1.5 2018/05/20 06:15:45 maxv Exp $	*/
 
 /* Id: vmbuf.h,v 1.4 2005/10/30 10:28:44 vanhu Exp */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -17,7 +17,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *may be used to endorse or promote products derived from this software
  *without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -62,7 +62,7 @@ do { \
 
 #if defined(__APPLE__) && defined(__MACH__)
 /* vfree is already defined in Apple's system libraries */
-#define vfree   vmbuf_free
+#define vfree	vmbuf_free
 #endif
 
 extern vchar_t *vmalloc __P((size_t));