date:20180206

CVS commit: src/sys/netinet

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 06:21:23 UTC 2018

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

Log Message:
ip_add_membership() has an missing {} issue, but solve it by
dropping the "goto out" that would have happened immediately
next anyway, ie, should be NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/sys/netinet/ip_output.c

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

Modified files:

Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.293 src/sys/netinet/ip_output.c:1.294
--- src/sys/netinet/ip_output.c:1.293	Tue Feb  6 17:08:18 2018
+++ src/sys/netinet/ip_output.c	Wed Feb  7 06:21:23 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_output.c,v 1.293 2018/02/06 17:08:18 maxv Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.294 2018/02/07 06:21:23 mrg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.293 2018/02/06 17:08:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.294 2018/02/07 06:21:23 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1827,7 +1827,6 @@ ip_add_membership(struct ip_moptions *im
 		error = ip6_get_membership(sopt, , , , sizeof(ia));
 #else
 		error = EINVAL;
-		goto out;
 #endif
 
 	if (error)

CVS commit: src/sys/net

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 06:19:43 UTC 2018

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

Log Message:
ppprcvframe() has indentation issues.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/net/ppp_tty.c

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

Modified files:

Index: src/sys/net/ppp_tty.c
diff -u src/sys/net/ppp_tty.c:1.63 src/sys/net/ppp_tty.c:1.64
--- src/sys/net/ppp_tty.c:1.63	Sun Oct  2 14:17:07 2016
+++ src/sys/net/ppp_tty.c	Wed Feb  7 06:19:43 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ppp_tty.c,v 1.63 2016/10/02 14:17:07 christos Exp $	*/
+/*	$NetBSD: ppp_tty.c,v 1.64 2018/02/07 06:19:43 mrg Exp $	*/
 /*	Id: ppp_tty.c,v 1.3 1996/07/01 01:04:11 paulus Exp 	*/
 
 /*
@@ -93,7 +93,7 @@
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.63 2016/10/02 14:17:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.64 2018/02/07 06:19:43 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "ppp.h"
@@ -530,8 +530,8 @@ ppprcvframe(struct ppp_softc *sc, struct
 printf(
 "%s: garbage received: 0x%x (need 0xFF)\n",
 sc->sc_if.if_xname, hdr[0]);
-goto bail;
-			}
+			goto bail;
+		}
 		M_PREPEND(m,2,M_DONTWAIT);
 		if (m==NULL) {
 			splx(s);
@@ -562,7 +562,7 @@ ppprcvframe(struct ppp_softc *sc, struct
 		if (sc->sc_flags & SC_DEBUG)
 			printf("%s: bad protocol %x\n", sc->sc_if.if_xname,
 (hdr[2] << 8) + hdr[3]);
-			goto bail;
+		goto bail;
 	}
 
 	/* packet beyond configured mru? */

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

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 06:18:46 UTC 2018

Modified Files:
src/sys/external/bsd/drm2/drm: drm_scatter.c

Log Message:
XXX: add a NULL init to avoid a GCC 6 maybe uninit warning.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_scatter.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/drm/drm_scatter.c
diff -u src/sys/external/bsd/drm2/drm/drm_scatter.c:1.3 src/sys/external/bsd/drm2/drm/drm_scatter.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_scatter.c:1.3	Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/drm/drm_scatter.c	Wed Feb  7 06:18:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_scatter.c,v 1.3 2014/07/16 20:56:25 riastradh Exp $	*/
+/*	$NetBSD: drm_scatter.c,v 1.4 2018/02/07 06:18:46 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.3 2014/07/16 20:56:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.4 2018/02/07 06:18:46 mrg Exp $");
 
 #include 
 #include 
@@ -50,7 +50,7 @@ drm_sg_alloc(struct drm_device *dev, voi
 struct drm_file *file __unused)
 {
 	struct drm_scatter_gather *const request = data;
-	struct drm_sg_mem *sg;
+	struct drm_sg_mem *sg = NULL;
 	int error;
 
 	/*

CVS commit: src/sys/dev/pci

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 06:18:11 UTC 2018

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

Log Message:
avoid an indentation issue by adding "if (1)".


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/if_lmc.c

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

Modified files:

Index: src/sys/dev/pci/if_lmc.c
diff -u src/sys/dev/pci/if_lmc.c:1.63 src/sys/dev/pci/if_lmc.c:1.64
--- src/sys/dev/pci/if_lmc.c:1.63	Tue Jan 24 09:05:28 2017
+++ src/sys/dev/pci/if_lmc.c	Wed Feb  7 06:18:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.63 2017/01/24 09:05:28 ozaki-r Exp $ */
+/* $NetBSD: if_lmc.c,v 1.64 2018/02/07 06:18:11 mrg Exp $ */
 
 /*-
  * Copyright (c) 2002-2006 David Boggs. 
@@ -74,7 +74,7 @@
  */
 
 # include 
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.63 2017/01/24 09:05:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.64 2018/02/07 06:18:11 mrg Exp $");
 # include 	/* OS version */
 # include "opt_inet.h"	/* INET6, INET */
 # include "opt_altq_enabled.h" /* ALTQ */
@@ -5340,7 +5340,7 @@ print_driver_info(void)
 printf("LMC driver version %d/%d/%d; options",
  VER_YEAR, VER_MONTH, VER_DAY);
 if (ALTQ)   printf(" ALTQ");
-printf(" BPF"); /* always defined */
+if (1)  printf(" BPF"); /* always defined */
 if (NAPI)   printf(" NAPI");
 if (DEVICE_POLLING) printf(" POLL");
 if (P2P)printf(" P2P");

CVS commit: src/libexec/ld.elf_so

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 06:17:45 UTC 2018

Modified Files:
src/libexec/ld.elf_so: rtld.c

Log Message:
update for GCC 6:

ignore -Wframe-address warnings for the ppc hack.


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/libexec/ld.elf_so/rtld.c

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

Modified files:

Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.188 src/libexec/ld.elf_so/rtld.c:1.189
--- src/libexec/ld.elf_so/rtld.c:1.188	Mon Nov  6 21:16:04 2017
+++ src/libexec/ld.elf_so/rtld.c	Wed Feb  7 06:17:45 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtld.c,v 1.188 2017/11/06 21:16:04 joerg Exp $	 */
+/*	$NetBSD: rtld.c,v 1.189 2018/02/07 06:17:45 mrg Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.188 2017/11/06 21:16:04 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.189 2018/02/07 06:17:45 mrg Exp $");
 #endif /* not lint */
 
 #include 
@@ -1109,7 +1109,10 @@ _rtld_objmain_sym(const char *name)
 static __noinline void *
 hackish_return_address(void)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wframe-address"
 	return __builtin_return_address(1);
+#pragma GCC diagnostic pop
 }
 #endif

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

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 06:17:07 UTC 2018

Modified Files:
src/external/bsd/cron/bin/cron: Makefile

Log Message:
update for GCC 6:

do_process has vfork() vs clobber issues


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/cron/bin/cron/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/bsd/cron/bin/cron/Makefile
diff -u src/external/bsd/cron/bin/cron/Makefile:1.6 src/external/bsd/cron/bin/cron/Makefile:1.7
--- src/external/bsd/cron/bin/cron/Makefile:1.6	Wed Jun 14 17:37:40 2017
+++ src/external/bsd/cron/bin/cron/Makefile	Wed Feb  7 06:17:07 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2017/06/14 17:37:40 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2018/02/07 06:17:07 mrg Exp $
 
 .include 
 
@@ -19,5 +19,6 @@ LDADD+=		-lpam ${PAM_STATIC_LDADD}
 .endif
 
 CWARNFLAGS.clang+=	-Wno-string-plus-int
+CWARNFLAGS.gcc+=	-Wno-error=clobbered
 
 .include

CVS commit: src/external/gpl3/gcc

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 05:34:22 UTC 2018

Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64: gstdint.h
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64: defs.mk
gtyp-input.list tm.h

Log Message:
for now, turn off biarch support in ppc64.  it ends up enabling
secureplt support for 64 bit mode, which doesn't exist (or need it.)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/gstdint.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/gtyp-input.list \
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/tm.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.38 src/external/gpl3/gcc/dist/gcc/config.gcc:1.39
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.38	Fri Feb  2 03:41:03 2018
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Wed Feb  7 05:34:21 2018
@@ -2498,18 +2498,21 @@ powerpc*-*-netbsd*)
 	tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h"
 	tm_file="${tm_file} netbsd.h netbsd-elf.h"
 	case ${target} in
-	  powerpc64*)
-	tm_file="rs6000/biarch64.h ${tm_file} rs6000/sysv4.h rs6000/default64.h rs6000/netbsd64.h"
-	tmake_file="${tmake_file} rs6000/t-netbsd64"
-	;;
-	  *)
-	tm_file="${tm_file} rs6000/sysv4.h rs6000/netbsd.h"
-	tmake_file="${tmake_file} rs6000/t-netbsd"
-	;;
+	powerpc64*)
+		# ends up enabling --secure-plt on 64 bit, which isn't good.
+		#tm_file="rs6000/biarch64.h ${tm_file}"
+		enable_secureplt=no
+		tm_file="${tm_file} rs6000/sysv4.h rs6000/default64.h rs6000/netbsd64.h"
+		tmake_file="${tmake_file} rs6000/t-netbsd64"
+		;;
+	*)
+		tm_file="${tm_file} rs6000/sysv4.h rs6000/netbsd.h"
+		tmake_file="${tmake_file} rs6000/t-netbsd"
+		;;
 	esac
 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 	if test x${enable_secureplt} != xno; then
-	  tm_file="rs6000/secureplt.h ${tm_file}"
+	tm_file="rs6000/secureplt.h ${tm_file}"
 	fi
 	extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
 	;;

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/gstdint.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/gstdint.h:1.7 src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/gstdint.h:1.8
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/gstdint.h:1.7	Mon Nov 13 07:21:23 2017
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/gstdint.h	Wed Feb  7 05:34:21 2018
@@ -1,8 +1,8 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.90 2017/10/04 21:42:20 christos Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.92 2018/02/06 07:04:01 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp  */
 
-/* generated for  powerpc64--netbsd-gcc (NetBSD nb1 20171112) 5.5.0 */
+/* generated for  powerpc64--netbsd-gcc (NetBSD nb1 20180203) 6.4.0 */
 
 #ifndef GCC_GENERATED_STDINT_H
 #define GCC_GENERATED_STDINT_H 1

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/defs.mk
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/defs.mk:1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/defs.mk:1.8
--- src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/defs.mk:1.7	Tue Feb  6 09:18:33 2018
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/defs.mk	Wed Feb  7 05:34:22 2018
@@ -18,7 +18,7 @@ G_GCC_OBJS=gcc.o gcc-main.o ggc-none.o s
 G_GCOV_OBJS=gcov.o
 G_GCOV_DUMP_OBJS=gcov-dump.o
 G_GXX_OBJS=gcc.o gcc-main.o ggc-none.o spellcheck.o cp/g++spec.o
-G_GTM_H=tm.h  options.h ${GNUHOSTDIST}/gcc/config/rs6000/secureplt.h ${GNUHOSTDIST}/gcc/config/rs6000/biarch64.h ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/freebsd-spec.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.h ${GNUHOSTDIST}/gcc/config/rs6000/default64.h ${GNUHOSTDIST}/gcc/config/rs6000/netbsd64.h ${GNUHOSTDIST}/gcc/config/rs6000/option-defaults.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h
+G_GTM_H=tm.h  options.h ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/freebsd-spec.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.h

CVS commit: src/sys/kern

2018-02-06 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Wed Feb  7 04:25:09 UTC 2018

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

Log Message:
Spinkle ASSERT_SLEEPABLE to xcall functions


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/kern/subr_xcall.c

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

Modified files:

Index: src/sys/kern/subr_xcall.c
diff -u src/sys/kern/subr_xcall.c:1.25 src/sys/kern/subr_xcall.c:1.26
--- src/sys/kern/subr_xcall.c:1.25	Mon Feb  5 02:51:41 2018
+++ src/sys/kern/subr_xcall.c	Wed Feb  7 04:25:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_xcall.c,v 1.25 2018/02/05 02:51:41 ozaki-r Exp $	*/
+/*	$NetBSD: subr_xcall.c,v 1.26 2018/02/07 04:25:09 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.25 2018/02/05 02:51:41 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.26 2018/02/07 04:25:09 ozaki-r Exp $");
 
 #include 
 #include 
@@ -257,6 +257,7 @@ xc_broadcast(unsigned int flags, xcfunc_
 {
 
 	KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+	ASSERT_SLEEPABLE();
 
 	if ((flags & XC_HIGHPRI) != 0) {
 		int ipl = xc_extract_ipl(flags);
@@ -278,6 +279,7 @@ xc_unicast(unsigned int flags, xcfunc_t 
 
 	KASSERT(ci != NULL);
 	KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+	ASSERT_SLEEPABLE();
 
 	if ((flags & XC_HIGHPRI) != 0) {
 		int ipl = xc_extract_ipl(flags);
@@ -298,6 +300,7 @@ xc_wait(uint64_t where)
 	xc_state_t *xc;
 
 	KASSERT(!cpu_intr_p() && !cpu_softintr_p());
+	ASSERT_SLEEPABLE();
 
 	/* Determine whether it is high or low priority cross-call. */
 	if ((where & XC_PRI_BIT) != 0) {

CVS commit: src/external/gpl3/gcc

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 04:13:48 UTC 2018

Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: gstdint.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: c++config.h
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64: auto-host.h
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel: auto-host.h
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64: auto-host.h
src/external/gpl3/gcc/usr.bin/gcc/arch/vax: auto-host.h

Log Message:
regen mknative gcc 6.4 for mipsel.  sort of do it for vax, ia64 and ppc64.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h
cvs rdiff -u -r1.23 -r1.24 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/auto-host.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h

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

Modified files:

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h:1.5 src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h:1.6
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h:1.5	Mon Nov 13 07:21:22 2017
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h	Wed Feb  7 04:13:47 2018
@@ -1,8 +1,8 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.90 2017/10/04 21:42:20 christos Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.92 2018/02/06 07:04:01 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp  */
 
-/* generated for  ia64--netbsd-gcc (NetBSD nb1 20171112) 5.5.0 */
+/* generated for  ia64--netbsd-gcc (NetBSD nb1 20180203) 6.4.0 */
 
 #ifndef GCC_GENERATED_STDINT_H
 #define GCC_GENERATED_STDINT_H 1

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h:1.23 src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h:1.24
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h:1.23	Tue Feb  6 19:57:57 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h	Wed Feb  7 04:13:47 2018
@@ -1067,7 +1067,7 @@ namespace std
 #define _GLIBCXX_HAVE_TANL 1
 
 /* Define to 1 if you have the  header file. */
-/* #undef _GLIBCXX_HAVE_TGMATH_H */
+#define _GLIBCXX_HAVE_TGMATH_H 1
 
 /* Define to 1 if the target supports thread-local storage. */
 #define _GLIBCXX_HAVE_TLS 1

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h:1.6 src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h:1.6	Tue Feb  6 09:18:32 2018
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h	Wed Feb  7 04:13:47 2018
@@ -704,7 +704,7 @@
 
 /* Define if  defines clock_t. */
 #ifndef USED_FOR_TARGET
-/* #undef HAVE_CLOCK_T */
+#define HAVE_CLOCK_T 1
 #endif
 
 
@@ -717,33 +717,33 @@
 /* Define to 1 if we found a declaration for 'abort', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ABORT 0
+#define HAVE_DECL_ABORT 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'asprintf', otherwise define to
0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ASPRINTF 0
+#define HAVE_DECL_ASPRINTF 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'atof', otherwise define to 0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ATOF 0
+#define HAVE_DECL_ATOF 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'atol', otherwise define to 0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ATOL 0
+#define HAVE_DECL_ATOL 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'atoll', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ATOLL 0
+#define HAVE_DECL_ATOLL 1
 #endif
 
 
@@ -757,7 +757,7 @@
 /* Define to 1 if we found a declaration for 'calloc', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_CALLOC 0
+#define HAVE_DECL_CALLOC 1
 #endif
 
 
@@ -771,14 +771,14 @@
 /* Define to 1 if we found a declaration for 'clock', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_CLOCK 0
+#define HAVE_DECL_CLOCK 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'errno', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ERRNO 0
+#define HAVE_DECL_ERRNO 1
 #endif
 
 
@@ -805,7 +805,7 @@

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

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Feb  7 03:59:03 UTC 2018

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: crypto_openssl.c
crypto_openssl.h prsa_par.y rsalist.c

Log Message:
Welcome to the 21st century Buck Rogers: OpenSSL-1.1


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.h
cvs rdiff -u -r1.6 -r1.7 src/crypto/dist/ipsec-tools/src/racoon/prsa_par.y \
src/crypto/dist/ipsec-tools/src/racoon/rsalist.c

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/crypto_openssl.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.26 src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.27
--- src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c:1.26	Sun Jun 11 18:12:56 2017
+++ src/crypto/dist/ipsec-tools/src/racoon/crypto_openssl.c	Tue Feb  6 22:59:03 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto_openssl.c,v 1.26 2017/06/11 22:12:56 christos Exp $	*/
+/*	$NetBSD: crypto_openssl.c,v 1.27 2018/02/07 03:59:03 christos Exp $	*/
 
 /* Id: crypto_openssl.c,v 1.47 2006/05/06 20:42:09 manubsd Exp */
 
@@ -109,11 +109,11 @@
  * necessary for SSLeay/OpenSSL portability.  It sucks.
  */
 
-static int cb_check_cert_local __P((int, X509_STORE_CTX *));
-static int cb_check_cert_remote __P((int, X509_STORE_CTX *));
-static X509 *mem2x509 __P((vchar_t *));
+static int cb_check_cert_local(int, X509_STORE_CTX *);
+static int cb_check_cert_remote(int, X509_STORE_CTX *);
+static X509 *mem2x509(vchar_t *);
 
-static caddr_t eay_hmac_init __P((vchar_t *, const EVP_MD *));
+static caddr_t eay_hmac_init(vchar_t *, const EVP_MD *);
 
 /* X509 Certificate */
 /*
@@ -312,13 +312,19 @@ eay_cmp_asn1dn(n1, n2)
 	for(idx = 0; idx < X509_NAME_entry_count(a); idx++) {
 		X509_NAME_ENTRY *ea = X509_NAME_get_entry(a, idx);
 		X509_NAME_ENTRY *eb = X509_NAME_get_entry(b, idx);
+		ASN1_STRING *eda, *edb;
 		if (!eb) {	/* reached end of eb while still entries in ea, can not be equal... */
 			i = idx+1;
 			goto end;
 		}
-		if ((ea->value->length == 1 && ea->value->data[0] == '*') ||
-		(eb->value->length == 1 && eb->value->data[0] == '*')) {
-			if (OBJ_cmp(ea->object,eb->object)) {
+		eda = X509_NAME_ENTRY_get_data(ea);
+		edb = X509_NAME_ENTRY_get_data(eb);
+		if ((eda->length == 1 && eda->data[0] == '*') ||
+		(edb->length == 1 && edb->data[0] == '*')) {
+			ASN1_OBJECT *eoa, *eob;
+			eoa = X509_NAME_ENTRY_get_object(ea);
+			eob = X509_NAME_ENTRY_get_object(eb);
+			if (OBJ_cmp(eoa, eob)) {
 i = idx+1;
 goto end;
 			}
@@ -426,19 +432,17 @@ cb_check_cert_local(ok, ctx)
 	X509_STORE_CTX *ctx;
 {
 	char buf[256];
-	int log_tag;
+	int log_tag, error;
 
 	if (!ok) {
-		X509_NAME_oneline(
-X509_get_subject_name(ctx->current_cert),
-buf,
-256);
+		X509_NAME_oneline(X509_get_subject_name(
+		X509_STORE_CTX_get_current_cert(ctx)), buf, 256);
 		/*
 		 * since we are just checking the certificates, it is
 		 * ok if they are self signed. But we should still warn
 		 * the user.
  		 */
-		switch (ctx->error) {
+		switch (error = X509_STORE_CTX_get_error(ctx)) {
 		case X509_V_ERR_CERT_HAS_EXPIRED:
 		case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
 		case X509_V_ERR_INVALID_CA:
@@ -453,9 +457,8 @@ cb_check_cert_local(ok, ctx)
 		}
 		plog(log_tag, LOCATION, NULL,
 			"%s(%d) at depth:%d SubjectName:%s\n",
-			X509_verify_cert_error_string(ctx->error),
-			ctx->error,
-			ctx->error_depth,
+			X509_verify_cert_error_string(error), error,
+			X509_STORE_CTX_get_error_depth(ctx),
 			buf);
 	}
 	ERR_clear_error();
@@ -473,14 +476,12 @@ cb_check_cert_remote(ok, ctx)
 	X509_STORE_CTX *ctx;
 {
 	char buf[256];
-	int log_tag;
+	int log_tag, error;
 
 	if (!ok) {
-		X509_NAME_oneline(
-X509_get_subject_name(ctx->current_cert),
-buf,
-256);
-		switch (ctx->error) {
+		X509_NAME_oneline(X509_get_subject_name(
+		X509_STORE_CTX_get_current_cert(ctx)), buf, 256);
+		switch (error = X509_STORE_CTX_get_error(ctx)) {
 		case X509_V_ERR_UNABLE_TO_GET_CRL:
 			ok = 1;
 			log_tag = LLV_WARNING;
@@ -490,9 +491,9 @@ cb_check_cert_remote(ok, ctx)
 		}
 		plog(log_tag, LOCATION, NULL,
 			"%s(%d) at depth:%d SubjectName:%s\n",
-			X509_verify_cert_error_string(ctx->error),
-			ctx->error,
-			ctx->error_depth,
+			X509_verify_cert_error_string(error),
+			error,
+			X509_STORE_CTX_get_error_depth(ctx),
 			buf);
 	}
 	ERR_clear_error();
@@ -508,6 +509,7 @@ eay_get_x509asn1subjectname(cert)
 	vchar_t *cert;
 {
 	X509 *x509 = NULL;
+	X509_NAME *xname;
 	u_char *bp;
 	vchar_t *name = NULL;
 	int len;
@@ -517,13 +519,14 @@ eay_get_x509asn1subjectname(cert)
 		goto error;
 
 	/* get the length of the name */
-	len = i2d_X509_NAME(x509->cert_info->subject, NULL);

CVS commit: src/share/man/man4

2018-02-06 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Wed Feb  7 03:26:37 UTC 2018

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

Log Message:
Fix PR misc/52890


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/share/man/man4/wm.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/wm.4
diff -u src/share/man/man4/wm.4:1.38 src/share/man/man4/wm.4:1.39
--- src/share/man/man4/wm.4:1.38	Thu Jan 18 09:54:52 2018
+++ src/share/man/man4/wm.4	Wed Feb  7 03:26:36 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: wm.4,v 1.38 2018/01/18 09:54:52 wiz Exp $
+.\"	$NetBSD: wm.4,v 1.39 2018/02/07 03:26:36 knakahara Exp $
 .\"
 .\" Copyright 2002, 2003 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -168,6 +168,15 @@ driver supports these features of the ch
 See
 .Xr ifconfig 8
 for information on how to enable this feature.
+.Pp
+Many chips supported by the
+.Nm
+driver support jumbo frames, however several chips do not support
+jumbo frames, e.g. i82542, i82081H and 82567V.
+Jumbo frames can be configured via the interface MTU setting.
+Selecting an MTU larger than 1500 bytes with the
+.Xr ifconfig 8
+utility configures the adapter to receive and transmit jumbo frames.
 .\" .Sh DIAGNOSTICS
 .\" XXX to be done.
 .Sh OPTIONS

CVS commit: src/external/gpl3/gcc/usr.bin/backend

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 02:33:05 UTC 2018

Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile

Log Message:
make this actually work:
- use ${G_OBJS} directly, it avoids issues with .c vs .cc files.
- add a method to not rm -rf .ab for inspection.
- fix and add missing depends for many things.
- use -Wno-error for mips and arm insn-recog.c, due to eg:
insn-recog.c:10304:7: error: this decimal constant is unsigned only in ISO 
C90 [-Werror]
mips.md:3474:11: error: this decimal constant is unsigned only in ISO C90 
[-Werror]


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/external/gpl3/gcc/usr.bin/backend/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/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.41 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.42
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.41	Sun Feb  4 10:16:07 2018
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Wed Feb  7 02:33:05 2018
@@ -1,10 +1,13 @@
-#	$NetBSD: Makefile,v 1.41 2018/02/04 10:16:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.42 2018/02/07 02:33:05 mrg Exp $
 
 LIBISPRIVATE=	yes
 
 LIB=		backend
 
-SRCS=		${G_OBJS:.o=.c} ${G_out_file:T} regsub.c
+SRCS=		${G_OBJS} ${G_out_file:T} regsub.c
+
+# XXX: something misses these.
+CLEANDIRFILES+=	${G_OBJS:.o=.d}
 
 # Make sure we use the pre-generated C files
 .l.c:
@@ -29,16 +32,6 @@ HOSTPROG_CXX=	1
 
 HOST_LIBIBERTYOBJ!=	cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
 
-# XXX ${G_OBJS:.o=.c} is invalid in GCC 5.3, but work around for now
-BUILDSYMLINKS+=	${GNUHOSTDIST}/gcc/wide-int-print.cc wide-int-print.c
-BUILDSYMLINKS+=	${GNUHOSTDIST}/gcc/wide-int.cc wide-int.c
-
-.if ${MACHINE_CPU} == "sh3"
-BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh-mem.cc sh-mem.c
-BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh_treg_combine.cc sh_treg_combine.c
-BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh_optimize_sett_clrt.cc sh_optimize_sett_clrt.c
-.endif
-
 .include 
 
 # Force using C++ for this
@@ -211,6 +204,10 @@ ${G_OBJS} ${G_OBJS:.o=.d}:	tm_p.h		# XXX
 CLEANFILES+=	auto-build.h
 HOST_CFLAGS+= -I${.OBJDIR}
 HOST_CXXFLAGS+= -I${.OBJDIR}
+
+# Set this to "true" to leave .ab around
+HOST_AB_CLEAN?=	rm -rf .ab
+
 auto-build.h: gmp.h Makefile
 	${_MKTARGET_CREATE}
 	rm -rf .ab && \
@@ -228,8 +225,7 @@ auto-build.h: gmp.h Makefile
 			--host=`${HOST_SH} ${GNUHOSTDIST}/config.guess` \
 			--target=${MACHINE_GNU_PLATFORM} && \
 		mv auto-host.h ../auto-build.h) && \
-	true
-	#rm -rf .ab
+	${HOST_AB_CLEAN}
 
 pass-instances.def: passes.def gen-pass-instances.awk
 	${_MKTARGET_CREATE}
@@ -243,12 +239,12 @@ CLEANFILES+=	pass-instances.def
 #
 
 build-rtl.c: rtl.c \
-  ${G_RTL_H} real.h ${G_GCC_H} ${G_GGC_H} errors.h
+  ${G_RTL_H} real.h ${G_GCC_H} ${G_RTL_BASE_H} ${G_GGC_H} errors.h
 	${_MKTARGET_CREATE}
 	rm -f build-rtl.c
 	${TOOL_SED} -e 's/${.TARGET}
-build-rtl.lo: ${HH}
+build-rtl.lo: ${HH} insn-constants.h
 CLEANFILES+=	build-rtl.c
 
 build-print-rtl.c: print-rtl.c \
@@ -310,6 +306,8 @@ build-vec.c: vec.c vec.h ${G_GGC_H}
 build-vec.lo: ${HH_NORTL}
 CLEANFILES+=	build-vec.c
 
+build-genattrtab.o: ${G_GGC_H}
+
 #
 # The normal insn-foo generators
 #
@@ -333,7 +331,7 @@ GENPROG_RTL_DEPENDS=	${G_BUILD_RTL:.o=.l
 .for f in attr attr-common attrtab automata codes conditions config emit \
 	  extract flags opinit output peep preds recog mddump condmd \
 	  target-def cfn-macros
-gen${f}.lo: ${HH} gen${f}.c
+gen${f}.lo: ${HH} gen${f}.c ${G_RTL_BASE_H}
 gen${f}: gen${f}.lo ${GENPROG_RTL_DEPENDS} 
 	${_MKTARGET_LINK}
 	${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
@@ -341,15 +339,15 @@ CLEANFILES+=	gen${f} gen${f}.lo
 .endfor
 
 .for f in mddeps constants enums
-gen${f}.lo: ${HH} gen${f}.c
-gen${f}: gen${f}.lo ${GENPROG_READER_DEPENDS} 
+gen${f}.lo: ${HH} gen${f}.c ${G_RTL_BASE_H}
+gen${f}: gen${f}.lo ${GENPROG_READER_DEPENDS}
 	${_MKTARGET_LINK}
 	${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
 CLEANFILES+=	gen${f} gen${f}.lo
 .endfor
 
 .for f in check checksum
-gen${f}.lo: ${HH} gen${f}.c
+gen${f}.lo: ${HH} gen${f}.c ${G_RTL_BASE_H}
 gen${f}: gen${f}.lo
 	${_MKTARGET_LINK}
 	${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
@@ -421,7 +419,7 @@ CLEANFILES+=	insn-conditions.md 
 
 # build params.list for params.h.
 params.h: params.list
-DPSRCS+= params.h
+${SRCS}: params.list
 params-list.h: params.def
 params.list: params-list.h
 	${CPP} ${.ALLSRC} | sed 's/^#.*//;/^$$/d' > params.list.tmp && \
@@ -450,10 +448,10 @@ ${CASECFNDEPS}: case-cfn-macros.h
 #
 genextract.lo: insn-config.h
 gencondmd.lo: tm_p.h tm-constrs.h
-read-rtl.lo gencodes.lo genattrtab.lo

CVS commit: src/external/gpl3/gcc/lib/libasan

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 02:32:39 UTC 2018

Modified Files:
src/external/gpl3/gcc/lib/libasan: Makefile

Log Message:
some more/changed files need -O1 for vax.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/lib/libasan/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/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.19 src/external/gpl3/gcc/lib/libasan/Makefile:1.20
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.19	Sun Feb  4 01:16:33 2018
+++ src/external/gpl3/gcc/lib/libasan/Makefile	Wed Feb  7 02:32:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/02/04 01:16:33 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2018/02/07 02:32:39 mrg Exp $
 
 UNSUPPORTED_COMPILER.clang=	# defined
 
@@ -39,8 +39,11 @@ LIB=	asan
 SRCS+=	${ASAN_SRCS}
 
 .if ${MACHINE_ARCH} == "vax"
-COPTS.asan_allocator2.cc += -O1
+COPTS.asan_allocator.cc += -O1
 COPTS.asan_report.cc += -O1
+COPTS.sanitizer_common.cc += -O1
+COPTS.sanitizer_common_libcdep.cc += -O1
+COPTS.sanitizer_posix.cc += -O1
 .endif
 
 .include

CVS commit: src/external/gpl3/gcc/dist/libsanitizer

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 02:32:01 UTC 2018

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_linux.cc
src/external/gpl3/gcc/dist/libsanitizer/ubsan: ubsan_platform.h

Log Message:
port to hppa, m68k, m68000, vax, and sh3.  this should complete
our list of ports.  it's only about obtaining some pointers in
this code, really.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.14 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.15
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.14	Tue Feb  6 09:31:56 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc	Wed Feb  7 02:32:01 2018
@@ -1158,10 +1158,16 @@ void GetPcSpBp(void *context, uptr *pc, 
   *sp = ucontext->uc_mcontext.sp;
 #elif defined(__hppa__)
   ucontext_t *ucontext = (ucontext_t*)context;
+# if SANITIZER_NETBSD
+  *pc = _UC_MACHINE_PC(ucontext);
+  *sp = _UC_MACHINE_SP(ucontext);
+  *bp = ucontext->uc_mcontext.__gregs[3]; /* XXX */
+#else
   *pc = ucontext->uc_mcontext.sc_iaoq[0];
   /* GCC uses %r3 whenever a frame pointer is needed.  */
   *bp = ucontext->uc_mcontext.sc_gr[3];
   *sp = ucontext->uc_mcontext.sc_gr[30];
+# endif
 #elif defined(__x86_64__)
 # if SANITIZER_FREEBSD
   ucontext_t *ucontext = (ucontext_t*)context;
@@ -1208,7 +1214,7 @@ void GetPcSpBp(void *context, uptr *pc, 
   // The powerpc{,64}-linux ABIs do not specify r31 as the frame
   // pointer, but GCC always uses r31 when we need a frame pointer.
   *bp = ucontext->uc_mcontext.regs->gpr[PT_R31];
-#endif
+# endif
 #elif defined(__sparc__)
   ucontext_t *ucontext = (ucontext_t*)context;
   uptr *stk_ptr;
@@ -1248,6 +1254,21 @@ void GetPcSpBp(void *context, uptr *pc, 
   *pc = _UC_MACHINE_PC(ucontext);
   *sp = _UC_MACHINE_SP(ucontext);
   *bp = ucontext->uc_mcontext.__gregs[_REG_S6];
+#elif (defined(__m68k__) || defined(__mc68010__)) && SANITIZER_NETBSD
+  ucontext_t *ucontext = (ucontext_t*)context;
+  *pc = _UC_MACHINE_PC(ucontext);
+  *sp = _UC_MACHINE_SP(ucontext);
+  *bp = ucontext->uc_mcontext.__gregs[_REG_A6];
+#elif defined(__vax__) && SANITIZER_NETBSD
+  ucontext_t *ucontext = (ucontext_t*)context;
+  *pc = _UC_MACHINE_PC(ucontext);
+  *sp = _UC_MACHINE_SP(ucontext);
+  *bp = ucontext->uc_mcontext.__gregs[_REG_FP];
+#elif defined(__sh3__) && SANITIZER_NETBSD
+  ucontext_t *ucontext = (ucontext_t*)context;
+  *pc = _UC_MACHINE_PC(ucontext);
+  *sp = _UC_MACHINE_SP(ucontext);
+  *bp = ucontext->uc_mcontext.__gregs[_REG_R14];
 #else
 # error "Unsupported arch"
 #endif

Index: src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h:1.5 src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h:1.6
--- src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h:1.5	Tue Feb  6 09:31:56 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h	Wed Feb  7 02:32:01 2018
@@ -17,7 +17,9 @@
  defined(__APPLE__)) && \
 (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || \
  defined(__aarch64__) || defined(__mips__) || defined(__powerpc__) || \
- defined(__powerpc64__) || defined(__sparc__) || defined(__alpha__))
+ defined(__hppa__) || defined(__m68k__) || defined(__mc68010__) || \
+ defined(__powerpc64__) || defined(__sparc__) || defined(__alpha__) || \
+ defined(__vax__) || defined(__sh3__))
 # define CAN_SANITIZE_UB 1
 #elif defined(_WIN32)
 # define CAN_SANITIZE_UB 1

CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Feb  7 02:30:39 UTC 2018

Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile

Log Message:
handle MKPICLIB=no builds.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/gcc/lib/libstdc++-v3/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/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.31 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.32
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.31	Sun Feb  4 01:16:33 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile	Wed Feb  7 02:30:39 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2018/02/04 01:16:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.32 2018/02/07 02:30:39 mrg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -25,7 +25,11 @@ libstdc++-symbols.ver:
 	${CXX} -I${DESTDIR}/usr/include/g++ -E -P -include ${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}/c++config.h - > \
 	${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET} && rm -f ${.TARGET}.tmp
 
+.if ${MKPICLIB} != "no"
 libstdc++_pic.a:: libstdc++-symbols.ver
+.else
+libstdc++.a:: libstdc++-symbols.ver
+.endif
 
 LDFLAGS+=	-Wl,-O1 \
 		-Wl,--gc-sections \

CVS commit: src/external/gpl3/gcc

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 23:12:35 UTC 2018

Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: c++config.h
src/external/gpl3/gcc/usr.bin/gcc/arch/alpha: auto-host.h

Log Message:
fix alpha gcc 6.4 mknative.  now works.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h

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

Modified files:

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h:1.22 src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h:1.23
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h:1.22	Sun Feb  4 01:17:44 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h	Tue Feb  6 23:12:35 2018
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.91 2018/02/03 19:06:25 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.92 2018/02/06 07:04:01 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp  */
 
 // Predefined symbols and macros -*- C++ -*-
@@ -1067,7 +1067,7 @@ namespace std
 #define _GLIBCXX_HAVE_TANL 1
 
 /* Define to 1 if you have the  header file. */
-/* #undef _GLIBCXX_HAVE_TGMATH_H */
+#define _GLIBCXX_HAVE_TGMATH_H 1
 
 /* Define to 1 if the target supports thread-local storage. */
 #define _GLIBCXX_HAVE_TLS 1

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h:1.9 src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h:1.10
--- src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h:1.9	Sun Feb  4 01:17:45 2018
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h	Tue Feb  6 23:12:35 2018
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.91 2018/02/03 19:06:25 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.92 2018/02/06 07:04:01 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp  */
 
 /* auto-host.h.  Generated from config.in by configure.  */
@@ -704,7 +704,7 @@
 
 /* Define if  defines clock_t. */
 #ifndef USED_FOR_TARGET
-/* #undef HAVE_CLOCK_T */
+#define HAVE_CLOCK_T 1
 #endif
 
 
@@ -717,33 +717,33 @@
 /* Define to 1 if we found a declaration for 'abort', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ABORT 0
+#define HAVE_DECL_ABORT 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'asprintf', otherwise define to
0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ASPRINTF 0
+#define HAVE_DECL_ASPRINTF 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'atof', otherwise define to 0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ATOF 0
+#define HAVE_DECL_ATOF 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'atol', otherwise define to 0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ATOL 0
+#define HAVE_DECL_ATOL 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'atoll', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ATOLL 0
+#define HAVE_DECL_ATOLL 1
 #endif
 
 
@@ -757,7 +757,7 @@
 /* Define to 1 if we found a declaration for 'calloc', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_CALLOC 0
+#define HAVE_DECL_CALLOC 1
 #endif
 
 
@@ -771,14 +771,14 @@
 /* Define to 1 if we found a declaration for 'clock', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_CLOCK 0
+#define HAVE_DECL_CLOCK 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'errno', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_ERRNO 0
+#define HAVE_DECL_ERRNO 1
 #endif
 
 
@@ -805,7 +805,7 @@
 
 /* Define to 1 if we found a declaration for 'ffs', otherwise define to 0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_FFS 0
+#define HAVE_DECL_FFS 1
 #endif
 
 
@@ -860,7 +860,7 @@
 
 /* Define to 1 if we found a declaration for 'free', otherwise define to 0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_FREE 0
+#define HAVE_DECL_FREE 1
 #endif
 
 
@@ -874,63 +874,63 @@
 /* Define to 1 if we found a declaration for 'getchar_unlocked', otherwise
define to 0. */
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_GETCHAR_UNLOCKED 0
+#define HAVE_DECL_GETCHAR_UNLOCKED 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'getcwd', otherwise define to 0.
*/
 #ifndef USED_FOR_TARGET
-#define HAVE_DECL_GETCWD 0
+#define HAVE_DECL_GETCWD 1
 #endif
 
 
 /* Define to 1 if we found a declaration for 'getc_unlocked', otherwise define
to 0. */
 #ifndef USED_FOR_TARGET
-#define

CVS commit: src

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 23:12:02 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/external/gpl3/gcc/usr.bin: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin/gcov-dump: Makefile

Log Message:
build and install gcov-dump.


To generate a diff of this commit:
cvs rdiff -u -r1.2175 -r1.2176 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.239 -r1.240 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/gcov-dump/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2175 src/distrib/sets/lists/comp/mi:1.2176
--- src/distrib/sets/lists/comp/mi:1.2175	Sun Feb  4 11:08:16 2018
+++ src/distrib/sets/lists/comp/mi	Tue Feb  6 23:12:01 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2175 2018/02/04 11:08:16 mrg Exp $
+#	$NetBSD: mi,v 1.2176 2018/02/06 23:12:01 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -39,6 +39,7 @@
 ./usr/bin/gcc	comp-c-bin		gcccmds
 ./usr/bin/gcore	comp-debug-bin
 ./usr/bin/gcov	comp-debug-bin		gcccmds
+./usr/bin/gcov-dumpcomp-debug-bin		gcccmds,gcc=6
 ./usr/bin/gdb	comp-debug-bin		gdb
 ./usr/bin/gdbtuicomp-debug-bin		gdb
 ./usr/bin/genassymcomp-util-bin
@@ -4013,6 +4014,7 @@
 ./usr/share/man/cat1/gcc.0			comp-c-catman		gcccmds,.cat
 ./usr/share/man/cat1/gcore.0			comp-debug-catman	.cat
 ./usr/share/man/cat1/gcov.0			comp-debug-catman	gcccmds,.cat
+./usr/share/man/cat1/gcov-dump.0		comp-debug-catman	gcccmds,.cat,gcc=6
 ./usr/share/man/cat1/gdb.0			comp-debug-catman	gdb,.cat
 ./usr/share/man/cat1/genassym.0			comp-util-catman	.cat
 ./usr/share/man/cat1/gprof.0			comp-debug-catman	binutils,.cat
@@ -11697,6 +11699,7 @@
 ./usr/share/man/html1/gcc.html			comp-c-htmlman		gcccmds,html
 ./usr/share/man/html1/gcore.html		comp-debug-htmlman	html
 ./usr/share/man/html1/gcov.html			comp-debug-htmlman	gcccmds,html
+./usr/share/man/html1/gcov-dump.html		comp-debug-htmlman	gcccmds,html,gcc=6
 ./usr/share/man/html1/gdb.html			comp-debug-htmlman	gdb,html
 ./usr/share/man/html1/genassym.html		comp-util-htmlman	html
 ./usr/share/man/html1/gprof.html		comp-debug-htmlman	binutils,html
@@ -19121,6 +19124,7 @@
 ./usr/share/man/man1/gcc.1			comp-c-man		gcccmds,.man
 ./usr/share/man/man1/gcore.1			comp-debug-man		.man
 ./usr/share/man/man1/gcov.1			comp-debug-man		gcccmds,.man
+./usr/share/man/man1/gcov-dump.1		comp-debug-man		gcccmds,.man,gcc=6
 ./usr/share/man/man1/gdb.1			comp-debug-man		gdb,.man
 ./usr/share/man/man1/genassym.1			comp-util-man		.man
 ./usr/share/man/man1/gprof.1			comp-debug-man		binutils,.man

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.239 src/distrib/sets/lists/debug/mi:1.240
--- src/distrib/sets/lists/debug/mi:1.239	Sat Feb  3 21:27:45 2018
+++ src/distrib/sets/lists/debug/mi	Tue Feb  6 23:12:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.239 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: mi,v 1.240 2018/02/06 23:12:02 mrg Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -541,6 +541,7 @@
 ./usr/libdata/debug/usr/bin/gcc.debug		comp-c-debug		gcccmds,debug
 ./usr/libdata/debug/usr/bin/gcore.debug		comp-debug-debug	debug
 ./usr/libdata/debug/usr/bin/gcov.debug		comp-debug-debug	gcccmds,debug
+./usr/libdata/debug/usr/bin/gcov-dump.debug	comp-debug-debug	gcccmds,debug,gcc=6
 ./usr/libdata/debug/usr/bin/gdb.debug		comp-debug-debug	gdb,debug
 ./usr/libdata/debug/usr/bin/gdbtui.debug	comp-debug-debug	gdb,debug
 ./usr/libdata/debug/usr/bin/gencat.debug	comp-locale-debug	debug

Index: src/external/gpl3/gcc/usr.bin/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.8 src/external/gpl3/gcc/usr.bin/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/Makefile:1.8	Tue Mar 15 19:14:47 2016
+++ src/external/gpl3/gcc/usr.bin/Makefile	Tue Feb  6 23:12:01 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2016/03/15 19:14:47 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2018/02/06 23:12:01 mrg Exp $
 
 NOOBJ=# defined
 
@@ -16,7 +16,7 @@ SUBDIR+=	host-libiberty .WAIT \
 		frontend .WAIT \
 		common common-target .WAIT \
 		libcpp libdecnumber .WAIT \
-		gcov cc1 cc1obj cc1plus cpp g++ gcc \
+		gcov gcov-dump cc1 cc1obj cc1plus cpp g++ gcc \
 		lto1 lto-wrapper \
 		include
 

Added files:

Index: src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile
diff -u /dev/null src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile:1.1
--- /dev/null	Tue Feb  6 23:12:02 2018
+++ src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile	Tue Feb  6 23:12:01 2018
@@ -0,0 +1,32 @@
+#	$NetBSD: Makefile,v 1.1 2018/02/06 23:12:01

CVS commit: src/usr.sbin/syslogd

2018-02-06 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Tue Feb  6 22:04:22 UTC 2018

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

Log Message:
Correct misleading indentation.


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

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

Modified files:

Index: src/usr.sbin/syslogd/tls.c
diff -u src/usr.sbin/syslogd/tls.c:1.14 src/usr.sbin/syslogd/tls.c:1.15
--- src/usr.sbin/syslogd/tls.c:1.14	Tue Feb  6 21:36:46 2018
+++ src/usr.sbin/syslogd/tls.c	Tue Feb  6 22:04:22 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls.c,v 1.14 2018/02/06 21:36:46 christos Exp $	*/
+/*	$NetBSD: tls.c,v 1.15 2018/02/06 22:04:22 maya Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: tls.c,v 1.14 2018/02/06 21:36:46 christos Exp $");
+__RCSID("$NetBSD: tls.c,v 1.15 2018/02/06 22:04:22 maya Exp $");
 
 #ifndef DISABLE_TLS
 #include 
@@ -116,8 +116,8 @@ get_dh1024(void)
 		goto out;
 	return dh;
 out:
-		DH_free(dh);
-		return NULL;
+	DH_free(dh);
+	return NULL;
 }
 
 #define ST_CHANGE(x, y) do {	\

CVS commit: src/usr.sbin/syslogd

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 21:36:47 UTC 2018

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

Log Message:
Adjust to OpenSSL-1.1


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/syslogd/sign.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/syslogd/tls.c

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

Modified files:

Index: src/usr.sbin/syslogd/sign.c
diff -u src/usr.sbin/syslogd/sign.c:1.6 src/usr.sbin/syslogd/sign.c:1.7
--- src/usr.sbin/syslogd/sign.c:1.6	Tue Feb 10 15:38:15 2015
+++ src/usr.sbin/syslogd/sign.c	Tue Feb  6 16:36:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sign.c,v 1.6 2015/02/10 20:38:15 christos Exp $	*/
+/*	$NetBSD: sign.c,v 1.7 2018/02/06 21:36:46 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
  * 1. check; next draft will be clearer and specify the format as implemented.
  * 2. check; definitely only DSA in this version.
  * 3. remains a problem, so far no statement from authors or WG.
- * 4. check; used EVP_dss1 method implements FIPS.
+ * 4. check; used EVP_sha1 method implements FIPS.
  */
 /*
  * Limitations of this implementation:
@@ -66,7 +66,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: sign.c,v 1.6 2015/02/10 20:38:15 christos Exp $");
+__RCSID("$NetBSD: sign.c,v 1.7 2018/02/06 21:36:46 christos Exp $");
 
 #ifndef DISABLE_SIGN
 #include "syslogd.h"
@@ -99,15 +99,19 @@ sign_global_init(struct filed *Files)
 	EVP_MD_CTX_init(GlobalSign.sigctx);
 
 	/* the signature algorithm depends on the type of key */
-	if (EVP_PKEY_DSA == EVP_PKEY_type(GlobalSign.pubkey->type)) {
-		GlobalSign.sig = EVP_dss1();
+	switch (EVP_PKEY_base_id(GlobalSign.pubkey)) {
+	case EVP_PKEY_DSA:
+		GlobalSign.sig = EVP_sha1();
 		GlobalSign.sig_len_b64 = SIGN_B64SIGLEN_DSS;
-/* this is the place to add non-DSA key types and algorithms
-	} else if (EVP_PKEY_RSA == EVP_PKEY_type(GlobalSign.pubkey->type)) {
+		break;
+#ifdef notyet
+	/* this is the place to add non-DSA key types and algorithms */
+	case EVP_PKEY_RSA:
 		GlobalSign.sig = EVP_sha1();
 		GlobalSign.sig_len_b64 = 28;
-*/
-	} else {
+		break;
+#endif
+	default:
 		logerror("key type not supported for syslog-sign");
 		return false;
 	}
@@ -115,7 +119,6 @@ sign_global_init(struct filed *Files)
 	assert(GlobalSign.keytype == 'C' || GlobalSign.keytype == 'K');
 	assert(GlobalSign.pubkey_b64 && GlobalSign.privkey &&
 	GlobalSign.pubkey);
-	assert(GlobalSign.privkey->pkey.dsa->priv_key);
 
 	GlobalSign.gbc = 0;
 	STAILQ_INIT();
@@ -126,7 +129,7 @@ sign_global_init(struct filed *Files)
 	EVP_MD_CTX_init(GlobalSign.mdctx);
 
 	/* values for SHA-1 */
-	GlobalSign.md = EVP_dss1();
+	GlobalSign.md = EVP_sha1();
 	GlobalSign.md_len_b64 = 28;
 	GlobalSign.ver = "0111";
 
@@ -191,7 +194,7 @@ sign_get_keys(void)
 		 */
 		FREE_SSL(ssl);
 
-		if (EVP_PKEY_DSA != EVP_PKEY_type(pubkey->type)) {
+		if (EVP_PKEY_DSA != EVP_PKEY_base_id(pubkey)) {
 			DPRINTF(D_SIGN, "X.509 cert has no DSA key\n");
 			EVP_PKEY_free(pubkey);
 			privkey = NULL;
@@ -234,8 +237,15 @@ sign_get_keys(void)
 			logerror("EVP_PKEY_new() failed");
 			return false;
 		}
-		dsa = DSA_generate_parameters(SIGN_GENCERT_BITS, NULL, 0,
-			NULL, NULL, NULL, NULL);
+		if ((dsa = DSA_new()) == NULL) {
+			logerror("DSA_new() failed");
+			return false;
+		}
+		if (!DSA_generate_parameters_ex(dsa, SIGN_GENCERT_BITS, NULL, 0,
+			NULL, NULL, NULL)) {
+			logerror("DSA_generate_parameters_ex() failed");
+			return false;
+		}
 		if (!DSA_generate_key(dsa)) {
 			logerror("DSA_generate_key() failed");
 			return false;

Index: src/usr.sbin/syslogd/tls.c
diff -u src/usr.sbin/syslogd/tls.c:1.13 src/usr.sbin/syslogd/tls.c:1.14
--- src/usr.sbin/syslogd/tls.c:1.13	Tue Jan 10 16:05:42 2017
+++ src/usr.sbin/syslogd/tls.c	Tue Feb  6 16:36:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls.c,v 1.13 2017/01/10 21:05:42 christos Exp $	*/
+/*	$NetBSD: tls.c,v 1.14 2018/02/06 21:36:46 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: tls.c,v 1.13 2017/01/10 21:05:42 christos Exp $");
+__RCSID("$NetBSD: tls.c,v 1.14 2018/02/06 21:36:46 christos Exp $");
 
 #ifndef DISABLE_TLS
 #include 
@@ -104,16 +104,20 @@ get_dh1024(void)
 		0x88,0xEC,0xA6,0xBA,0x9F,0x4F,0x85,0x43 };
 	static const unsigned char dh1024_g[]={ 0x02 };
 	DH *dh;
+	BIGNUM *p, *g;
 
-	if ((dh=DH_new()) == NULL)
+	if ((dh = DH_new()) == NULL)
 		return NULL;
-	dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
-	dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
-	if ((dh->p == NULL) || (dh->g == NULL)) {
+	p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL);
+	g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL);
+	if (p == NULL || g == NULL)
+		goto out;
+	if (!DH_set0_pqg(dh, p, NULL, g))
+		goto out;
+	return dh;
+out:
 		DH_free(dh);
 		return NULL;
-	}
-	return dh;
 }
 
 #define ST_CHANGE(x, y) do {

CVS commit: src/external/bsd/unbound/include

2018-02-06 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Tue Feb  6 21:27:49 UTC 2018

Modified Files:
src/external/bsd/unbound/include: config-1.0.h config-1.1.h

Log Message:
Restore default paths to what they were before prior import.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/unbound/include/config-1.0.h \
src/external/bsd/unbound/include/config-1.1.h

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

Modified files:

Index: src/external/bsd/unbound/include/config-1.0.h
diff -u src/external/bsd/unbound/include/config-1.0.h:1.1 src/external/bsd/unbound/include/config-1.0.h:1.2
--- src/external/bsd/unbound/include/config-1.0.h:1.1	Tue Feb  6 03:29:57 2018
+++ src/external/bsd/unbound/include/config-1.0.h	Tue Feb  6 21:27:49 2018
@@ -617,7 +617,7 @@
 #define PACKAGE_VERSION "1.6.8"
 
 /* default pidfile location */
-#define PIDFILE "/usr/local/etc/unbound/unbound.pid"
+#define PIDFILE "/var/run/unbound.pid"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -627,19 +627,19 @@
 #define RETSIGTYPE void
 
 /* default rootkey location */
-#define ROOT_ANCHOR_FILE "/usr/local/etc/unbound/root.key"
+#define ROOT_ANCHOR_FILE "/etc/unbound/root.key"
 
 /* default rootcert location */
-#define ROOT_CERT_FILE "/usr/local/etc/unbound/icannbundle.pem"
+#define ROOT_CERT_FILE "/etc/unbound/icannbundle.pem"
 
 /* version number for resource files */
 #define RSRC_PACKAGE_VERSION 1,6,8,0
 
 /* Directory to chdir to */
-#define RUN_DIR "/usr/local/etc/unbound"
+#define RUN_DIR "/etc/unbound"
 
 /* Shared data */
-#define SHARE_DIR "/usr/local/etc/unbound"
+#define SHARE_DIR "/etc/unbound"
 
 /* The size of `time_t', as computed by sizeof. */
 #define SIZEOF_TIME_T 8
@@ -657,7 +657,7 @@
 /* #undef UB_ON_WINDOWS */
 
 /* default username */
-#define UB_USERNAME "unbound"
+#define UB_USERNAME "_unbound"
 
 /* use to enable lightweight alloc assertions, for debug use */
 /* #undef UNBOUND_ALLOC_LITE */
Index: src/external/bsd/unbound/include/config-1.1.h
diff -u src/external/bsd/unbound/include/config-1.1.h:1.1 src/external/bsd/unbound/include/config-1.1.h:1.2
--- src/external/bsd/unbound/include/config-1.1.h:1.1	Tue Feb  6 03:29:57 2018
+++ src/external/bsd/unbound/include/config-1.1.h	Tue Feb  6 21:27:49 2018
@@ -617,7 +617,7 @@
 #define PACKAGE_VERSION "1.6.8"
 
 /* default pidfile location */
-#define PIDFILE "/usr/local/etc/unbound/unbound.pid"
+#define PIDFILE "/var/run/unbound.pid"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -627,19 +627,19 @@
 #define RETSIGTYPE void
 
 /* default rootkey location */
-#define ROOT_ANCHOR_FILE "/usr/local/etc/unbound/root.key"
+#define ROOT_ANCHOR_FILE "/etc/unbound/root.key"
 
 /* default rootcert location */
-#define ROOT_CERT_FILE "/usr/local/etc/unbound/icannbundle.pem"
+#define ROOT_CERT_FILE "/etc/unbound/icannbundle.pem"
 
 /* version number for resource files */
 #define RSRC_PACKAGE_VERSION 1,6,8,0
 
 /* Directory to chdir to */
-#define RUN_DIR "/usr/local/etc/unbound"
+#define RUN_DIR "/etc/unbound"
 
 /* Shared data */
-#define SHARE_DIR "/usr/local/etc/unbound"
+#define SHARE_DIR "/etc/unbound"
 
 /* The size of `time_t', as computed by sizeof. */
 #define SIZEOF_TIME_T 8
@@ -657,7 +657,7 @@
 /* #undef UB_ON_WINDOWS */
 
 /* default username */
-#define UB_USERNAME "unbound"
+#define UB_USERNAME "_unbound"
 
 /* use to enable lightweight alloc assertions, for debug use */
 /* #undef UNBOUND_ALLOC_LITE */

CVS commit: [netbsd-8] src/doc

2018-02-06 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Feb  6 20:33:35 UTC 2018

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

Log Message:
amend 524


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

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.117 src/doc/CHANGES-8.0:1.1.2.118
--- src/doc/CHANGES-8.0:1.1.2.117	Tue Feb  6 09:30:08 2018
+++ src/doc/CHANGES-8.0	Tue Feb  6 20:33:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.117 2018/02/06 09:30:08 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.118 2018/02/06 20:33:35 snj Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -9446,7 +9446,11 @@ sys/arch/x86/pci/amdsmn.c			1.1-1.3
 sys/arch/x86/pci/amdsmn.h			1.1
 sys/arch/x86/pci/amdzentemp.c			1.1-1.7
 sys/arch/x86/pci/files.pci			1.22,1.23
-sys/modules/amdzentemp/amdzentemp.ioconf	1.2
+sys/modules/Makefile1.199
+sys/modules/amdsmn/Makefile			1.1
+sys/modules/amdsmn/amdsmn.ioconf		1.1
+sys/modules/amdzentemp/Makefile			1.1
+sys/modules/amdzentemp/amdzentemp.ioconf	1.1-1.2
 
 	Provide amdsmn(4) and amdzentemp(4) drivers (and modules)
 	to access on-die temperature sensors on AMD Ryzen CPUs.

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

2018-02-06 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Feb  6 20:31:13 UTC 2018

Modified Files:
src/sys/modules [netbsd-8]: Makefile
Added Files:
src/sys/modules/amdsmn [netbsd-8]: Makefile amdsmn.ioconf
src/sys/modules/amdzentemp [netbsd-8]: Makefile

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #524):
sys/modules/Makefile: revision 1.199
sys/modules/amdsmn/Makefile: revision 1.1
sys/modules/amdsmn/amdsmn.ioconf: revision 1.1
sys/modules/amdzentemp/Makefile: revision 1.1
Create amdsmn(4) amd amdzentemp(4) modules for X86


To generate a diff of this commit:
cvs rdiff -u -r1.192.2.1 -r1.192.2.2 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/amdsmn/Makefile \
src/sys/modules/amdsmn/amdsmn.ioconf
cvs rdiff -u -r0 -r1.1.2.2 src/sys/modules/amdzentemp/Makefile

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

Modified files:

Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.192.2.1 src/sys/modules/Makefile:1.192.2.2
--- src/sys/modules/Makefile:1.192.2.1	Thu Dec 21 19:14:41 2017
+++ src/sys/modules/Makefile	Tue Feb  6 20:31:13 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.192.2.1 2017/12/21 19:14:41 snj Exp $
+#	$NetBSD: Makefile,v 1.192.2.2 2018/02/06 20:31:13 snj Exp $
 
 .include 
 
@@ -177,7 +177,9 @@ SUBDIR+=	exec_elf64
 
 .if ${MACHINE_ARCH} == "i386" || \
 ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=	amdsmn
 SUBDIR+=	amdtemp
+SUBDIR+=	amdzentemp
 SUBDIR+=	coretemp
 SUBDIR+=	est
 SUBDIR+=	hdafg

Added files:

Index: src/sys/modules/amdsmn/Makefile
diff -u /dev/null src/sys/modules/amdsmn/Makefile:1.1.2.2
--- /dev/null	Tue Feb  6 20:31:13 2018
+++ src/sys/modules/amdsmn/Makefile	Tue Feb  6 20:31:13 2018
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1.2.2 2018/02/06 20:31:13 snj Exp $
+
+.include "../Makefile.inc"
+
+.PATH:	${S}/arch/x86/pci
+
+KMOD=	amdsmn
+IOCONF=	amdsmn.ioconf
+SRCS=	amdsmn.c
+
+WARNS=	4
+
+.include 
Index: src/sys/modules/amdsmn/amdsmn.ioconf
diff -u /dev/null src/sys/modules/amdsmn/amdsmn.ioconf:1.1.2.2
--- /dev/null	Tue Feb  6 20:31:13 2018
+++ src/sys/modules/amdsmn/amdsmn.ioconf	Tue Feb  6 20:31:13 2018
@@ -0,0 +1,11 @@
+# $NetBSD: amdsmn.ioconf,v 1.1.2.2 2018/02/06 20:31:13 snj Exp $
+
+ioconf amdsmn
+
+include "conf/files"
+include "dev/pci/files.pci"
+include "arch/x86/pci/files.pci"
+
+pseudo-root pci*
+
+amdsmn* at pci?

Index: src/sys/modules/amdzentemp/Makefile
diff -u /dev/null src/sys/modules/amdzentemp/Makefile:1.1.2.2
--- /dev/null	Tue Feb  6 20:31:13 2018
+++ src/sys/modules/amdzentemp/Makefile	Tue Feb  6 20:31:13 2018
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1.2.2 2018/02/06 20:31:13 snj Exp $
+
+.include "../Makefile.inc"
+
+.PATH:	${S}/arch/x86/pci
+
+KMOD=	amdzentemp
+IOCONF=	amdzentemp.ioconf
+SRCS=	amdzentemp.c
+
+WARNS=	4
+
+.include

CVS commit: src/include

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 20:22:41 UTC 2018

Modified Files:
src/include: unistd.h

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/include/unistd.h

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

Modified files:

Index: src/include/unistd.h
diff -u src/include/unistd.h:1.148 src/include/unistd.h:1.149
--- src/include/unistd.h:1.148	Tue Feb  6 15:21:21 2018
+++ src/include/unistd.h	Tue Feb  6 15:22:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.148 2018/02/06 20:21:21 christos Exp $	*/
+/*	$NetBSD: unistd.h,v 1.149 2018/02/06 20:22:41 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -213,8 +213,8 @@ int	 fsync(int);
 #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
 defined(_REENTRANT) || defined(_NETBSD_SOURCE)
 int	 ttyname_r(int, char *, size_t);
-#ifndef __PTHREAD_AFORK_DECLARED
-#define __PTHREAD_AFORK_DECLARED
+#ifndef __PTHREAD_ATFORK_DECLARED
+#define __PTHREAD_ATFORK_DECLARED
 int	 pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
 #endif
 #endif

CVS commit: src/lib/libpthread

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 20:22:23 UTC 2018

Modified Files:
src/lib/libpthread: pthread.h

Log Message:
fix duplicate declaration of pthread_atfork in unistd.h


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libpthread/pthread.h

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

Modified files:

Index: src/lib/libpthread/pthread.h
diff -u src/lib/libpthread/pthread.h:1.39 src/lib/libpthread/pthread.h:1.40
--- src/lib/libpthread/pthread.h:1.39	Tue Dec 26 12:00:50 2017
+++ src/lib/libpthread/pthread.h	Tue Feb  6 15:22:23 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread.h,v 1.39 2017/12/26 17:00:50 christos Exp $	*/
+/*	$NetBSD: pthread.h,v 1.40 2018/02/06 20:22:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,10 @@
 #include 
 
 __BEGIN_DECLS
+#ifndef __PTHREAD_ATFORK_DECLARED
+#define __PTHREAD_ATFORK_DECLARED
 int	pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
+#endif
 int	pthread_create(pthread_t * __restrict,
 	const pthread_attr_t * __restrict, void *(*)(void *),
 	void * __restrict);

CVS commit: src/include

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 20:21:21 UTC 2018

Modified Files:
src/include: unistd.h

Log Message:
detect duplicate declaration of pthread_atfork() in pthread.h


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/include/unistd.h

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

Modified files:

Index: src/include/unistd.h
diff -u src/include/unistd.h:1.147 src/include/unistd.h:1.148
--- src/include/unistd.h:1.147	Thu Jun 30 11:29:20 2016
+++ src/include/unistd.h	Tue Feb  6 15:21:21 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.147 2016/06/30 15:29:20 dholland Exp $	*/
+/*	$NetBSD: unistd.h,v 1.148 2018/02/06 20:21:21 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -213,8 +213,11 @@ int	 fsync(int);
 #if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
 defined(_REENTRANT) || defined(_NETBSD_SOURCE)
 int	 ttyname_r(int, char *, size_t);
+#ifndef __PTHREAD_AFORK_DECLARED
+#define __PTHREAD_AFORK_DECLARED
 int	 pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
 #endif
+#endif
 
 /*
  * X/Open Portability Guide, all issues

CVS commit: src/usr.bin/nbsvtool

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 20:15:39 UTC 2018

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

Log Message:
mark old compat functions.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/nbsvtool/nbsvtool.c

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

Modified files:

Index: src/usr.bin/nbsvtool/nbsvtool.c
diff -u src/usr.bin/nbsvtool/nbsvtool.c:1.3 src/usr.bin/nbsvtool/nbsvtool.c:1.4
--- src/usr.bin/nbsvtool/nbsvtool.c:1.3	Tue Feb  6 14:51:03 2018
+++ src/usr.bin/nbsvtool/nbsvtool.c	Tue Feb  6 15:15:39 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: nbsvtool.c,v 1.3 2018/02/06 19:51:03 christos Exp $	*/
+/*	$NetBSD: nbsvtool.c,v 1.4 2018/02/06 20:15:39 christos Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@@ -309,8 +309,10 @@ main(int argc, char **argv)
 
 	setprogname(argv[0]);
 
+#if OPENSSL_VERSION_NUMBER < 0x1010L
 	OpenSSL_add_all_algorithms();
 	ERR_load_crypto_strings();
+#endif
 
 	while ((ch = getopt(argc, argv, "a:c:f:hk:u:v")) != -1) {
 		switch (ch) {

CVS commit: src/crypto/external/bsd/openssh

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 20:10:36 UTC 2018

Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc

Log Message:
use OPENSSL_API_COMPAT


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/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/crypto/external/bsd/openssh/Makefile.inc
diff -u src/crypto/external/bsd/openssh/Makefile.inc:1.11 src/crypto/external/bsd/openssh/Makefile.inc:1.12
--- src/crypto/external/bsd/openssh/Makefile.inc:1.11	Mon Feb  5 06:57:28 2018
+++ src/crypto/external/bsd/openssh/Makefile.inc	Tue Feb  6 15:10:36 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.11 2018/02/05 11:57:28 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.12 2018/02/06 20:10:36 christos Exp $
 
 WARNS?=	4
 
@@ -15,7 +15,7 @@ CPPFLAGS+=-DHAVE_DLOPEN
 CPPFLAGS+=-DHAVE_HEADER_AD
 CPPFLAGS+=-DHAVE_LOGIN_CAP
 CPPFLAGS+=-DHAVE_STDLIB_H
-CPPFLAGS+=-DOPENSSL_VERSION_NUMBER=0x1010L
+CPPFLAGS+=-DOPENSSL_API_COMPAT=0x1010L
 
 CPPFLAGS+=-DWITH_OPENSSL -DENABLE_PKCS11 -D_OPENBSD_SOURCE
 .if !defined(NOPIC)

CVS commit: src/usr.bin/nbsvtool

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 20:10:05 UTC 2018

Modified Files:
src/usr.bin/nbsvtool: Makefile

Log Message:
use OPENSSL_API_COMPAT


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/nbsvtool/Makefile

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

Modified files:

Index: src/usr.bin/nbsvtool/Makefile
diff -u src/usr.bin/nbsvtool/Makefile:1.2 src/usr.bin/nbsvtool/Makefile:1.3
--- src/usr.bin/nbsvtool/Makefile:1.2	Tue Feb  6 14:51:03 2018
+++ src/usr.bin/nbsvtool/Makefile	Tue Feb  6 15:10:05 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2018/02/06 19:51:03 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/02/06 20:10:05 christos Exp $
 
 PROG=	nbsvtool
 LDADD+=	-lcrypto
 DPADD+=	${LIBCRYPTO}
-CPPFLAGS+=-DOPENSSL_VERSION_NUMBER=0x1010L
+CPPFLAGS+=-DOPENSSL_API_COMPAT=0x1010L
 
 .include

CVS commit: src/crypto/external/bsd/openssl.old/dist/crypto

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 19:58:31 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl.old/dist/crypto: opensslv.h
src/crypto/external/bsd/openssl.old/dist/crypto/dh: dh.h
src/crypto/external/bsd/openssl.old/dist/crypto/dsa: dsa.h
src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa: ecdsa.h
src/crypto/external/bsd/openssl.old/dist/crypto/evp: evp.h
src/crypto/external/bsd/openssl.old/dist/crypto/hmac: hmac.h
src/crypto/external/bsd/openssl.old/dist/crypto/rsa: rsa.h
src/crypto/external/bsd/openssl.old/dist/crypto/x509v3: x509v3.h

Log Message:
use OPENSSL_API_COMPAT instead of hacking the version


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl.old/dist/crypto/hmac/hmac.h
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl.old/dist/crypto/rsa/rsa.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h

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

Modified files:

Index: src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.2 src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.3
--- src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h:1.2	Mon Feb  5 06:52:32 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/opensslv.h	Tue Feb  6 14:58:29 2018
@@ -30,9 +30,7 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# ifndef OPENSSL_VERSION_NUMBER
 # define OPENSSL_VERSION_NUMBER  0x100020bfL
-# endif
 # ifdef OPENSSL_FIPS
 #  define OPENSSL_VERSION_TEXT"OpenSSL 1.0.2k-fips  26 Jan 2017"
 # else

Index: src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.6 src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.7
--- src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h:1.6	Mon Feb  5 15:23:47 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/dh/dh.h	Tue Feb  6 14:58:30 2018
@@ -387,7 +387,7 @@ void ERR_load_DH_strings(void);
 # define DH_R_PEER_KEY_ERROR  113
 # define DH_R_SHARED_INFO_ERROR   114
 
-#if OPENSSL_VERSION_NUMBER >= 0x1010L
+#if OPENSSL_API_COMPAT >= 0x1010L
 static inline void
 DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
 {

Index: src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.5 src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.6
--- src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h:1.5	Mon Feb  5 15:27:06 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/dsa/dsa.h	Tue Feb  6 14:58:30 2018
@@ -326,7 +326,7 @@ void ERR_load_DSA_strings(void);
 # define DSA_R_PARAMETER_ENCODING_ERROR   105
 # define DSA_R_Q_NOT_PRIME113
 
-#if OPENSSL_VERSION_NUMBER >= 0x1010L
+#if OPENSSL_API_COMPAT >= 0x1010L
 static inline void
 DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **r, const BIGNUM **s)
 {

Index: src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.4 src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.5
--- src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h:1.4	Mon Feb  5 06:55:46 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/ecdsa/ecdsa.h	Tue Feb  6 14:58:30 2018
@@ -329,7 +329,7 @@ void ERR_load_ECDSA_strings(void);
 # define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED  104
 # define ECDSA_R_SIGNATURE_MALLOC_FAILED  105
 
-#if OPENSSL_VERSION_NUMBER >= 0x1010L
+#if OPENSSL_API_COMPAT >= 0x1010L
 
 static inline void
 ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **r, const BIGNUM **s)

Index: src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.4 src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.5
--- src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.4	Mon Feb  5 06:55:47 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h	Tue Feb  6 14:58:30 2018
@@ -1533,7 +1533,7 @@ void ERR_load_EVP_strings(void);
 # define

CVS commit: src/external/gpl3/gcc

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 19:57:59 UTC 2018

Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: c++config.h gstdint.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: c++config.h
gstdint.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: c++config.h
gstdint.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: c++config.h
gstdint.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: gstdint.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: gstdint.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: gstdint.h
src/external/gpl3/gcc/usr.bin/gcc/arch/m68k: configargs.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb: auto-host.h
configargs.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el: configargs.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb: auto-host.h configargs.h
defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel: configargs.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc: configargs.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el: auto-host.h configargs.h
defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc: configargs.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64: configargs.h defs.mk
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: configargs.h defs.mk

Log Message:
more mknative-gcc 6.4 for m68k, mips*, powerpc, sh*, sparc* and amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/gstdint.h
cvs rdiff -u -r1.21 -r1.22 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/c++config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/gstdint.h
cvs rdiff -u -r1.22 -r1.23 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/gstdint.h
cvs rdiff -u -r1.24 -r1.25 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/gstdint.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/gstdint.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/gstdint.h
cvs rdiff -u -r1.16 -r1.17 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/gstdint.h
cvs rdiff -u -r1.22 -r1.23 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/configargs.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/usr.bin/gcc/arch/m68k/defs.mk
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/defs.mk
cvs rdiff -u -r1.24 -r1.25 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/configargs.h
cvs rdiff -u -r1.24 -r1.25 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/configargs.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mips64el/defs.mk
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h
cvs rdiff -u -r1.23 -r1.24 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/configargs.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/defs.mk
cvs rdiff -u -r1.24 -r1.25 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/configargs.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/defs.mk
cvs rdiff -u -r1.30 -r1.31 \
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/configargs.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/defs.mk
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h
cvs rdiff -u -r1.27 -r1.28 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/configargs.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sh3el/defs.mk
cvs rdiff -u -r1.27 -r1.28 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/defs.mk
cvs rdiff -u -r1.27 -r1.28 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/configargs.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/gpl3/gcc/usr.bin/gcc/arch/sparc64/defs.mk
cvs rdiff -u -r1.35 -r1.36 \
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/defs.mk

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

Modified files:

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h:1.22

CVS commit: src/crypto/external/bsd/openssl.old/dist/crypto/x509v3

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 19:51:25 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl.old/dist/crypto/x509v3: x509v3.h

Log Message:
added 1.1 api


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h

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

Modified files:

Index: src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h:1.1.1.1 src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h:1.2
--- src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h:1.1.1.1	Sat Feb  3 17:43:48 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/x509v3/x509v3.h	Tue Feb  6 14:51:25 2018
@@ -1049,6 +1049,15 @@ void ERR_load_X509V3_strings(void);
 # define X509V3_R_UNSUPPORTED_TYPE167
 # define X509V3_R_USER_TOO_LONG   132
 
+#if OPENSSL_VERSION_NUMBER >= 0x1010L
+static inline uint32_t
+X509_get_extended_key_usage(X509 *x)
+{
+	return x->ex_xkusage;
+}
+
+#endif
+
 #ifdef  __cplusplus
 }
 #endif

CVS commit: src/usr.bin/nbsvtool

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 19:51:03 UTC 2018

Modified Files:
src/usr.bin/nbsvtool: Makefile nbsvtool.c

Log Message:
use OpenSSL-1.1 apis


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/nbsvtool/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/nbsvtool/nbsvtool.c

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

Modified files:

Index: src/usr.bin/nbsvtool/Makefile
diff -u src/usr.bin/nbsvtool/Makefile:1.1 src/usr.bin/nbsvtool/Makefile:1.2
--- src/usr.bin/nbsvtool/Makefile:1.1	Sun May 11 13:58:09 2008
+++ src/usr.bin/nbsvtool/Makefile	Tue Feb  6 14:51:03 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2008/05/11 17:58:09 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2018/02/06 19:51:03 christos Exp $
 
 PROG=	nbsvtool
 LDADD+=	-lcrypto
 DPADD+=	${LIBCRYPTO}
+CPPFLAGS+=-DOPENSSL_VERSION_NUMBER=0x1010L
 
 .include 

Index: src/usr.bin/nbsvtool/nbsvtool.c
diff -u src/usr.bin/nbsvtool/nbsvtool.c:1.2 src/usr.bin/nbsvtool/nbsvtool.c:1.3
--- src/usr.bin/nbsvtool/nbsvtool.c:1.2	Wed Jun 11 12:31:09 2008
+++ src/usr.bin/nbsvtool/nbsvtool.c	Tue Feb  6 14:51:03 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: nbsvtool.c,v 1.2 2008/06/11 16:31:09 joerg Exp $	*/
+/*	$NetBSD: nbsvtool.c,v 1.3 2018/02/06 19:51:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@@ -148,10 +148,11 @@ verify_file(STACK_OF(X509) *cert_chain, 
 
 	if (key_usage != 0) {
 		for (i = 0; i < sk_X509_num(signers); i++) {
-			if ((sk_X509_value(signers, i)->ex_xkusage & key_usage)
+			X509 *x = sk_X509_value(signers, i);
+			if ((X509_get_extended_key_usage(x) & key_usage)
 			== key_usage)
 continue;
-			name = X509_get_subject_name(sk_X509_value(signers, i));
+			name = X509_get_subject_name(x);
 			subject = X509_NAME_oneline(name, NULL, 0);
 			errx(EXIT_FAILURE,
 			"Certificate doesn't match required key usage: %s",

CVS commit: src/usr.bin/moduli/qsafe

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 19:32:49 UTC 2018

Modified Files:
src/usr.bin/moduli/qsafe: qsafe.c

Log Message:
use BN_is_prime_ex


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/moduli/qsafe/qsafe.c

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

Modified files:

Index: src/usr.bin/moduli/qsafe/qsafe.c
diff -u src/usr.bin/moduli/qsafe/qsafe.c:1.3 src/usr.bin/moduli/qsafe/qsafe.c:1.4
--- src/usr.bin/moduli/qsafe/qsafe.c:1.3	Sun Sep  4 16:55:43 2011
+++ src/usr.bin/moduli/qsafe/qsafe.c	Tue Feb  6 14:32:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: qsafe.c,v 1.3 2011/09/04 20:55:43 joerg Exp $ */
+/* $NetBSD: qsafe.c,v 1.4 2018/02/06 19:32:49 christos Exp $ */
 
 /*-
  * Copyright 1994 Phil Karn 
@@ -254,7 +254,7 @@ main(int argc, char *argv[])
 		 * single pass will weed out the vast majority of composite
 		 * q's.
 		 */
-		if (BN_is_prime(q, 1, NULL, ctx, NULL) <= 0) {
+		if (BN_is_prime_ex(q, 1, ctx, NULL) <= 0) {
 #ifdef  DEBUGPRINT
 			(void)fprintf(stderr, "%10lu: q failed first "
   "possible prime test\n", count_in);
@@ -269,7 +269,7 @@ main(int argc, char *argv[])
 		 * the first Rabin-Miller iteration so it doesn't hurt to
 		 * specify a high iteration count.
 		 */
-		if (!BN_is_prime(p, trials, NULL, ctx, NULL)) {
+		if (!BN_is_prime_ex(p, trials, ctx, NULL)) {
 #ifdef  DEBUGPRINT
 			(void)fprintf(stderr, "%10lu: p is not prime\n",
   count_in);
@@ -283,7 +283,7 @@ main(int argc, char *argv[])
 #endif
 
 		/* recheck q more rigorously */
-		if (!BN_is_prime(q, trials - 1, NULL, ctx, NULL)) {
+		if (!BN_is_prime_ex(q, trials - 1, ctx, NULL)) {
 #ifdef  DEBUGPRINT
 			(void)fprintf(stderr, "%10lu: q is not prime\n",
   count_in);

CVS commit: src/usr.bin/ftp

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 19:26:02 UTC 2018

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

Log Message:
explicitly include  since OpenSSL-1.1 does not do it for us.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/ftp/ssl.c

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

Modified files:

Index: src/usr.bin/ftp/ssl.c
diff -u src/usr.bin/ftp/ssl.c:1.5 src/usr.bin/ftp/ssl.c:1.6
--- src/usr.bin/ftp/ssl.c:1.5	Wed Sep 16 11:32:53 2015
+++ src/usr.bin/ftp/ssl.c	Tue Feb  6 14:26:02 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssl.c,v 1.5 2015/09/16 15:32:53 joerg Exp $	*/
+/*	$NetBSD: ssl.c,v 1.6 2018/02/06 19:26:02 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
@@ -34,11 +34,12 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: ssl.c,v 1.5 2015/09/16 15:32:53 joerg Exp $");
+__RCSID("$NetBSD: ssl.c,v 1.6 2018/02/06 19:26:02 christos Exp $");
 #endif
 
 #include 
 #include 
+#include 
 #include 
 
 #include

CVS commit: src/usr.bin/dc

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 17:58:19 UTC 2018

Modified Files:
src/usr.bin/dc: bcode.c inout.c

Log Message:
Adjust to OpenSSL 1.1


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/dc/bcode.c src/usr.bin/dc/inout.c

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

Modified files:

Index: src/usr.bin/dc/bcode.c
diff -u src/usr.bin/dc/bcode.c:1.2 src/usr.bin/dc/bcode.c:1.3
--- src/usr.bin/dc/bcode.c:1.2	Mon Apr 10 12:37:48 2017
+++ src/usr.bin/dc/bcode.c	Tue Feb  6 12:58:19 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcode.c,v 1.2 2017/04/10 16:37:48 christos Exp $	*/
+/*	$NetBSD: bcode.c,v 1.3 2018/02/06 17:58:19 christos Exp $	*/
 /*	$OpenBSD: bcode.c,v 1.51 2017/02/26 11:29:55 otto Exp $	*/
 
 /*
@@ -17,7 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include 
-__RCSID("$NetBSD: bcode.c,v 1.2 2017/04/10 16:37:48 christos Exp $");
+__RCSID("$NetBSD: bcode.c,v 1.3 2018/02/06 17:58:19 christos Exp $");
 
 #include 
 #include 
@@ -32,6 +32,7 @@ __RCSID("$NetBSD: bcode.c,v 1.2 2017/04/
 
 #define MAX_ARRAY_INDEX		2048
 #define READSTACK_SIZE		8
+#define	NO_NUMBER		(~0UL)
 
 #define NO_ELSE			-2	/* -1 is EOF */
 #define REG_ARRAY_SIZE_SMALL	(UCHAR_MAX + 1)
@@ -590,7 +591,7 @@ set_scale(void)
 			warnx("scale must be a nonnegative number");
 		else {
 			scale = get_ulong(n);
-			if (scale != BN_MASK2 && scale <= UINT_MAX)
+			if (scale != NO_NUMBER && scale <= UINT_MAX)
 bmachine.scale = (u_int)scale;
 			else
 warnx("scale too large");
@@ -618,7 +619,7 @@ set_obase(void)
 	n = pop_number();
 	if (n != NULL) {
 		base = get_ulong(n);
-		if (base != BN_MASK2 && base > 1 && base <= UINT_MAX)
+		if (base != NO_NUMBER && base > 1 && base <= UINT_MAX)
 			bmachine.obase = (u_int)base;
 		else
 			warnx("output base must be a number greater than 1");
@@ -645,7 +646,7 @@ set_ibase(void)
 	n = pop_number();
 	if (n != NULL) {
 		base = get_ulong(n);
-		if (base != BN_MASK2 && 2 <= base && base <= 16)
+		if (base != NO_NUMBER && 2 <= base && base <= 16)
 			bmachine.ibase = (u_int)base;
 		else
 			warnx("input base must be a number between 2 and 16 "
@@ -884,7 +885,7 @@ load_array(void)
 		idx = get_ulong(inumber);
 		if (BN_is_negative(inumber->number))
 			warnx("negative idx");
-		else if (idx == BN_MASK2 || idx > MAX_ARRAY_INDEX)
+		else if (idx == NO_NUMBER || idx > MAX_ARRAY_INDEX)
 			warnx("idx too big");
 		else {
 			stack = [reg];
@@ -924,7 +925,7 @@ store_array(void)
 		if (BN_is_negative(inumber->number)) {
 			warnx("negative idx");
 			stack_free_value(value);
-		} else if (idx == BN_MASK2 || idx > MAX_ARRAY_INDEX) {
+		} else if (idx == NO_NUMBER || idx > MAX_ARRAY_INDEX) {
 			warnx("idx too big");
 			stack_free_value(value);
 		} else {
@@ -1205,7 +1206,7 @@ bexp(void)
 		b = BN_get_word(p->number);
 		m = max(a->scale, bmachine.scale);
 		rscale = a->scale * (u_int)b;
-		if (rscale > m || (a->scale > 0 && (b == BN_MASK2 ||
+		if (rscale > m || (a->scale > 0 && (b == NO_NUMBER ||
 		b > UINT_MAX)))
 			rscale = m;
 	}
@@ -1566,7 +1567,7 @@ quitN(void)
 		return;
 	i = get_ulong(n);
 	free_number(n);
-	if (i == BN_MASK2 || i == 0)
+	if (i == NO_NUMBER || i == 0)
 		warnx("Q command requires a number >= 1");
 	else if (bmachine.readsp < i)
 		warnx("Q command argument exceeded string execution depth");
@@ -1588,7 +1589,7 @@ skipN(void)
 	if (n == NULL)
 		return;
 	i = get_ulong(n);
-	if (i == BN_MASK2)
+	if (i == NO_NUMBER)
 		warnx("J command requires a number >= 0");
 	else if (i > 0 && bmachine.readsp < i)
 		warnx("J command argument exceeded string execution depth");
Index: src/usr.bin/dc/inout.c
diff -u src/usr.bin/dc/inout.c:1.2 src/usr.bin/dc/inout.c:1.3
--- src/usr.bin/dc/inout.c:1.2	Mon Apr 10 12:37:48 2017
+++ src/usr.bin/dc/inout.c	Tue Feb  6 12:58:19 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: inout.c,v 1.2 2017/04/10 16:37:48 christos Exp $	*/
+/*	$NetBSD: inout.c,v 1.3 2018/02/06 17:58:19 christos Exp $	*/
 /*	$OpenBSD: inout.c,v 1.20 2017/02/26 11:29:55 otto Exp $	*/
 
 /*
@@ -17,7 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include 
-__RCSID("$NetBSD: inout.c,v 1.2 2017/04/10 16:37:48 christos Exp $");
+__RCSID("$NetBSD: inout.c,v 1.3 2018/02/06 17:58:19 christos Exp $");
 
 #include 
 #include 
@@ -331,19 +331,21 @@ printnumber(FILE *f, const struct number
 	stack_clear();
 	if (b->scale > 0) {
 		struct number	*num_base;
-		BIGNUM		mult, stop;
+		BIGNUM		*mult, *stop;
 
 		putcharwrap(f, '.');
 		num_base = new_number();
 		bn_check(BN_set_word(num_base->number, base));
-		BN_init();
-		bn_check(BN_one());
-		BN_init();
-		bn_check(BN_one());
-		scale_number(, (int)b->scale);
+		mult = BN_new();
+		stop = BN_new();
+		if (mult == NULL || stop == NULL)
+			err(1, NULL);
+		bn_check(BN_one(mult));
+		bn_check(BN_one(stop));
+		scale_number(stop, (int)b->scale);
 
 		i = 0;
-		while

CVS commit: src/sys/netinet

2018-02-06 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Tue Feb  6 17:08:19 UTC 2018

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

Log Message:
Several changes, mostly cosmetic:

 * Add a KASSERT in ip_output(), we expect (at least) the IP header to be
   here.

 * In ip_fragment(), declare two variables instead of recomputing the
   values each time. Add an XXX for ipoff, it seems to me we should also
   remove IP_RF.

 * Rename the arguments of ip_optcopy().

 * Style: use NULL for pointers, remove ()s for return statements, and
   add whitespaces for clarity.

No real functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/sys/netinet/ip_output.c

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

Modified files:

Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.292 src/sys/netinet/ip_output.c:1.293
--- src/sys/netinet/ip_output.c:1.292	Wed Jan 10 18:51:31 2018
+++ src/sys/netinet/ip_output.c	Tue Feb  6 17:08:18 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_output.c,v 1.292 2018/01/10 18:51:31 christos Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.293 2018/02/06 17:08:18 maxv Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-/*-
+/*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.292 2018/01/10 18:51:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.293 2018/02/06 17:08:18 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -156,7 +156,7 @@ static int ip_ifaddrvalid(const struct i
 
 extern pfil_head_t *inet_pfil_hook;			/* XXX */
 
-int	ip_do_loopback_cksum = 0;
+int ip_do_loopback_cksum = 0;
 
 static int
 ip_mark_mpls(struct ifnet * const ifp, struct mbuf * const m,
@@ -232,8 +232,7 @@ ip_output(struct mbuf *m0, struct mbuf *
 	struct ip *ip;
 	struct ifnet *ifp, *mifp = NULL;
 	struct mbuf *m = m0;
-	int hlen = sizeof (struct ip);
-	int len, error = 0;
+	int len, hlen, error = 0;
 	struct route iproute;
 	const struct sockaddr_in *dst;
 	struct in_ifaddr *ia = NULL;
@@ -262,11 +261,12 @@ ip_output(struct mbuf *m0, struct mbuf *
 	KASSERT((m->m_pkthdr.csum_flags & (M_CSUM_TCPv6|M_CSUM_UDPv6)) == 0);
 	KASSERT((m->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) !=
 	(M_CSUM_TCPv4|M_CSUM_UDPv4));
+	KASSERT(m->m_len >= sizeof(struct ip));
 
+	hlen = sizeof(struct ip);
 	if (opt) {
 		m = ip_insertoptions(m, opt, );
-		if (len >= sizeof(struct ip))
-			hlen = len;
+		hlen = len;
 	}
 	ip = mtod(m, struct ip *);
 
@@ -538,8 +538,8 @@ ip_output(struct mbuf *m0, struct mbuf *
 	}
 
 	/*
-	 * packets with Class-D address as source are not valid per
-	 * RFC 1112
+	 * Packets with Class-D address as source are not valid per
+	 * RFC1112.
 	 */
 	if (IN_MULTICAST(ip->ip_src.s_addr)) {
 		IP_STATINC(IP_STAT_ODROPPED);
@@ -576,7 +576,6 @@ sendit:
 		} else if ((m->m_pkthdr.csum_flags & M_CSUM_TSOv4) == 0) {
 			ip->ip_id = ip_newid(ia);
 		} else {
-
 			/*
 			 * TSO capable interfaces (typically?) increment
 			 * ip_id for each segment.
@@ -673,6 +672,7 @@ sendit:
 		m->m_pkthdr.csum_flags |= M_CSUM_IPv4;
 	}
 	sw_csum = m->m_pkthdr.csum_flags & ~ifp->if_csum_flags_tx;
+
 	/*
 	 * If small enough for mtu of path, or if using TCP segmentation
 	 * offload, can just send directly.
@@ -726,8 +726,7 @@ sendit:
 	}
 
 	/*
-	 * We can't use HW checksumming if we're about to
-	 * fragment the packet.
+	 * We can't use HW checksumming if we're about to fragment the packet.
 	 *
 	 * XXX Some hardware can do this.
 	 */
@@ -791,6 +790,7 @@ sendit:
 	if (error == 0) {
 		IP_STATINC(IP_STAT_FRAGMENTED);
 	}
+
 done:
 	ia4_release(ia, _ia);
 	rtcache_unref(rt, ro);
@@ -803,6 +803,7 @@ done:
 	if (bind_need_restore)
 		curlwp_bindx(bound);
 	return error;
+
 bad:
 	m_freem(m);
 	goto done;
@@ -819,16 +820,24 @@ ip_fragment(struct mbuf *m, struct ifnet
 	int sw_csum = m->m_pkthdr.csum_flags;
 	int fragments = 0;
 	int error = 0;
+	int ipoff;
+	bool mff;
 
 	ip = mtod(m, struct ip *);
 	hlen = ip->ip_hl << 2;
+
+	/* XXX: Why don't we remove IP_RF? */
+	ipoff = ntohs(ip->ip_off) & ~IP_MF;
+
+	mff = (ip->ip_off & htons(IP_MF)) != 0;
+
 	if (ifp != NULL)
 		sw_csum &= ~ifp->if_csum_flags_tx;
 
 	len = (mtu - hlen) &~ 7;
 	if (len < 8) {
 		m_freem(m);
-		return (EMSGSIZE);
+		return EMSGSIZE;
 	}
 
 	firstlen = len;
@@ -839,45 +848,52 @@ ip_fragment(struct mbuf *m, struct ifnet
 	 * make new header and copy data of each part and link onto chain.
 	 */
 	m0 = m;
-	mhlen = sizeof (struct ip);
+	mhlen = sizeof(struct ip);
 	for (off = hlen + len; off < ntohs(ip->ip_len); off += len) {
 		MGETHDR(m, M_DONTWAIT, MT_HEADER);
-		if (m == 0) {
+		if (m == NULL) {
 			error = ENOBUFS;
 			IP_STATINC(IP_STAT_ODROPPED);
 			goto sendorfree;
 		}
 		MCLAIM(m, m0->m_owner);
+
 		*mnext = m;
 		mnext = >m_nextpkt;
+

CVS commit: src/games/factor

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 16:53:27 UTC 2018

Modified Files:
src/games/factor: factor.c

Log Message:
fix for OpenSSL-1.1


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/games/factor/factor.c

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

Modified files:

Index: src/games/factor/factor.c
diff -u src/games/factor/factor.c:1.28 src/games/factor/factor.c:1.29
--- src/games/factor/factor.c:1.28	Sat Nov 11 18:48:44 2017
+++ src/games/factor/factor.c	Tue Feb  6 11:53:27 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: factor.c,v 1.28 2017/11/11 23:48:44 rin Exp $	*/
+/*	$NetBSD: factor.c,v 1.29 2018/02/06 16:53:27 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
 #if 0
 static char sccsid[] = "@(#)factor.c	8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: factor.c,v 1.28 2017/11/11 23:48:44 rin Exp $");
+__RCSID("$NetBSD: factor.c,v 1.29 2018/02/06 16:53:27 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -234,8 +234,8 @@ pr_fact(BIGNUM *val, int hflag)
 			BN_set_word(bnfact, (BN_ULONG)*(fact - 1));
 			BN_sqr(bnfact, bnfact, ctx);
 			if (BN_cmp(bnfact, val) > 0
-			|| BN_is_prime(val, PRIME_CHECKS, NULL, NULL,
-	   NULL) == 1) {
+			|| BN_is_prime_ex(val, PRIME_CHECKS, NULL, NULL)
+			== 1) {
 putchar(' ');
 BN_print_dec_fp(stdout, val);
 			} else
@@ -326,8 +326,8 @@ restart:
 		BN_gcd(tmp, tmp, val, ctx);
 
 		if (!BN_is_one(tmp)) {
-			if (BN_is_prime(tmp, PRIME_CHECKS, NULL, NULL,
-			NULL) == 1) {
+			if (BN_is_prime_ex(tmp, PRIME_CHECKS, NULL, NULL) == 1)
+			{
 putchar(' ');
 BN_print_dec_fp(stdout, tmp);
 			} else {
@@ -346,8 +346,8 @@ restart:
 			BN_div(num, NULL, val, tmp, ctx);
 			if (BN_is_one(num))
 return;
-			if (BN_is_prime(num, PRIME_CHECKS, NULL, NULL,
-			NULL) == 1) {
+			if (BN_is_prime_ex(num, PRIME_CHECKS, NULL, NULL) == 1)
+			{
 putchar(' ');
 BN_print_dec_fp(stdout, num);
 fflush(stdout);

CVS commit: src/libexec/httpd

2018-02-06 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Feb  6 15:48:46 UTC 2018

Modified Files:
src/libexec/httpd: ssl-bozo.c

Log Message:
- need string.h
- cast options to long for OpenSSL-1.1


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/libexec/httpd/ssl-bozo.c

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

Modified files:

Index: src/libexec/httpd/ssl-bozo.c
diff -u src/libexec/httpd/ssl-bozo.c:1.22 src/libexec/httpd/ssl-bozo.c:1.23
--- src/libexec/httpd/ssl-bozo.c:1.22	Mon Dec 28 02:37:59 2015
+++ src/libexec/httpd/ssl-bozo.c	Tue Feb  6 10:48:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssl-bozo.c,v 1.22 2015/12/28 07:37:59 mrg Exp $	*/
+/*	$NetBSD: ssl-bozo.c,v 1.23 2018/02/06 15:48:46 christos Exp $	*/
 
 /*	$eterna: ssl-bozo.c,v 1.15 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -34,6 +34,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -62,7 +63,7 @@
 
 #ifndef BOZO_SSL_OPTIONS
 #define BOZO_SSL_OPTIONS	\
-	(SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1)
+	((long)(SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1))
 #endif
 
   /* this structure encapsulates the ssl info */

CVS commit: src/sys/netinet

2018-02-06 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Tue Feb  6 15:48:02 UTC 2018

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

Log Message:
Add one more check in ip_reass_packet(): make sure that the end of each
fragment does not exceed IP_MAXPACKET.

In ip_reass(), we only check the final length of the reassembled packet
against IP_MAXPACKET.

But there is an integer overflow that can happen a little earlier. We
are doing:

i = ntohs(p->ipqe_ip->ip_off) + ntohs(p->ipqe_ip->ip_len) -
ntohs(ip->ip_off);
[...]
ip->ip_off = htons(ntohs(ip->ip_off) + i);

It is possible that

ntohs(p->ipqe_ip->ip_off) + ntohs(p->ipqe_ip->ip_len) > 65535

so the computation of ip_off wraps to zero. This breaks an assumption in
the reassembler - it expects the list of fragments to be ordered by
offset, and here it's not ordered anymore. (Un)Fortunately I couldn't
turn this into anything exploitable.

With the new check, it is guaranteed that ip_off+ip_len<=65535.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/ip_reass.c

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

Modified files:

Index: src/sys/netinet/ip_reass.c
diff -u src/sys/netinet/ip_reass.c:1.11 src/sys/netinet/ip_reass.c:1.12
--- src/sys/netinet/ip_reass.c:1.11	Wed Jan 11 13:08:29 2017
+++ src/sys/netinet/ip_reass.c	Tue Feb  6 15:48:02 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_reass.c,v 1.11 2017/01/11 13:08:29 ozaki-r Exp $	*/
+/*	$NetBSD: ip_reass.c,v 1.12 2018/02/06 15:48:02 maxv Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -46,7 +46,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.11 2017/01/11 13:08:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.12 2018/02/06 15:48:02 maxv Exp $");
 
 #include 
 #include 
@@ -629,6 +629,11 @@ ip_reass_packet(struct mbuf **m0, struct
 		return EINVAL;
 	}
 
+	if (off + len > IP_MAXPACKET) {
+		IP_STATINC(IP_STAT_BADFRAGS);
+		return EINVAL;
+	}
+
 	/*
 	 * Fragment length and MF flag.  Make sure that fragments have
 	 * a data length which is non-zero and multiple of 8 bytes.

CVS commit: src/sys/dev/ic

2018-02-06 Thread Rin Okuyama

Module Name:src
Committed By:   rin
Date:   Tue Feb  6 13:26:32 UTC 2018

Modified Files:
src/sys/dev/ic: msm6242b.c

Log Message:
Remove misplaced semicolon, found by GCC 6.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/msm6242b.c

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

Modified files:

Index: src/sys/dev/ic/msm6242b.c
diff -u src/sys/dev/ic/msm6242b.c:1.3 src/sys/dev/ic/msm6242b.c:1.4
--- src/sys/dev/ic/msm6242b.c:1.3	Wed Dec  4 07:48:59 2013
+++ src/sys/dev/ic/msm6242b.c	Tue Feb  6 13:26:32 2018
@@ -1,4 +1,4 @@
-/*  $NetBSD: msm6242b.c,v 1.3 2013/12/04 07:48:59 rkujawa Exp $ */
+/*  $NetBSD: msm6242b.c,v 1.4 2018/02/06 13:26:32 rin Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: msm6242b.c,v 1.3 2013/12/04 07:48:59 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msm6242b.c,v 1.4 2018/02/06 13:26:32 rin Exp $");
 
 /* 
  * Driver for OKI MSM6242B Real Time Clock. Somewhat based on an ancient, amiga
@@ -123,7 +123,7 @@ msm6242b_gettime_ymdhms(todr_chip_handle
 		MSM6242B_PMAM_BIT) == 0 && dt->dt_hour == 12)
 			dt->dt_hour = 0;
 		else if ((msm6242b_read(sc, MSM6242B_10HOUR_PMAM) & 
-		MSM6242B_PMAM_BIT) && dt->dt_hour != 12);
+		MSM6242B_PMAM_BIT) && dt->dt_hour != 12)
 			dt->dt_hour += 12;
 	}

CVS commit: src/sys/modules/pf

2018-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Tue Feb  6 12:58:17 UTC 2018

Modified Files:
src/sys/modules/pf: Makefile

Log Message:
Avoid gcc 6 specific options when compiling with gcc 5


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/pf/Makefile

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

Modified files:

Index: src/sys/modules/pf/Makefile
diff -u src/sys/modules/pf/Makefile:1.5 src/sys/modules/pf/Makefile:1.6
--- src/sys/modules/pf/Makefile:1.5	Tue Feb  6 09:20:50 2018
+++ src/sys/modules/pf/Makefile	Tue Feb  6 12:58:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/02/06 09:20:50 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/02/06 12:58:17 martin Exp $
 
 .include "../Makefile.inc"
 
@@ -20,6 +20,8 @@ SRCS+=	tcp_rndiss.c
 
 CPPFLAGS+=	-I${S}/dist/pf -I${S} -DINET6 -DINET
 
+.if ${HAVE_GCC} != 5
 COPTS.pf_table.c+=	-Wno-error=shift-negative-value
+.endif
 
 .include

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

2018-02-06 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Tue Feb  6 12:45:39 UTC 2018

Added Files:
src/sys/arch/arm/sunxi: sun6i_spireg.h

Log Message:
Add register definitions file for sun6i_spi I forgot to add earlier.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/sunxi/sun6i_spireg.h

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

Added files:

Index: src/sys/arch/arm/sunxi/sun6i_spireg.h
diff -u /dev/null src/sys/arch/arm/sunxi/sun6i_spireg.h:1.1
--- /dev/null	Tue Feb  6 12:45:39 2018
+++ src/sys/arch/arm/sunxi/sun6i_spireg.h	Tue Feb  6 12:45:39 2018
@@ -0,0 +1,135 @@
+/*	$NetBSD: sun6i_spireg.h,v 1.1 2018/02/06 12:45:39 jakllsch Exp $	*/
+
+/*
+ * Copyright (c) 2018 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SUNXI_SUN6I_SPIREG_H_
+#define _SUNXI_SUN6I_SPIREG_H_
+
+#include 
+
+#define SPI_GCR		0x004
+#define SPI_GCR_SRST		__BIT(31)
+#define SPI_GCR_TP_EN		__BIT(7)
+#define SPI_GCR_MODE		__BIT(1)
+#define SPI_GCR_MODE_SLAVE	(0)
+#define SPI_GCR_MODE_MASTER	(1)
+#define SPI_GCR_EN		__BIT(0)
+
+#define SPI_TCR		0x008
+#define SPI_TCR_XCH		__BIT(31)
+#define SPI_TCR_SDDM		__BIT(14)
+#define SPI_TCR_SDM		__BIT(13)
+#define SPI_TCR_FBS		__BIT(12)
+#define SPI_TCR_SDC		__BIT(11)
+#define SPI_TCR_RPSM		__BIT(10)
+#define SPI_TCR_DDB		__BIT(9)
+#define SPI_TCR_DHB		__BIT(8)
+#define SPI_TCR_SS_LEVEL	__BIT(7)
+#define SPI_TCR_SS_OWNER	__BIT(6)
+#define SPI_TCR_SS_SEL		__BITS(5,4)
+#define SPI_TCR_SSCTL		__BIT(3)
+#define SPI_TCR_SPOL		__BIT(2)
+#define SPI_TCR_CPOL		__BIT(1)
+#define SPI_TCR_CPHA		__BIT(0)
+
+#define SPI_IER		0x010
+#define SPI_IER_SS_INT_EN	__BIT(13)
+#define SPI_IER_TC_INT_EN	__BIT(12)
+#define SPI_IER_TF_UDR_INT_EN	__BIT(11)
+#define SPI_IER_TF_OVF_INT_EN	__BIT(10)
+#define SPI_IER_RF_UDR_INT_EN	__BIT(9)
+#define SPI_IER_RF_OVF_INT_EN	__BIT(8)
+#define SPI_IER_TF_FUL_INT_EN	__BIT(6)
+#define SPI_IER_TX_EMP_INT_EN	__BIT(5)
+#define SPI_IER_TX_ERQ_INT_EN	__BIT(4)
+#define SPI_IER_RF_FUL_INT_EN	__BIT(2)
+#define SPI_IER_RX_EMP_INT_EN	__BIT(1)
+#define SPI_IER_RF_RDY_INT_EN	__BIT(0)
+
+#define SPI_INT_STA	0x014
+#define SPI_ISR_SSI		__BIT(13)
+#define SPI_ISR_TC		__BIT(12)
+#define SPI_ISR_TF_UDF		__BIT(11)
+#define SPI_ISR_TF_OVF		__BIT(10)
+#define SPI_ISR_RX_UDF		__BIT(9)
+#define SPI_ISR_RX_OVF		__BIT(8)
+#define SPI_ISR_TX_FULL		__BIT(6)
+#define SPI_ISR_TX_EMP		__BIT(5)
+#define SPI_ISR_TX_READY	__BIT(4)
+#define SPI_ISR_RX_FULL		__BIT(2)
+#define SPI_ISR_RX_EMP		__BIT(1)
+#define SPI_ISR_RX_RDY		__BIT(0)
+
+#define SPI_FCR		0x018
+#define SPI_FCR_TX_FIFO_RST	__BIT(31)
+#define SPI_FCR_TF_TEST		__BIT(30)
+#define SPI_FCR_TF_DRQ_EN	__BIT(24)
+#define SPI_FCR_TX_TRIG_LEVEL	__BITS(23,16)
+#define SPI_FCR_RF_RST		__BIT(15)
+#define SPI_FCR_RF_TEST		__BIT(14)
+#define SPI_FCR_RX_DMA_MODE	__BIT(9)
+#define SPI_FCR_RF_DRQ_EN	__BIT(8)
+#define SPI_FCR_RX_TRIG_LEVEL	__BITS(7,0)
+
+#define SPI_FSR		0x01c
+#define SPI_FSR_TB_WR		__BIT(31)
+#define SPI_FSR_TB_CNT		__BITS(30,28)
+#define SPI_FSR_TF_CNT		__BITS(23,16)
+#define SPI_FSR_RB_WR		__BIT(15)
+#define SPI_FSR_RB_CNT		__BITS(14,12)
+#define SPI_FSR_RF_CNT		__BITS(7,0)
+
+#define SPI_WCR		0x020
+#define SPI_WCR_SWC		__BITS(19,16)
+#define SPI_WCR_WCC		__BITS(15,0)
+
+#define SPI_CCTL	0x024
+#define SPI_CCTL_DRS		__BIT(12)
+#define SPI_CCTL_CDR1		__BITS(11,8)
+#define SPI_CCTL_CDR2		__BITS(7,0)
+
+#define SPI_BC		0x030
+#define SPI_BC_MBC		__BITS(23,0)
+
+#define SPI_TC		0x034
+#define SPI_TC_MWTC		__BITS(23,0)
+
+#define SPI_BCC		0x038
+#define SPI_BCC_DRM		__BIT(28)
+#define SPI_BCC_DBC		__BITS(27,24)
+#define

CVS commit: src/crypto/external/bsd/openssh/dist

2018-02-06 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Tue Feb  6 10:56:35 UTC 2018

Modified Files:
src/crypto/external/bsd/openssh/dist: ssh-dss.c

Log Message:
style: remove spurious {} added in 1.12


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/ssh-dss.c

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/ssh-dss.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-dss.c:1.12 src/crypto/external/bsd/openssh/dist/ssh-dss.c:1.13
--- src/crypto/external/bsd/openssh/dist/ssh-dss.c:1.12	Mon Feb  5 00:13:50 2018
+++ src/crypto/external/bsd/openssh/dist/ssh-dss.c	Tue Feb  6 10:56:35 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssh-dss.c,v 1.12 2018/02/05 00:13:50 christos Exp $	*/
+/*	$NetBSD: ssh-dss.c,v 1.13 2018/02/06 10:56:35 maya Exp $	*/
 /* $OpenBSD: ssh-dss.c,v 1.35 2016/04/21 06:08:02 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-dss.c,v 1.12 2018/02/05 00:13:50 christos Exp $");
+__RCSID("$NetBSD: ssh-dss.c,v 1.13 2018/02/06 10:56:35 maya Exp $");
 #include 
 
 #include 
@@ -175,7 +175,6 @@ ssh_dss_verify(const struct sshkey *key,
 	}
 
 	/* parse signature */
-	{
 	BIGNUM *r=NULL, *s=NULL;
 	if ((sig = DSA_SIG_new()) == NULL ||
 	(r = BN_new()) == NULL ||
@@ -194,7 +193,6 @@ ssh_dss_verify(const struct sshkey *key,
 	}
 	DSA_SIG_set0(sig, r, s);
 	r = s = NULL;
-	}
 
 	/* sha1 the data */
 	if ((ret = ssh_digest_memory(SSH_DIGEST_SHA1, data, datalen,

CVS commit: src/sys/dev/i2c

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 10:02:09 UTC 2018

Modified Files:
src/sys/dev/i2c: dbcool.c

Log Message:
dbcool_read_volt() has a missing {} issue.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/i2c/dbcool.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/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.47 src/sys/dev/i2c/dbcool.c:1.48
--- src/sys/dev/i2c/dbcool.c:1.47	Fri Sep 22 03:04:17 2017
+++ src/sys/dev/i2c/dbcool.c	Tue Feb  6 10:02:09 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbcool.c,v 1.47 2017/09/22 03:04:17 macallan Exp $ */
+/*	$NetBSD: dbcool.c,v 1.48 2018/02/06 10:02:09 mrg Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.47 2017/09/22 03:04:17 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.48 2018/02/06 10:02:09 mrg Exp $");
 
 #include 
 #include 
@@ -1079,9 +1079,10 @@ dbcool_read_volt(struct dbcool_softc *sc
 		if (reg == DBCOOL_IMON) {
 			val = v1;
 			ext >>= 6;
-		} else
+		} else {
 			val = v2;
 			ext >>= 4;
+		}
 		ext &= 0x0f;
 	} else {
 		ext = sc->sc_dc.dc_readreg(>sc_dc, DBCOOL_EXTRES1_REG);

CVS commit: src/compat/mips64/64

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 10:00:00 UTC 2018

Modified Files:
src/compat/mips64/64: bsd.64.mk

Log Message:
fix a comment.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/compat/mips64/64/bsd.64.mk

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

Modified files:

Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.11 src/compat/mips64/64/bsd.64.mk:1.12
--- src/compat/mips64/64/bsd.64.mk:1.11	Mon Jun 22 00:09:39 2015
+++ src/compat/mips64/64/bsd.64.mk	Tue Feb  6 10:00:00 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.64.mk,v 1.11 2015/06/22 00:09:39 matt Exp $
+#	$NetBSD: bsd.64.mk,v 1.12 2018/02/06 10:00:00 mrg Exp $
 
 .if ${MACHINE_ARCH} == "mips64eb"
 LD+=		-m elf64btsmip
@@ -8,9 +8,7 @@ LD+=		-m elf64ltsmip
 .ifndef MLIBDIR
 MLIBDIR=	64
 
-# XXX
-# GCC 4.5 libgomp wants a different omp.h installed for the 64 bit
-# version of it, and we don't have a way of doing that yet.
+# GCC 5/6 libgomp for n64 needs files we don't generate yet.
 NO_LIBGOMP=	1
 
 COPTS+=		-mabi=64

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

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:41:55 UTC 2018

Modified Files:
src/distrib/sets/lists/base: shl.mi

Log Message:
fix mips64 & GCC 6 builds.


To generate a diff of this commit:
cvs rdiff -u -r1.829 -r1.830 src/distrib/sets/lists/base/shl.mi

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/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.829 src/distrib/sets/lists/base/shl.mi:1.830
--- src/distrib/sets/lists/base/shl.mi:1.829	Tue Feb  6 06:28:20 2018
+++ src/distrib/sets/lists/base/shl.mi	Tue Feb  6 09:41:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.829 2018/02/06 06:28:20 skrll Exp $
+# $NetBSD: shl.mi,v 1.830 2018/02/06 09:41:55 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -302,7 +302,9 @@
 ./usr/lib/libgomp.so.1.2			base-sys-shlib		compatfile,gcc=5,!machine_arch=mips64eb,!machine_arch=mips64el
 ./usr/lib/libgomp.so.1.2			base-sys-shlib		gcc=5,machine_arch=mips64eb
 ./usr/lib/libgomp.so.1.2			base-sys-shlib		gcc=5,machine_arch=mips64el
-./usr/lib/libgomp.so.1.3			base-sys-shlib		compatfile,gcc=6
+./usr/lib/libgomp.so.1.3			base-sys-shlib		compatfile,gcc=6,!machine_arch=mips64eb,!machine_arch=mips64el
+./usr/lib/libgomp.so.1.3			base-sys-shlib		gcc=6,machine_arch=mips64eb
+./usr/lib/libgomp.so.1.3			base-sys-shlib		gcc=6,machine_arch=mips64el
 ./usr/lib/libgssapi.sobase-krb5-shlib		compatfile,kerberos
 ./usr/lib/libgssapi.so.11			base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libgssapi.so.11.0			base-krb5-shlib		compatfile,kerberos

CVS commit: src/external/gpl3/gcc/lib/libiberty

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:36:34 UTC 2018

Modified Files:
src/external/gpl3/gcc/lib/libiberty: defs.mk

Log Message:
regen for GCC 6.4 (no real change)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/lib/libiberty/defs.mk

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

Modified files:

Index: src/external/gpl3/gcc/lib/libiberty/defs.mk
diff -u src/external/gpl3/gcc/lib/libiberty/defs.mk:1.14 src/external/gpl3/gcc/lib/libiberty/defs.mk:1.15
--- src/external/gpl3/gcc/lib/libiberty/defs.mk:1.14	Mon Nov 13 07:21:20 2017
+++ src/external/gpl3/gcc/lib/libiberty/defs.mk	Tue Feb  6 09:36:34 2018
@@ -1,6 +1,6 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.90 2017/10/04 21:42:20 christos Exp 
-# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.92 2018/02/06 07:04:01 mrg Exp 
+# Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp 
 #
 G_ALLOCA=
 G_EXTRA_OFILES=

CVS commit: src/sys/arch/mips/cavium/dev

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:33:45 UTC 2018

Modified Files:
src/sys/arch/mips/cavium/dev: octeon_pip.c

Log Message:
update for GCC 6:

hide octeon_pip_dump_regs_[] under OCTEON_ETH_DEBUG, the only user.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/cavium/dev/octeon_pip.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/mips/cavium/dev/octeon_pip.c
diff -u src/sys/arch/mips/cavium/dev/octeon_pip.c:1.1 src/sys/arch/mips/cavium/dev/octeon_pip.c:1.2
--- src/sys/arch/mips/cavium/dev/octeon_pip.c:1.1	Wed Apr 29 08:32:01 2015
+++ src/sys/arch/mips/cavium/dev/octeon_pip.c	Tue Feb  6 09:33:45 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: octeon_pip.c,v 1.1 2015/04/29 08:32:01 hikaru Exp $	*/
+/*	$NetBSD: octeon_pip.c,v 1.2 2018/02/06 09:33:45 mrg Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: octeon_pip.c,v 1.1 2015/04/29 08:32:01 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_pip.c,v 1.2 2018/02/06 09:33:45 mrg Exp $");
 
 #include "opt_octeon.h"
 
@@ -88,6 +88,7 @@ static const struct octeon_pip_dump_reg_
 	_ENTRY_0_1_2_32	(PIP_STAT_INB_ERRS),
 };
 
+#ifdef OCTEON_ETH_DEBUG
 static const struct octeon_pip_dump_reg_ octeon_pip_dump_regs_[] = {
 	_ENTRY		(PIP_BIST_STATUS),
 	_ENTRY		(PIP_INT_REG),
@@ -106,6 +107,8 @@ static const struct octeon_pip_dump_reg_
 	_ENTRY_0_1_2_32	(PIP_PRT_CFG),
 	_ENTRY_0_1_2_32	(PIP_PRT_TAG),
 };
+#endif
+
 #undef	_ENTRY
 #undef	_ENTRY_0_3
 #undef	_ENTRY_0_7

CVS commit: src/sbin/routed

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:33:07 UTC 2018

Modified Files:
src/sbin/routed: table.c

Log Message:
update for GCC 6:

- read_rt() has a missing {} issue.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sbin/routed/table.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/routed/table.c
diff -u src/sbin/routed/table.c:1.27 src/sbin/routed/table.c:1.28
--- src/sbin/routed/table.c:1.27	Tue Dec 20 03:35:12 2016
+++ src/sbin/routed/table.c	Tue Feb  6 09:33:07 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: table.c,v 1.27 2016/12/20 03:35:12 ozaki-r Exp $	*/
+/*	$NetBSD: table.c,v 1.28 2018/02/06 09:33:07 mrg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -36,7 +36,7 @@
 #include "defs.h"
 
 #ifdef __NetBSD__
-__RCSID("$NetBSD: table.c,v 1.27 2016/12/20 03:35:12 ozaki-r Exp $");
+__RCSID("$NetBSD: table.c,v 1.28 2018/02/06 09:33:07 mrg Exp $");
 #elif defined(__FreeBSD__)
 __RCSID("$FreeBSD$");
 #else
@@ -1292,11 +1292,12 @@ read_rt(void)
 			gate = 0;
 		}
 
-		if (INFO_AUTHOR() != 0)
+		if (INFO_AUTHOR() != 0) {
 			snprintf(strp, str + sizeof(str) - strp,
 			" by authority of %s",
 			saddr_ntoa(INFO_AUTHOR()));
 			strp += strlen(strp);
+		}
 
 		switch (m.r.rtm.rtm_type) {
 		case RTM_ADD:

CVS commit: src/external/gpl3/gcc/dist/libsanitizer

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:31:57 UTC 2018

Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_linux.cc sanitizer_linux_libcdep.cc
src/external/gpl3/gcc/dist/libsanitizer/ubsan: ubsan_platform.h

Log Message:
port to mips and alpha.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
cvs rdiff -u -r1.5 -r1.6 \

src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h

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

Modified files:

Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.13 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.14
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.13	Mon Feb  5 22:04:54 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc	Tue Feb  6 09:31:56 2018
@@ -27,7 +27,6 @@
 
 #if !SANITIZER_FREEBSD && !SANITIZER_NETBSD
 #include 
-#endif
 
 // For mips64, syscall(__NR_stat) fills the buffer in the 'struct kernel_stat'
 // format. Struct kernel_stat is defined as 'struct stat' in asm/stat.h. To
@@ -41,6 +40,8 @@
 #undef stat
 #endif
 
+#endif // !SANITIZER_FREEBSD && !SANITIZER_NETBSD
+
 #include 
 #include 
 #include 
@@ -207,7 +208,7 @@ static void stat64_to_stat(struct stat64
 }
 #endif
 
-#if defined(__mips64)
+#if defined(__mips64) && SANITIZER_LINUX
 static void kernel_stat_to_stat(struct kernel_stat *in, struct stat *out) {
   internal_memset(out, 0, sizeof(*out));
   out->st_dev = in->st_dev;
@@ -933,7 +934,7 @@ uptr internal_clone(int (*fn)(void *), v
: "rsp", "memory", "r11", "rcx");
   return res;
 }
-#elif defined(__mips__)
+#elif defined(__mips__) && SANITIZER_LINUX
 uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg,
 int *parent_tidptr, void *newtls, int *child_tidptr) {
   long long res;
@@ -1233,9 +1234,20 @@ void GetPcSpBp(void *context, uptr *pc, 
 # endif
 #elif defined(__mips__)
   ucontext_t *ucontext = (ucontext_t*)context;
+# if SANITIZER_NETBSD
+  *pc = _UC_MACHINE_PC(ucontext);
+  *sp = _UC_MACHINE_SP(ucontext);
+  *bp = ucontext->uc_mcontext.__gregs[_REG_S8];
+# else
   *pc = ucontext->uc_mcontext.pc;
   *bp = ucontext->uc_mcontext.gregs[30];
   *sp = ucontext->uc_mcontext.gregs[29];
+# endif
+#elif defined(__alpha__) && SANITIZER_NETBSD
+  ucontext_t *ucontext = (ucontext_t*)context;
+  *pc = _UC_MACHINE_PC(ucontext);
+  *sp = _UC_MACHINE_SP(ucontext);
+  *bp = ucontext->uc_mcontext.__gregs[_REG_S6];
 #else
 # error "Unsupported arch"
 #endif

Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc:1.5 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc:1.6
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc:1.5	Sun Feb  4 01:14:42 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc	Tue Feb  6 09:31:56 2018
@@ -164,6 +164,7 @@ static uptr g_tls_size;
 # define DL_INTERNAL_FUNCTION
 #endif
 
+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_ANDROID && !SANITIZER_GO
 #if defined(__mips__) || defined(__powerpc64__)
 // TlsPreTcbSize includes size of struct pthread_descr and size of tcb
 // head structure. It lies before the static tls blocks.
@@ -181,6 +182,7 @@ static uptr TlsPreTcbSize() {
   return kTlsPreTcbSize;
 }
 #endif
+#endif // !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_ANDROID && !SANITIZER_GO
 
 void InitTlsSize() {
 #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_NETBSD && !SANITIZER_GO

Index: src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h:1.4 src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h:1.5
--- src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h:1.4	Mon Feb  5 22:04:54 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/ubsan/ubsan_platform.h	Tue Feb  6 09:31:56 2018
@@ -17,7 +17,7 @@
  defined(__APPLE__)) && \
 (defined(__x86_64__) || defined(__i386__) || defined(__arm__) || \
  defined(__aarch64__) || defined(__mips__) || defined(__powerpc__) || \
- defined(__powerpc64__) || defined(__sparc__))
+ defined(__powerpc64__) || defined(__sparc__) || defined(__alpha__))
 # define CAN_SANITIZE_UB 1
 #elif defined(_WIN32)
 # define CAN_SANITIZE_UB 1

CVS commit: [netbsd-8] src/doc

2018-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Tue Feb  6 09:30:08 UTC 2018

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

Log Message:
Tickets #534 and #535


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

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.116 src/doc/CHANGES-8.0:1.1.2.117
--- src/doc/CHANGES-8.0:1.1.2.116	Tue Feb  6 09:06:35 2018
+++ src/doc/CHANGES-8.0	Tue Feb  6 09:30:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.116 2018/02/06 09:06:35 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.117 2018/02/06 09:30:08 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -9518,3 +9518,14 @@ sys/arch/i386/conf/XEN3_DOM0			1.126
 	Follow GENERIC and enable xhci(4) by default.
 	[bouyer, ticket #533]
 
+distrib/sets/lists/xetc/mi			1.29
+external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile 1.5
+
+	Don't fc-match bitmap fonts by default.
+	[maya, ticket #534]
+
+share/man/man4/vnd.41.19
+
+	Remove outdated BUGS entry - vnd does work on sparse files.
+	[maya, ticket #535]
+

CVS commit: [netbsd-8] src/share/man/man4

2018-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Tue Feb  6 09:29:21 UTC 2018

Modified Files:
src/share/man/man4 [netbsd-8]: vnd.4

Log Message:
Pull up following revision(s) (requested by maya in ticket #535):
share/man/man4/vnd.4: revision 1.19
Remove outdated BUGS entry - vnd does work on sparse files.
(thanks hannken in 2011-06-29)


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.24.1 src/share/man/man4/vnd.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/vnd.4
diff -u src/share/man/man4/vnd.4:1.18 src/share/man/man4/vnd.4:1.18.24.1
--- src/share/man/man4/vnd.4:1.18	Sun Jul  8 22:47:41 2012
+++ src/share/man/man4/vnd.4	Tue Feb  6 09:29:21 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: vnd.4,v 1.18 2012/07/08 22:47:41 wiz Exp $
+.\"	$NetBSD: vnd.4,v 1.18.24.1 2018/02/06 09:29:21 martin Exp $
 .\"
 .\" Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd December 18, 2009
+.Dd September 29, 2017
 .Dt VND 4
 .Os
 .Sh NAME
@@ -97,7 +97,3 @@ The compression handling is based on cod
 The
 .Nm
 driver does not work if the file does not reside in a local filesystem.
-.Pp
-The
-.Nm
-driver does not work if the file is sparse.

CVS commit: src/common/lib/libc/string

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:28:48 UTC 2018

Modified Files:
src/common/lib/libc/string: memset.c strlen.c

Log Message:
- remove two more _DIAGASSERT() checks against not NULL for functions
  with arguments with nonnull attributes.  in two cases, leave
  code behind that should set defaults to "(null)".


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/common/lib/libc/string/memset.c
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/string/strlen.c

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

Modified files:

Index: src/common/lib/libc/string/memset.c
diff -u src/common/lib/libc/string/memset.c:1.10 src/common/lib/libc/string/memset.c:1.11
--- src/common/lib/libc/string/memset.c:1.10	Mon Dec  2 21:21:33 2013
+++ src/common/lib/libc/string/memset.c	Tue Feb  6 09:28:48 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: memset.c,v 1.10 2013/12/02 21:21:33 joerg Exp $	*/
+/*	$NetBSD: memset.c,v 1.11 2018/02/06 09:28:48 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)memset.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: memset.c,v 1.10 2013/12/02 21:21:33 joerg Exp $");
+__RCSID("$NetBSD: memset.c,v 1.11 2018/02/06 09:28:48 mrg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -106,8 +106,6 @@ memset(void *dst0, int c0, size_t length
 #endif
 	u_char *dst;
 
-	_DIAGASSERT(dst0 != 0);
-
 	dst = dst0;
 	/*
 	 * If not enough words, just fill bytes.  A length >= 2 words

Index: src/common/lib/libc/string/strlen.c
diff -u src/common/lib/libc/string/strlen.c:1.2 src/common/lib/libc/string/strlen.c:1.3
--- src/common/lib/libc/string/strlen.c:1.2	Mon Jun  4 18:19:27 2007
+++ src/common/lib/libc/string/strlen.c	Tue Feb  6 09:28:48 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: strlen.c,v 1.2 2007/06/04 18:19:27 christos Exp $	*/
+/*	$NetBSD: strlen.c,v 1.3 2018/02/06 09:28:48 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)strlen.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: strlen.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
+__RCSID("$NetBSD: strlen.c,v 1.3 2018/02/06 09:28:48 mrg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,8 +50,6 @@ strlen(const char *str)
 {
 	const char *s;
 
-	_DIAGASSERT(str != NULL);
-
 	for (s = str; *s; ++s)
 		continue;
 	return(s - str);

CVS commit: [netbsd-8] src

2018-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Tue Feb  6 09:28:03 UTC 2018

Modified Files:
src/distrib/sets/lists/xetc [netbsd-8]: mi
src/external/mit/xorg/lib/fontconfig/etc/conf.d [netbsd-8]: Makefile

Log Message:
Pull up following revision(s) (requested by maya in ticket #534):
external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile: revision 1.5
distrib/sets/lists/xetc/mi: revision 1.29
Don't fc-match bitmap fonts by default.
Now things using Helvetica won't look terrible, and will use the fallback
font instead.
Idea by jakllsch, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.6.1 src/distrib/sets/lists/xetc/mi
cvs rdiff -u -r1.3 -r1.3.20.1 \
src/external/mit/xorg/lib/fontconfig/etc/conf.d/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/xetc/mi
diff -u src/distrib/sets/lists/xetc/mi:1.27 src/distrib/sets/lists/xetc/mi:1.27.6.1
--- src/distrib/sets/lists/xetc/mi:1.27	Thu Dec 15 12:56:52 2016
+++ src/distrib/sets/lists/xetc/mi	Tue Feb  6 09:28:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.27 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: mi,v 1.27.6.1 2018/02/06 09:28:03 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -101,6 +101,7 @@
 ./etc/fonts/conf.d/65-fonts-persian.conf		-unknown-	xorg
 ./etc/fonts/conf.d/65-nonlatin.conf			-unknown-	xorg
 ./etc/fonts/conf.d/69-unifont.conf			-unknown-	xorg
+./etc/fonts/conf.d/70-no-bitmaps.conf			-unknown-	xorg
 ./etc/fonts/conf.d/80-delicious.conf			-unknown-	xorg
 ./etc/fonts/conf.d/90-synthetic.conf			-unknown-	xorg
 ./etc/fonts/fonts.conf	-unknown-	x11

Index: src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3.20.1
--- src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile:1.3	Mon Jun  3 20:23:39 2013
+++ src/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile	Tue Feb  6 09:28:03 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
+#	$NetBSD: Makefile,v 1.3.20.1 2018/02/06 09:28:03 martin Exp $
 
 .include 
 
@@ -17,6 +17,7 @@ FONTCONFIG_LINKS= \
 	65-fonts-persian.conf \
 	65-nonlatin.conf \
 	69-unifont.conf \
+	70-no-bitmaps.conf \
 	80-delicious.conf \
 	90-synthetic.conf

CVS commit: src/sys/arch/sparc/sparc

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:22:58 UTC 2018

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

Log Message:
workaround a problem -Warray-bounds triggers but isn't a problem
in practise, as described from this old commment:

/*
 * Set up pm_regmap for kernel to point NUREG *below* the beginning
 * of kernel regmap storage. Since the kernel only uses regions
 * above NUREG, we save storage space and can index kernel and
 * user regions in the same way.
 */


To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/sys/arch/sparc/sparc/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/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.362 src/sys/arch/sparc/sparc/pmap.c:1.363
--- src/sys/arch/sparc/sparc/pmap.c:1.362	Tue Jan 16 08:23:17 2018
+++ src/sys/arch/sparc/sparc/pmap.c	Tue Feb  6 09:22:57 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.362 2018/01/16 08:23:17 mrg Exp $ */
+/*	$NetBSD: pmap.c,v 1.363 2018/02/06 09:22:57 mrg Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -56,7 +56,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.362 2018/01/16 08:23:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.363 2018/02/06 09:22:57 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -3214,7 +3214,10 @@ pmap_bootstrap4_4c(void *top, int nctx, 
 	 * above NUREG, we save storage space and can index kernel and
 	 * user regions in the same way.
 	 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
 	kernel_pmap_store.pm_regmap = kernel_regmap_store - NUREG;
+#pragma GCC diagnostic pop
 	for (i = NKREG; --i >= 0;) {
 #if defined(SUN4_MMU3L)
 		kernel_regmap_store[i].rg_smeg = reginval;
@@ -3592,7 +3595,10 @@ pmap_bootstrap4m(void *top)
 	 * above NUREG, we save storage space and can index kernel and
 	 * user regions in the same way.
 	 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
 	kernel_pmap_store.pm_regmap = kernel_regmap_store - NUREG;
+#pragma GCC diagnostic pop
 	memset(kernel_regmap_store, 0, NKREG * sizeof(struct regmap));
 	memset(kernel_segmap_store, 0, NKREG * NSEGRG * sizeof(struct segmap));
 	for (i = NKREG; --i >= 0;) {

CVS commit: src/sys/dev/sbus

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:21:07 UTC 2018

Modified Files:
src/sys/dev/sbus: esp_sbus.c

Log Message:
db_esp() has a missing {} issue in debug code.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/sbus/esp_sbus.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/sbus/esp_sbus.c
diff -u src/sys/dev/sbus/esp_sbus.c:1.53 src/sys/dev/sbus/esp_sbus.c:1.54
--- src/sys/dev/sbus/esp_sbus.c:1.53	Sat Oct 18 08:33:28 2014
+++ src/sys/dev/sbus/esp_sbus.c	Tue Feb  6 09:21:07 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp_sbus.c,v 1.53 2014/10/18 08:33:28 snj Exp $	*/
+/*	$NetBSD: esp_sbus.c,v 1.54 2018/02/06 09:21:07 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.53 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.54 2018/02/06 09:21:07 mrg Exp $");
 
 #include 
 #include 
@@ -752,12 +752,13 @@ db_esp(db_expr_t addr, bool have_addr, d
 " busy %d used %x\n",
 t, (int)li->lun, li->untagged, li->busy,
 li->used);
-for (i = 0; i < 256; i++)
+for (i = 0; i < 256; i++) {
 	ecb = li->queued[i];
 	if (ecb != NULL) {
 		db_printf("ecb %p tag %x\n",
 		ecb, i);
 	}
+}
 			}
 		}
 	}

CVS commit: src/sys/uvm

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:20:30 UTC 2018

Modified Files:
src/sys/uvm: uvm_map.c

Log Message:
uvm_map_extract() has an indentation issue.


To generate a diff of this commit:
cvs rdiff -u -r1.353 -r1.354 src/sys/uvm/uvm_map.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/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.353 src/sys/uvm/uvm_map.c:1.354
--- src/sys/uvm/uvm_map.c:1.353	Sat Oct 28 00:37:13 2017
+++ src/sys/uvm/uvm_map.c	Tue Feb  6 09:20:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_map.c,v 1.353 2017/10/28 00:37:13 pgoyette Exp $	*/
+/*	$NetBSD: uvm_map.c,v 1.354 2018/02/06 09:20:29 mrg Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.353 2017/10/28 00:37:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.354 2018/02/06 09:20:29 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_pax.h"
@@ -2762,7 +2762,7 @@ uvm_map_extract(struct vm_map *srcmap, v
 			if (newentry->object.uvm_obj->pgops->pgo_reference)
 newentry->object.uvm_obj->pgops->
 pgo_reference(newentry->object.uvm_obj);
-newentry->offset = entry->offset + fudge;
+			newentry->offset = entry->offset + fudge;
 		} else {
 			newentry->offset = 0;
 		}

CVS commit: src/sys/modules/pf

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:20:50 UTC 2018

Modified Files:
src/sys/modules/pf: Makefile

Log Message:
pf_table.c has many left-shift of negative value issues.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/pf/Makefile

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

Modified files:

Index: src/sys/modules/pf/Makefile
diff -u src/sys/modules/pf/Makefile:1.4 src/sys/modules/pf/Makefile:1.5
--- src/sys/modules/pf/Makefile:1.4	Thu Aug 20 11:05:01 2015
+++ src/sys/modules/pf/Makefile	Tue Feb  6 09:20:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/08/20 11:05:01 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/02/06 09:20:50 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -20,4 +20,6 @@ SRCS+=	tcp_rndiss.c
 
 CPPFLAGS+=	-I${S}/dist/pf -I${S} -DINET6 -DINET
 
+COPTS.pf_table.c+=	-Wno-error=shift-negative-value
+
 .include

CVS commit: src/external/gpl3/gcc

2018-02-06 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Feb  6 09:18:35 UTC 2018

Modified Files:
src/external/gpl3/gcc/lib/libbacktrace/arch/arm: backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/armeb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmeb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmhf:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmhfeb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4eb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6eb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6hf:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv6hfeb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7eb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7hf:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/earmv7hfeb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/hppa: backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64: backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/m68000:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/m68k: backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/mips64el:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/powerpc64:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/sh3eb:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/sh3el:
backtrace-supported.h
src/external/gpl3/gcc/lib/libbacktrace/arch/vax: backtrace-supported.h
src/external/gpl3/gcc/lib/libgcc/arch/arm: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/armeb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmeb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmhf: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmhfeb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv4eb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv6: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv6eb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv6hf: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv6hfeb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv7: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv7eb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv7hf: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/earmv7hfeb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/hppa: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/ia64: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/m68000: auto-target.h defs.mk
src/external/gpl3/gcc/lib/libgcc/arch/m68k: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/mips64el: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/mipseb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/mipsel: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/powerpc64: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/sh3eb: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/sh3el: auto-target.h
src/external/gpl3/gcc/lib/libgcc/arch/vax: auto-target.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/arm: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/armeb: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmeb: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmhf: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmhfeb: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4eb: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv6: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv6eb: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv6hf: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv6hfeb: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv7: gcov-iov.h
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv7eb:

CVS commit: [netbsd-8] src/doc

2018-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Tue Feb  6 09:06:36 UTC 2018

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

Log Message:
Ammend #524 for additional pullups


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

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.115 src/doc/CHANGES-8.0:1.1.2.116
--- src/doc/CHANGES-8.0:1.1.2.115	Mon Feb  5 15:17:15 2018
+++ src/doc/CHANGES-8.0	Tue Feb  6 09:06:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.115 2018/02/05 15:17:15 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.116 2018/02/06 09:06:35 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -9442,7 +9442,7 @@ share/man/man4/man4.x86/amdzentemp.4		1.
 sys/arch/amd64/conf/ALL1.79,1.80
 sys/arch/amd64/conf/GENERIC			1.482,1.484
 sys/arch/amd64/conf/XEN3_DOM0			1.146,1.147
-sys/arch/x86/pci/amdsmn.c			1.1-1.2
+sys/arch/x86/pci/amdsmn.c			1.1-1.3
 sys/arch/x86/pci/amdsmn.h			1.1
 sys/arch/x86/pci/amdzentemp.c			1.1-1.7
 sys/arch/x86/pci/files.pci			1.22,1.23

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

2018-02-06 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Tue Feb  6 09:05:27 UTC 2018

Modified Files:
src/sys/arch/x86/pci [netbsd-8]: amdsmn.c

Log Message:
Additionally pull up rev 1.3 of sys/arch/x86/pci/amdsmn.c, requested by
pgoyette in ticket #524:

rescan amdsmnbus instead of amdsmn (fixes panic)


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/x86/pci/amdsmn.c

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

Modified files:

Index: src/sys/arch/x86/pci/amdsmn.c
diff -u src/sys/arch/x86/pci/amdsmn.c:1.3.2.2 src/sys/arch/x86/pci/amdsmn.c:1.3.2.3
--- src/sys/arch/x86/pci/amdsmn.c:1.3.2.2	Mon Feb  5 13:06:55 2018
+++ src/sys/arch/x86/pci/amdsmn.c	Tue Feb  6 09:05:27 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdsmn.c,v 1.3.2.2 2018/02/05 13:06:55 martin Exp $	*/
+/*	$NetBSD: amdsmn.c,v 1.3.2.3 2018/02/06 09:05:27 martin Exp $	*/
 
 /*-
  * Copyright (c) 2017 Conrad Meyer 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.3.2.2 2018/02/05 13:06:55 martin Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdsmn.c,v 1.3.2.3 2018/02/06 09:05:27 martin Exp $ ");
 
 /*
  * Driver for the AMD Family 17h CPU System Management Network.
@@ -101,7 +101,7 @@ amdsmn_attach(device_t parent, device_t 
 	sc->pc = pa->pa_pc;
 	sc->pcitag = pa->pa_tag;
 	aprint_normal(": AMD Family 17h System Management Network\n");
-	amdsmn_rescan(self, "amdsmn", );
+	amdsmn_rescan(self, "amdsmnbus", );
 }
 
 static int

61 matches

Mail list logo