CVS commit: [netbsd-7] src/lib/libc/gen

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:10:31 UTC 2016

Modified Files:
src/lib/libc/gen [netbsd-7]: glob.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1247):
lib/libc/gen/glob.c: revision 1.36
Bump the glob limits to 512KB for total string size and 64K path
entries. The old limits were too small for some important FTP use cases
like a pkgsrc repository.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.8.1 src/lib/libc/gen/glob.c

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

Modified files:

Index: src/lib/libc/gen/glob.c
diff -u src/lib/libc/gen/glob.c:1.35 src/lib/libc/gen/glob.c:1.35.8.1
--- src/lib/libc/gen/glob.c:1.35	Wed Mar 20 23:44:47 2013
+++ src/lib/libc/gen/glob.c	Sun Sep 18 06:10:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $	*/
+/*	$NetBSD: glob.c,v 1.35.8.1 2016/09/18 06:10:31 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-__RCSID("$NetBSD: glob.c,v 1.35 2013/03/20 23:44:47 lukem Exp $");
+__RCSID("$NetBSD: glob.c,v 1.35.8.1 2016/09/18 06:10:31 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -87,9 +87,9 @@ __RCSID("$NetBSD: glob.c,v 1.35 2013/03/
 #define NO_GETPW_R
 #endif
 
-#define	GLOB_LIMIT_STRING	65536	/* number of readdirs */
+#define	GLOB_LIMIT_STRING	524288	/* number of readdirs */
 #define	GLOB_LIMIT_STAT		128	/* number of stat system calls */
-#define	GLOB_LIMIT_READDIR	16384	/* total buffer size of path strings */
+#define	GLOB_LIMIT_READDIR	65536	/* total buffer size of path strings */
 #define	GLOB_LIMIT_PATH		1024	/* number of path elements */
 #define GLOB_LIMIT_BRACE	128	/* Number of brace calls */
 

CVS commit: [netbsd-7] src/etc/namedb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:05:16 UTC 2016

Modified Files:
src/etc/namedb [netbsd-7]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1246):
etc/namedb/root.cache: revision 1.21
Update root.cache to 2016/8/25 version, l.root-servers.net has  record
now.


To generate a diff of this commit:
cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/etc/namedb/root.cache

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.18.2.2 src/etc/namedb/root.cache:1.18.2.3
--- src/etc/namedb/root.cache:1.18.2.2	Mon Apr 11 10:02:57 2016
+++ src/etc/namedb/root.cache	Sun Sep 18 06:05:16 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.18.2.2 2016/04/11 10:02:57 snj Exp $
+;	$NetBSD: root.cache,v 1.18.2.3 2016/09/18 06:05:16 snj Exp $
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -10,8 +10,8 @@
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:March 23, 2016
-;   related version of root zone:   2016032301
+;   last update:August 25, 2016
+;   related version of root zone:   2016082500
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -41,6 +41,7 @@ D.ROOT-SERVERS.NET.  360  AA
 ;
 .360  NSE.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.  360  A 192.203.230.10
+E.ROOT-SERVERS.NET.  360    2001:500:a8::e
 ;
 ; FORMERLY NS.ISC.ORG
 ;

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:01:07 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: usbdevs.h usbdevs_data.h

Log Message:
regen for ticket 1245


To generate a diff of this commit:
cvs rdiff -u -r1.672.2.4 -r1.672.2.5 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.673.2.4 -r1.673.2.5 src/sys/dev/usb/usbdevs_data.h

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

Modified files:

Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.672.2.4 src/sys/dev/usb/usbdevs.h:1.672.2.5
--- src/sys/dev/usb/usbdevs.h:1.672.2.4	Sun Oct 18 09:03:22 2015
+++ src/sys/dev/usb/usbdevs.h	Sun Sep 18 06:01:05 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs.h,v 1.672.2.4 2015/10/18 09:03:22 martin Exp $	*/
+/*	$NetBSD: usbdevs.h,v 1.672.2.5 2016/09/18 06:01:05 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp
+ *	NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp
  */
 
 /*
@@ -1364,6 +1364,7 @@
 #define	USB_PRODUCT_DLINK2_AR9271	0x3a10		/* AR9271 */
 #define	USB_PRODUCT_DLINK2_DWLG122C1	0x3c03		/* DWL-G122 rev C1 */
 #define	USB_PRODUCT_DLINK2_WUA1340	0x3c04		/* WUA-1340 */
+#define	USB_PRODUCT_DLINK2_DUBE100B1	0x3c05		/* DUB-E100 rev B1 */
 #define	USB_PRODUCT_DLINK2_DWA111	0x3c06		/* DWA-111 */
 #define	USB_PRODUCT_DLINK2_DWA110	0x3c07		/* DWA-110 */
 #define	USB_PRODUCT_DLINK2_RT2870_1	0x3c09		/* RT2870 */

Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.673.2.4 src/sys/dev/usb/usbdevs_data.h:1.673.2.5
--- src/sys/dev/usb/usbdevs_data.h:1.673.2.4	Sun Oct 18 09:03:22 2015
+++ src/sys/dev/usb/usbdevs_data.h	Sun Sep 18 06:01:05 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: usbdevs_data.h,v 1.673.2.4 2015/10/18 09:03:22 martin Exp $	*/
+/*	$NetBSD: usbdevs_data.h,v 1.673.2.5 2016/09/18 06:01:05 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp
+ *	NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp
  */
 
 /*
@@ -4419,6 +4419,10 @@ const struct usb_product usb_products[] 
 	"WUA-1340",
 	},
 	{
+	USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DUBE100B1,
+	"DUB-E100 rev B1",
+	},
+	{
 	USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111,
 	"DWA-111",
 	},
@@ -10203,4 +10207,4 @@ const struct usb_product usb_products[] 
 	"Prestige",
 	},
 };
-const int usb_nproducts = 2010;
+const int usb_nproducts = 2011;

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Sep 18 06:00:20 UTC 2016

Modified Files:
src/sys/dev/usb [netbsd-7]: if_axe.c usbdevs

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1245):
sys/dev/usb/if_axe.c: revision 1.73, 1.74
sys/dev/usb/usbdevs: revision 1.716
Add flxd's axe(4)
--
flxd's axe(4) - I think.
--
Fix harmless typo


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.67.2.1 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.680.2.4 -r1.680.2.5 src/sys/dev/usb/usbdevs

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/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.67 src/sys/dev/usb/if_axe.c:1.67.2.1
--- src/sys/dev/usb/if_axe.c:1.67	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_axe.c	Sun Sep 18 06:00:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $	*/
+/*	$NetBSD: if_axe.c,v 1.67.2.1 2016/09/18 06:00:20 snj Exp $	*/
 /*	$OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
 
 /*
@@ -89,7 +89,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.2.1 2016/09/18 06:00:20 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -155,6 +155,7 @@ static const struct axe_type axe_devs[] 
 	{ { USB_VENDOR_COREGA,		USB_PRODUCT_COREGA_FETHER_USB2_TX }, 0},
 	{ { USB_VENDOR_DLINK,		USB_PRODUCT_DLINK_DUBE100}, 0 },
 	{ { USB_VENDOR_DLINK,		USB_PRODUCT_DLINK_DUBE100B1 }, AX772 },
+	{ { USB_VENDOR_DLINK2,		USB_PRODUCT_DLINK2_DUBE100B1 }, AX772 },
 	{ { USB_VENDOR_DLINK,		USB_PRODUCT_DLINK_DUBE100C1 }, AX772 | AX772B },
 	{ { USB_VENDOR_GOODWAY,		USB_PRODUCT_GOODWAY_GWUSB2E}, 0 },
 	{ { USB_VENDOR_IODATA,		USB_PRODUCT_IODATA_ETGUS2 }, AX178 },

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.680.2.4 src/sys/dev/usb/usbdevs:1.680.2.5
--- src/sys/dev/usb/usbdevs:1.680.2.4	Sun Oct 18 09:01:58 2015
+++ src/sys/dev/usb/usbdevs	Sun Sep 18 06:00:20 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.680.2.4 2015/10/18 09:01:58 martin Exp $
+$NetBSD: usbdevs,v 1.680.2.5 2016/09/18 06:00:20 snj Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1357,6 +1357,7 @@ product DLINK2 DWA130D1		0x3a0f	DWA-130 
 product DLINK2 AR9271		0x3a10	AR9271
 product DLINK2 DWLG122C1	0x3c03	DWL-G122 rev C1
 product DLINK2 WUA1340		0x3c04	WUA-1340
+product DLINK2 DUBE100B1	0x3c05	DUB-E100 rev B1
 product DLINK2 DWA111		0x3c06	DWA-111
 product DLINK2 DWA110		0x3c07	DWA-110
 product DLINK2 RT2870_1		0x3c09	RT2870

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Sep 18 05:57:00 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: if_vioif.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1244):
sys/dev/pci/if_vioif.c: revision 1.25
Fix initializing wrong queues
Pointed out by Mike Larkin.
PR kern/51448


To generate a diff of this commit:
cvs rdiff -u -r1.7.2.1 -r1.7.2.2 src/sys/dev/pci/if_vioif.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_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.7.2.1 src/sys/dev/pci/if_vioif.c:1.7.2.2
--- src/sys/dev/pci/if_vioif.c:1.7.2.1	Mon Dec 29 17:01:01 2014
+++ src/sys/dev/pci/if_vioif.c	Sun Sep 18 05:57:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vioif.c,v 1.7.2.1 2014/12/29 17:01:01 martin Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.7.2.2 2016/09/18 05:57:00 snj Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.1 2014/12/29 17:01:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.7.2.2 2016/09/18 05:57:00 snj Exp $");
 
 #include 
 #include 
@@ -394,7 +394,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
 	}
 
 	for (i = 0; i < txqsize; i++) {
-		C_L1(txhdr_dmamaps[i], rx_hdrs[i],
+		C_L1(txhdr_dmamaps[i], tx_hdrs[i],
 		sizeof(struct virtio_net_hdr), 1,
 		WRITE, "tx header");
 		C(tx_dmamaps[i], NULL, ETHER_MAX_LEN, 256 /* XXX */, 0,

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Sep 10 06:45:45 UTC 2016

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

Log Message:
tidy up entries for 1210, 1211


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.107 src/doc/CHANGES-7.1:1.1.2.108
--- src/doc/CHANGES-7.1:1.1.2.107	Sat Sep 10 06:39:43 2016
+++ src/doc/CHANGES-7.1	Sat Sep 10 06:45:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.107 2016/09/10 06:39:43 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.108 2016/09/10 06:45:45 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5212,25 +5212,23 @@ sbin/fsdb/fsdb.c1.49
 sys/ufs/ffs/ffs_vfsops.c			1.340
 usr.sbin/quot/quot.c1.34
 
-From Michael Plass:
-
-The superblock field that distinguishes between 4.2BSD and 4.4BSD
-inodes is really only relevant on a UFS1 file system. Make sure that
-it is a UFS1 fs before using fs_old_inodefmt.
-
-Note that the NetBSD newfs and mkfs utilities initialize fs_old_inodefmt
-even for UFS2, so problems were apparent only on file systems created
-by other operating systems, for example, FreeBSD.
-[martin, ticket #1210]
+	The superblock field that distinguishes between 4.2BSD and
+	4.4BSD inodes is really only relevant on a UFS1 file system.
+	Make sure that it is a UFS1 fs before using fs_old_inodefmt.
+
+	Note that the NetBSD newfs and mkfs utilities initialize
+	fs_old_inodefmt even for UFS2, so problems were apparent only
+	on file systems created by other operating systems, for example,
+	FreeBSD.
+	[martin, ticket #1210]
 
 sys/arch/evbppc/conf/Makefile.ev64260.inc	1.8
 sys/arch/evbppc/conf/Makefile.obs405.inc	1.13
 sys/arch/evbppc/conf/Makefile.walnut.inc	1.9
 
-Fix typo in Makefile which resulted in kernel image not being generated
-
-From Rin Okuyama in PR/51369
-[maya, ticket #1211]
+	Fix typo in Makefile which resulted in kernel image not being
+	generated.  PR/51369
+	[maya, ticket #1211]
 
 bin/sh/parser.c	1.114 via patch
 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Sep 10 06:39:43 UTC 2016

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

Log Message:
1242, 1248


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.106 src/doc/CHANGES-7.1:1.1.2.107
--- src/doc/CHANGES-7.1:1.1.2.106	Sun Aug 28 04:37:17 2016
+++ src/doc/CHANGES-7.1	Sat Sep 10 06:39:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.106 2016/08/28 04:37:17 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.107 2016/09/10 06:39:43 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5255,3 +5255,15 @@ sys/dev/splash/splash.c1.13
 	Don't panic if the splash screen is bigger than the framebuffer.
 	[khorben, ticket #1238]
 
+sbin/resize_ffs/resize_ffs.c			1.47
+
+	Fix handling of ffsv2 inode initialization. PR 51116.
+	[dholland, ticket #1242]
+
+sys/arch/sparc64/sparc64/kobj_machdep.c		1.6
+
+	The target of the OLO10 relocation is the simd13 field of the
+	instruction, so use a 13 bit target mask.
+	Fixes PR kern/51436.
+	[martin, ticket #1248]
+

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Sep 10 06:38:54 UTC 2016

Modified Files:
src/sys/arch/sparc64/sparc64 [netbsd-7]: kobj_machdep.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1248):
sys/arch/sparc64/sparc64/kobj_machdep.c: revision 1.6
The target of the OLO10 relocation is the simd13 field of the instruction,
so use a 13 bit target mask.
Fixes PR kern/51436 (I broke this myself in rev 1.4)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/arch/sparc64/sparc64/kobj_machdep.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/kobj_machdep.c
diff -u src/sys/arch/sparc64/sparc64/kobj_machdep.c:1.5 src/sys/arch/sparc64/sparc64/kobj_machdep.c:1.5.4.1
--- src/sys/arch/sparc64/sparc64/kobj_machdep.c:1.5	Sat Feb  1 11:19:04 2014
+++ src/sys/arch/sparc64/sparc64/kobj_machdep.c	Sat Sep 10 06:38:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kobj_machdep.c,v 1.5 2014/02/01 11:19:04 nakayama Exp $	*/
+/*	$NetBSD: kobj_machdep.c,v 1.5.4.1 2016/09/10 06:38:54 snj Exp $	*/
 
 /*-
  * Copyright (c) 2001 Jake Burkholder.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.5 2014/02/01 11:19:04 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.5.4.1 2016/09/10 06:38:54 snj Exp $");
 
 #define	ELFSIZE		ARCH_ELFSIZE
 
@@ -164,7 +164,7 @@ static const long reloc_target_bitmask[]
 	_BM(22), _BM(10),		/* _HIPLT22, LOPLT10 */
 	_BM(32), _BM(22), _BM(10),	/* _PCPLT32, _PCPLT22, _PCPLT10 */
 	_BM(10), _BM(11), -1,		/* _10, _11, _64 */
-	_BM(10), _BM(22),		/* _OLO10, _HH22 */
+	_BM(13), _BM(22),		/* _OLO10, _HH22 */
 	_BM(10), _BM(22),		/* _HM10, _LM22 */
 	_BM(22), _BM(10), _BM(22),	/* _PC_HH22, _PC_HM10, _PC_LM22 */
 	_BM(16), _BM(19),		/* _WDISP16, _WDISP19 */

CVS commit: [netbsd-7] src/sbin/resize_ffs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Sep 10 06:36:37 UTC 2016

Modified Files:
src/sbin/resize_ffs [netbsd-7]: resize_ffs.c

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1242):
sbin/resize_ffs/resize_ffs.c: revision 1.47
Fix handling of ffsv2 inode initialization. Retires PR 51116.


To generate a diff of this commit:
cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sbin/resize_ffs/resize_ffs.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/resize_ffs/resize_ffs.c
diff -u src/sbin/resize_ffs/resize_ffs.c:1.38.6.1 src/sbin/resize_ffs/resize_ffs.c:1.38.6.2
--- src/sbin/resize_ffs/resize_ffs.c:1.38.6.1	Thu Aug  6 21:13:44 2015
+++ src/sbin/resize_ffs/resize_ffs.c	Sat Sep 10 06:36:37 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: resize_ffs.c,v 1.38.6.1 2015/08/06 21:13:44 snj Exp $	*/
+/*	$NetBSD: resize_ffs.c,v 1.38.6.2 2016/09/10 06:36:37 snj Exp $	*/
 /* From sources sent on February 17, 2003 */
 /*-
  * As its sole author, I explicitly place this code in the public
@@ -36,7 +36,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: resize_ffs.c,v 1.38.6.1 2015/08/06 21:13:44 snj Exp $");
+__RCSID("$NetBSD: resize_ffs.c,v 1.38.6.2 2016/09/10 06:36:37 snj Exp $");
 
 #include 
 #include 
@@ -105,7 +105,8 @@ union dinode {
 	} while (0)
 
 /* a cg's worth of brand new squeaky-clean inodes */
-static struct ufs1_dinode *zinodes;
+static struct ufs1_dinode *zinodes1;
+static struct ufs2_dinode *zinodes2;
 
 /* pointers to the in-core cgs, read off disk and possibly modified */
 static struct cg **cgs;
@@ -615,10 +616,15 @@ initcg(int cgn)
 	newsb->fs_cstotal.cs_nffree += cg->cg_cs.cs_nffree;
 	newsb->fs_cstotal.cs_nbfree += cg->cg_cs.cs_nbfree;
 	newsb->fs_cstotal.cs_nifree += cg->cg_cs.cs_nifree;
-	if (is_ufs2 == 0)
+	if (is_ufs2) {
+		/* Write out the cleared inodes. */
+		writeat(FFS_FSBTODB(newsb, cgimin(newsb, cgn)), zinodes2,
+		cg->cg_initediblk * sizeof(*zinodes2));
+	} else {
 		/* Write out the cleared inodes. */
-		writeat(FFS_FSBTODB(newsb, cgimin(newsb, cgn)), zinodes,
-		newsb->fs_ipg * sizeof(*zinodes));
+		writeat(FFS_FSBTODB(newsb, cgimin(newsb, cgn)), zinodes1,
+		newsb->fs_ipg * sizeof(*zinodes1));
+	}
 	/* Dirty the cg. */
 	cgflags[cgn] |= CGF_DIRTY;
 }
@@ -993,8 +999,15 @@ grow(void)
 	/* Update the timestamp. */
 	newsb->fs_time = timestamp();
 	/* Allocate and clear the new-inode area, in case we add any cgs. */
-	zinodes = alloconce(newsb->fs_ipg * sizeof(*zinodes), "zeroed inodes");
-	memset(zinodes, 0, newsb->fs_ipg * sizeof(*zinodes));
+	if (is_ufs2) {
+		zinodes2 = alloconce(newsb->fs_ipg * sizeof(*zinodes2),
+			"zeroed inodes");
+		memset(zinodes2, 0, newsb->fs_ipg * sizeof(*zinodes2));
+	} else {
+		zinodes1 = alloconce(newsb->fs_ipg * sizeof(*zinodes1),
+			"zeroed inodes");
+		memset(zinodes1, 0, newsb->fs_ipg * sizeof(*zinodes1));
+	}
 	
 	/* Check that the new last sector (frag, actually) is writable.  Since
 	 * it's at least one frag larger than it used to be, we know we aren't

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep  7 08:35:27 UTC 2016

Removed Files:
src/sys/dev/usb [netbsd-7]: usbroothub.c usbroothub.h

Log Message:
Wrong branch (for now)


To generate a diff of this commit:
cvs rdiff -u -r1.2.4.2 -r0 src/sys/dev/usb/usbroothub.c \
src/sys/dev/usb/usbroothub.h

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

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep  7 08:29:49 UTC 2016

Added Files:
src/sys/dev/usb [netbsd-7]: usbroothub.c usbroothub.h

Log Message:
Add missing files


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.4.2 src/sys/dev/usb/usbroothub.c \
src/sys/dev/usb/usbroothub.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/dev/usb/usbroothub.c
diff -u /dev/null src/sys/dev/usb/usbroothub.c:1.2.4.2
--- /dev/null	Wed Sep  7 08:29:49 2016
+++ src/sys/dev/usb/usbroothub.c	Wed Sep  7 08:29:49 2016
@@ -0,0 +1,491 @@
+/* $NetBSD: usbroothub.c,v 1.2.4.2 2016/09/07 08:29:49 skrll Exp $ */
+
+/*-
+ * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (lenn...@augustsson.net) at
+ * Carlstedt Research & Technology, Jared D. McNeill (jmcne...@invisible.ca),
+ * Matthew R. Green (m...@eterna.com.au) and Nick Hudson.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 2008
+ *	Matthias Drochner.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+extern int usbdebug;
+
+/* helper functions for USB root hub emulation */
+
+static usbd_status	roothub_ctrl_transfer(struct usbd_xfer *);
+static usbd_status	roothub_ctrl_start(struct usbd_xfer *);
+static void		roothub_ctrl_abort(struct usbd_xfer *);
+static void		roothub_ctrl_close(struct usbd_pipe *);
+static void		roothub_ctrl_done(struct usbd_xfer *);
+static void		roothub_noop(struct usbd_pipe *pipe);
+
+const struct usbd_pipe_methods roothub_ctrl_methods = {
+	.upm_transfer =	roothub_ctrl_transfer,
+	.upm_start =	roothub_ctrl_start,
+	.upm_abort =	roothub_ctrl_abort,
+	.upm_close =	roothub_ctrl_close,
+	.upm_cleartoggle =	roothub_noop,
+	.upm_done =	roothub_ctrl_done,
+};
+
+int
+usb_makestrdesc(usb_string_descriptor_t *p, int l, const char *s)
+{
+	int i;
+
+	if (l == 0)
+		return 0;
+	p->bLength = 2 * strlen(s) + 2;
+	if (l == 1)
+		return 1;
+	p->bDescriptorType = UDESC_STRING;
+	l -= 2;
+	/* poor man's utf-16le conversion */
+	for (i = 0; s[i] && l > 1; i++, l -= 2)
+		USETW2(p->bString[i], 0, s[i]);
+	return 2 * i + 2;
+}
+
+int
+usb_makelangtbl(usb_string_descriptor_t *p, int l)
+{
+
+	if (l == 0)
+		return 0;
+	

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Aug 28 04:37:17 UTC 2016

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

Log Message:
1213, 1238


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.105 src/doc/CHANGES-7.1:1.1.2.106
--- src/doc/CHANGES-7.1:1.1.2.105	Sat Aug 27 15:21:10 2016
+++ src/doc/CHANGES-7.1	Sun Aug 28 04:37:17 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.105 2016/08/27 15:21:10 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.106 2016/08/28 04:37:17 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5243,3 +5243,15 @@ bin/sh/parser.c	1.114 via patch
 	based) shells .. see http://www.in-ulm.de/~mascheck/ (from kre@)
 	[kre, ticket #1212]
 
+sys/arch/x86/pci/ichlpcib.c			1.51
+
+	Disable gpio(4) attachment to ichlpcib(4) by default.
+	GPIO functionality can be enabled by setting ichlpcib_gpio_disable
+	to 0, for instance with `gdb -write`.  PR port-amd64/50733.
+	[maya, ticket #1213]
+
+sys/dev/splash/splash.c1.13
+
+	Don't panic if the splash screen is bigger than the framebuffer.
+	[khorben, ticket #1238]
+

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Aug 28 04:31:19 UTC 2016

Modified Files:
src/sys/dev/splash [netbsd-7]: splash.c

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1238):
sys/dev/splash/splash.c: revision 1.13
Do not panic if the splash screen is bigger than the framebuffer
This fixes a kernel crash if the splash screen does not fit inside the
framebuffer. It should probably be truncated (and optionally centered)
instead, but this avoids a panic in the meantime.
Tested on NetBSD/amd64 with a vesa framebuffer.
 From Christian Koch (cfkoch@) of EdgeBSD; thanks!
XXX pull-up(s)


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.14.1 src/sys/dev/splash/splash.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/splash/splash.c
diff -u src/sys/dev/splash/splash.c:1.12 src/sys/dev/splash/splash.c:1.12.14.1
--- src/sys/dev/splash/splash.c:1.12	Sat Jun  2 14:24:00 2012
+++ src/sys/dev/splash/splash.c	Sun Aug 28 04:31:19 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: splash.c,v 1.12 2012/06/02 14:24:00 martin Exp $ */
+/* $NetBSD: splash.c,v 1.12.14.1 2016/08/28 04:31:19 snj Exp $ */
 
 /*-
  * Copyright (c) 2006 Jared D. McNeill 
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: splash.c,v 1.12 2012/06/02 14:24:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: splash.c,v 1.12.14.1 2016/08/28 04:31:19 snj Exp $");
 
 #include "opt_splash.h"
 
@@ -195,6 +195,14 @@ splash_render(struct splash_info *si, in
 	aprint_debug("%s: splash loaded, width %d height %d comp %d\n",
 	__func__, width, height, comp);
 
+	if ((width > si->si_width) || (height > si->si_height)) {
+		aprint_error(
+			"WARNING: splash size (%dx%d) too big for framebuffer (%dx%d)\n",
+			width, height, si->si_width, si->si_height);
+		stbi_image_free(data);
+		return EINVAL;
+	}
+
 	/* XXX */
 	if (flg & SPLASH_F_CENTER) {
 		xoff = (si->si_width - width) / 2;

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Aug 28 03:38:15 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by maya in ticket #1213):
sys/arch/x86/pci/ichlpcib.c: revision 1.51
Disable gpio(4) attachment to ichlpcib(4) by default.
The GPIO lines on an ICH are usually connected to opaque platform-
defined functionality, and may be manipulated by the ACPI DSDT or other
mechanisms behind our backs.  In one instance, it was found this
in combiation with gpio_resume() sabotaged repeated suspend/resume cycles.
GPIO functionality can be enabled by setting ichlpcib_gpio_disable to 0,
for instance with `gdb -write`.


To generate a diff of this commit:
cvs rdiff -u -r1.43.4.4 -r1.43.4.5 src/sys/arch/x86/pci/ichlpcib.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/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.43.4.4 src/sys/arch/x86/pci/ichlpcib.c:1.43.4.5
--- src/sys/arch/x86/pci/ichlpcib.c:1.43.4.4	Thu Apr 30 19:27:20 2015
+++ src/sys/arch/x86/pci/ichlpcib.c	Sun Aug 28 03:38:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ichlpcib.c,v 1.43.4.4 2015/04/30 19:27:20 snj Exp $	*/
+/*	$NetBSD: ichlpcib.c,v 1.43.4.5 2016/08/28 03:38:15 snj Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.4 2015/04/30 19:27:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.5 2016/08/28 03:38:15 snj Exp $");
 
 #include 
 #include 
@@ -279,6 +279,14 @@ static struct lpcib_device {
 };
 
 /*
+ * Allow user to enable GPIO functionality if they really need it.  The
+ * vast majority of systems with an ICH should not expose GPIO to the
+ * kernel or user.  In at least one instance the gpio_resume() handler
+ * on ICH GPIO was found to sabotage S3 suspend/resume.
+ */
+int	ichlpcib_gpio_disable = 1;
+
+/*
  * Autoconf callbacks.
  */
 static int
@@ -1073,6 +1081,9 @@ lpcib_gpio_configure(device_t self)
 	int pin, shift, base_reg, cntl_reg, reg;
 	int rv;
 
+	if (ichlpcib_gpio_disable != 0)
+		return;
+
 	/* this implies ICH >= 6, and thus different mapreg */
 	if (sc->sc_has_rcba) {
 		base_reg = LPCIB_PCI_GPIO_BASE_ICH6;

CVS commit: [netbsd-7] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Aug 27 15:21:10 UTC 2016

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

Log Message:
tickets 1210, 1211, 1212


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.104 src/doc/CHANGES-7.1:1.1.2.105
--- src/doc/CHANGES-7.1:1.1.2.104	Sat Aug 27 15:11:31 2016
+++ src/doc/CHANGES-7.1	Sat Aug 27 15:21:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.104 2016/08/27 15:11:31 bouyer Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.105 2016/08/27 15:21:10 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5208,3 +5208,38 @@ sys/compat/common/vfs_syscalls_43.c		1.5
 	fill in the tv_nsec parts of the converted timespec in cvtstat().
 	[mrg, ticket #1240]
 
+sbin/fsdb/fsdb.c1.49
+sys/ufs/ffs/ffs_vfsops.c			1.340
+usr.sbin/quot/quot.c1.34
+
+From Michael Plass:
+
+The superblock field that distinguishes between 4.2BSD and 4.4BSD
+inodes is really only relevant on a UFS1 file system. Make sure that
+it is a UFS1 fs before using fs_old_inodefmt.
+
+Note that the NetBSD newfs and mkfs utilities initialize fs_old_inodefmt
+even for UFS2, so problems were apparent only on file systems created
+by other operating systems, for example, FreeBSD.
+[martin, ticket #1210]
+
+sys/arch/evbppc/conf/Makefile.ev64260.inc	1.8
+sys/arch/evbppc/conf/Makefile.obs405.inc	1.13
+sys/arch/evbppc/conf/Makefile.walnut.inc	1.9
+
+Fix typo in Makefile which resulted in kernel image not being generated
+
+From Rin Okuyama in PR/51369
+[maya, ticket #1211]
+
+bin/sh/parser.c	1.114 via patch
+
+	PR bin/51027 - fix the parsing of references to shell parameters
+	when given without braces (ie: $2 etc).  Only the first 9 shell
+	parameters ($1 .. $9) and the special parameter ($0) can be
+	referenced this way, $10 is ${1}0 not ${10}.   Make it so.
+	This bug brought to notice by Sven Mascheck's web pages which
+	discuss (among other things) the history of this (and other ash
+	based) shells .. see http://www.in-ulm.de/~mascheck/ (from kre@)
+	[kre, ticket #1212]
+

CVS commit: [netbsd-7] src/bin/sh

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Aug 27 15:20:49 UTC 2016

Modified Files:
src/bin/sh [netbsd-7]: parser.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #1212):
bin/sh/parser.c: revision 1.114 via patch
PR bin/51027 - fix the parsing of references to shell parameters
when given without braces (ie: $2 etc).  Only the first 9 shell
parameters ($1 .. $9) and the special parameter ($0) can be
referenced this way, $10 is ${1}0 not ${10}.   Make it so.
This bug brought to notice by Sven Mascheck's web pages which
discuss (among other things) the history of this (and other ash
based) shells .. see http://www.in-ulm.de/~mascheck/ (from kre@)


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.90.4.1 src/bin/sh/parser.c

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

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.90 src/bin/sh/parser.c:1.90.4.1
--- src/bin/sh/parser.c:1.90	Wed Jan  1 19:50:44 2014
+++ src/bin/sh/parser.c	Sat Aug 27 15:20:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.90 2014/01/01 19:50:44 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.90.4.1 2016/08/27 15:20:48 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.90 2014/01/01 19:50:44 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.90.4.1 2016/08/27 15:20:48 bouyer Exp $");
 #endif
 #endif /* not lint */
 
@@ -1330,7 +1330,7 @@ parsesub: {
 			do {
 USTPUTC(c, out);
 c = pgetc();
-			} while (is_digit(c));
+			} while (subtype != VSNORMAL && is_digit(c));
 		}
 		else if (is_special(c)) {
 			USTPUTC(c, out);

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Aug 27 15:19:09 UTC 2016

Modified Files:
src/sys/arch/evbppc/conf [netbsd-7]: Makefile.ev64260.inc
Makefile.obs405.inc Makefile.walnut.inc

Log Message:
Pull up following revision(s) (requested by maya in ticket #1211):
sys/arch/evbppc/conf/Makefile.walnut.inc: revision 1.9
sys/arch/evbppc/conf/Makefile.obs405.inc: revision 1.13
sys/arch/evbppc/conf/Makefile.ev64260.inc: revision 1.8
Fix typo in Makefile which resulted in kernel image not being generated
>From Rin Okuyama in PR/51369


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/evbppc/conf/Makefile.ev64260.inc
cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/evbppc/conf/Makefile.walnut.inc

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/evbppc/conf/Makefile.ev64260.inc
diff -u src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.7 src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.7.4.1
--- src/sys/arch/evbppc/conf/Makefile.ev64260.inc:1.7	Mon Mar  3 19:08:46 2014
+++ src/sys/arch/evbppc/conf/Makefile.ev64260.inc	Sat Aug 27 15:19:09 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ev64260.inc,v 1.7 2014/03/03 19:08:46 joerg Exp $
+#	$NetBSD: Makefile.ev64260.inc,v 1.7.4.1 2016/08/27 15:19:09 bouyer Exp $
 
 MKIMG?=	${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 
@@ -9,5 +9,5 @@ SYSTEM_FIRST_SFILE=	${THISPPC}/${BOARDTY
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${MKIMG} $@ $@.img ; \
-	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
 		export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img

Index: src/sys/arch/evbppc/conf/Makefile.obs405.inc
diff -u src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.12 src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.12.2.1
--- src/sys/arch/evbppc/conf/Makefile.obs405.inc:1.12	Tue Aug  5 15:40:59 2014
+++ src/sys/arch/evbppc/conf/Makefile.obs405.inc	Sat Aug 27 15:19:09 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.obs405.inc,v 1.12 2014/08/05 15:40:59 apb Exp $
+#	$NetBSD: Makefile.obs405.inc,v 1.12.2.1 2016/08/27 15:19:09 bouyer Exp $
 
 CFLAGS+=-mcpu=405
 AFLAGS+=-mcpu=405
@@ -15,7 +15,7 @@ SYSTEM_FIRST_SFILE=	${THISPPC}/obs405/ob
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${MKIMG} $@ $@.img ; \
-	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
 		export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
 
 
@@ -30,7 +30,7 @@ SYSTEM_FIRST_SFILE=	${POWERPC}/${PPCDIR}
 
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${MKIMG} $@ $@.img ; \
-	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
 		export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img
 
 

Index: src/sys/arch/evbppc/conf/Makefile.walnut.inc
diff -u src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.8 src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.8.4.1
--- src/sys/arch/evbppc/conf/Makefile.walnut.inc:1.8	Mon Mar  3 19:08:46 2014
+++ src/sys/arch/evbppc/conf/Makefile.walnut.inc	Sat Aug 27 15:19:09 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.walnut.inc,v 1.8 2014/03/03 19:08:46 joerg Exp $
+#	$NetBSD: Makefile.walnut.inc,v 1.8.4.1 2016/08/27 15:19:09 bouyer Exp $
 
 MKIMG?=	${HOST_SH} ${THISPPC}/compile/walnut-mkimg.sh
 CFLAGS+=-mcpu=403
@@ -10,5 +10,5 @@ SYSTEM_FIRST_SFILE=	${THISPPC}/walnut/wa
 
 SYSTEM_LD_TAIL_EXTRA_EXTRA+=; \
 	echo ${MKIMG} $@ $@.img ; \
-	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT]; \
+	OBJDUMP=${OBJDUMP}; OBJCOPY=${OBJCOPY}; STAT=${TOOL_STAT}; \
 		export OBJDUMP OBJCOPY STAT; ${MKIMG} $@ $@.img

CVS commit: [netbsd-7] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Aug 27 15:17:34 UTC 2016

Modified Files:
src/sbin/fsdb [netbsd-7]: fsdb.c
src/sys/ufs/ffs [netbsd-7]: ffs_vfsops.c
src/usr.sbin/quot [netbsd-7]: quot.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1210):
sys/ufs/ffs/ffs_vfsops.c: revision 1.340
usr.sbin/quot/quot.c: revision 1.34
sbin/fsdb/fsdb.c: revision 1.49
>From Michael Plass:
The superblock field that distinguishes between 4.2BSD and 4.4BSD
inodes is really only relevant on a UFS1 file system. Make sure that
it is a UFS1 fs before using fs_old_inodefmt.
Note that the NetBSD newfs and mkfs utilities initialize fs_old_inodefmt
even for UFS2, so problems were apparent only on file systems created
by other operating systems, for example, FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.6.1 src/sbin/fsdb/fsdb.c
cvs rdiff -u -r1.299.2.3 -r1.299.2.4 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.33 -r1.33.4.1 src/usr.sbin/quot/quot.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/fsdb/fsdb.c
diff -u src/sbin/fsdb/fsdb.c:1.48 src/sbin/fsdb/fsdb.c:1.48.6.1
--- src/sbin/fsdb/fsdb.c:1.48	Sun Jun 23 02:06:04 2013
+++ src/sbin/fsdb/fsdb.c	Sat Aug 27 15:17:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fsdb.c,v 1.48 2013/06/23 02:06:04 dholland Exp $	*/
+/*	$NetBSD: fsdb.c,v 1.48.6.1 2016/08/27 15:17:34 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.48 2013/06/23 02:06:04 dholland Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.48.6.1 2016/08/27 15:17:34 bouyer Exp $");
 #endif /* not lint */
 
 #include 
@@ -1232,7 +1232,7 @@ CMDFUNC(chgroup)
 			return 1;
 		}
 	}
-	if (sblock->fs_old_inodefmt < FS_44INODEFMT)
+	if (!is_ufs2 && sblock->fs_old_inodefmt < FS_44INODEFMT)
 		curinode->dp1.di_ogid = iswap32(gid);
 	else
 		DIP_SET(curinode, gid, iswap32(gid));

Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.299.2.3 src/sys/ufs/ffs/ffs_vfsops.c:1.299.2.4
--- src/sys/ufs/ffs/ffs_vfsops.c:1.299.2.3	Wed Jan 28 18:34:11 2015
+++ src/sys/ufs/ffs/ffs_vfsops.c	Sat Aug 27 15:17:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.299.2.3 2015/01/28 18:34:11 martin Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.299.2.4 2016/08/27 15:17:34 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.299.2.3 2015/01/28 18:34:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.299.2.4 2016/08/27 15:17:34 bouyer Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -1450,7 +1450,8 @@ ffs_oldfscompat_read(struct fs *fs, stru
 		fs->fs_old_trackskew = 0;
 	}
 
-	if (fs->fs_old_inodefmt < FS_44INODEFMT) {
+	if (fs->fs_magic == FS_UFS1_MAGIC &&
+	fs->fs_old_inodefmt < FS_44INODEFMT) {
 		fs->fs_maxfilesize = (u_quad_t) 1LL << 39;
 		fs->fs_qbmask = ~fs->fs_bmask;
 		fs->fs_qfmask = ~fs->fs_fmask;
@@ -1895,7 +1896,8 @@ ffs_loadvnode(struct mount *mp, struct v
 	 * fix until fsck has been changed to do the update.
 	 */
 
-	if (fs->fs_old_inodefmt < FS_44INODEFMT) {		/* XXX */
+	if (fs->fs_magic == FS_UFS1_MAGIC &&			/* XXX */
+	fs->fs_old_inodefmt < FS_44INODEFMT) {		/* XXX */
 		ip->i_uid = ip->i_ffs1_ouid;			/* XXX */
 		ip->i_gid = ip->i_ffs1_ogid;			/* XXX */
 	}			/* XXX */

Index: src/usr.sbin/quot/quot.c
diff -u src/usr.sbin/quot/quot.c:1.33 src/usr.sbin/quot/quot.c:1.33.4.1
--- src/usr.sbin/quot/quot.c:1.33	Sat Oct 19 17:16:38 2013
+++ src/usr.sbin/quot/quot.c	Sat Aug 27 15:17:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: quot.c,v 1.33 2013/10/19 17:16:38 christos Exp $	*/
+/*	$NetBSD: quot.c,v 1.33.4.1 2016/08/27 15:17:34 bouyer Exp $	*/
 
 /*
  * Copyright (C) 1991, 1994 Wolfgang Solfrank.
@@ -33,7 +33,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: quot.c,v 1.33 2013/10/19 17:16:38 christos Exp $");
+__RCSID("$NetBSD: quot.c,v 1.33.4.1 2016/08/27 15:17:34 bouyer Exp $");
 #endif /* not lint */
 
 #include 
@@ -521,7 +521,8 @@ ffs_oldfscompat(struct fs *fs)
 {
 	int i;
 
-	if (fs->fs_old_inodefmt < FS_44INODEFMT) {
+	if (fs->fs_magic == FS_UFS1_MAGIC &&
+	fs->fs_old_inodefmt < FS_44INODEFMT) {
 		quad_t sizepb = fs->fs_bsize;
 
 		fs->fs_maxfilesize = fs->fs_bsize * UFS_NDADDR - 1;

CVS commit: [netbsd-7] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Aug 27 15:11:31 UTC 2016

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

Log Message:
tickets 1239, 1240


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.103 src/doc/CHANGES-7.1:1.1.2.104
--- src/doc/CHANGES-7.1:1.1.2.103	Sat Aug 27 04:32:15 2016
+++ src/doc/CHANGES-7.1	Sat Aug 27 15:11:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.103 2016/08/27 04:32:15 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.104 2016/08/27 15:11:31 bouyer Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5195,3 +5195,16 @@ sys/netinet/ip_carp.c1.76
 	wrong hash, to help debugging.
 	[is, ticket #1209]
 
+sys/dev/fss.c	1.95
+
+	Disestablish COW handler on error.  No need to do further copies after
+	the snapshot device failed.
+
+	Should fix PR kern/51377: fss(4) panic if snapshot mounted read/write
+	[hannken, ticket #1239]
+
+sys/compat/common/vfs_syscalls_43.c		1.58
+
+	fill in the tv_nsec parts of the converted timespec in cvtstat().
+	[mrg, ticket #1240]
+

CVS commit: [netbsd-7] src/sys/compat/common

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Aug 27 15:10:59 UTC 2016

Modified Files:
src/sys/compat/common [netbsd-7]: vfs_syscalls_43.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1240):
sys/compat/common/vfs_syscalls_43.c: revision 1.58
fill in the tv_nsec parts of the converted timespec in cvtstat().


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.4.1 src/sys/compat/common/vfs_syscalls_43.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/compat/common/vfs_syscalls_43.c
diff -u src/sys/compat/common/vfs_syscalls_43.c:1.56 src/sys/compat/common/vfs_syscalls_43.c:1.56.4.1
--- src/sys/compat/common/vfs_syscalls_43.c:1.56	Tue Jan 28 01:29:04 2014
+++ src/sys/compat/common/vfs_syscalls_43.c	Sat Aug 27 15:10:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_syscalls_43.c,v 1.56 2014/01/28 01:29:04 christos Exp $	*/
+/*	$NetBSD: vfs_syscalls_43.c,v 1.56.4.1 2016/08/27 15:10:59 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.56 2014/01/28 01:29:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.56.4.1 2016/08/27 15:10:59 bouyer Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -75,15 +75,42 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_syscalls
 #include 
 #include 
 
+static void cvttimespec(struct timespec *, struct timespec50 *);
 static void cvtstat(struct stat *, struct stat43 *);
 
 /*
+ * Convert from an old to a new timespec structure.
+ */
+static void
+cvttimespec(struct timespec *ts, struct timespec50 *ots)
+{
+
+	if (ts->tv_sec > INT_MAX) {
+#if defined(DEBUG) || 1
+		static bool first = true;
+
+		if (first) {
+			first = false;
+			printf("%s[%s:%d]: time_t does not fit\n",
+			__func__, curlwp->l_proc->p_comm,
+			curlwp->l_lid);
+		}
+#endif
+		ots->tv_sec = INT_MAX;
+	} else
+		ots->tv_sec = ts->tv_sec;
+	ots->tv_nsec = ts->tv_nsec;
+}
+
+/*
  * Convert from an old to a new stat structure.
  */
 static void
 cvtstat(struct stat *st, struct stat43 *ost)
 {
 
+	/* Handle any padding. */
+	memset(ost, 0, sizeof *ost);
 	ost->st_dev = st->st_dev;
 	ost->st_ino = st->st_ino;
 	ost->st_mode = st->st_mode & 0x;
@@ -95,9 +122,9 @@ cvtstat(struct stat *st, struct stat43 *
 		ost->st_size = st->st_size;
 	else
 		ost->st_size = -2;
-	ost->st_atime = st->st_atime;
-	ost->st_mtime = st->st_mtime;
-	ost->st_ctime = st->st_ctime;
+	cvttimespec(>st_atimespec, >st_atimespec);
+	cvttimespec(>st_mtimespec, >st_mtimespec);
+	cvttimespec(>st_ctimespec, >st_ctimespec);
 	ost->st_blksize = st->st_blksize;
 	ost->st_blocks = st->st_blocks;
 	ost->st_flags = st->st_flags;

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Aug 27 15:09:22 UTC 2016

Modified Files:
src/sys/dev [netbsd-7]: fss.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1239):
sys/dev/fss.c: revision 1.95
Disestablish COW handler on error.  No need to do further copies after
the snapshot device failed.
Should fix PR kern/51377: fss(4) panic if snapshot mounted read/write


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/dev/fss.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/fss.c
diff -u src/sys/dev/fss.c:1.91 src/sys/dev/fss.c:1.91.2.1
--- src/sys/dev/fss.c:1.91	Fri Jul 25 08:10:35 2014
+++ src/sys/dev/fss.c	Sat Aug 27 15:09:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fss.c,v 1.91 2014/07/25 08:10:35 dholland Exp $	*/
+/*	$NetBSD: fss.c,v 1.91.2.1 2016/08/27 15:09:22 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.91 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.91.2.1 2016/08/27 15:09:22 bouyer Exp $");
 
 #include 
 #include 
@@ -445,17 +445,20 @@ fss_dump(dev_t dev, daddr_t blkno, void 
 
 /*
  * An error occurred reading or writing the snapshot or backing store.
- * If it is the first error log to console.
+ * If it is the first error log to console and disestablish cow handler.
  * The caller holds the mutex.
  */
 static inline void
 fss_error(struct fss_softc *sc, const char *msg)
 {
 
-	if ((sc->sc_flags & (FSS_ACTIVE|FSS_ERROR)) == FSS_ACTIVE)
-		aprint_error_dev(sc->sc_dev, "snapshot invalid: %s\n", msg);
-	if ((sc->sc_flags & FSS_ACTIVE) == FSS_ACTIVE)
-		sc->sc_flags |= FSS_ERROR;
+	if ((sc->sc_flags & (FSS_ACTIVE | FSS_ERROR)) != FSS_ACTIVE)
+		return;
+
+	aprint_error_dev(sc->sc_dev, "snapshot invalid: %s\n", msg);
+	if ((sc->sc_flags & FSS_PERSISTENT) == 0)
+		fscow_disestablish(sc->sc_mount, fss_copy_on_write, sc);
+	sc->sc_flags |= FSS_ERROR;
 }
 
 /*
@@ -575,9 +578,8 @@ fss_unmount_hook(struct mount *mp)
 		if ((sc = device_lookup_private(_cd, i)) == NULL)
 			continue;
 		mutex_enter(>sc_slock);
-		if ((sc->sc_flags & FSS_ACTIVE) != 0 &&
-		sc->sc_mount == mp)
-			fss_error(sc, "forced unmount");
+		if ((sc->sc_flags & FSS_ACTIVE) != 0 && sc->sc_mount == mp)
+			fss_error(sc, "forced by unmount");
 		mutex_exit(>sc_slock);
 	}
 	mutex_exit(_device_lock);
@@ -886,7 +888,7 @@ static int
 fss_delete_snapshot(struct fss_softc *sc, struct lwp *l)
 {
 
-	if ((sc->sc_flags & FSS_PERSISTENT) == 0)
+	if ((sc->sc_flags & (FSS_PERSISTENT | FSS_ERROR)) == 0)
 		fscow_disestablish(sc->sc_mount, fss_copy_on_write, sc);
 
 	mutex_enter(>sc_slock);

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Aug 27 04:32:15 UTC 2016

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

Log Message:
1208, 1209


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.102 src/doc/CHANGES-7.1:1.1.2.103
--- src/doc/CHANGES-7.1:1.1.2.102	Thu Jul 21 12:54:44 2016
+++ src/doc/CHANGES-7.1	Sat Aug 27 04:32:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.102 2016/07/21 12:54:44 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.103 2016/08/27 04:32:15 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5182,3 +5182,16 @@ libexec/mail.local/mail.local.c			1.28
 	Fix error checks in open(2) calls.
 	[shm, ticket #1207]
 
+sys/netinet/ip_carp.c1.75
+
+	Workaround for PR 47013: ipv4+ipv6 carp0 interface is trying
+	to get MASTER status although master is still advertising.
+	Only works for mixed IPv4/IPv6 environemnts, not pure-IPv6.
+	[is, ticket #1208]
+
+sys/netinet/ip_carp.c1.76
+
+	carp(4): Print the IPv6 or IPv4 source addresses of packets with
+	wrong hash, to help debugging.
+	[is, ticket #1209]
+

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Aug 27 04:29:41 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by is in ticket #1209):
sys/netinet/ip_carp.c: revision 1.76
Print the IPv6 or IPv4 source addresses of packets with wrong hash, to
help debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.59.2.3 -r1.59.2.4 src/sys/netinet/ip_carp.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_carp.c
diff -u src/sys/netinet/ip_carp.c:1.59.2.3 src/sys/netinet/ip_carp.c:1.59.2.4
--- src/sys/netinet/ip_carp.c:1.59.2.3	Sat Aug 27 04:25:50 2016
+++ src/sys/netinet/ip_carp.c	Sat Aug 27 04:29:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.59.2.3 2016/08/27 04:25:50 snj Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.59.2.4 2016/08/27 04:29:41 snj Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
 #include "opt_mbuftrace.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.3 2016/08/27 04:25:50 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.4 2016/08/27 04:29:41 snj Exp $");
 
 /*
  * TODO:
@@ -92,6 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 
 #include 
 #include 
 #include 
+#include 
 #endif
 
 #include 
@@ -675,9 +676,29 @@ carp_proto_input_c(struct mbuf *m, struc
 
 	/* verify the hash */
 	if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) {
+		struct ip *ip;
+		struct ip6_hdr *ip6;
+
 		CARP_STATINC(CARP_STAT_BADAUTH);
 		sc->sc_if.if_ierrors++;
-		CARP_LOG(sc, ("incorrect hash"));
+
+		switch(af) {
+		
+		case AF_INET:
+			ip = mtod(m, struct ip *);
+			CARP_LOG(sc, ("incorrect hash from %s", 
+			in_fmtaddr(ip->ip_src)));
+			break;
+
+		case AF_INET6:
+			ip6 = mtod(m, struct ip6_hdr *);
+			CARP_LOG(sc, ("incorrect hash from %s",
+ip6_sprintf(>ip6_src)));
+			break;
+
+		default: CARP_LOG(sc, ("incorrect hash"));
+			break;
+		}
 		m_freem(m);
 		return;
 	}

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Aug 27 04:25:50 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by is in ticket #1208):
sys/netinet/ip_carp.c: revision 1.75
Workaround for PR 47013 by bouyer@. Only works for mixed IPv4/IPv6
environemnts, not for pure-IPv6 yet. A real fix is still needed.


To generate a diff of this commit:
cvs rdiff -u -r1.59.2.2 -r1.59.2.3 src/sys/netinet/ip_carp.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_carp.c
diff -u src/sys/netinet/ip_carp.c:1.59.2.2 src/sys/netinet/ip_carp.c:1.59.2.3
--- src/sys/netinet/ip_carp.c:1.59.2.2	Sat Jul 23 13:33:32 2016
+++ src/sys/netinet/ip_carp.c	Sat Aug 27 04:25:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.59.2.3 2016/08/27 04:25:50 snj Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
 #include "opt_mbuftrace.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.3 2016/08/27 04:25:50 snj Exp $");
 
 /*
  * TODO:
@@ -1067,7 +1067,7 @@ carp_send_ad(void *v)
 		}
 	}
 #endif /* INET */
-#ifdef INET6
+#ifdef INET6_notyet
 	if (sc->sc_naddrs6) {
 		struct ip6_hdr *ip6;
 
@@ -1475,7 +1475,7 @@ carp_setrun(struct carp_softc *sc, sa_fa
 			callout_schedule(>sc_md_tmo, tvtohz());
 			break;
 #endif /* INET */
-#ifdef INET6
+#ifdef INET6_notyet
 		case AF_INET6:
 			callout_schedule(>sc_md6_tmo, tvtohz());
 			break;
@@ -1483,8 +1483,10 @@ carp_setrun(struct carp_softc *sc, sa_fa
 		default:
 			if (sc->sc_naddrs)
 callout_schedule(>sc_md_tmo, tvtohz());
+#ifdef INET6_notyet
 			if (sc->sc_naddrs6)
 callout_schedule(>sc_md6_tmo, tvtohz());
+#endif /* INET6 */
 			break;
 		}
 		break;

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

[Ignatios Souvatzis]

Module Name:src
Committed By:   is
Date:   Sat Jul 23 13:33:32 UTC 2016

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

Log Message:
backout last change (wrong branch).


To generate a diff of this commit:
cvs rdiff -u -r1.59.2.1 -r1.59.2.2 src/sys/netinet/ip_carp.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_carp.c
diff -u src/sys/netinet/ip_carp.c:1.59.2.1 src/sys/netinet/ip_carp.c:1.59.2.2
--- src/sys/netinet/ip_carp.c:1.59.2.1	Sat Jul 23 13:24:40 2016
+++ src/sys/netinet/ip_carp.c	Sat Jul 23 13:33:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
 #include "opt_mbuftrace.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.2 2016/07/23 13:33:32 is Exp $");
 
 /*
  * TODO:
@@ -92,7 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 
 #include 
 #include 
 #include 
-#include 
 #endif
 
 #include 
@@ -676,29 +675,9 @@ carp_proto_input_c(struct mbuf *m, struc
 
 	/* verify the hash */
 	if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) {
-		struct ip *ip;
-		struct ip6_hdr *ip6;
-
 		CARP_STATINC(CARP_STAT_BADAUTH);
 		sc->sc_if.if_ierrors++;
-
-		switch(af) {
-		
-		case AF_INET:
-			ip = mtod(m, struct ip *);
-			CARP_LOG(sc, ("incorrect hash from %s", 
-			in_fmtaddr(ip->ip_src)));
-			break;
-
-		case AF_INET6:
-			ip6 = mtod(m, struct ip6_hdr *);
-			CARP_LOG(sc, ("incorrect hash from %s",
-ip6_sprintf(>ip6_src)));
-			break;
-
-		default: CARP_LOG(sc, ("incorrect hash"));
-			break;
-		}
+		CARP_LOG(sc, ("incorrect hash"));
 		m_freem(m);
 		return;
 	}

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

[Ignatios Souvatzis]

Module Name:src
Committed By:   is
Date:   Sat Jul 23 13:24:40 UTC 2016

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

Log Message:
Log the IPv4/IPv6 source of incorrect hash packets, too. Needed for
meaningful debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.2.1 src/sys/netinet/ip_carp.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_carp.c
diff -u src/sys/netinet/ip_carp.c:1.59 src/sys/netinet/ip_carp.c:1.59.2.1
--- src/sys/netinet/ip_carp.c:1.59	Thu Jul 31 02:37:25 2014
+++ src/sys/netinet/ip_carp.c	Sat Jul 23 13:24:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
 #include "opt_mbuftrace.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59.2.1 2016/07/23 13:24:40 is Exp $");
 
 /*
  * TODO:
@@ -92,6 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 
 #include 
 #include 
 #include 
+#include 
 #endif
 
 #include 
@@ -675,9 +676,29 @@ carp_proto_input_c(struct mbuf *m, struc
 
 	/* verify the hash */
 	if (carp_hmac_verify(sc, ch->carp_counter, ch->carp_md)) {
+		struct ip *ip;
+		struct ip6_hdr *ip6;
+
 		CARP_STATINC(CARP_STAT_BADAUTH);
 		sc->sc_if.if_ierrors++;
-		CARP_LOG(sc, ("incorrect hash"));
+
+		switch(af) {
+		
+		case AF_INET:
+			ip = mtod(m, struct ip *);
+			CARP_LOG(sc, ("incorrect hash from %s", 
+			in_fmtaddr(ip->ip_src)));
+			break;
+
+		case AF_INET6:
+			ip6 = mtod(m, struct ip6_hdr *);
+			CARP_LOG(sc, ("incorrect hash from %s",
+ip6_sprintf(>ip6_src)));
+			break;
+
+		default: CARP_LOG(sc, ("incorrect hash"));
+			break;
+		}
 		m_freem(m);
 		return;
 	}

CVS commit: [netbsd-7] src/libexec/mail.local

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Jul 21 12:54:09 UTC 2016

Modified Files:
src/libexec/mail.local [netbsd-7]: mail.local.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #1207):
libexec/mail.local/mail.local.c: revision 1.28
Fix error checks in open(2) calls.


To generate a diff of this commit:
cvs rdiff -u -r1.26.20.1 -r1.26.20.2 src/libexec/mail.local/mail.local.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/mail.local/mail.local.c
diff -u src/libexec/mail.local/mail.local.c:1.26.20.1 src/libexec/mail.local/mail.local.c:1.26.20.2
--- src/libexec/mail.local/mail.local.c:1.26.20.1	Tue Jul 19 14:08:19 2016
+++ src/libexec/mail.local/mail.local.c	Thu Jul 21 12:54:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mail.local.c,v 1.26.20.1 2016/07/19 14:08:19 martin Exp $	*/
+/*	$NetBSD: mail.local.c,v 1.26.20.2 2016/07/21 12:54:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 19
 #if 0
 static char sccsid[] = "@(#)mail.local.c	8.22 (Berkeley) 6/21/95";
 #else
-__RCSID("$NetBSD: mail.local.c,v 1.26.20.1 2016/07/19 14:08:19 martin Exp $");
+__RCSID("$NetBSD: mail.local.c,v 1.26.20.2 2016/07/21 12:54:09 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -218,10 +218,10 @@ deliver(int fd, char *name, int lockfile
 	}
 	
 	if ((mbfd = open(path, O_APPEND|O_WRONLY|O_EXLOCK,
-	S_IRUSR|S_IWUSR)) != -1) {
+	S_IRUSR|S_IWUSR)) == -1) {
 		/* create file */
 		if ((mbfd = open(path, O_APPEND|O_CREAT|O_WRONLY|O_EXLOCK,
-		S_IRUSR|S_IWUSR)) != -1) {
+		S_IRUSR|S_IWUSR)) == -1) {
 			logwarn("%s: %s", path, strerror(errno));
 			rval = EX_OSERR;
 			goto bad;

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jul 19 14:10:15 UTC 2016

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

Log Message:
Ticket #1206


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.100 src/doc/CHANGES-7.1:1.1.2.101
--- src/doc/CHANGES-7.1:1.1.2.100	Thu Jul 14 18:47:11 2016
+++ src/doc/CHANGES-7.1	Tue Jul 19 14:10:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.100 2016/07/14 18:47:11 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.101 2016/07/19 14:10:15 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5172,3 +5172,8 @@ sys/ufs/lfs/lfs_vnops.c1.304
 	Fix a deadlock
 	[dholland, ticket #1205]
 
+libexec/mail.local/mail.local.c			1.27
+
+	Fix race condition in deliver(), fix resource leak.
+	[shm, ticket #1206]
+

CVS commit: [netbsd-7] src/libexec/mail.local

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jul 19 14:08:19 UTC 2016

Modified Files:
src/libexec/mail.local [netbsd-7]: mail.local.c

Log Message:
Pull up following revision(s) (requested by shm in ticket #1206):
libexec/mail.local/mail.local.c: revision 1.27
Fix race condition in deliver(), fix resource leak.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.20.1 src/libexec/mail.local/mail.local.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/mail.local/mail.local.c
diff -u src/libexec/mail.local/mail.local.c:1.26 src/libexec/mail.local/mail.local.c:1.26.20.1
--- src/libexec/mail.local/mail.local.c:1.26	Sat Aug 27 15:40:31 2011
+++ src/libexec/mail.local/mail.local.c	Tue Jul 19 14:08:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mail.local.c,v 1.26 2011/08/27 15:40:31 joerg Exp $	*/
+/*	$NetBSD: mail.local.c,v 1.26.20.1 2016/07/19 14:08:19 martin Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -36,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 19
 #if 0
 static char sccsid[] = "@(#)mail.local.c	8.22 (Berkeley) 6/21/95";
 #else
-__RCSID("$NetBSD: mail.local.c,v 1.26 2011/08/27 15:40:31 joerg Exp $");
+__RCSID("$NetBSD: mail.local.c,v 1.26.20.1 2016/07/19 14:08:19 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -169,7 +169,8 @@ store(const char *from)
 	(void)fflush(fp);
 	if (ferror(fp))
 		logerr(EX_OSERR, "temporary file write error");
-	fd = dup(fd);
+	if ((fd = dup(fd)) == -1) 
+		logerr(EX_OSERR, "dup failed");
 	(void)fclose(fp);
 	return(fd);
 }
@@ -177,10 +178,10 @@ store(const char *from)
 static int
 deliver(int fd, char *name, int lockfile)
 {
-	struct stat sb;
+	struct stat sb, nsb;
 	struct passwd pwres, *pw;
 	char pwbuf[1024];
-	int created, mbfd, nr, nw, off, rval=EX_OK, lfd=-1;
+	int created = 0, mbfd, nr, nw, off, rval=EX_OK, lfd = -1;
 	char biffmsg[100], buf[8*1024], path[MAXPATHLEN], lpath[MAXPATHLEN];
 	off_t curoff;
 
@@ -210,22 +211,42 @@ deliver(int fd, char *name, int lockfile
 		}
 	}
 
-	if (!(created = lstat(path, )) &&
+	if ((lstat(path, ) != -1) &&
 	(sb.st_nlink != 1 || S_ISLNK(sb.st_mode))) {
 		logwarn("%s: linked file", path);
 		return(EX_OSERR);
 	}
 	
 	if ((mbfd = open(path, O_APPEND|O_WRONLY|O_EXLOCK,
-	S_IRUSR|S_IWUSR)) < 0) {
+	S_IRUSR|S_IWUSR)) != -1) {
+		/* create file */
 		if ((mbfd = open(path, O_APPEND|O_CREAT|O_WRONLY|O_EXLOCK,
-		S_IRUSR|S_IWUSR)) < 0) {
+		S_IRUSR|S_IWUSR)) != -1) {
 			logwarn("%s: %s", path, strerror(errno));
-			return(EX_OSERR);
+			rval = EX_OSERR;
+			goto bad;
+		}
+		created = 1;
+	} else {
+		/* opened existing file, check for TOCTTOU */
+		if (fstat(mbfd, ) == -1) {
+			rval = EX_OSERR;
+			goto bad;
+		}
+
+		/* file is not what we expected */
+		if (nsb.st_ino != sb.st_ino || nsb.st_dev != sb.st_dev) {
+			rval = EX_OSERR;
+			goto bad;
 		}
 	}
 
-	curoff = lseek(mbfd, 0, SEEK_END);
+	if ((curoff = lseek(mbfd, 0, SEEK_END)) == (off_t)-1) {
+		logwarn("%s: %s", path, strerror(errno));
+		rval = EX_OSERR;
+		goto bad;
+	}
+
 	(void)snprintf(biffmsg, sizeof biffmsg, "%s@%lld\n", name,
 	(long long)curoff);
 	if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
@@ -259,11 +280,14 @@ bad:
 			close(lfd);
 		}
 	}
-	if (created) 
-		(void)fchown(mbfd, pw->pw_uid, pw->pw_gid);
 
-	(void)fsync(mbfd);		/* Don't wait for update. */
-	(void)close(mbfd);		/* Implicit unlock. */
+	if (mbfd >= 0) {
+		if (created) 
+			(void)fchown(mbfd, pw->pw_uid, pw->pw_gid);
+
+		(void)fsync(mbfd);		/* Don't wait for update. */
+		(void)close(mbfd);		/* Implicit unlock. */
+	}
 
 	if (rval == EX_OK)
 		notifybiff(biffmsg);

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Jul 14 18:47:11 UTC 2016

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

Log Message:
Ticket #1205


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.99 src/doc/CHANGES-7.1:1.1.2.100
--- src/doc/CHANGES-7.1:1.1.2.99	Thu Jul 14 18:38:51 2016
+++ src/doc/CHANGES-7.1	Thu Jul 14 18:47:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.99 2016/07/14 18:38:51 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.100 2016/07/14 18:47:11 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5167,3 +5167,8 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p8.
 	[snj, ticket #1204]
 
+sys/ufs/lfs/lfs_vnops.c1.304
+
+	Fix a deadlock
+	[dholland, ticket #1205]
+

CVS commit: [netbsd-7] src/sys/ufs/lfs

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Jul 14 18:45:39 UTC 2016

Modified Files:
src/sys/ufs/lfs [netbsd-7]: lfs_vnops.c

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1205):
sys/ufs/lfs/lfs_vnops.c: revision 1.304
Fix a deadlock
ok dholland@


To generate a diff of this commit:
cvs rdiff -u -r1.269.2.1 -r1.269.2.2 src/sys/ufs/lfs/lfs_vnops.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/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.269.2.1 src/sys/ufs/lfs/lfs_vnops.c:1.269.2.2
--- src/sys/ufs/lfs/lfs_vnops.c:1.269.2.1	Thu Aug  6 21:57:28 2015
+++ src/sys/ufs/lfs/lfs_vnops.c	Thu Jul 14 18:45:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_vnops.c,v 1.269.2.1 2015/08/06 21:57:28 snj Exp $	*/
+/*	$NetBSD: lfs_vnops.c,v 1.269.2.2 2016/07/14 18:45:39 martin Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.269.2.1 2015/08/06 21:57:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.269.2.2 2016/07/14 18:45:39 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -527,8 +527,10 @@ lfs_set_dirop(struct vnode *dvp, struct 
 		if ((error = mtsleep(_dirvcount,
 		PCATCH | PUSER | PNORELOCK, "lfs_maxdirop", 0,
 		_lock)) != 0) {
+			mutex_exit(_lock);
 			goto unreserve;
 		}
+		mutex_exit(_lock);
 		goto restart;
 	}
 

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu Jul 14 18:38:51 UTC 2016

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

Log Message:
Ticket #1204


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.98 src/doc/CHANGES-7.1:1.1.2.99
--- src/doc/CHANGES-7.1:1.1.2.98	Mon Jul 11 10:40:40 2016
+++ src/doc/CHANGES-7.1	Thu Jul 14 18:38:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.98 2016/07/11 10:40:40 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.99 2016/07/14 18:38:51 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -5004,3 +5004,166 @@ sys/dev/pci/lynxfb.c1.5
 	fix inverted screen blanking logic
 	[jmcneill, ticket #1203]
 
+doc/3RDPARTY	1.1336, 1.1337 via patch
+external/bsd/ntp/Makefile.inc   up to 1.16 via patch
+external/bsd/ntp/bin/Makefile   up to 1.3
+external/bsd/ntp/dist/ChangeLog up to 1.1.1.10
+external/bsd/ntp/dist/CommitLog up to 1.1.1.10
+external/bsd/ntp/dist/NEWS  up to 1.1.1.10
+external/bsd/ntp/dist/configure up to 1.1.1.10
+external/bsd/ntp/dist/configure.ac  up to 1.1.1.9
+external/bsd/ntp/dist/html/miscopt.html up to 1.1.1.9
+external/bsd/ntp/dist/include/ntp.h up to 1.7
+external/bsd/ntp/dist/include/ntp_md5.h up to 1.6
+external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.6
+external/bsd/ntp/dist/ntpd/complete.conf.in up to 1.1.1.4
+external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/keyword-gen-utd  up to 1.1.1.6
+external/bsd/ntp/dist/ntpd/keyword-gen.cup to 1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc   up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.conf.def up to 1.1.1.7
+external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.conf.man.in  up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc   up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.keys.man.in  up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.15
+external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.17
+external/bsd/ntp/dist/ntpd/ntp_io.c up to 1.23
+external/bsd/ntp/dist/ntpd/ntp_keyword.hup to 1.11
+external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.14
+external/bsd/ntp/dist/ntpd/ntp_proto.c  up to 1.13
+external/bsd/ntp/dist/ntpd/ntpd-opts.c  up to 1.8
+external/bsd/ntp/dist/ntpd/ntpd-opts.h  up to 1.11
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmanup to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntpd.1ntpdmdoc   up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntpd.htmlup to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntpd.man.in  up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/ntpd.mdoc.in up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/refclock_parse.c up to 1.19
+external/bsd/ntp/dist/ntpdc/invoke-ntpdc.texi   up to 1.1.1.8
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.cup to 1.8
+external/bsd/ntp/dist/ntpdc/ntpdc-opts.hup to 1.8
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcman up to 1.1.1.8
+external/bsd/ntp/dist/ntpdc/ntpdc.1ntpdcmdocup to 1.1.1.8
+external/bsd/ntp/dist/ntpdc/ntpdc.c up to 1.14
+external/bsd/ntp/dist/ntpdc/ntpdc.html  up to 1.1.1.8
+external/bsd/ntp/dist/ntpdc/ntpdc.man.inup to 1.1.1.8
+external/bsd/ntp/dist/ntpdc/ntpdc.mdoc.in   up to 1.1.1.8
+external/bsd/ntp/dist/ntpq/invoke-ntpq.texi up to 1.1.1.8
+external/bsd/ntp/dist/ntpq/ntpq-opts.c  up to 1.8
+external/bsd/ntp/dist/ntpq/ntpq-opts.h  up to 1.8
+external/bsd/ntp/dist/ntpq/ntpq.1ntpqmanup to 1.1.1.8
+external/bsd/ntp/dist/ntpq/ntpq.1ntpqmdoc   up to 1.1.1.8
+external/bsd/ntp/dist/ntpq/ntpq.c   up to 1.16
+external/bsd/ntp/dist/ntpq/ntpq.htmlup to 1.1.1.8
+external/bsd/ntp/dist/ntpq/ntpq.man.in  up to 1.1.1.8
+external/bsd/ntp/dist/ntpq/ntpq.mdoc.in up to 1.1.1.8
+external/bsd/ntp/dist/ntpsnmpd/invoke-ntpsnmpd.texi up to 1.1.1.8
+external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c  up to 1.8
+external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h  up to 1.8
+external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.1ntpsnmpdman up to 1.1.1.8

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 10:40:40 UTC 2016

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

Log Message:
Tickets #1201 - #1203


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.97 src/doc/CHANGES-7.1:1.1.2.98
--- src/doc/CHANGES-7.1:1.1.2.97	Sun Jul 10 10:42:26 2016
+++ src/doc/CHANGES-7.1	Mon Jul 11 10:40:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.97 2016/07/10 10:42:26 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.98 2016/07/11 10:40:40 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4985,3 +4985,22 @@ sys/arch/mips/mips/pmap.c			1.221-1.223
 	Various fixes to MIPS pmap.
 	[skrll, ticket #1200]
 
+external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c 1.5
+external/mit/xorg-server.old/dist/hw/xfree86/vgahw/vgaHW.h 1.2
+
+	Avoid legacy VGA I/O port access on MIPS.
+	This fixes Xorg on the Lemote YeeLoong netbook.
+	[jmcneill, ticket #1201]
+
+sys/arch/evbmips/loongson/yeeloong_machdep.c	1.8
+
+	The version of PMON on my 8089B (LM8089-1.4.9a) configures OHCI
+	but doesn't enable memory space access. Enable it before the ohci
+	driver attaches to allow low- and full-speed devices to work.
+	[jmcneill, ticket #1202]
+
+sys/dev/pci/lynxfb.c1.5
+
+	fix inverted screen blanking logic
+	[jmcneill, ticket #1203]
+

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 10:39:42 UTC 2016

Modified Files:
src/sys/dev/pci [netbsd-7]: lynxfb.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1203):
sys/dev/pci/lynxfb.c: revision 1.5
fix inverted screen blanking logic


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.16.1 src/sys/dev/pci/lynxfb.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/lynxfb.c
diff -u src/sys/dev/pci/lynxfb.c:1.4 src/sys/dev/pci/lynxfb.c:1.4.16.1
--- src/sys/dev/pci/lynxfb.c:1.4	Wed Mar 14 13:41:07 2012
+++ src/sys/dev/pci/lynxfb.c	Mon Jul 11 10:39:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lynxfb.c,v 1.4 2012/03/14 13:41:07 nonaka Exp $	*/
+/*	$NetBSD: lynxfb.c,v 1.4.16.1 2016/07/11 10:39:42 martin Exp $	*/
 /*	$OpenBSD: smfb.c,v 1.13 2011/07/21 20:36:12 miod Exp $	*/
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lynxfb.c,v 1.4 2012/03/14 13:41:07 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lynxfb.c,v 1.4.16.1 2016/07/11 10:39:42 martin Exp $");
 
 #include "opt_wsemul.h"
 
@@ -824,11 +824,11 @@ lynxfb_vcons_eraserows(void *cookie, int
 }
 
 static void
-lynxfb_blank(struct lynxfb *fb, int blank)
+lynxfb_blank(struct lynxfb *fb, int enable)
 {
 
-	fb->blank = blank;
-	if (!blank) {
+	fb->blank = !enable;
+	if (enable) {
 		lynxfb_vgats_write(fb, 0x31,
 		lynxfb_vgats_read(fb, 0x31) | 0x01);
 	} else {

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jul 11 10:37:51 UTC 2016

Modified Files:
src/sys/arch/evbmips/loongson [netbsd-7]: yeeloong_machdep.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1202):
sys/arch/evbmips/loongson/yeeloong_machdep.c: revision 1.8
The version of PMON on my 8089B (LM8089-1.4.9a) configures OHCI but doesn't
enable memory space access. Enable it before the ohci driver attaches to
allow low- and full-speed devices to work.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/evbmips/loongson/yeeloong_machdep.c

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

Modified files:

Index: src/sys/arch/evbmips/loongson/yeeloong_machdep.c
diff -u src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.6 src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.6.4.1
--- src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.6	Sat Mar 29 19:28:28 2014
+++ src/sys/arch/evbmips/loongson/yeeloong_machdep.c	Mon Jul 11 10:37:51 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: yeeloong_machdep.c,v 1.6 2014/03/29 19:28:28 christos Exp $	*/
+/*	$NetBSD: yeeloong_machdep.c,v 1.6.4.1 2016/07/11 10:37:51 martin Exp $	*/
 /*	$OpenBSD: yeeloong_machdep.c,v 1.16 2011/04/15 20:40:06 deraadt Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: yeeloong_machdep.c,v 1.6 2014/03/29 19:28:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yeeloong_machdep.c,v 1.6.4.1 2016/07/11 10:37:51 martin Exp $");
 
 #include 
 #include 
@@ -558,6 +558,18 @@ lemote_device_register(device_t dev, voi
 	if (device_class(dev) != bootdev_class)
 		return;
 
+	/* OHCI memory space access may not be enabled by the BIOS */
+	if (device_is_a(dev, "ohci")) {
+		struct pci_attach_args *pa = aux;
+		pcireg_t csr = pci_conf_read(pa->pa_pc, pa->pa_tag,
+		PCI_COMMAND_STATUS_REG);
+		if ((csr & PCI_COMMAND_MEM_ENABLE) == 0) {
+			csr |= PCI_COMMAND_MEM_ENABLE;
+			pci_conf_write(pa->pa_pc, pa->pa_tag,
+			PCI_COMMAND_STATUS_REG, csr);
+		}
+	}
+
 	/* 
 	 * The device numbering must match. There's no way
 	 * pmon tells us more info. Depending on the usb slot

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jul 10 10:42:26 UTC 2016

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

Log Message:
Tickets #1183, #1184, #1188, #1189, #1200


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.96 src/doc/CHANGES-7.1:1.1.2.97
--- src/doc/CHANGES-7.1:1.1.2.96	Tue Jul  5 19:20:55 2016
+++ src/doc/CHANGES-7.1	Sun Jul 10 10:42:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.96 2016/07/05 19:20:55 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.97 2016/07/10 10:42:26 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4952,3 +4952,36 @@ sys/dev/adb/adb_usb_map.c			1.2
 	PR port-macppc/51255.
 	[sevan, ticket #1187]
 
+sys/kern/kern_module.c1.111
+
+	Check for duplicate module names before loading modules that were
+	"pushed" by the boot loader. Addresses PR kern/50357.
+	[pgoyette, ticket #1183]
+
+sys/nfs/nfs_clntsocket.c			1.5
+sys/nfs/nfs_socket.c1.198
+
+	Serialize all access to the NFS request queue via splsoftnet().
+	Fixes random crashes.
+	[christos, ticket #1184]
+
+sys/ufs/lfs/ulfs_inode.c			1.14
+
+	Merge ufs_inode.c 1.93: missing unlock on error path.
+	[dholland, ticket #1188]
+
+external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S 1.6
+external/cddl/osnet/dev/dtrace/dtrace_hacks.c	1.5
+external/cddl/osnet/dist/uts/common/dtrace/dtrace.c 1.32
+external/cddl/osnet/sys/kern/string.c		1.3
+
+	Fix DTrace's panic() action.
+	Do not redefine strpbrk(), we have it in libkern.
+	Fixes PR-51265.
+	[pgoyette, ticket #1189]
+
+sys/arch/mips/mips/pmap.c			1.221-1.223
+
+	Various fixes to MIPS pmap.
+	[skrll, ticket #1200]
+

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jul 10 10:33:42 UTC 2016

Modified Files:
src/sys/arch/mips/mips [netbsd-7]: pmap.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1200):
sys/arch/mips/mips/pmap.c: revision 1.221
sys/arch/mips/mips/pmap.c: revision 1.222
sys/arch/mips/mips/pmap.c: revision 1.223
Fix a bug introduced by me in 1.214 where unmanaged mappings would be
affected by calls to pmap_page_protect which is wrong.  Now PV_KENTER
mappings are left intact.
Thanks to chuq for spotting my mistake and reviewing this diff.
Thanks to everyone who tested it as well.
Fix PR/51288 reproducable panic on evbmips64-eb (erlite)
pmap_page_remove from the previous change neglected to terminate the pv
list correctly when it started with an initial unmanaged mapping and
subsequent managed mappings.  Fix this.
Fix MIPS3_NO_PV_UNCACHED alias handling by looping through the pv_list
looking for bad aliases and removing the bad entries.  That is, revert
to the code before the matt-mips64 merge.
Additionally, fix the pmap_update call to not use the (recently
  removed/freed) pv for the pmap_t.
Fixes the following two PRs
PR/49903: Panic during installation on WorkPad Z50 (hpcmips) whilst 
uncompressing base.tgz
PR/51226: Install bug for hpcmips NetBSD V7 using FTP Full installation


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.214.2.1 src/sys/arch/mips/mips/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/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.214 src/sys/arch/mips/mips/pmap.c:1.214.2.1
--- src/sys/arch/mips/mips/pmap.c:1.214	Sun May 11 07:53:28 2014
+++ src/sys/arch/mips/mips/pmap.c	Sun Jul 10 10:33:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.214 2014/05/11 07:53:28 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.214.2.1 2016/07/10 10:33:42 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.214 2014/05/11 07:53:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.214.2.1 2016/07/10 10:33:42 martin Exp $");
 
 /*
  *	Manages physical address maps.
@@ -316,6 +316,7 @@ u_int		pmap_page_colormask;
 	 (pm) == curlwp->l_proc->p_vmspace->vm_map.pmap)
 
 /* Forward function declarations */
+void pmap_page_remove(struct vm_page *);
 void pmap_remove_pv(pmap_t, vaddr_t, struct vm_page *, bool);
 void pmap_enter_pv(pmap_t, vaddr_t, struct vm_page *, u_int *, int);
 pt_entry_t *pmap_pte(pmap_t, vaddr_t);
@@ -1063,6 +1064,10 @@ pmap_page_protect(struct vm_page *pg, vm
 			while (pv != NULL) {
 const pmap_t pmap = pv->pv_pmap;
 const uint16_t gen = PG_MD_PVLIST_GEN(md);
+if (pv->pv_va & PV_KENTER) {
+	pv = pv->pv_next;
+	continue;
+}
 va = trunc_page(pv->pv_va);
 PG_MD_PVLIST_UNLOCK(md);
 pmap_protect(pmap, va, va + PAGE_SIZE, prot);
@@ -1087,17 +1092,7 @@ pmap_page_protect(struct vm_page *pg, vm
 		if (pmap_clear_mdpage_attributes(md, PG_MD_EXECPAGE)) {
 			PMAP_COUNT(exec_uncached_page_protect);
 		}
-		(void)PG_MD_PVLIST_LOCK(md, false);
-		pv = >pvh_first;
-		while (pv->pv_pmap != NULL) {
-			const pmap_t pmap = pv->pv_pmap;
-			va = trunc_page(pv->pv_va);
-			PG_MD_PVLIST_UNLOCK(md);
-			pmap_remove(pmap, va, va + PAGE_SIZE);
-			pmap_update(pmap);
-			(void)PG_MD_PVLIST_LOCK(md, false);
-		}
-		PG_MD_PVLIST_UNLOCK(md);
+		pmap_page_remove(pg);
 	}
 }
 
@@ -2069,6 +2064,32 @@ pmap_set_modified(paddr_t pa)
 / pv_entry management /
 
 static void
+pmap_check_alias(struct vm_page *pg)
+{
+#ifdef MIPS3_PLUS	/* XXX mmu XXX */
+#ifndef MIPS3_NO_PV_UNCACHED
+	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
+
+	if (MIPS_HAS_R4K_MMU && PG_MD_UNCACHED_P(md)) {
+		/*
+		 * Page is currently uncached, check if alias mapping has been
+		 * removed.  If it was, then reenable caching.
+		 */
+		pv_entry_t pv = >pvh_first;
+		pv_entry_t pv0 = pv->pv_next;
+
+		for (; pv0; pv0 = pv0->pv_next) {
+			if (mips_cache_badalias(pv->pv_va, pv0->pv_va))
+break;
+		}
+		if (pv0 == NULL)
+			pmap_page_cache(pg, true);
+	}
+#endif
+#endif	/* MIPS3_PLUS */
+}
+
+static void
 pmap_check_pvlist(struct vm_page_md *md)
 {
 #ifdef PARANOIADIAG
@@ -2156,12 +2177,12 @@ again:
 			 * be mapped with one index at any given time.
 			 */
 
-			if (mips_cache_badalias(pv->pv_va, va)) {
-for (npv = pv; npv; npv = npv->pv_next) {
-	vaddr_t nva = trunc_page(npv->pv_va);
-	pmap_remove(npv->pv_pmap, nva,
-	nva + PAGE_SIZE);
-	pmap_update(npv->pv_pmap);
+			for (npv = pv; npv; npv = npv->pv_next) {
+vaddr_t nva = trunc_page(npv->pv_va);
+pmap_t npm = npv->pv_pmap;
+if (mips_cache_badalias(nva, va)) {
+	pmap_remove(npm, nva, nva + PAGE_SIZE);
+	pmap_update(npm);
 	goto again;
 }
 			}
@@ -2285,6 +2306,114 @@ again:
 }
 
 

CVS commit: [netbsd-7] src/external/cddl/osnet

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jul 10 10:00:20 UTC 2016

Modified Files:
src/external/cddl/osnet/dev/dtrace [netbsd-7]: dtrace_hacks.c
src/external/cddl/osnet/dev/dtrace/amd64 [netbsd-7]: dtrace_asm.S
src/external/cddl/osnet/dist/uts/common/dtrace [netbsd-7]: dtrace.c
src/external/cddl/osnet/sys/kern [netbsd-7]: string.c

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1189):
external/cddl/osnet/sys/kern/string.c: revision 1.3
external/cddl/osnet/dev/dtrace/dtrace_hacks.c: revision 1.5
external/cddl/osnet/dist/uts/common/dtrace/dtrace.c: revision 1.32
external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S: revision 1.6
Import fix from FreeBSD - see [1], [2] references below...
Fix DTrace's panic() action.
It would previously call into some unfinished Solaris compatibility code
and return without actually calling panic(9). The compatibility code is
unneeded, however, so just remove it and have dtrace_panic() call
vpanic(9)
directly.
Fixes immediate problem in PR-51265.  However, this now reveals another
redefined symbol 'strpbrk' in the required module "solaris".
[1] https://svnweb.freebsd.org/changeset/base/281916
[2] http://lists.freebsd.org/pipermail/svn-src-head/2015-April/071019.html
On NetBSD we already have strpbrk() in libkern, so we don't need to
provide another copy in the module.  Removes another 'redefined symbol'
error when loading the module.
Related to PR kern/51265
One more removal of a redefined symbol while loading dtrace module.
Should finish the issues with PR kern/51265


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.24.1 \
src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c
cvs rdiff -u -r1.4 -r1.4.10.1 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S
cvs rdiff -u -r1.28 -r1.28.2.1 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.2 -r1.2.24.1 src/external/cddl/osnet/sys/kern/string.c

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

Modified files:

Index: src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c
diff -u src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c:1.3 src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c:1.3.24.1
--- src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c:1.3	Sun Feb 28 07:01:43 2010
+++ src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c	Sun Jul 10 10:00:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtrace_hacks.c,v 1.3 2010/02/28 07:01:43 darran Exp $	*/
+/*	$NetBSD: dtrace_hacks.c,v 1.3.24.1 2016/07/10 10:00:20 martin Exp $	*/
 
 /* $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_hacks.c,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $ */
 /* XXX Hacks */
@@ -8,8 +8,6 @@ dtrace_cacheid_t dtrace_predcache_id;
 int panic_quiesce;
 char panic_stack[PANICSTKSIZE];
 
-cpu_core_t	cpu_core[MAXCPUS];
-
 boolean_t
 priv_policy_only(const cred_t *a, int b, boolean_t c)
 {

Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.4 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.4.10.1
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.4	Mon Jun 11 15:18:05 2012
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S	Sun Jul 10 10:00:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtrace_asm.S,v 1.4 2012/06/11 15:18:05 chs Exp $	*/
+/*	$NetBSD: dtrace_asm.S,v 1.4.10.1 2016/07/10 10:00:20 martin Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -365,211 +365,3 @@ dtrace_interrupt_enable(dtrace_icookie_t
 	popfq
 	ret
 	END(dtrace_interrupt_enable)
-
-/*
- * The panic() and cmn_err() functions invoke vpanic() as a common entry point
- * into the panic code implemented in panicsys().  vpanic() is responsible
- * for passing through the format string and arguments, and constructing a
- * regs structure on the stack into which it saves the current register
- * values.  If we are not dying due to a fatal trap, these registers will
- * then be preserved in panicbuf as the current processor state.  Before
- * invoking panicsys(), vpanic() activates the first panic trigger (see
- * common/os/panic.c) and switches to the panic_stack if successful.  Note that
- * DTrace takes a slightly different panic path if it must panic from probe
- * context.  Instead of calling panic, it calls into dtrace_vpanic(), which
- * sets up the initial stack as vpanic does, calls dtrace_panic_trigger(), and
- * branches back into vpanic().
- */
-
-/*
-void
-vpanic(const char *format, va_list alist)
-*/
-	ENTRY(vpanic)/* Initial stack layout: */
-	
-	pushq	%rbp/* | %rip | 	0x60	*/
-	movq	%rsp, %rbp			/* | %rbp |	0x58	*/
-	pushfq	/* | rfl  |	0x50	*/
-	pushq	%r11/* | %r11 |	0x48	*/
-	pushq	%r10/* | %r10 |	0x40	*/
-	pushq	%rbx/* | %rbx |	0x38	*/
-	pushq	%rax/* | %rax |	0x30	*/
-	pushq	%r9/* | %r9  |	0x28	*/
-	pushq	%r8/* | %r8  |	0x20	*/
-	pushq	%rcx/* | %rcx |	0x18	*/
-	pushq	%rdx		

CVS commit: [netbsd-7] src/sys/ufs/lfs

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jul 10 09:49:41 UTC 2016

Modified Files:
src/sys/ufs/lfs [netbsd-7]: ulfs_inode.c

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1188):
sys/ufs/lfs/ulfs_inode.c: revision 1.14
Merge ufs_inode.c 1.93: missing unlock on error path.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.6.1 src/sys/ufs/lfs/ulfs_inode.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/ufs/lfs/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.9 src/sys/ufs/lfs/ulfs_inode.c:1.9.6.1
--- src/sys/ufs/lfs/ulfs_inode.c:1.9	Sun Jul 28 00:37:07 2013
+++ src/sys/ufs/lfs/ulfs_inode.c	Sun Jul 10 09:49:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulfs_inode.c,v 1.9 2013/07/28 00:37:07 dholland Exp $	*/
+/*	$NetBSD: ulfs_inode.c,v 1.9.6.1 2016/07/10 09:49:41 martin Exp $	*/
 /*  from NetBSD: ufs_inode.c,v 1.89 2013/01/22 09:39:18 dholland Exp  */
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.9 2013/07/28 00:37:07 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.9.6.1 2016/07/10 09:49:41 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
@@ -226,6 +226,7 @@ ulfs_balloc_range(struct vnode *vp, off_
 	VM_PROT_WRITE, 0, PGO_SYNCIO | PGO_PASTEOF | PGO_NOBLOCKALLOC |
 	PGO_NOTIMESTAMP | PGO_GLOCKHELD);
 	if (error) {
+		genfs_node_unlock(vp);
 		goto out;
 	}
 

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jul 10 09:42:34 UTC 2016

Modified Files:
src/sys/nfs [netbsd-7]: nfs_clntsocket.c nfs_socket.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1184):
sys/nfs/nfs_socket.c: revision 1.198
sys/nfs/nfs_clntsocket.c: revision 1.5
Serialize all access to the NFS request queue via splsoftnet(). Fixes random
crashes.
XXX: Pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.1.40.1 -r1.1.40.2 src/sys/nfs/nfs_clntsocket.c
cvs rdiff -u -r1.192.2.1 -r1.192.2.2 src/sys/nfs/nfs_socket.c

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

Modified files:

Index: src/sys/nfs/nfs_clntsocket.c
diff -u src/sys/nfs/nfs_clntsocket.c:1.1.40.1 src/sys/nfs/nfs_clntsocket.c:1.1.40.2
--- src/sys/nfs/nfs_clntsocket.c:1.1.40.1	Wed Nov  4 17:32:00 2015
+++ src/sys/nfs/nfs_clntsocket.c	Sun Jul 10 09:42:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_clntsocket.c,v 1.1.40.1 2015/11/04 17:32:00 riz Exp $	*/
+/*	$NetBSD: nfs_clntsocket.c,v 1.1.40.2 2016/07/10 09:42:34 martin Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nfs_clntsocket.c,v 1.1.40.1 2015/11/04 17:32:00 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_clntsocket.c,v 1.1.40.2 2016/07/10 09:42:34 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -324,7 +324,7 @@ nfs_reply(struct nfsreq *myrep, struct l
 	struct mbuf *mrep, *nam, *md;
 	u_int32_t rxid, *tl;
 	char *dpos, *cp2;
-	int error;
+	int error, s;
 
 	/*
 	 * Loop around until we get our own reply
@@ -402,6 +402,7 @@ nfsmout:
 		 * Loop through the request list to match up the reply
 		 * Iff no match, just drop the datagram
 		 */
+		s = splsoftnet();
 		TAILQ_FOREACH(rep, _reqq, r_chain) {
 			if (rep->r_mrep == NULL && rxid == rep->r_xid) {
 /* Found it.. */
@@ -465,6 +466,7 @@ nfsmout:
 break;
 			}
 		}
+		splx(s);
 		nfs_rcvunlock(nmp);
 		/*
 		 * If not matched to a request, drop it.

Index: src/sys/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.192.2.1 src/sys/nfs/nfs_socket.c:1.192.2.2
--- src/sys/nfs/nfs_socket.c:1.192.2.1	Wed Nov  4 17:32:00 2015
+++ src/sys/nfs/nfs_socket.c	Sun Jul 10 09:42:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_socket.c,v 1.192.2.1 2015/11/04 17:32:00 riz Exp $	*/
+/*	$NetBSD: nfs_socket.c,v 1.192.2.2 2016/07/10 09:42:34 martin Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.192.2.1 2015/11/04 17:32:00 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.192.2.2 2016/07/10 09:42:34 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -358,7 +358,7 @@ nfs_reconnect(struct nfsreq *rep)
 {
 	struct nfsreq *rp;
 	struct nfsmount *nmp = rep->r_nmp;
-	int error;
+	int error, s;
 	time_t before_ts;
 
 	nfs_disconnect(nmp);
@@ -393,6 +393,7 @@ nfs_reconnect(struct nfsreq *rep)
 	 * Loop through outstanding request list and fix up all requests
 	 * on old socket.
 	 */
+	s = splsoftnet();
 	TAILQ_FOREACH(rp, _reqq, r_chain) {
 		if (rp->r_nmp == nmp) {
 			if ((rp->r_flags & R_MUSTRESEND) == 0)
@@ -400,6 +401,7 @@ nfs_reconnect(struct nfsreq *rep)
 			rp->r_rexmit = 0;
 		}
 	}
+	splx(s);
 	return (0);
 }
 

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Jul 10 09:38:38 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: kern_module.c

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1183):
sys/kern/kern_module.c: revision 1.111
Check for duplicate module names before loading modules that were
"pushed" by the boot loader.  The boot loader pushes the module
name for the root file system (unless the root file system is ffs)
even if the file system module is built into the kernel.  When
this happens, we get a lot of "redefined symbol" error messages.
This fix does not alter the behavior of pushing the file system
name.  It simply avoids the redefined symbol errors by detecting
that the module is already built-in to the kernel and not trying
to load another copy.
While here, differentiate the error message text between "failed
to load" and "failed to fetch_info" conditions.
Addresses PR kern/50357


To generate a diff of this commit:
cvs rdiff -u -r1.97.2.2 -r1.97.2.3 src/sys/kern/kern_module.c

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

Modified files:

Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.97.2.2 src/sys/kern/kern_module.c:1.97.2.3
--- src/sys/kern/kern_module.c:1.97.2.2	Thu Mar  3 14:47:08 2016
+++ src/sys/kern/kern_module.c	Sun Jul 10 09:38:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.97.2.2 2016/03/03 14:47:08 martin Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.97.2.3 2016/07/10 09:38:38 martin Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.97.2.2 2016/03/03 14:47:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.97.2.3 2016/07/10 09:38:38 martin Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -1235,6 +1235,8 @@ module_do_unload(const char *name, bool 
 int
 module_prime(const char *name, void *base, size_t size)
 {
+	__link_set_decl(modules, modinfo_t);
+	modinfo_t *const *mip;
 	module_t *mod;
 	int error;
 
@@ -1243,6 +1245,18 @@ module_prime(const char *name, void *bas
 		return ENOMEM;
 	}
 
+	/* Check for duplicate modules */
+
+	__link_set_foreach(mip, modules) {
+		if (*mip == _dummy)
+			continue;
+		if (strcmp((*mip)->mi_name, name) == 0) {
+			module_error("module `%s' pushed by boot loader "
+			"already exists", name);
+			kmem_free(mod, sizeof(*mod));
+			return EEXIST;
+		}
+	}
 	error = kobj_load_mem(>mod_kobj, name, base, size);
 	if (error != 0) {
 		kmem_free(mod, sizeof(*mod));
@@ -1254,8 +1268,8 @@ module_prime(const char *name, void *bas
 	if (error != 0) {
 		kobj_unload(mod->mod_kobj);
 		kmem_free(mod, sizeof(*mod));
-		module_error("unable to load `%s' pushed by boot loader, "
-		"error %d", name, error);
+		module_error("unable to fetch_info for `%s' pushed by boot "
+		"loader, error %d", name, error);
 		return error;
 	}
 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jul  5 19:20:55 UTC 2016

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

Log Message:
1182, 1185-1187


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.95 src/doc/CHANGES-7.1:1.1.2.96
--- src/doc/CHANGES-7.1:1.1.2.95	Fri Jul  1 07:50:06 2016
+++ src/doc/CHANGES-7.1	Tue Jul  5 19:20:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.95 2016/07/01 07:50:06 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.96 2016/07/05 19:20:55 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4916,3 +4916,39 @@ xsrc/external/mit/glu/dist/include/GL/gl
 	in a double, or 1e15 if DBL_MAX_10_EXP is not large enough.
 	[bouyer, ticket #1181]
 
+bin/cat/cat.c	1.57
+distrib/sets/lists/tests/mi			1.675 via patch
+tests/bin/cat/Makefile1.2
+tests/bin/cat/d_se_output.in			1.1
+tests/bin/cat/d_se_output.out			1.1
+tests/bin/cat/t_cat.sh1.3
+
+	When invoked with -se, print a '$' on blank lines
+	Obtained from OpenBSD r1.13 of src/bin/cat/cat.c
+	PR bin/51250
+	[sevan, ticket #1182]
+
+sys/kern/kern_subr.c1.215
+
+	Don't crash if rootspec is invalid.
+	[mlelstv, ticket #1185]
+
+sys/dev/ata/wd.c1.421
+sys/kern/subr_autoconf.c			1.242 via patch
+sys/sys/device.h1.149
+
+	Add a new config_detach() flag, DETACH_POWEROFF, which is set
+	when detaching devices at shutdown time with RB_POWERDOWN.
+	When detaching wd(4), put the drive in standby before detach
+	for DETACH_POWEROFF.  Fix PR kern/51252
+	[bouyer, ticket #1186]
+
+sys/dev/adb/adb_kbd.c1.23
+sys/dev/adb/adb_keymap.h			1.5, 1.6
+sys/dev/adb/adb_usb_map.c			1.2
+
+	ADB: ask the keyboard to distinguish between left and right
+	Control, Alt and Shift keys.  Add us.dvorak keymap variant.
+	PR port-macppc/51255.
+	[sevan, ticket #1187]
+

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jul  5 19:14:59 UTC 2016

Modified Files:
src/sys/dev/adb [netbsd-7]: adb_kbd.c adb_keymap.h adb_usb_map.c

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1187):
sys/dev/adb/adb_kbd.c: revision 1.23
sys/dev/adb/adb_keymap.h: revisions 1.5, 1.6
sys/dev/adb/adb_usb_map.c: revision 1.2
nicely ask the keyboard to distinguish between left and right Control, Alt
and Shift keys.
Welcome to the world of accents and diacritics!
--
Add us.dvorak keymap variant for ADB keyboards.  Addresses PR 51255.
Tested by sevan@.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/dev/adb/adb_kbd.c
cvs rdiff -u -r1.4 -r1.4.14.1 src/sys/dev/adb/adb_keymap.h
cvs rdiff -u -r1.1 -r1.1.16.1 src/sys/dev/adb/adb_usb_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/dev/adb/adb_kbd.c
diff -u src/sys/dev/adb/adb_kbd.c:1.22 src/sys/dev/adb/adb_kbd.c:1.22.4.1
--- src/sys/dev/adb/adb_kbd.c:1.22	Mon Nov 18 11:02:34 2013
+++ src/sys/dev/adb/adb_kbd.c	Tue Jul  5 19:14:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_kbd.c,v 1.22 2013/11/18 11:02:34 nisimura Exp $	*/
+/*	$NetBSD: adb_kbd.c,v 1.22.4.1 2016/07/05 19:14:59 snj Exp $	*/
 
 /*
  * Copyright (C) 1998	Colin Wood
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.22 2013/11/18 11:02:34 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.22.4.1 2016/07/05 19:14:59 snj Exp $");
 
 #include 
 #include 
@@ -190,6 +190,7 @@ adbkbd_attach(device_t parent, device_t 
 #if NWSMOUSE > 0
 	struct wsmousedev_attach_args am;
 #endif
+	uint8_t buffer[2];
 
 	sc->sc_dev = self;
 	sc->sc_ops = aaa->ops;
@@ -333,6 +334,27 @@ adbkbd_attach(device_t parent, device_t 
 		break;
 	}
 
+	/*
+	 * try to switch to extended protocol
+	 * as in, tell the keyboard to distinguish between left and right
+	 * Shift, Control and Alt keys
+	 */
+	cmd = ADBLISTEN(sc->sc_adbdev->current_addr, 3);
+	buffer[0] = sc->sc_adbdev->current_addr;
+	buffer[1] = 3;
+	sc->sc_msg_len = 0;
+	sc->sc_ops->send(sc->sc_ops->cookie, sc->sc_poll, cmd, 2, buffer);
+	adbkbd_wait(sc, 10);
+
+	cmd = ADBTALK(sc->sc_adbdev->current_addr, 3);
+	sc->sc_msg_len = 0;
+	sc->sc_ops->send(sc->sc_ops->cookie, sc->sc_poll, cmd, 0, NULL);
+	adbkbd_wait(sc, 10);
+	if ((sc->sc_msg_len == 4) && (sc->sc_buffer[3] == 3)) {
+		printf("%s: extended protocol enabled\n",
+		device_xname(sc->sc_dev));
+	}
+
 	if (adbkbd_is_console && (adbkbd_console_attached == 0)) {
 		wskbd_cnattach(_consops, sc, _keymapdata);
 		adbkbd_console_attached = 1;

Index: src/sys/dev/adb/adb_keymap.h
diff -u src/sys/dev/adb/adb_keymap.h:1.4 src/sys/dev/adb/adb_keymap.h:1.4.14.1
--- src/sys/dev/adb/adb_keymap.h:1.4	Wed Aug 29 02:44:07 2012
+++ src/sys/dev/adb/adb_keymap.h	Tue Jul  5 19:14:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: adb_keymap.h,v 1.4 2012/08/29 02:44:07 macallan Exp $	*/
+/*	$NetBSD: adb_keymap.h,v 1.4.14.1 2016/07/05 19:14:59 snj Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -148,10 +148,56 @@ static const keysym_t akbd_keydesc_us[] 
 KC(120),KS_Cmd_Screen1,	KS_f2,
 KC(121),KS_Cmd_ScrollFastDown, KS_Next,
 KC(122),KS_Cmd_Screen0,	KS_f1,
-
+KC(123),			KS_Shift_R,
+KC(124),			KS_Alt_R,
+KC(125),			KS_Control_R,
 KC(127),  KS_Cmd_Debugger,
 };
 
+static const keysym_t akbd_keydesc_us_dvorak[] = {
+/*  pos  command		normal		shifted */
+KC(0),			KS_a,
+KC(1),			KS_o,
+KC(2),			KS_e,
+KC(3),			KS_u,
+KC(4),			KS_d,
+KC(5),			KS_i,
+KC(6),			KS_semicolon,	KS_colon,
+KC(7),			KS_q,
+KC(8),			KS_j,
+KC(9),			KS_k,
+
+KC(11),			KS_x,
+KC(12),			KS_apostrophe,	KS_quotedbl,
+KC(13),			KS_comma,	KS_less,
+KC(14),			KS_period,	KS_greater,
+KC(15),			KS_p,
+KC(16),			KS_f,
+KC(17),			KS_y,
+
+KC(24),			KS_bracketright, KS_braceright,
+KC(27),			KS_bracketleft,	KS_braceleft,
+
+KC(30),			KS_equal,	KS_plus,
+KC(31),			KS_r,
+KC(32),			KS_g,
+KC(33),			KS_slash,	KS_question,
+KC(34),			KS_c,
+KC(35),			KS_l,
+
+KC(37),			KS_n,
+KC(38),			KS_h,
+KC(39),			KS_minus,	KS_underscore,
+KC(40),			KS_t,
+KC(41),			KS_s,
+
+KC(43),			KS_w,
+KC(44),			KS_z,
+KC(45),			KS_b,
+KC(46),			KS_m,
+KC(47),			KS_v,
+};
+
 static const keysym_t akbd_keydesc_fr[] = {
 /*  pos		normal		shifted		altgr		shift-altgr */
 KC(0),	KS_q,
@@ -404,6 +450,7 @@ static const keysym_t akbd_keydesc_pt[] 
 
 static const struct wscons_keydesc akbd_keydesctab[] = {
 	KBD_MAP(KB_US,			0,	akbd_keydesc_us),
+	KBD_MAP(KB_US | KB_DVORAK,  KB_US,  akbd_keydesc_us_dvorak),
 	KBD_MAP(KB_FR,			KB_US,	akbd_keydesc_fr),
 	KBD_MAP(KB_JP,			KB_US,	akbd_keydesc_jp),
 	KBD_MAP(KB_FR | KB_NODEAD,	KB_FR,	akbd_keydesc_fr_nodead),

Index: src/sys/dev/adb/adb_usb_map.c
diff 

CVS commit: [netbsd-7] src/sys

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jul  5 19:09:17 UTC 2016

Modified Files:
src/sys/dev/ata [netbsd-7]: wd.c
src/sys/kern [netbsd-7]: subr_autoconf.c
src/sys/sys [netbsd-7]: device.h

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1186):
sys/dev/ata/wd.c: revision 1.421
sys/kern/subr_autoconf.c: revision 1.242 via patch
sys/sys/device.h: revision 1.149
Add a new config_detach() flag, DETACH_POWEROFF, which is set when
detaching devices at shutdown time with RB_POWERDOWN.
When detaching wd(4), put the drive in standby before detach
for DETACH_POWEROFF.
Fix PR kern/51252


To generate a diff of this commit:
cvs rdiff -u -r1.412.2.1 -r1.412.2.2 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.231.2.2 -r1.231.2.3 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.144.4.1 -r1.144.4.2 src/sys/sys/device.h

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

Modified files:

Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.412.2.1 src/sys/dev/ata/wd.c:1.412.2.2
--- src/sys/dev/ata/wd.c:1.412.2.1	Tue Nov 11 10:36:41 2014
+++ src/sys/dev/ata/wd.c	Tue Jul  5 19:09:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: wd.c,v 1.412.2.1 2014/11/11 10:36:41 martin Exp $ */
+/*	$NetBSD: wd.c,v 1.412.2.2 2016/07/05 19:09:17 snj Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.412.2.1 2014/11/11 10:36:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.412.2.2 2016/07/05 19:09:17 snj Exp $");
 
 #include "opt_ata.h"
 
@@ -464,6 +464,8 @@ wddetach(device_t self, int flags)
 
 	bufq_free(sc->sc_q);
 	sc->atabus->ata_killpending(sc->drvp);
+	if (flags & DETACH_POWEROFF)
+		wd_standby(sc, AT_POLL);
 
 	splx(s);
 

Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.231.2.2 src/sys/kern/subr_autoconf.c:1.231.2.3
--- src/sys/kern/subr_autoconf.c:1.231.2.2	Mon Nov 16 14:40:41 2015
+++ src/sys/kern/subr_autoconf.c	Tue Jul  5 19:09:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.231.2.2 2015/11/16 14:40:41 msaitoh Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.231.2.3 2016/07/05 19:09:17 snj Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.231.2.2 2015/11/16 14:40:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.231.2.3 2016/07/05 19:09:17 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -1864,14 +1864,20 @@ config_detach_all(int how)
 	static struct shutdown_state s;
 	device_t curdev;
 	bool progress = false;
+	int flags;
 
 	if ((how & RB_NOSYNC) != 0)
 		return false;
 
+	if ((how & RB_POWERDOWN) == RB_POWERDOWN)
+		flags = DETACH_SHUTDOWN | DETACH_POWEROFF;
+	else
+		flags = DETACH_SHUTDOWN;
+
 	for (curdev = shutdown_first(); curdev != NULL;
 	 curdev = shutdown_next()) {
 		aprint_debug(" detaching %s, ", device_xname(curdev));
-		if (config_detach(curdev, DETACH_SHUTDOWN) == 0) {
+		if (config_detach(curdev, flags) == 0) {
 			progress = true;
 			aprint_debug("success.");
 		} else

Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.144.4.1 src/sys/sys/device.h:1.144.4.2
--- src/sys/sys/device.h:1.144.4.1	Mon Mar  9 08:56:02 2015
+++ src/sys/sys/device.h	Tue Jul  5 19:09:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.144.4.1 2015/03/09 08:56:02 snj Exp $ */
+/* $NetBSD: device.h,v 1.144.4.2 2016/07/05 19:09:17 snj Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -347,6 +347,7 @@ struct cfattach __CONCAT(name,_ca) = {		
 #define	DETACH_FORCE	0x01		/* force detachment; hardware gone */
 #define	DETACH_QUIET	0x02		/* don't print a notice */
 #define	DETACH_SHUTDOWN	0x04		/* detach because of system shutdown */
+#define	DETACH_POWEROFF	0x08		/* going to power off; power down devices */
 
 struct cfdriver {
 	LIST_ENTRY(cfdriver) cd_list;	/* link on allcfdrivers */

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jul  5 19:06:48 UTC 2016

Modified Files:
src/sys/kern [netbsd-7]: kern_subr.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1185):
sys/kern/kern_subr.c: revision 1.215
don't crash if rootspec is invalid


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.214.4.1 src/sys/kern/kern_subr.c

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

Modified files:

Index: src/sys/kern/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.214 src/sys/kern/kern_subr.c:1.214.4.1
--- src/sys/kern/kern_subr.c:1.214	Mon Dec  9 16:49:43 2013
+++ src/sys/kern/kern_subr.c	Tue Jul  5 19:06:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $	*/
+/*	$NetBSD: kern_subr.c,v 1.214.4.1 2016/07/05 19:06:48 snj Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.214 2013/12/09 16:49:43 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.214.4.1 2016/07/05 19:06:48 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -422,7 +422,8 @@ setroot(device_t bootdv, int bootpartiti
 		}
 
 		if (rootdev == NODEV &&
-		device_class(dv) == DV_DISK && device_is_a(dv, "dk") &&
+		dv != NULL && device_class(dv) == DV_DISK &&
+		device_is_a(dv, "dk") &&
 		(majdev = devsw_name2blk(device_xname(dv), NULL, 0)) >= 0)
 			rootdev = makedev(majdev, device_unit(dv));
 

CVS commit: [netbsd-7] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jul  5 19:03:31 UTC 2016

Modified Files:
src/bin/cat [netbsd-7]: cat.c
src/distrib/sets/lists/tests [netbsd-7]: mi
src/tests/bin/cat [netbsd-7]: Makefile t_cat.sh
Added Files:
src/tests/bin/cat [netbsd-7]: d_se_output.in d_se_output.out

Log Message:
Pull up following revision(s) (requested by sevan in ticket #1182):
bin/cat/cat.c: revision 1.57
distrib/sets/lists/tests/mi: revision 1.675
tests/bin/cat/Makefile: revision 1.2
tests/bin/cat/d_se_output.in: revision 1.1
tests/bin/cat/d_se_output.out: revision 1.1
tests/bin/cat/t_cat.sh: revision 1.3
When invoked with -se, print a '$' on blank lines
Obtained from OpenBSD r1.13 of src/bin/cat/cat.c
Closes PR bin/51250
Reviewed by Christos@
--
Add a unit test for PR bin/51250 called se_output. se_output checks
the output of cat when invoked with '-se', to ensure that a '$' is
printed on blank lines.
--
Add input/output files for new test case - fix build


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.4.1 src/bin/cat/cat.c
cvs rdiff -u -r1.584.2.3 -r1.584.2.4 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.1.12.1 src/tests/bin/cat/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/tests/bin/cat/d_se_output.in \
src/tests/bin/cat/d_se_output.out
cvs rdiff -u -r1.2 -r1.2.12.1 src/tests/bin/cat/t_cat.sh

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

Modified files:

Index: src/bin/cat/cat.c
diff -u src/bin/cat/cat.c:1.54 src/bin/cat/cat.c:1.54.4.1
--- src/bin/cat/cat.c:1.54	Sun Dec  8 08:32:13 2013
+++ src/bin/cat/cat.c	Tue Jul  5 19:03:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cat.c,v 1.54 2013/12/08 08:32:13 spz Exp $	*/
+/* $NetBSD: cat.c,v 1.54.4.1 2016/07/05 19:03:31 snj Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: cat.c,v 1.54 2013/12/08 08:32:13 spz Exp $");
+__RCSID("$NetBSD: cat.c,v 1.54.4.1 2016/07/05 19:03:31 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -175,18 +175,16 @@ cook_buf(FILE *fp)
 	line = gobble = 0;
 	for (prev = '\n'; (ch = getc(fp)) != EOF; prev = ch) {
 		if (prev == '\n') {
-			if (ch == '\n') {
-if (sflag) {
-	if (!gobble && nflag && !bflag)
-		(void)fprintf(stdout,
-			"%6d\t\n", ++line);
-	else if (!gobble && putchar(ch) == EOF)
-		break;
+			if (sflag) {
+if (ch == '\n') {
+	if (gobble)
+		continue;
 	gobble = 1;
-	continue;
+} else
+	gobble = 0;
 }
 if (nflag) {
-	if (!bflag) {
+	if (!bflag || ch != '\n') {
 		(void)fprintf(stdout,
 		"%6d\t", ++line);
 		if (ferror(stdout))
@@ -198,13 +196,7 @@ cook_buf(FILE *fp)
 			break;
 	}
 }
-			} else if (nflag) {
-(void)fprintf(stdout, "%6d\t", ++line);
-if (ferror(stdout))
-	break;
 			}
-		}
-		gobble = 0;
 		if (ch == '\n') {
 			if (eflag)
 if (putchar('$') == EOF)

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.584.2.3 src/distrib/sets/lists/tests/mi:1.584.2.4
--- src/distrib/sets/lists/tests/mi:1.584.2.3	Thu Aug  6 21:13:43 2015
+++ src/distrib/sets/lists/tests/mi	Tue Jul  5 19:03:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.584.2.3 2015/08/06 21:13:43 snj Exp $
+# $NetBSD: mi,v 1.584.2.4 2016/07/05 19:03:31 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -801,6 +801,8 @@
 ./usr/tests/bin/cat/Kyuafile			tests-bin-tests		atf,kyua
 ./usr/tests/bin/cat/d_align.in			tests-bin-tests		atf
 ./usr/tests/bin/cat/d_align.out			tests-bin-tests		atf
+./usr/tests/bin/cat/d_se_output.in		tests-bin-tests		atf
+./usr/tests/bin/cat/d_se_output.out		tests-bin-tests		atf
 ./usr/tests/bin/cat/t_cat			tests-bin-tests		atf
 ./usr/tests/bin/cptests-bin-tests
 ./usr/tests/bin/cp/Atffile			tests-bin-tests		atf

Index: src/tests/bin/cat/Makefile
diff -u src/tests/bin/cat/Makefile:1.1 src/tests/bin/cat/Makefile:1.1.12.1
--- src/tests/bin/cat/Makefile:1.1	Tue Mar 27 08:16:33 2012
+++ src/tests/bin/cat/Makefile	Tue Jul  5 19:03:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/27 08:16:33 jruoho Exp $
+# $NetBSD: Makefile,v 1.1.12.1 2016/07/05 19:03:31 snj Exp $
 
 .include 
 
@@ -8,5 +8,7 @@ TESTS_SH=	t_cat
 FILESDIR=	${TESTSDIR}
 FILES+=		d_align.in
 FILES+=		d_align.out
+FILES+= 	d_se_output.in
+FILES+= 	d_se_output.out
 
 .include 

Index: src/tests/bin/cat/t_cat.sh
diff -u src/tests/bin/cat/t_cat.sh:1.2 src/tests/bin/cat/t_cat.sh:1.2.12.1
--- src/tests/bin/cat/t_cat.sh:1.2	Tue Mar 27 17:57:02 2012
+++ src/tests/bin/cat/t_cat.sh	Tue Jul  5 19:03:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_cat.sh,v 1.2 2012/03/27 17:57:02 jruoho Exp $
+# $NetBSD: t_cat.sh,v 1.2.12.1 2016/07/05 19:03:31 snj Exp $
 #
 # Copyright (c) 2012 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Jul  1 07:50:06 UTC 2016

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

Log Message:
1171, 1181


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.94 src/doc/CHANGES-7.1:1.1.2.95
--- src/doc/CHANGES-7.1:1.1.2.94	Wed Jun 22 08:31:49 2016
+++ src/doc/CHANGES-7.1	Fri Jul  1 07:50:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.94 2016/06/22 08:31:49 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.95 2016/07/01 07:50:06 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4833,3 +4833,86 @@ sys/dev/ic/ns16550reg.h1.11
 	LCR and divisor registers, and then commit the changes.
 	[bouyer, ticket #1178]
 
+doc/3RDPARTY	1.1277, 1.1331 via patch
+external/mit/lua/Makefile   up to 1.4
+external/mit/lua/dist/Makefile  up to 1.5
+external/mit/lua/dist/READMEup to 1.5
+external/mit/lua/dist/doc/index.css up to 1.1.1.1
+external/mit/lua/dist/doc/lua.css   up to 1.5
+external/mit/lua/dist/doc/luac.1up to 1.3
+external/mit/lua/dist/doc/manual.html   up to 1.5
+external/mit/lua/dist/src/lapi.cup to 1.6
+external/mit/lua/dist/src/lauxlib.c up to 1.6
+external/mit/lua/dist/src/lauxlib.h up to 1.4
+external/mit/lua/dist/src/lbaselib.cup to 1.6
+external/mit/lua/dist/src/lbitlib.c up to 1.3
+external/mit/lua/dist/src/lcode.c   up to 1.5
+external/mit/lua/dist/src/lcode.h   up to 1.4
+external/mit/lua/dist/src/lcorolib.cup to 1.3
+external/mit/lua/dist/src/lctype.c  up to 1.3
+external/mit/lua/dist/src/lctype.h  up to 1.3
+external/mit/lua/dist/src/ldblib.c  up to 1.7
+external/mit/lua/dist/src/ldebug.c  up to 1.6
+external/mit/lua/dist/src/ldo.c up to 1.5
+external/mit/lua/dist/src/ldo.h up to 1.5
+external/mit/lua/dist/src/ldump.c   up to 1.5
+external/mit/lua/dist/src/lfunc.c   up to 1.4
+external/mit/lua/dist/src/lgc.c up to 1.5
+external/mit/lua/dist/src/lgc.h up to 1.4
+external/mit/lua/dist/src/linit.c   up to 1.5
+external/mit/lua/dist/src/liolib.c  up to 1.5
+external/mit/lua/dist/src/llex.cup to 1.7
+external/mit/lua/dist/src/llex.hup to 1.4
+external/mit/lua/dist/src/llimits.h up to 1.6
+external/mit/lua/dist/src/lmathlib.cup to 1.5
+external/mit/lua/dist/src/lmem.cup to 1.5
+external/mit/lua/dist/src/lmem.hup to 1.4
+external/mit/lua/dist/src/loadlib.c up to 1.5
+external/mit/lua/dist/src/lobject.c up to 1.8
+external/mit/lua/dist/src/lobject.h up to 1.6
+external/mit/lua/dist/src/lopcodes.cup to 1.4
+external/mit/lua/dist/src/lopcodes.hup to 1.4
+external/mit/lua/dist/src/loslib.c  up to 1.5
+external/mit/lua/dist/src/lparser.c up to 1.5
+external/mit/lua/dist/src/lparser.h up to 1.4
+external/mit/lua/dist/src/lprefix.h up to 1.3
+external/mit/lua/dist/src/lstate.c  up to 1.5
+external/mit/lua/dist/src/lstate.h  up to 1.5
+external/mit/lua/dist/src/lstring.c up to 1.5
+external/mit/lua/dist/src/lstring.h up to 1.5
+external/mit/lua/dist/src/lstrlib.c up to 1.12
+external/mit/lua/dist/src/ltable.c  up to 1.6
+external/mit/lua/dist/src/ltable.h  up to 1.4
+external/mit/lua/dist/src/ltablib.c up to 1.5
+external/mit/lua/dist/src/ltm.c up to 1.5
+external/mit/lua/dist/src/ltm.h up to 1.4
+external/mit/lua/dist/src/lua.c up to 1.5
+external/mit/lua/dist/src/lua.h up to 1.6
+external/mit/lua/dist/src/luac.cup to 1.6
+external/mit/lua/dist/src/luaconf.h up to 1.16
+external/mit/lua/dist/src/lualib.h  up to 1.3
+external/mit/lua/dist/src/lundump.c up to 1.4
+external/mit/lua/dist/src/lundump.h up to 1.3
+external/mit/lua/dist/src/lutf8lib.cup to 1.4
+external/mit/lua/dist/src/lvm.c up to 1.10
+external/mit/lua/dist/src/lvm.h up to 1.6
+external/mit/lua/dist/src/lzio.cup to 1.4
+external/mit/lua/dist/src/lzio.hup to 1.4
+external/mit/lua/lib/liblua/Makefileup to 1.8
+
+	Update Lua to 5.3.2.
+	[salazar, ticket #1173]
+
+xsrc/external/mit/glu/dist/include/GL/glu.h		1.3
+
+	Changing GLU_TESS_MAX_COORD to DBL_MAX causes 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jun 22 08:31:50 UTC 2016

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

Log Message:
1172, 1177, 1178


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.93 src/doc/CHANGES-7.1:1.1.2.94
--- src/doc/CHANGES-7.1:1.1.2.93	Tue Jun 14 09:05:16 2016
+++ src/doc/CHANGES-7.1	Wed Jun 22 08:31:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.93 2016/06/14 09:05:16 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.94 2016/06/22 08:31:49 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4801,3 +4801,35 @@ external/gpl3/gcc/dist/gcc/cp/except.c		
 	Fix building GCC with GCC-6.1.
 	[kamil, ticket #1176]
 
+sys/arch/i386/stand/misc/rawr32.exe.uue		up to 1.6
+
+	Update rawrite32 to 1.0.4.0.  Changes:
+	- now digitally signed
+	- avoid a crash when all hash types were deselected
+	- added support for .xz images
+	- minor bugfixes
+	[martin, ticket #1172]
+
+sys/dev/isapnp/isapnpdevs			1.69
+sys/dev/isapnp/isapnpdevs.c			regen
+sys/dev/isapnp/isapnpdevs.h			regen
+
+	Add support for SysKonnect SK-NET Flash ISAPNP cards.
+	PR kern/50449.
+	[pgoyette, ticket #1177]
+
+sys/arch/arm/allwinner/files.awin		1.36
+sys/conf/files	1.1159
+sys/dev/ic/com.c1.339
+sys/dev/ic/comreg.h1.25
+sys/dev/ic/comvar.h1.82
+sys/dev/ic/ns16550reg.h1.11
+
+	The UART in the allwiner SoCs is not full-compatible with
+	the 16550, and it's not a 16750 either. Like the 16750 it
+	has the IIR_BUSY interrupt, which is triggered when writing
+	to LCR while the chip can't accept it. But unlike the 16750,
+	it has a specific register, HALT, to allow writing to the
+	LCR and divisor registers, and then commit the changes.
+	[bouyer, ticket #1178]
+

CVS commit: [netbsd-7] src/sys

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jun 22 08:26:05 UTC 2016

Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: files.awin
src/sys/conf [netbsd-7]: files
src/sys/dev/ic [netbsd-7]: com.c comreg.h comvar.h ns16550reg.h

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1178):
sys/arch/arm/allwinner/files.awin: revision 1.36
sys/conf/files: revision 1.1159
sys/dev/ic/com.c: revision 1.339
sys/dev/ic/comreg.h: revision 1.25
sys/dev/ic/comvar.h: revision 1.82
sys/dev/ic/ns16550reg.h: revision 1.11
The UART in the allwiner SoCs is not full-compatible with the 16550, and
it's not a 16750 either. Like the 16750 it has the IIR_BUSY interrupt,
which is triggered when writing to LCR while the chip
can't accept it. But unlike the 16750, it has a specific register,
HALT, to allow writing to the LCR and divisor registers, and then
commit the changes.
Tested on an A20 SoC, changing the baud rate while keeping the
tty device open and incoming data.


To generate a diff of this commit:
cvs rdiff -u -r1.8.10.4 -r1.8.10.5 src/sys/arch/arm/allwinner/files.awin
cvs rdiff -u -r1.1096.2.6 -r1.1096.2.7 src/sys/conf/files
cvs rdiff -u -r1.327 -r1.327.2.1 src/sys/dev/ic/com.c
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/dev/ic/comreg.h
cvs rdiff -u -r1.78 -r1.78.4.1 src/sys/dev/ic/comvar.h
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/dev/ic/ns16550reg.h

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

Modified files:

Index: src/sys/arch/arm/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.8.10.4 src/sys/arch/arm/allwinner/files.awin:1.8.10.5
--- src/sys/arch/arm/allwinner/files.awin:1.8.10.4	Sun Nov 23 13:07:04 2014
+++ src/sys/arch/arm/allwinner/files.awin	Wed Jun 22 08:26:05 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.awin,v 1.8.10.4 2014/11/23 13:07:04 martin Exp $
+#	$NetBSD: files.awin,v 1.8.10.5 2016/06/22 08:26:05 snj Exp $
 #
 # Configuration info for Allwinner ARM Peripherals
 #
@@ -64,7 +64,7 @@ attach	awincnt at awinio with awin_cnt
 file	arch/arm/allwinner/awin_cnt.c		awin_cnt
 
 # A10/A20 UART
-options 	COM_16750			# for IIR_BUSY
+options 	COM_AWIN			# for IIR_BUSY
 attach	com at awinio with awin_com
 file	arch/arm/allwinner/awin_com.c		awin_com
 

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1096.2.6 src/sys/conf/files:1.1096.2.7
--- src/sys/conf/files:1.1096.2.6	Tue May 19 04:42:31 2015
+++ src/sys/conf/files	Wed Jun 22 08:26:05 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1096.2.6 2015/05/19 04:42:31 snj Exp $
+#	$NetBSD: files,v 1.1096.2.7 2016/06/22 08:26:05 snj Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -864,7 +864,7 @@ defflag	opt_com.h		COM_DEBUG
 # XXX In a perfect world, this would be done with attributes
 defflag	opt_com.h		COM_16650 COM_16750
 COM_HAYESP COM_PXA2X0 COM_AU1X00
-COM_REGMAP COM_FUNCMAP
+COM_REGMAP COM_FUNCMAP COM_AWIN
 defparam opt_com.h		COM_TOLERANCE
 device	com { } : tty
 file	dev/ic/com.c			com			needs-flag

Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.327 src/sys/dev/ic/com.c:1.327.2.1
--- src/sys/dev/ic/com.c:1.327	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/com.c	Wed Jun 22 08:26:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.327 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: com.c,v 1.327.2.1 2016/06/22 08:26:05 snj Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.327 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.327.2.1 2016/06/22 08:26:05 snj Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -425,7 +425,7 @@ com_attach_subr(struct com_softc *sc)
 			(u_long)comcons_info.regs.cr_iobase);
 		}
 
-#ifdef COM_16750
+#if defined(COM_16750) || defined(COM_AWIN)
 		/* Use in comintr(). */
  		sc->sc_lcr = cflag2lcr(comcons_info.cflag);
 #endif
@@ -1536,7 +1536,7 @@ com_iflush(struct com_softc *sc)
 		aprint_error_dev(sc->sc_dev, "com_iflush timeout %02x\n", reg);
 #endif
 
-#ifdef COM_16750
+#if defined(COM_16750) || defined(COM_AWIN)
 	uint8_t fifo;
 	/*
 	 * Reset all Rx/Tx FIFO, preserve current FIFO length.
@@ -1978,6 +1978,9 @@ comintr(void *arg)
 
 	/* Handle ns16750-specific busy interrupt. */
 #ifdef COM_16750
+#ifdef COM_AWIN
+#error "COM_16750 and COM_AWIN are exclusive"
+#endif
 	int timeout;
 	if ((iir & IIR_BUSY) == IIR_BUSY) {
 		for (timeout = 1;
@@ -1994,7 +1997,39 @@ comintr(void *arg)
 		iir = CSR_READ_1(regsp, COM_REG_IIR);
 	}
 #endif /* COM_16750 */
-
+#ifdef COM_AWIN
+	/* Allwinner BUSY interrupt */
+	if ((iir & IIR_BUSY) == IIR_BUSY) {
+		if ((CSR_READ_1(regsp, COM_REG_USR) & 0x1) != 0) {
+			CSR_WRITE_1(regsp, COM_REG_HALT, HALT_CHCFG_EN);
+			CSR_WRITE_1(regsp, COM_REG_LCR, sc->sc_lcr | LCR_DLAB);
+			CSR_WRITE_1(regsp, COM_REG_DLBL, sc->sc_dlbl);
+			

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jun 22 08:19:53 UTC 2016

Modified Files:
src/sys/dev/isapnp [netbsd-7]: isapnpdevs.c isapnpdevs.h

Log Message:
regen for ticket 1177


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.71.62.1 src/sys/dev/isapnp/isapnpdevs.c
cvs rdiff -u -r1.66 -r1.66.62.1 src/sys/dev/isapnp/isapnpdevs.h

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

Modified files:

Index: src/sys/dev/isapnp/isapnpdevs.c
diff -u src/sys/dev/isapnp/isapnpdevs.c:1.71 src/sys/dev/isapnp/isapnpdevs.c:1.71.62.1
--- src/sys/dev/isapnp/isapnpdevs.c:1.71	Mon Apr 28 20:23:53 2008
+++ src/sys/dev/isapnp/isapnpdevs.c	Wed Jun 22 08:19:53 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: isapnpdevs.c,v 1.71 2008/04/28 20:23:53 martin Exp $	*/
+/*	$NetBSD: isapnpdevs.c,v 1.71.62.1 2016/06/22 08:19:53 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: isapnpdevs,v 1.66 2008/04/20 13:24:34 tsutsui Exp
+ *	NetBSD: isapnpdevs,v 1.68.40.1 2016/06/22 08:18:22 snj Exp
  */
 
 /*-
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isapnpdevs.c,v 1.71 2008/04/28 20:23:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnpdevs.c,v 1.71.62.1 2016/06/22 08:19:53 snj Exp $");
 
 #include 
 #include 
@@ -224,9 +224,10 @@ static const struct isapnp_matchinfo isa
 	{"ATK1500", 0},	/* Lance Ethernet on Allied Telesyn board */
 	{"CSI2203", 0},	/* Cabletron E22xx */
 	{"BUF0001", 0},	/* Melco Inc. LGY-IV */
+	{"SKD8000", 0},	/* SysKonnect SK-NET Flash */
 };
 const struct isapnp_devinfo isapnp_le_devinfo = {
-	isapnp_le_devlogic, 4,
+	isapnp_le_devlogic, 5,
 	NULL, 0,
 };
 

Index: src/sys/dev/isapnp/isapnpdevs.h
diff -u src/sys/dev/isapnp/isapnpdevs.h:1.66 src/sys/dev/isapnp/isapnpdevs.h:1.66.62.1
--- src/sys/dev/isapnp/isapnpdevs.h:1.66	Mon Apr 28 20:23:53 2008
+++ src/sys/dev/isapnp/isapnpdevs.h	Wed Jun 22 08:19:53 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: isapnpdevs.h,v 1.66 2008/04/28 20:23:53 martin Exp $	*/
+/*	$NetBSD: isapnpdevs.h,v 1.66.62.1 2016/06/22 08:19:53 snj Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: isapnpdevs,v 1.66 2008/04/20 13:24:34 tsutsui Exp
+ *	NetBSD: isapnpdevs,v 1.68.40.1 2016/06/22 08:18:22 snj Exp
  */
 
 
@@ -38,6 +38,11 @@
  */
 
 /*
+ * Use "make -f Makefile.isapnpdevs" to regenerate isapnpdevs.h and
+ * isapnpdevs.c
+ */
+
+/*
  * List of known drivers
  */
 struct isapnp_matchinfo {

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jun 22 08:18:22 UTC 2016

Modified Files:
src/sys/dev/isapnp [netbsd-7]: isapnpdevs

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1177):
sys/dev/isapnp/isapnpdevs: revision 1.69
Add another le board.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.68.40.1 src/sys/dev/isapnp/isapnpdevs

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/isapnp/isapnpdevs
diff -u src/sys/dev/isapnp/isapnpdevs:1.68 src/sys/dev/isapnp/isapnpdevs:1.68.40.1
--- src/sys/dev/isapnp/isapnpdevs:1.68	Wed Jan 21 14:22:46 2009
+++ src/sys/dev/isapnp/isapnpdevs	Wed Jun 22 08:18:22 2016
@@ -1,4 +1,4 @@
-$NetBSD: isapnpdevs,v 1.68 2009/01/21 14:22:46 jnemeth Exp $
+$NetBSD: isapnpdevs,v 1.68.40.1 2016/06/22 08:18:22 snj Exp $
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -184,6 +184,7 @@ devlogic	le	TKN0010		0	Lance Ethernet on
 devlogic	le	ATK1500		0	Lance Ethernet on Allied Telesyn board
 devlogic	le	CSI2203		0	Cabletron E22xx
 devlogic	le	BUF0001		0	Melco Inc. LGY-IV
+devlogic	le	SKD8000		0	SysKonnect SK-NET Flash
 
 /*
  * mpu

CVS commit: [netbsd-7] src/sys/arch/i386/stand/misc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed Jun 22 08:13:14 UTC 2016

Modified Files:
src/sys/arch/i386/stand/misc [netbsd-7]: rawr32.exe.uue

Log Message:
Pull up following revision(s) (requested by martin in ticket #1172):
sys/arch/i386/stand/misc/rawr32.exe.uue: up to revision 1.6
New Rawrite32 release


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.24.1 src/sys/arch/i386/stand/misc/rawr32.exe.uue

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

diffs are larger than 1MB and have been omitted

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jun 14 09:05:16 UTC 2016

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

Log Message:
1174, 1176


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.92 src/doc/CHANGES-7.1:1.1.2.93
--- src/doc/CHANGES-7.1:1.1.2.92	Sun May 22 10:29:51 2016
+++ src/doc/CHANGES-7.1	Tue Jun 14 09:05:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.92 2016/05/22 10:29:51 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.93 2016/06/14 09:05:16 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4752,9 +4752,52 @@ sys/dev/ic/gem.c1.105
 	multiple packets.
 	[jdc, ticket #1170]
 
-
 sys/modules/lua/lua.c1.17
 
 	Fix double require bug.
 	[salazar, ticket #1171]
 
+sys/dev/pci/ixgbe/README			1.2
+sys/dev/pci/ixgbe/ixgbe.c			1.30-1.33, 1.35 via patch
+sys/dev/pci/ixgbe/ixgbe.h			1.8 via patch
+sys/dev/pci/ixgbe/ixgbe_82598.c			1.5 via patch
+sys/dev/pci/ixgbe/ixgbe_82599.c			1.10 via patch
+sys/dev/pci/ixgbe/ixgbe_api.c			1.8-1.11 via patch
+sys/dev/pci/ixgbe/ixgbe_api.h			1.5-1.6 via patch
+sys/dev/pci/ixgbe/ixgbe_common.c		1.6-1.7 via patch
+sys/dev/pci/ixgbe/ixgbe_common.h		1.5 via patch
+sys/dev/pci/ixgbe/ixgbe_osdep.h			1.9 via patch
+sys/dev/pci/ixgbe/ixgbe_phy.c			1.6 via patch
+sys/dev/pci/ixgbe/ixgbe_phy.h			1.5 via patch
+sys/dev/pci/ixgbe/ixgbe_type.h			1.11, 1.13 via patch
+sys/dev/pci/ixgbe/ixgbe_vf.c			1.5-1.6 via patch
+sys/dev/pci/ixgbe/ixv.c1.9-1.10, 1.12-1.14 via patch
+sys/dev/pci/ixgbe/ixv.h1.6 via patch
+sys/dev/pci/ixgbe/ixgbe_dcb.c			1.1
+sys/dev/pci/ixgbe/ixgbe_dcb.h			1.1
+sys/dev/pci/ixgbe/ixgbe_dcb_82598.c		1.1
+sys/dev/pci/ixgbe/ixgbe_dcb_82598.h		1.1
+sys/dev/pci/ixgbe/ixgbe_dcb_82599.c		1.1
+sys/dev/pci/ixgbe/ixgbe_dcb_82599.h		1.1
+
+	Sync ixg(4) up to ixgbe.c rev. 1.35 except MSI/MSI-X and NET_MPSAFE:
+	- Sync ixg(4) up to FreeBSD r279805 (or r280181) which include some
+	  bugfixes.
+	- Add missing evcnt_detach(>rx_copies) in ixgbe_detach().
+	- Fix error path in ixgbe_attach() and ixgbe_detatch() to prevent
+	  panic.
+	- Remove unreachable code.
+	- Remove duplicated assignment of mh->m_len.
+	- Reduce the diff against FreeBSD (tabs, spaces and comments)
+	- ixv.c: Fix unintialized data. Include vlan.h and check NVLAN.
+	- Avoid shadowing global `min'.
+	[msaitoh, ticket #1174]
+
+external/gpl3/gcc/dist/gcc/cp/Make-lang.in	1.6
+external/gpl3/gcc/dist/gcc/cp/cfns.gperf	1.2
+external/gpl3/gcc/dist/gcc/cp/cfns.h		1.2
+external/gpl3/gcc/dist/gcc/cp/except.c		1.2
+
+	Fix building GCC with GCC-6.1.
+	[kamil, ticket #1176]
+

CVS commit: [netbsd-7] src/external/gpl3/gcc/dist/gcc/cp

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Jun 14 09:03:52 UTC 2016

Modified Files:
src/external/gpl3/gcc/dist/gcc/cp [netbsd-7]: Make-lang.in cfns.gperf
cfns.h except.c

Log Message:
Pull up following revision(s) (requested by kamil in ticket #1176):
external/gpl3/gcc/dist/gcc/cp/cfns.h: revision 1.2
external/gpl3/gcc/dist/gcc/cp/except.c: revision 1.2
external/gpl3/gcc/dist/gcc/cp/Make-lang.in: revision 1.6
external/gpl3/gcc/dist/gcc/cp/cfns.gperf: revision 1.2
Fix building GCC-5.3 with GCC-6.1
Cherry-pick upstream patch:
>From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001
From: edlinger 
Date: Thu, 25 Feb 2016 15:33:50 +
Subject: [PATCH] 2016-02-25  Bernd Edlinger  

Backported from mainline
2016-02-19  Jakub Jelinek  
Bernd Edlinger  
* Make-lang.in: Invoke gperf with -L C++.
* cfns.gperf: Remove prototypes for hash and libc_name_p
inlines.
* cfns.h: Regenerated.
* except.c (nothrow_libfn_p): Adjust.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 
138bc75d-0d04-0410-961f-82ee72b054a4
Verified to work with GCC 5.3 and 6.1.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \
src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf \
src/external/gpl3/gcc/dist/gcc/cp/cfns.h \
src/external/gpl3/gcc/dist/gcc/cp/except.c

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in
diff -u src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in:1.4 src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in:1.4.2.1
--- src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in:1.4	Sat Apr 19 12:41:31 2014
+++ src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in	Tue Jun 14 09:03:52 2016
@@ -117,7 +117,7 @@ else
 # deleting the $(srcdir)/cp/cfns.h file.
 $(srcdir)/cp/cfns.h:
 endif
-	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \
 		$(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h
 
 #

Index: src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf
diff -u src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf:1.1.1.2 src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf:1.1.1.2.4.1
--- src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf:1.1.1.2	Sat Mar  1 08:43:04 2014
+++ src/external/gpl3/gcc/dist/gcc/cp/cfns.gperf	Tue Jun 14 09:03:52 2016
@@ -1,3 +1,5 @@
+%language=C++
+%define class-name libc_name
 %{
 /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
@@ -16,14 +18,6 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 .  */
-#ifdef __GNUC__
-__inline
-#endif
-static unsigned int hash (const char *, unsigned int);
-#ifdef __GNUC__
-__inline
-#endif
-const char * libc_name_p (const char *, unsigned int);
 %}
 %%
 # The standard C library functions, for feeding to gperf; the result is used
Index: src/external/gpl3/gcc/dist/gcc/cp/cfns.h
diff -u src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.1.1.2 src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.1.1.2.4.1
--- src/external/gpl3/gcc/dist/gcc/cp/cfns.h:1.1.1.2	Sat Mar  1 08:43:09 2014
+++ src/external/gpl3/gcc/dist/gcc/cp/cfns.h	Tue Jun 14 09:03:52 2016
@@ -1,5 +1,5 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
+/* C++ code produced by gperf version 3.0.4 */
+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
   && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,7 @@
 #error "gperf generated tables don't work with this execution character set. Please report a bug to ."
 #endif
 
-#line 1 "cfns.gperf"
+#line 3 "cfns.gperf"
 
 /* Copyright (C) 2000-2013 Free Software Foundation, Inc.
 
@@ -47,25 +47,18 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 .  */
-#ifdef __GNUC__
-__inline
-#endif
-static unsigned int hash (const char *, unsigned int);
-#ifdef __GNUC__
-__inline
-#endif
-const char * libc_name_p (const char *, unsigned int);
 /* maximum key range = 391, duplicates = 0 */
 
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (register const char *str, register unsigned int len)
+class libc_name
+{
+private:
+  static inline 

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun May 22 10:29:51 UTC 2016

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

Log Message:
Tickets #1170 and #1171


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.91 src/doc/CHANGES-7.1:1.1.2.92
--- src/doc/CHANGES-7.1:1.1.2.91	Wed May 18 09:22:11 2016
+++ src/doc/CHANGES-7.1	Sun May 22 10:29:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.91 2016/05/18 09:22:11 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.92 2016/05/22 10:29:51 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4744,3 +4744,17 @@ external/mit/expat/lib/libexpat/shlib_ve
 	Update expat to 2.1.1.  Apply fixes for CVE-2016-0718.
 	[spz, ticket #1169]
 
+sys/dev/ic/gem.c1.105
+
+	PR kern/46083:
+	Track the start of each packet, so that we set the "Start of
+	Frame" bit in all the relevant transmit descriptors when enqueing
+	multiple packets.
+	[jdc, ticket #1170]
+
+
+sys/modules/lua/lua.c1.17
+
+	Fix double require bug.
+	[salazar, ticket #1171]
+

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun May 22 10:24:50 UTC 2016

Modified Files:
src/sys/dev/ic [netbsd-7]: gem.c

Log Message:
Pull up following revision(s) (requested by jdc in ticket #1170):
sys/dev/ic/gem.c: revision 1.105
PR kern/46083
Track the start of each packet, so that we set the "Start of Frame" bit in
all the relevant transmit descriptors when enqueing multiple packets.
Patch from Valery Ushakov, slightly modified by me to handle debug output.
Tested on macppc/6.x and sparc64/7.99.x.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.102.2.1 src/sys/dev/ic/gem.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/gem.c
diff -u src/sys/dev/ic/gem.c:1.102 src/sys/dev/ic/gem.c:1.102.2.1
--- src/sys/dev/ic/gem.c:1.102	Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/gem.c	Sun May 22 10:24:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: gem.c,v 1.102 2014/08/10 16:44:35 tls Exp $ */
+/*	$NetBSD: gem.c,v 1.102.2.1 2016/05/22 10:24:50 martin Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.102 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.102.2.1 2016/05/22 10:24:50 martin Exp $");
 
 #include "opt_inet.h"
 
@@ -1360,6 +1360,9 @@ gem_start(struct ifnet *ifp)
 	struct gem_txsoft *txs;
 	bus_dmamap_t dmamap;
 	int error, firsttx, nexttx = -1, lasttx = -1, ofree, seg;
+#ifdef GEM_DEBUG
+	int otxnext;
+#endif
 	uint64_t flags = 0;
 
 	if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
@@ -1370,10 +1373,12 @@ gem_start(struct ifnet *ifp)
 	 * the first descriptor we'll use.
 	 */
 	ofree = sc->sc_txfree;
-	firsttx = sc->sc_txnext;
+#ifdef GEM_DEBUG
+	otxnext = sc->sc_txnext;
+#endif
 
 	DPRINTF(sc, ("%s: gem_start: txfree %d, txnext %d\n",
-	device_xname(sc->sc_dev), ofree, firsttx));
+	device_xname(sc->sc_dev), ofree, otxnext));
 
 	/*
 	 * Loop through the send queue, setting up transmit descriptors
@@ -1478,7 +1483,8 @@ gem_start(struct ifnet *ifp)
 		/*
 		 * Initialize the transmit descriptors.
 		 */
-		for (nexttx = sc->sc_txnext, seg = 0;
+		firsttx = sc->sc_txnext;
+		for (nexttx = firsttx, seg = 0;
 		 seg < dmamap->dm_nsegs;
 		 seg++, nexttx = GEM_NEXTTX(nexttx)) {
 
@@ -1600,7 +1606,7 @@ gem_start(struct ifnet *ifp)
 
 	if (sc->sc_txfree != ofree) {
 		DPRINTF(sc, ("%s: packets enqueued, IC on %d, OWN on %d\n",
-		device_xname(sc->sc_dev), lasttx, firsttx));
+		device_xname(sc->sc_dev), lasttx, otxnext));
 		/*
 		 * The entire packet chain is set up.
 		 * Kick the transmitter.

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed May 18 09:22:11 UTC 2016

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

Log Message:
1169


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.90 src/doc/CHANGES-7.1:1.1.2.91
--- src/doc/CHANGES-7.1:1.1.2.90	Tue May 17 18:51:39 2016
+++ src/doc/CHANGES-7.1	Wed May 18 09:22:11 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.90 2016/05/17 18:51:39 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.91 2016/05/18 09:22:11 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4677,3 +4677,70 @@ crypto/external/bsd/openssh/dist/session
 	set via PAM.  CVE-2015-8325.
 	[christos, ticket #1168]
 
+distrib/sets/lists/base/ad.aarch64		patch
+distrib/sets/lists/base/ad.arm			patch
+distrib/sets/lists/base/ad.mips			patch
+distrib/sets/lists/base/ad.powerpc		patch
+distrib/sets/lists/base/md.amd64		patch
+distrib/sets/lists/base/md.sparc64		patch
+distrib/sets/lists/base/shl.mi			1.771, 1.772 via patch
+distrib/sets/lists/comp/mi			1.2035
+distrib/sets/lists/debug/ad.aarch64		patch
+distrib/sets/lists/debug/ad.arm			patch
+distrib/sets/lists/debug/ad.mips		patch
+distrib/sets/lists/debug/ad.powerpc		patch
+distrib/sets/lists/debug/md.amd64		patch
+distrib/sets/lists/debug/md.sparc64		patch
+distrib/sets/lists/debug/shl.mi			1.133, 1.134 via patch
+doc/3RDPARTY	1.1316, 1.1330
+external/mit/expat/dist/CMake.README		up to 1.1.1.2
+external/mit/expat/dist/CMakeLists.txt		up to 1.1.1.2
+external/mit/expat/dist/Changes			up to 1.1.1.3
+external/mit/expat/dist/MANIFEST		up to 1.1.1.3
+external/mit/expat/dist/Makefile.in		up to 1.1.1.3
+external/mit/expat/dist/README			up to 1.1.1.3
+external/mit/expat/dist/aclocal.m4		up to 1.1.1.2
+external/mit/expat/dist/configure		up to 1.1.1.3
+external/mit/expat/dist/configure.ac		up to 1.1.1.1
+external/mit/expat/dist/expat_config.h.in	up to 1.1.1.3
+external/mit/expat/dist/bcb5/elements.bpr	up to 1.1.1.2
+external/mit/expat/dist/bcb5/expat.bpr		up to 1.1.1.2
+external/mit/expat/dist/bcb5/expat_static.bpr	up to 1.1.1.2
+external/mit/expat/dist/bcb5/expatw.bpr		up to 1.1.1.2
+external/mit/expat/dist/bcb5/expatw_static.bpr	up to 1.1.1.2
+external/mit/expat/dist/bcb5/outline.bpr	up to 1.1.1.2
+external/mit/expat/dist/bcb5/xmlwf.bpr		up to 1.1.1.2
+external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 up to 1.4
+external/mit/expat/dist/conftools/config.guess	up to 1.1.1.3
+external/mit/expat/dist/conftools/config.sub	up to 1.1.1.3
+external/mit/expat/dist/conftools/install-sh	up to 1.1.1.3
+external/mit/expat/dist/conftools/ltmain.sh	up to 1.1.1.3
+external/mit/expat/dist/conftools/mkinstalldirs	up to 1.4
+external/mit/expat/dist/doc/reference.html	up to 1.1.1.3
+external/mit/expat/dist/doc/xmlwf.1		up to 1.1.1.2
+external/mit/expat/dist/doc/xmlwf.sgml		up to 1.1.1.3
+external/mit/expat/dist/examples/elements.c	up to 1.1.1.2
+external/mit/expat/dist/lib/amigaconfig.h	up to 1.1.1.2
+external/mit/expat/dist/lib/expat.h		up to 1.1.1.3
+external/mit/expat/dist/lib/libexpat.def	up to 1.1.1.2
+external/mit/expat/dist/lib/libexpatw.def	up to 1.1.1.2
+external/mit/expat/dist/lib/xmlparse.c		up to 1.4
+external/mit/expat/dist/lib/xmltok.c		up to 1.1.1.2
+external/mit/expat/dist/lib/xmltok.h		up to 1.1.1.1
+external/mit/expat/dist/lib/xmltok_impl.c	up to 1.3
+external/mit/expat/dist/m4/libtool.m4		up to 1.1.1.2
+external/mit/expat/dist/m4/ltoptions.m4		up to 1.1.1.2
+external/mit/expat/dist/m4/ltversion.m4		up to 1.1.1.2
+external/mit/expat/dist/tests/chardata.c	up to 1.1.1.2
+external/mit/expat/dist/tests/benchmark/README.txt up to 1.1.1.2
+external/mit/expat/dist/win32/expat.iss		up to 1.1.1.3
+external/mit/expat/dist/xmlwf/unixfilemap.c	up to 1.1.1.2
+external/mit/expat/dist/xmlwf/xmlwf.c		up to 1.1.1.3
+external/mit/expat/lib/libexpat/Makefile	up to 1.2
+external/mit/expat/lib/libexpat/expat.pc.in	up to 1.1
+external/mit/expat/lib/libexpat/expat_config.h	up to 1.3
+external/mit/expat/lib/libexpat/shlib_version	up to 1.3
+
+	Update expat to 2.1.1.  Apply fixes for CVE-2016-0718.
+	[spz, ticket #1169]
+

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:51:39 UTC 2016

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

Log Message:
1168


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.89 src/doc/CHANGES-7.1:1.1.2.90
--- src/doc/CHANGES-7.1:1.1.2.89	Sun May 15 09:09:13 2016
+++ src/doc/CHANGES-7.1	Tue May 17 18:51:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.89 2016/05/15 09:09:13 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.90 2016/05/17 18:51:39 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4661,7 +4661,6 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p7.
 	[snj, ticket #1166]
 
-
 sys/net80211/ieee80211_input.c			1.83-1.84
 
 	Don't check sequence number on multicast packets in station mode.
@@ -4670,4 +4669,11 @@ sys/net80211/ieee80211_input.c			1.83-1.
 	interface is in promiscous mode or doesn't filter packets itself.
 	[mlelstv, ticket #1167]
 
+crypto/external/bsd/openssh/dist/session.c	1.19
+
+	If PAM is configured to read user-specified environment variables
+	and UseLogin=yes in sshd_config, then a hostile local user may
+	attack /bin/login via LD_PRELOAD or similar environment variables
+	set via PAM.  CVE-2015-8325.
+	[christos, ticket #1168]
 

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 17 18:50:35 UTC 2016

Modified Files:
src/crypto/external/bsd/openssh/dist [netbsd-7]: session.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1168):
crypto/external/bsd/openssh/dist/session.c: revision 1.19
If PAM is configured to read user-specified environment variables
and UseLogin=yes in sshd_config, then a hostile local user may
attack /bin/login via LD_PRELOAD or similar environment variables
set via PAM.
CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
https://anongit.mindrot.org/openssh.git/commit/?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/crypto/external/bsd/openssh/dist/session.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/session.c
diff -u src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/session.c:1.12.4.2
--- src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/session.c	Tue May 17 18:50:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: session.c,v 1.12.4.2 2016/05/17 18:50:34 snj Exp $	*/
 /* $OpenBSD: session.c,v 1.277 2015/01/16 06:40:12 deraadt Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $");
+__RCSID("$NetBSD: session.c,v 1.12.4.2 2016/05/17 18:50:34 snj Exp $");
 #include 
 #include 
 #include 
@@ -1223,7 +1223,7 @@ do_setup_env(Session *s, const char *she
 	 * Pull in any environment variables that may have
 	 * been set by PAM.
 	 */
-	if (options.use_pam) {
+	if (options.use_pam && !options.use_login) {
 		char **p;
 
 		p = fetch_pam_child_environment();

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun May 15 09:09:13 UTC 2016

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

Log Message:
Ticket #1167


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.88 src/doc/CHANGES-7.1:1.1.2.89
--- src/doc/CHANGES-7.1:1.1.2.88	Thu May 12 08:49:49 2016
+++ src/doc/CHANGES-7.1	Sun May 15 09:09:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.88 2016/05/12 08:49:49 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.89 2016/05/15 09:09:13 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4662,3 +4662,12 @@ external/bsd/ntp/scripts/mkver  
 	[snj, ticket #1166]
 
 
+sys/net80211/ieee80211_input.c			1.83-1.84
+
+	Don't check sequence number on multicast packets in station mode.
+	Handle overflow of 12bit sequence number.
+	In station mode filter packets that or not for us in case the
+	interface is in promiscous mode or doesn't filter packets itself.
+	[mlelstv, ticket #1167]
+
+

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun May 15 09:07:57 UTC 2016

Modified Files:
src/sys/net80211 [netbsd-7]: ieee80211_input.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1167):
sys/net80211/ieee80211_input.c: revision 1.83-1.84
Don't check sequence number on multicast packets in station mode.
Handle overflow of 12bit sequence number.
In station mode filter packets that or not for us in case the
interface is in promiscous mode or doesn't filter packets itself.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.77.4.1 src/sys/net80211/ieee80211_input.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/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.77 src/sys/net80211/ieee80211_input.c:1.77.4.1
--- src/sys/net80211/ieee80211_input.c:1.77	Fri Sep 13 20:19:53 2013
+++ src/sys/net80211/ieee80211_input.c	Sun May 15 09:07:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_input.c,v 1.77 2013/09/13 20:19:53 joerg Exp $	*/
+/*	$NetBSD: ieee80211_input.c,v 1.77.4.1 2016/05/15 09:07:57 martin Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.77 2013/09/13 20:19:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.77.4.1 2016/05/15 09:07:57 martin Exp $");
 #endif
 
 #include "opt_inet.h"
@@ -224,6 +224,18 @@ ieee80211_input(struct ieee80211com *ic,
 ic->ic_stats.is_rx_wrongbss++;
 goto out;
 			}
+
+			/* Filter out packets not directed to us in case the
+			 * device is in promiscous mode
+			 */
+			if ((! IEEE80211_IS_MULTICAST(wh->i_addr1))
+			&& (! IEEE80211_ADDR_EQ(wh->i_addr1, ic->ic_myaddr))) {
+IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT,
+bssid, NULL, "not to cur sta: lladdr=%6D, addr1=%6D",
+ic->ic_myaddr, ":", wh->i_addr1, ":");
+ic->ic_stats.is_rx_wrongbss++;
+goto out;
+			}
 			break;
 		case IEEE80211_M_IBSS:
 		case IEEE80211_M_AHDEMO:
@@ -280,8 +292,11 @@ ieee80211_input(struct ieee80211com *ic,
 		}
 		ni->ni_rssi = rssi;
 		ni->ni_rstamp = rstamp;
-		if (HAS_SEQ(type)) {
-			u_int8_t tid;
+		if (HAS_SEQ(type) && (ic->ic_opmode != IEEE80211_M_STA ||
+		!IEEE80211_IS_MULTICAST(wh->i_addr1))) {
+			u_int8_t tid, retry;
+			u_int16_t rxno, orxno;
+
 			if (ieee80211_has_qos(wh)) {
 tid = ((struct ieee80211_qosframe *)wh)->
 	i_qos[0] & IEEE80211_QOS_TID;
@@ -291,15 +306,20 @@ ieee80211_input(struct ieee80211com *ic,
 			} else
 tid = 0;
 			rxseq = le16toh(*(u_int16_t *)wh->i_seq);
-			if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) &&
-			SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) {
+			retry = wh->i_fc[1] & IEEE80211_FC1_RETRY;
+			rxno = rxseq >> IEEE80211_SEQ_SEQ_SHIFT;
+			orxno = ni->ni_rxseqs[tid] >> IEEE80211_SEQ_SEQ_SHIFT;
+			if (retry && (
+			(orxno == 4095 && rxno == orxno) ||
+			(orxno != 4095 &&
+			 SEQ_LEQ(rxseq, ni->ni_rxseqs[tid]))
+			)) {
 /* duplicate, discard */
 IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT,
 bssid, "duplicate",
 "seqno <%u,%u> fragno <%u,%u> tid %u",
-rxseq >> IEEE80211_SEQ_SEQ_SHIFT,
-ni->ni_rxseqs[tid] >>
-	IEEE80211_SEQ_SEQ_SHIFT,
+rxno,
+orxno,
 rxseq & IEEE80211_SEQ_FRAG_MASK,
 ni->ni_rxseqs[tid] &
 	IEEE80211_SEQ_FRAG_MASK,

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May 12 08:49:49 UTC 2016

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

Log Message:
Ammend #1160


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.87 src/doc/CHANGES-7.1:1.1.2.88
--- src/doc/CHANGES-7.1:1.1.2.87	Wed May 11 11:37:24 2016
+++ src/doc/CHANGES-7.1	Thu May 12 08:49:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.87 2016/05/11 11:37:24 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.88 2016/05/12 08:49:49 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4239,6 +4239,70 @@ sys/fs/tmpfs/tmpfs_vnops.c			1.124, 1.12
 	[joerg, ticket #1163]
 
 external/gpl3/gcc.old/dist/gcc/config.gcc	1.5 (via patch)
+external/gpl3/gcc/usr.bin/gcc/arch/arm/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/arm/defs.mk			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/arm/gtyp-input.list		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/arm/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/armeb/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/armeb/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/armeb/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/armeb/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earm/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earm/gtyp-input.list		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmeb/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmeb/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhf/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/configargs.h	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/configargs.h	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/tm.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/configargs.h	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/tm.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/configargs.h	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/tm.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/configargs.h	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/tm.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7/configargs.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7/tm.h			(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/configargs.h	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/tm.h		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/configargs.h	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/defs.mk		(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/gtyp-input.list	(mknative)
+external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/tm.h		(mknative)

CVS commit: [netbsd-7] src/usr.bin/config

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed May 11 11:21:18 UTC 2016

Modified Files:
src/usr.bin/config [netbsd-7]: config.5 gram.y sem.c

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1164):
usr.bin/config/sem.c: revision 1.74
usr.bin/config/config.5: revision 1.35
usr.bin/config/gram.y: revision 1.53
Extend syntax of config phrase, a quoted string instead of a device name
is passed as root specification string. This can be used to specify a
wedge by name.


To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/usr.bin/config/config.5
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/usr.bin/config/gram.y
cvs rdiff -u -r1.43.2.1 -r1.43.2.2 src/usr.bin/config/sem.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/config/config.5
diff -u src/usr.bin/config/config.5:1.24.2.1 src/usr.bin/config/config.5:1.24.2.2
--- src/usr.bin/config/config.5:1.24.2.1	Fri Mar  6 21:00:23 2015
+++ src/usr.bin/config/config.5	Wed May 11 11:21:18 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: config.5,v 1.24.2.1 2015/03/06 21:00:23 snj Exp $
+.\" $NetBSD: config.5,v 1.24.2.2 2016/05/11 11:21:18 martin Exp $
 .\"
 .\"  Copyright (c) 2006, 2007 The NetBSD Foundation.
 .\"  All rights reserved.
@@ -638,6 +638,12 @@ and
 parameters can be wildcarded with
 .Dq \&?
 to let the kernel automatically discover those values.
+The
+.Ar device
+can also be specified as a quoted specification string.
+The kernel interprets this string like the console input
+when prompting for a root device. E.g. "wedge:NAME"
+specifies a named disk wedge.
 .Pp
 At least one
 .Ic config

Index: src/usr.bin/config/gram.y
diff -u src/usr.bin/config/gram.y:1.39.2.1 src/usr.bin/config/gram.y:1.39.2.2
--- src/usr.bin/config/gram.y:1.39.2.1	Fri Mar  6 21:00:23 2015
+++ src/usr.bin/config/gram.y	Wed May 11 11:21:18 2016
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: gram.y,v 1.39.2.1 2015/03/06 21:00:23 snj Exp $	*/
+/*	$NetBSD: gram.y,v 1.39.2.2 2016/05/11 11:21:18 martin Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: gram.y,v 1.39.2.1 2015/03/06 21:00:23 snj Exp $");
+__RCSID("$NetBSD: gram.y,v 1.39.2.2 2016/05/11 11:21:18 martin Exp $");
 
 #include 
 #include 
@@ -103,6 +103,7 @@ DECL_ALLOCWRAP(condexpr);
 #define	new_nx(n, x)	new0(n, NULL, NULL, 0, x)
 #define	new_ns(n, s)	new0(n, s, NULL, 0, NULL)
 #define	new_si(s, i)	new0(NULL, s, NULL, i, NULL)
+#define	new_spi(s, p, i)	new0(NULL, s, p, i, NULL)
 #define	new_nsi(n,s,i)	new0(n, s, NULL, i, NULL)
 #define	new_np(n, p)	new0(n, NULL, p, 0, NULL)
 #define	new_s(s)	new0(NULL, s, NULL, 0, NULL)
@@ -899,9 +900,14 @@ root_spec:
 
 /* device for root fs or dump */
 dev_spec:
-	  '?'{ $$ = new_si(intern("?"),
+	  '?'{ $$ = new_spi(intern("?"),
+	NULL,
 	(long long)NODEV); }
-	| WORD{ $$ = new_si($1,
+	| QSTRING			{ $$ = new_spi($1,
+	__UNCONST("spec"),
+	(long long)NODEV); }
+	| WORD{ $$ = new_spi($1,
+	NULL,
 	(long long)NODEV); }
 	| major_minor			{ $$ = new_si(NULL, $1); }
 ;

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.43.2.1 src/usr.bin/config/sem.c:1.43.2.2
--- src/usr.bin/config/sem.c:1.43.2.1	Fri Mar  6 21:00:23 2015
+++ src/usr.bin/config/sem.c	Wed May 11 11:21:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.43.2.1 2015/03/06 21:00:23 snj Exp $	*/
+/*	$NetBSD: sem.c,v 1.43.2.2 2016/05/11 11:21:18 martin Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: sem.c,v 1.43.2.1 2015/03/06 21:00:23 snj Exp $");
+__RCSID("$NetBSD: sem.c,v 1.43.2.2 2016/05/11 11:21:18 martin Exp $");
 
 #include 
 #include 
@@ -928,6 +928,12 @@ resolve(struct nvlist **nvp, const char 
 		 */
 		return (0);
 
+	if (nv->nv_ptr != NULL && strcmp(nv->nv_ptr, "spec") == 0)
+		/*
+		 * spec string, interpreted by kernel
+		 */
+		return (0);
+
 	/*
 	 * The normal case: things like "ra2b".  Check for partition
 	 * suffix, remove it if there, and split into name ("ra") and

CVS commit: [netbsd-7] src/external/gpl3/gcc/dist/gcc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed May 11 11:08:14 UTC 2016

Modified Files:
src/external/gpl3/gcc/dist/gcc [netbsd-7]: config.gcc

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1160):
external/gpl3/gcc.old/dist/gcc/config.gcc: revision 1.5
Re-order includes so that ARM_TARGET2_DWARF_FORMAT takes effect
Fixes PR/51066: C++ text relocations


To generate a diff of this commit:
cvs rdiff -u -r1.26.2.4 -r1.26.2.5 src/external/gpl3/gcc/dist/gcc/config.gcc

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.26.2.4 src/external/gpl3/gcc/dist/gcc/config.gcc:1.26.2.5
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.26.2.4	Sat Oct 31 21:35:15 2015
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Wed May 11 11:08:14 2016
@@ -889,7 +889,7 @@ arm-wrs-vxworks)
 	;;
 arm*-*-netbsdelf*)
 	tmake_file="${tmake_file} arm/t-arm"
-	tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h arm/aout.h arm/arm.h"
+	tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h"
 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 	case ${target} in
 	arm*eb-*) tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" ;;
@@ -910,6 +910,7 @@ arm*-*-netbsdelf*)
 	tmake_file="$tmake_file arm/t-netbsd"
 	;;
 	esac
+	tm_file="${tm_file} arm/aout.h arm/arm.h"
 	case ${target} in
 	arm*-*-netbsdelf-*eabihf*)
 	tm_defines="${tm_defines} TARGET_DEFAULT_FLOAT_ABI=ARM_FLOAT_ABI_HARD"

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 10 19:04:37 UTC 2016

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

Log Message:
amend 1163


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.84 src/doc/CHANGES-7.1:1.1.2.85
--- src/doc/CHANGES-7.1:1.1.2.84	Mon May  9 19:50:05 2016
+++ src/doc/CHANGES-7.1	Tue May 10 19:04:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.84 2016/05/09 19:50:05 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.85 2016/05/10 19:04:36 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4230,7 +4230,7 @@ sys/rump/librump/rumpkern/rump.c		1.329
 	[joerg, ticket #1162]
 
 sys/fs/tmpfs/tmpfs_vfsops.c			1.66, 1.67
-sys/fs/tmpfs/tmpfs_vnops.c			1.124
+sys/fs/tmpfs/tmpfs_vnops.c			1.124, 1.125
 
 	Only recheck size/node limits on update mounts if they
 	actually have been specified.

CVS commit: [netbsd-7] src/sys/fs/tmpfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue May 10 19:04:15 UTC 2016

Modified Files:
src/sys/fs/tmpfs [netbsd-7]: tmpfs_vnops.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1163):
sys/fs/tmpfs/tmpfs_vnops.c: revision 1.125
do not access uninitialized variables in KASSERTs - fixes build


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.2 -r1.120.2.3 src/sys/fs/tmpfs/tmpfs_vnops.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/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.2 src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.3
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.2	Mon May  9 19:45:00 2016
+++ src/sys/fs/tmpfs/tmpfs_vnops.c	Tue May 10 19:04:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: tmpfs_vnops.c,v 1.120.2.2 2016/05/09 19:45:00 snj Exp $	*/
+/*	$NetBSD: tmpfs_vnops.c,v 1.120.2.3 2016/05/10 19:04:15 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.120.2.2 2016/05/09 19:45:00 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.120.2.3 2016/05/10 19:04:15 snj Exp $");
 
 #include 
 #include 
@@ -589,14 +589,14 @@ tmpfs_write(void *v)
 
 	KASSERT(VOP_ISLOCKED(vp));
 
+	node = VP_TO_TMPFS_NODE(vp);
+	oldsize = node->tn_size;
+
 	if ((vp->v_mount->mnt_flag & MNT_RDONLY) != 0) {
 		error = EROFS;
 		goto out;
 	}
 
-	node = VP_TO_TMPFS_NODE(vp);
-	oldsize = node->tn_size;
-
 	if (uio->uio_offset < 0 || vp->v_type != VREG) {
 		error = EINVAL;
 		goto out;

CVS commit: [netbsd-7] src/lib/libc/stdlib

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue May 10 09:10:11 UTC 2016

Modified Files:
src/lib/libc/stdlib [netbsd-7]: jemalloc.c

Log Message:
Fix merge botch for #1161


To generate a diff of this commit:
cvs rdiff -u -r1.34.2.2 -r1.34.2.3 src/lib/libc/stdlib/jemalloc.c

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

Modified files:

Index: src/lib/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.34.2.2 src/lib/libc/stdlib/jemalloc.c:1.34.2.3
--- src/lib/libc/stdlib/jemalloc.c:1.34.2.2	Mon May  9 19:34:50 2016
+++ src/lib/libc/stdlib/jemalloc.c	Tue May 10 09:10:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: jemalloc.c,v 1.34.2.2 2016/05/09 19:34:50 snj Exp $	*/
+/*	$NetBSD: jemalloc.c,v 1.34.2.3 2016/05/10 09:10:11 martin Exp $	*/
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans .
@@ -118,7 +118,7 @@
 
 #include 
 /* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.34.2.2 2016/05/09 19:34:50 snj Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.34.2.3 2016/05/10 09:10:11 martin Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -1651,6 +1651,11 @@ arena_chunk_comp(arena_chunk_t *a, arena
 	assert(a != NULL);
 	assert(b != NULL);
 
+	if (a->max_frun_npages < b->max_frun_npages)
+		return -1;
+	if (a->max_frun_npages > b->max_frun_npages)
+		return 1;
+
 	if ((uintptr_t)a < (uintptr_t)b)
 		return (-1);
 	else if (a == b)
@@ -1671,11 +1676,6 @@ arena_run_comp(arena_run_t *a, arena_run
 	assert(a != NULL);
 	assert(b != NULL);
 
-	if (a->max_frun_npages < b->max_frun_npages)
-		return -1;
-	if (a->max_frun_npages > b->max_frun_npages)
-		return 1;
-
 	if ((uintptr_t)a < (uintptr_t)b)
 		return (-1);
 	else if (a == b)

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon May  9 19:50:05 UTC 2016

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

Log Message:
1161-1163


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.83 src/doc/CHANGES-7.1:1.1.2.84
--- src/doc/CHANGES-7.1:1.1.2.83	Wed May  4 22:52:13 2016
+++ src/doc/CHANGES-7.1	Mon May  9 19:50:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.83 2016/05/04 22:52:13 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.84 2016/05/09 19:50:05 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -4214,3 +4214,27 @@ doc/3RDPARTY	patch
 	Update OpenSSL to 1.0.1t.
 	[spz, ticket #1165]
 
+lib/libc/stdlib/jemalloc.c			1.40
+
+	PR lib/50791: Instead of using sorting the arena chunks by
+	address only, sort by size of the longest run and address
+	as tie break.  Avoids long linear searches for code heavy
+	on medium sized allocations.
+	[joerg, ticket #1161]
+
+sys/rump/librump/rumpkern/rump.c		1.329
+
+	Align the message buffer. The kernel routines normally are
+	used only with page aligned buffers and they assume at least
+	pointer alignment. Be defensive here and align to 256 Bytes.
+	[joerg, ticket #1162]
+
+sys/fs/tmpfs/tmpfs_vfsops.c			1.66, 1.67
+sys/fs/tmpfs/tmpfs_vnops.c			1.124
+
+	Only recheck size/node limits on update mounts if they
+	actually have been specified.
+
+	Implement most of mount -ur functionality for tmpfs.
+	[joerg, ticket #1163]
+

CVS commit: [netbsd-7] src/sys/fs/tmpfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon May  9 19:45:00 UTC 2016

Modified Files:
src/sys/fs/tmpfs [netbsd-7]: tmpfs_vfsops.c tmpfs_vnops.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1163):
sys/fs/tmpfs/tmpfs_vfsops.c: revision 1.66, 1.67
sys/fs/tmpfs/tmpfs_vnops.c: revision 1.124
Only recheck size/node limits on update mounts, if there actually have
been specified.
--
Implement most of mount -ur functionality for tmpfs. Remaining issue is
the question who is responsible for syncing pending writes, but the
functionality is good enough for serving as read-only chroot base in
bulk builds.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/fs/tmpfs/tmpfs_vfsops.c
cvs rdiff -u -r1.120.2.1 -r1.120.2.2 src/sys/fs/tmpfs/tmpfs_vnops.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/fs/tmpfs/tmpfs_vfsops.c
diff -u src/sys/fs/tmpfs/tmpfs_vfsops.c:1.63 src/sys/fs/tmpfs/tmpfs_vfsops.c:1.63.2.1
--- src/sys/fs/tmpfs/tmpfs_vfsops.c:1.63	Tue Jun 10 16:10:59 2014
+++ src/sys/fs/tmpfs/tmpfs_vfsops.c	Mon May  9 19:45:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: tmpfs_vfsops.c,v 1.63 2014/06/10 16:10:59 martin Exp $	*/
+/*	$NetBSD: tmpfs_vfsops.c,v 1.63.2.1 2016/05/09 19:45:00 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.63 2014/06/10 16:10:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vfsops.c,v 1.63.2.1 2016/05/09 19:45:00 snj Exp $");
 
 #include 
 #include 
@@ -102,6 +102,8 @@ tmpfs_mount(struct mount *mp, const char
 	uint64_t memlimit;
 	ino_t nodes;
 	int error;
+	bool set_memlimit;
+	bool set_nodes;
 
 	if (args == NULL)
 		return EINVAL;
@@ -146,26 +148,33 @@ tmpfs_mount(struct mount *mp, const char
 	/* Get the memory usage limit for this file-system. */
 	if (args->ta_size_max < PAGE_SIZE) {
 		memlimit = UINT64_MAX;
+		set_memlimit = false;
 	} else {
 		memlimit = args->ta_size_max;
+		set_memlimit = true;
 	}
 	KASSERT(memlimit > 0);
 
 	if (args->ta_nodes_max <= 3) {
 		nodes = 3 + (memlimit / 1024);
+		set_nodes = false;
 	} else {
 		nodes = args->ta_nodes_max;
+		set_nodes = true;
 	}
 	nodes = MIN(nodes, INT_MAX);
 	KASSERT(nodes >= 3);
 
 	if (mp->mnt_flag & MNT_UPDATE) {
 		tmp = VFS_TO_TMPFS(mp);
-		if (nodes < tmp->tm_nodes_cnt)
+		if (set_nodes && nodes < tmp->tm_nodes_cnt)
 			return EBUSY;
-		if ((error = tmpfs_mntmem_set(tmp, memlimit)) != 0)
-			return error;
-		tmp->tm_nodes_max = nodes;
+		if (set_memlimit) {
+			if ((error = tmpfs_mntmem_set(tmp, memlimit)) != 0)
+return error;
+		}
+		if (set_nodes)
+			tmp->tm_nodes_max = nodes;
 		root = tmp->tm_root;
 		root->tn_uid = args->ta_root_uid;
 		root->tn_gid = args->ta_root_gid;
@@ -205,7 +214,7 @@ tmpfs_mount(struct mount *mp, const char
 	mp->mnt_stat.f_namemax = TMPFS_MAXNAMLEN;
 	mp->mnt_fs_bshift = PAGE_SHIFT;
 	mp->mnt_dev_bshift = DEV_BSHIFT;
-	mp->mnt_iflag |= IMNT_MPSAFE;
+	mp->mnt_iflag |= IMNT_MPSAFE | IMNT_CAN_RWTORO;
 	vfs_getnewfsid(mp);
 
 	error = set_statvfs_info(path, UIO_USERSPACE, "tmpfs", UIO_SYSSPACE,

Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.1 src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.2
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.1	Mon Dec 22 02:05:08 2014
+++ src/sys/fs/tmpfs/tmpfs_vnops.c	Mon May  9 19:45:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: tmpfs_vnops.c,v 1.120.2.1 2014/12/22 02:05:08 msaitoh Exp $	*/
+/*	$NetBSD: tmpfs_vnops.c,v 1.120.2.2 2016/05/09 19:45:00 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.120.2.1 2014/12/22 02:05:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.120.2.2 2016/05/09 19:45:00 snj Exp $");
 
 #include 
 #include 
@@ -589,6 +589,11 @@ tmpfs_write(void *v)
 
 	KASSERT(VOP_ISLOCKED(vp));
 
+	if ((vp->v_mount->mnt_flag & MNT_RDONLY) != 0) {
+		error = EROFS;
+		goto out;
+	}
+
 	node = VP_TO_TMPFS_NODE(vp);
 	oldsize = node->tn_size;
 
@@ -1267,6 +1272,11 @@ tmpfs_putpages(void *v)
 		return 0;
 	}
 
+	if ((vp->v_mount->mnt_flag & MNT_RDONLY) != 0) {
+		mutex_exit(vp->v_interlock);
+		return EROFS;
+	}
+
 	node = VP_TO_TMPFS_NODE(vp);
 	uobj = node->tn_spec.tn_reg.tn_aobj;
 

CVS commit: [netbsd-7] src/sys/rump/librump/rumpkern

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon May  9 19:40:44 UTC 2016

Modified Files:
src/sys/rump/librump/rumpkern [netbsd-7]: rump.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1162):
sys/rump/librump/rumpkern/rump.c: revision 1.329
Align the message buffer. The kernel routines normally are used only
with page aligned buffers and they assume at least pointer alignment. Be
defensive here and align to 256 Bytes.


To generate a diff of this commit:
cvs rdiff -u -r1.308.2.3 -r1.308.2.4 src/sys/rump/librump/rumpkern/rump.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/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.308.2.3 src/sys/rump/librump/rumpkern/rump.c:1.308.2.4
--- src/sys/rump/librump/rumpkern/rump.c:1.308.2.3	Wed Mar 25 16:54:37 2015
+++ src/sys/rump/librump/rumpkern/rump.c	Mon May  9 19:40:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rump.c,v 1.308.2.3 2015/03/25 16:54:37 snj Exp $	*/
+/*	$NetBSD: rump.c,v 1.308.2.4 2016/05/09 19:40:44 snj Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.308.2.3 2015/03/25 16:54:37 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.308.2.4 2016/05/09 19:40:44 snj Exp $");
 
 #include 
 #define ELFSIZE ARCH_ELFSIZE
@@ -109,7 +109,8 @@ static void rump_hyp_execnotify(const ch
 static void rump_component_addlocal(void);
 static struct lwp *bootlwp;
 
-static char rump_msgbuf[16*1024]; /* 16k should be enough for std rump needs */
+/* 16k should be enough for std rump needs */
+static  char rump_msgbuf[16*1024] __aligned(256);
 
 bool rump_ttycomponent = false;
 

CVS commit: [netbsd-7] src/lib/libc/stdlib

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon May  9 19:34:50 UTC 2016

Modified Files:
src/lib/libc/stdlib [netbsd-7]: jemalloc.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #1161):
lib/libc/stdlib/jemalloc.c: revision 1.40
lib/50791: Instead of using sorting the arena chunks by address only,
sort by size of the longest run and address as tie break. Avoids long
linear searches for code heavy on medium sized allocations.


To generate a diff of this commit:
cvs rdiff -u -r1.34.2.1 -r1.34.2.2 src/lib/libc/stdlib/jemalloc.c

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

Modified files:

Index: src/lib/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.34.2.1 src/lib/libc/stdlib/jemalloc.c:1.34.2.2
--- src/lib/libc/stdlib/jemalloc.c:1.34.2.1	Tue Nov 24 17:37:16 2015
+++ src/lib/libc/stdlib/jemalloc.c	Mon May  9 19:34:50 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: jemalloc.c,v 1.34.2.1 2015/11/24 17:37:16 martin Exp $	*/
+/*	$NetBSD: jemalloc.c,v 1.34.2.2 2016/05/09 19:34:50 snj Exp $	*/
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans .
@@ -118,7 +118,7 @@
 
 #include 
 /* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.34.2.1 2015/11/24 17:37:16 martin Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.34.2.2 2016/05/09 19:34:50 snj Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -1671,6 +1671,11 @@ arena_run_comp(arena_run_t *a, arena_run
 	assert(a != NULL);
 	assert(b != NULL);
 
+	if (a->max_frun_npages < b->max_frun_npages)
+		return -1;
+	if (a->max_frun_npages > b->max_frun_npages)
+		return 1;
+
 	if ((uintptr_t)a < (uintptr_t)b)
 		return (-1);
 	else if (a == b)
@@ -1902,9 +1907,6 @@ arena_chunk_alloc(arena_t *arena)
 
 		chunk->arena = arena;
 
-		/* LINTED */
-		RB_INSERT(arena_chunk_tree_s, >chunks, chunk);
-
 		/*
 		 * Claim that no pages are in use, since the header is merely
 		 * overhead.
@@ -1924,6 +1926,8 @@ arena_chunk_alloc(arena_t *arena)
 		chunk->map[chunk_npages - 1].npages = chunk_npages -
 		arena_chunk_header_npages;
 		chunk->map[chunk_npages - 1].pos = POS_FREE;
+
+		RB_INSERT(arena_chunk_tree_s, >chunks, chunk);
 	}
 
 	return (chunk);
@@ -1960,30 +1964,44 @@ arena_chunk_dealloc(arena_t *arena, aren
 static arena_run_t *
 arena_run_alloc(arena_t *arena, size_t size)
 {
-	arena_chunk_t *chunk;
+	arena_chunk_t *chunk, *chunk_tmp;
 	arena_run_t *run;
-	unsigned need_npages, limit_pages, compl_need_npages;
+	unsigned need_npages;
 
 	assert(size <= (chunksize - (arena_chunk_header_npages <<
 	pagesize_2pow)));
 	assert((size & pagesize_mask) == 0);
 
 	/*
-	 * Search through arena's chunks in address order for a free run that is
-	 * large enough.  Look for the first fit.
+	 * Search through the arena chunk tree for a large enough free run.
+	 * Tree order ensures that any exact fit is picked immediately or
+	 * otherwise the lowest address of the next size.
 	 */
 	need_npages = (unsigned)(size >> pagesize_2pow);
-	limit_pages = chunk_npages - arena_chunk_header_npages;
-	compl_need_npages = limit_pages - need_npages;
 	/* LINTED */
-	RB_FOREACH(chunk, arena_chunk_tree_s, >chunks) {
+	for (;;) {
+		chunk_tmp = RB_ROOT(>chunks);
+		chunk = NULL;
+		while (chunk_tmp) {
+			if (chunk_tmp->max_frun_npages == need_npages) {
+chunk = chunk_tmp;
+break;
+			}
+			if (chunk_tmp->max_frun_npages < need_npages) {
+chunk_tmp = RB_RIGHT(chunk_tmp, link);
+continue;
+			}
+			chunk = chunk_tmp;
+			chunk_tmp = RB_LEFT(chunk, link);
+		}
+		if (chunk == NULL)
+			break;
 		/*
-		 * Avoid searching this chunk if there are not enough
-		 * contiguous free pages for there to possibly be a large
-		 * enough free run.
+		 * At this point, the chunk must have a cached run size large
+		 * enough to fit the allocation.
 		 */
-		if (chunk->pages_used <= compl_need_npages &&
-		need_npages <= chunk->max_frun_npages) {
+		assert(need_npages <= chunk->max_frun_npages);
+		{
 			arena_chunk_map_t *mapelm;
 			unsigned i;
 			unsigned max_frun_npages = 0;
@@ -2021,7 +2039,9 @@ arena_run_alloc(arena_t *arena, size_t s
 			 * chunk->min_frun_ind was already reset above (if
 			 * necessary).
 			 */
+			RB_REMOVE(arena_chunk_tree_s, >chunks, chunk);
 			chunk->max_frun_npages = max_frun_npages;
+			RB_INSERT(arena_chunk_tree_s, >chunks, chunk);
 		}
 	}
 
@@ -2104,8 +2124,11 @@ arena_run_dalloc(arena_t *arena, arena_r
 		assert(chunk->map[run_ind + run_pages - 1].pos == POS_FREE);
 	}
 
-	if (chunk->map[run_ind].npages > chunk->max_frun_npages)
+	if (chunk->map[run_ind].npages > chunk->max_frun_npages) {
+		RB_REMOVE(arena_chunk_tree_s, >chunks, chunk);
 		chunk->max_frun_npages = chunk->map[run_ind].npages;
+		RB_INSERT(arena_chunk_tree_s, >chunks, chunk);
+	}
 	if (run_ind < chunk->min_frun_ind)
 		chunk->min_frun_ind = run_ind;
 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Wed May  4 22:52:13 UTC 2016

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

Log Message:
1165


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.82 src/doc/CHANGES-7.1:1.1.2.83
--- src/doc/CHANGES-7.1:1.1.2.82	Fri Apr 29 19:17:22 2016
+++ src/doc/CHANGES-7.1	Wed May  4 22:52:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.82 2016/04/29 19:17:22 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.83 2016/05/04 22:52:13 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3821,3 +3821,396 @@ sys/miscfs/specfs/spec_vnops.c			1.161, 
 PR kern/50467.
 	[hannken, ticket #1154]
 
+crypto/external/bsd/openssl/dist/CHANGES	up to 1.11
+crypto/external/bsd/openssl/dist/Makefile	up to 1.12
+crypto/external/bsd/openssl/dist/NEWS		up to 1.11
+crypto/external/bsd/openssl/dist/README		up to 1.11
+crypto/external/bsd/openssl/dist/openssl.spec	up to 1.11
+crypto/external/bsd/openssl/dist/apps/pkcs7.c	up to 1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/opensslv.h up to 1.20
+crypto/external/bsd/openssl/dist/crypto/asn1/a_bytes.c up to 1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c up to 1.4
+crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c up to 1.4
+crypto/external/bsd/openssl/dist/crypto/asn1/asn1_lib.c up to 1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/asn1/asn1_par.c up to 1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/asn1/t_x509.c up to 1.1.1.6
+crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c up to 1.5
+crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c up to 1.5
+crypto/external/bsd/openssl/dist/crypto/asn1/x_name.c up to 1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/asn1/x_x509.c up to 1.1.1.6
+crypto/external/bsd/openssl/dist/crypto/bn/asm/x86-mont.pl up to 1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont.pl up to 1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont5.pl up to 1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/comp/comp.h up to 1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/evp/Makefile up to 1.6
+crypto/external/bsd/openssl/dist/crypto/evp/digest.c up to 1.1.1.7
+crypto/external/bsd/openssl/dist/crypto/evp/e_aes_cbc_hmac_sha1.c up to 1.1.1.7
+crypto/external/bsd/openssl/dist/crypto/evp/encode.c up to 1.1.1.7
+crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c up to 1.5
+crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c up to 1.1.1.7
+crypto/external/bsd/openssl/dist/crypto/pem/pvkfmt.c up to 1.1.1.7
+crypto/external/bsd/openssl/dist/crypto/x509/x509.h up to 1.1.1.7
+crypto/external/bsd/openssl/dist/crypto/x509/x509_err.c up to 1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/x509/x509_obj.c up to 1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/ciphers.pod up to 1.1.1.7
+crypto/external/bsd/openssl/dist/doc/crypto/EVP_EncodeInit.pod up to 1.1.1.1
+crypto/external/bsd/openssl/dist/doc/crypto/evp.pod up to 1.1.1.2
+crypto/external/bsd/openssl/dist/ssl/d1_both.c	up to 1.8
+crypto/external/bsd/openssl/dist/ssl/s2_lib.c	up to 1.6
+crypto/external/bsd/openssl/dist/ssl/s2_meth.c	up to 1.1.1.3
+crypto/external/bsd/openssl/dist/ssl/s3_clnt.c	up to 1.18
+crypto/external/bsd/openssl/dist/ssl/s3_lib.c	up to 1.18
+crypto/external/bsd/openssl/dist/ssl/ssl.h	up to 1.15
+crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c	up to 1.11
+crypto/external/bsd/openssl/dist/ssl/ssl_locl.h	up to 1.13
+crypto/external/bsd/openssl/dist/ssl/t1_lib.c	up to 1.21
+crypto/external/bsd/openssl/dist/test/testfipsssl up to 1.1.1.2
+crypto/external/bsd/openssl/dist/util/libeay.num up to 1.1.1.10
+crypto/external/bsd/openssl/dist/util/mk1mf.pl	up to 1.8
+crypto/external/bsd/openssl/dist/util/mkdef.pl	up to 1.4
+crypto/external/bsd/openssl/dist/util/ssleay.num up to 1.4
+crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_ssl.3 up to 1.14
+crypto/external/bsd/openssl/lib/libcrypto/man/BIO_find_type.3 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:17:22 UTC 2016

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

Log Message:
1146-1148, 1152-1154


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.81 src/doc/CHANGES-7.1:1.1.2.82
--- src/doc/CHANGES-7.1:1.1.2.81	Sat Apr 16 21:00:49 2016
+++ src/doc/CHANGES-7.1	Fri Apr 29 19:17:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.81 2016/04/16 21:00:49 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.82 2016/04/29 19:17:22 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3783,3 +3783,41 @@ xsrc/external/mit/MesaLib/dist/src/mesa/
 	library is dlopen/dlclose'd !
 	[riastradh, ticket #1158]
 
+lib/libc/time/localtime.c			1.103 via patch
+
+	Use the correct upper bounds for the types array.  The correct
+	upper bound is typecnt not timecnt.  Now perpetual 'standard'
+	time zones will work correctly as they have a typecnt of 1
+	but a timecnt of 0.
+	[christos, ticket #1146]
+
+external/bsd/ipf/dist/man/ipf.5			1.5
+
+	Correct the example for the port range syntax.
+	[khorben, ticket #1147]
+
+sys/external/bsd/ipf/netinet/ip_nat.c		1.16
+
+	Fix matching of ICMP queries when NAT'd through IPF.  This
+	notably fixes MTU updates for hosts issueing ICMP queries
+	through a NAT performed by NetBSD with IPF.
+	[khorben, ticket #1148]
+
+sys/external/bsd/ipf/netinet/fil.c		1.17
+
+	Comment out the mutex calls that protect against concurrent
+	configuration changes and processing. This needs to be done
+	differently since you can't sleep during interrupt processing.
+	[christos, ticket #1152]
+
+usr.bin/ftp/fetch.c1.223
+
+	Use the port number for CONNECT.  PR bin/51043.
+	[nonaka, ticket #1153]
+
+sys/miscfs/specfs/spec_vnops.c			1.161, 1.162
+
+	Avoid a race with spec_revoke when extracting v_rdev.  Fixes
+PR kern/50467.
+	[hannken, ticket #1154]
+

CVS commit: [netbsd-7] src/sys/miscfs/specfs

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:07:21 UTC 2016

Modified Files:
src/sys/miscfs/specfs [netbsd-7]: spec_vnops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1154):
sys/miscfs/specfs/spec_vnops.c: revisions 1.161, 1.162
Whhen spec_strategy() extracts v_rdev take care to avoid a
race with spec_revoke.
Fixes PR kern/50467 Panic from disconnecting phone while reading its contents
--
Avoid a race with spec_revoke for the assertion too.
Final fix for PR kern/50467 Panic from disconnecting phone while reading
its contents


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.145.2.1 src/sys/miscfs/specfs/spec_vnops.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/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.145 src/sys/miscfs/specfs/spec_vnops.c:1.145.2.1
--- src/sys/miscfs/specfs/spec_vnops.c:1.145	Fri Jul 25 08:20:53 2014
+++ src/sys/miscfs/specfs/spec_vnops.c	Fri Apr 29 19:07:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $	*/
+/*	$NetBSD: spec_vnops.c,v 1.145.2.1 2016/04/29 19:07:21 snj Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.145 2014/07/25 08:20:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.145.2.1 2016/04/29 19:07:21 snj Exp $");
 
 #include 
 #include 
@@ -1051,26 +1051,44 @@ spec_strategy(void *v)
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	struct buf *bp = ap->a_bp;
+	dev_t dev;
 	int error;
 
-	KASSERT(vp == vp->v_specnode->sn_dev->sd_bdevvp);
+	dev = NODEV;
 
-	error = 0;
-	bp->b_dev = vp->v_rdev;
+	/*
+	 * Extract all the info we need from the vnode, taking care to
+	 * avoid a race with VOP_REVOKE().
+	 */
 
-	if (!(bp->b_flags & B_READ))
-		error = fscow_run(bp, false);
+	mutex_enter(vp->v_interlock);
+	if (vdead_check(vp, VDEAD_NOWAIT) == 0 && vp->v_specnode != NULL) {
+		KASSERT(vp == vp->v_specnode->sn_dev->sd_bdevvp);
+		dev = vp->v_rdev;
+	}
+	mutex_exit(vp->v_interlock);
 
-	if (error) {
-		bp->b_error = error;
-		bp->b_resid = bp->b_bcount;
-		biodone(bp);
-		return (error);
+	if (dev == NODEV) {
+		error = ENXIO;
+		goto out;
 	}
+	bp->b_dev = dev;
 
+	if (!(bp->b_flags & B_READ)) {
+		error = fscow_run(bp, false);
+		if (error)
+			goto out;
+	}
 	bdev_strategy(bp);
 
-	return (0);
+	return 0;
+
+out:
+	bp->b_error = error;
+	bp->b_resid = bp->b_bcount;
+	biodone(bp);
+
+	return error;
 }
 
 int

CVS commit: [netbsd-7] src/usr.bin/ftp

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:03:44 UTC 2016

Modified Files:
src/usr.bin/ftp [netbsd-7]: fetch.c

Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1153):
usr.bin/ftp/fetch.c: revision 1.223
PR/51043: Yorick Hardy: ftp(1) should use the port number for CONNECT


To generate a diff of this commit:
cvs rdiff -u -r1.205.4.3 -r1.205.4.4 src/usr.bin/ftp/fetch.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/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.205.4.3 src/usr.bin/ftp/fetch.c:1.205.4.4
--- src/usr.bin/ftp/fetch.c:1.205.4.3	Sun Mar 13 11:49:14 2016
+++ src/usr.bin/ftp/fetch.c	Fri Apr 29 19:03:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.205.4.3 2016/03/13 11:49:14 martin Exp $	*/
+/*	$NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.205.4.3 2016/03/13 11:49:14 martin Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.205.4.4 2016/04/29 19:03:44 snj Exp $");
 #endif /* not lint */
 
 /*
@@ -847,8 +847,8 @@ print_connect(FETCH *fin, const struct u
 	} else
 		h = ui->host;
 
-	fetch_printf(fin, "CONNECT %s:%s HTTP/1.1\r\n", h, ui->port);
-	fetch_printf(fin, "Host: %s:%s\r\n", h, ui->port);
+	fetch_printf(fin, "CONNECT %s:%d HTTP/1.1\r\n", h, ui->portnum);
+	fetch_printf(fin, "Host: %s:%d\r\n", h, ui->portnum);
 }
 #endif
 

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 19:00:40 UTC 2016

Modified Files:
src/sys/external/bsd/ipf/netinet [netbsd-7]: fil.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1152):
sys/external/bsd/ipf/netinet/fil.c: revision 1.17
Comment out the mutex calls that protect against concurrent configuration
changes and processing. This needs to be done differently since you can't
sleep during interrupt processing.


To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/sys/external/bsd/ipf/netinet/fil.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/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.1 src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.2
--- src/sys/external/bsd/ipf/netinet/fil.c:1.15.2.1	Fri Apr 10 20:26:46 2015
+++ src/sys/external/bsd/ipf/netinet/fil.c	Fri Apr 29 19:00:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fil.c,v 1.15.2.1 2015/04/10 20:26:46 snj Exp $	*/
+/*	$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.1 2015/04/10 20:26:46 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.15.2.2 2016/04/29 19:00:40 snj Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -2916,7 +2916,9 @@ ipf_check(void *ctx, ip_t *ip, int hlen,
 		LBUMPD(ipf_stats[out], fr_short);
 	}
 
+#if 0
 	READ_ENTER(>ipf_mutex);
+#endif
 
 	if (!out) {
 		switch (fin->fin_v)
@@ -3048,9 +3050,10 @@ filterdone:
 		fr->fr_ref++;
 		MUTEX_EXIT(>fr_lock);
 	}
-
+#if 0
 	RWLOCK_EXIT(>ipf_mutex);
 #endif
+#endif
 
 	if ((pass & FR_RETMASK) != 0) {
 		/*
@@ -3146,8 +3149,10 @@ filterdone:
 #endif
 	}
 #if !defined(FASTROUTE_RECURSION)
+#if 0
 	RWLOCK_EXIT(>ipf_mutex);
 #endif
+#endif
 
 finished:
 	if (!FR_ISPASS(pass)) {

CVS commit: [netbsd-7] src/external/bsd/ipf/dist/man

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:54:49 UTC 2016

Modified Files:
src/external/bsd/ipf/dist/man [netbsd-7]: ipf.5

Log Message:
Pull up following revision(s) (requested by khorben in ticket #1147):
external/bsd/ipf/dist/man/ipf.5: revision 1.5
Correct the example for the port range syntax


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 src/external/bsd/ipf/dist/man/ipf.5

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/ipf/dist/man/ipf.5
diff -u src/external/bsd/ipf/dist/man/ipf.5:1.3 src/external/bsd/ipf/dist/man/ipf.5:1.3.12.1
--- src/external/bsd/ipf/dist/man/ipf.5:1.3	Sun Jul 22 14:27:50 2012
+++ src/external/bsd/ipf/dist/man/ipf.5	Fri Apr 29 18:54:49 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipf.5,v 1.3 2012/07/22 14:27:50 darrenr Exp $
+.\"	$NetBSD: ipf.5,v 1.3.12.1 2016/04/29 18:54:49 snj Exp $
 .\"
 .TH IPF 5
 .SH NAME
@@ -356,7 +356,7 @@ block in proto tcp from any port >= 1024
 pass in proto tcp from 10.1.0.0/24 to any port = 22
 block out proto udp from any to 10.1.1.1 port = 135
 pass in proto udp from 1.1.1.1 port = 123 to 10.1.1.1 port = 123
-pass in proto tcp from 127.0.0.0/8 to any port = 6000:6009
+pass in proto tcp from 127.0.0.0/8 to any port 6000:6009
 .fi
 .PP
 If there is no desire to mention any specific source or destintion

CVS commit: [netbsd-7] src/lib/libc/time

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 29 18:53:11 UTC 2016

Modified Files:
src/lib/libc/time [netbsd-7]: localtime.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1146):
lib/libc/time/localtime.c: revision 1.103 via patch
Use the correct upper bounds for the types array.  The correct upper
bound is typecnt not timecnt.  Now perpetual 'standard' time zones
will work correctly as they have a typecnt of 1 but a timecnt of 0.


To generate a diff of this commit:
cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/lib/libc/time/localtime.c

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

Modified files:

Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.82.2.2 src/lib/libc/time/localtime.c:1.82.2.3
--- src/lib/libc/time/localtime.c:1.82.2.2	Sun Mar  6 18:01:48 2016
+++ src/lib/libc/time/localtime.c	Fri Apr 29 18:53:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: localtime.c,v 1.82.2.2 2016/03/06 18:01:48 martin Exp $	*/
+/*	$NetBSD: localtime.c,v 1.82.2.3 2016/04/29 18:53:11 snj Exp $	*/
 
 /*
 ** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
 #if 0
 static char	elsieid[] = "@(#)localtime.c	8.17";
 #else
-__RCSID("$NetBSD: localtime.c,v 1.82.2.2 2016/03/06 18:01:48 martin Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.82.2.3 2016/04/29 18:53:11 snj Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -255,7 +255,7 @@ const char *
 tzgetname(const timezone_t sp, int isdst)
 {
 	int i;
-	for (i = 0; i < sp->timecnt; ++i) {
+	for (i = 0; i < sp->typecnt; ++i) {
 		const struct ttinfo *const ttisp = >ttis[sp->types[i]];
 
 		if (ttisp->tt_isdst == isdst)

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Apr 16 21:00:49 UTC 2016

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

Log Message:
merge 1141 addition


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.80 src/doc/CHANGES-7.1:1.1.2.81
--- src/doc/CHANGES-7.1:1.1.2.80	Fri Apr 15 20:24:30 2016
+++ src/doc/CHANGES-7.1	Sat Apr 16 21:00:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.80 2016/04/15 20:24:30 mrg Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.81 2016/04/16 21:00:49 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3653,7 +3653,7 @@ libexec/httpd/auth-bozo.c			up to 1.18
 libexec/httpd/bozohttpd.8			up to 1.59
 libexec/httpd/bozohttpd.c			up to 1.80
 libexec/httpd/bozohttpd.h			up to 1.45
-libexec/httpd/cgi-bozo.c			up to 1.33
+libexec/httpd/cgi-bozo.c			up to 1.34
 libexec/httpd/content-bozo.c			up to 1.13
 libexec/httpd/daemon-bozo.c			up to 1.17
 libexec/httpd/dir-index-bozo.c			up to 1.25
@@ -3783,7 +3783,3 @@ xsrc/external/mit/MesaLib/dist/src/mesa/
 	library is dlopen/dlclose'd !
 	[riastradh, ticket #1158]
 
-libexec/httpd/cgi-bozo.c1.34
-
-	Fix the build: use %zu instead of %lu for size_t.
-	[mrg, ticket #1141]

CVS commit: [netbsd-7] src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Apr 15 20:24:30 UTC 2016

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1
src/libexec/httpd [netbsd-7]: cgi-bozo.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1377):
libexec/httpd/cgi-bozo.c1.34

use %zu instead of %lu for size_t.

(ok snj@)


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-7.1
cvs rdiff -u -r1.25.2.4 -r1.25.2.5 src/libexec/httpd/cgi-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/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.79 src/doc/CHANGES-7.1:1.1.2.80
--- src/doc/CHANGES-7.1:1.1.2.79	Fri Apr 15 19:07:25 2016
+++ src/doc/CHANGES-7.1	Fri Apr 15 20:24:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.79 2016/04/15 19:07:25 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.80 2016/04/15 20:24:30 mrg Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3783,3 +3783,7 @@ xsrc/external/mit/MesaLib/dist/src/mesa/
 	library is dlopen/dlclose'd !
 	[riastradh, ticket #1158]
 
+libexec/httpd/cgi-bozo.c1.34
+
+	Fix the build: use %zu instead of %lu for size_t.
+	[mrg, ticket #1141]

Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.25.2.4 src/libexec/httpd/cgi-bozo.c:1.25.2.5
--- src/libexec/httpd/cgi-bozo.c:1.25.2.4	Fri Apr 15 19:01:05 2016
+++ src/libexec/httpd/cgi-bozo.c	Fri Apr 15 20:24:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgi-bozo.c,v 1.25.2.4 2016/04/15 19:01:05 snj Exp $	*/
+/*	$NetBSD: cgi-bozo.c,v 1.25.2.5 2016/04/15 20:24:30 mrg Exp $	*/
 
 /*	$eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -448,11 +448,11 @@ bozo_process_cgi(bozo_httpreq_t *request
 		_string_argc);
 	}
 
-	debug((httpd, DEBUG_NORMAL, "parse_search_string args no: %lu",
+	debug((httpd, DEBUG_NORMAL, "parse_search_string args no: %zu",
 	search_string_argc));
 	for (i = 0; i < search_string_argc; i++) {
 		debug((httpd, DEBUG_FAT,
-		"search_string[%lu]: `%s'", i, search_string_argv[i]));
+		"search_string[%zu]: `%s'", i, search_string_argv[i]));
 	}
 
 	argv = bozomalloc(httpd, sizeof(*argv) * (3 + search_string_argc));
@@ -578,7 +578,7 @@ bozo_process_cgi(bozo_httpreq_t *request
 	path));
 
 	for (i = 0; argv[i] != NULL; i++) {
-		debug((httpd, DEBUG_FAT, "bozo_process_cgi: argv[%lu] = `%s'",
+		debug((httpd, DEBUG_FAT, "bozo_process_cgi: argv[%zu] = `%s'",
 		i, argv[i]));
 	}
 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 15 19:07:25 UTC 2016

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

Log Message:
update ticket 1141


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.78 src/doc/CHANGES-7.1:1.1.2.79
--- src/doc/CHANGES-7.1:1.1.2.78	Fri Apr 15 09:04:28 2016
+++ src/doc/CHANGES-7.1	Fri Apr 15 19:07:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.78 2016/04/15 09:04:28 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.79 2016/04/15 19:07:25 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3647,39 +3647,43 @@ usr.sbin/vnconfig/vnconfig.c			1.43-1.44
 	for old scripts trying to find free vnodes.
 	[christos, ticket #1076]
 
-libexec/httpd/CHANGES  	 up to 1.21
-libexec/httpd/Makefile 	 up to 1.26
-libexec/httpd/auth-bozo.c  	 up to 1.18
-libexec/httpd/bozohttpd.8  	 up to 1.58
-libexec/httpd/bozohttpd.c  	 up to 1.79
-libexec/httpd/bozohttpd.h  	 up to 1.44
-libexec/httpd/cgi-bozo.c   	 up to 1.32
-libexec/httpd/content-bozo.c   	 up to 1.13
-libexec/httpd/daemon-bozo.c	 up to 1.17
-libexec/httpd/dir-index-bozo.c 	 up to 1.25
-libexec/httpd/lua-bozo.c   	 up to 1.14
-libexec/httpd/main.c   	 up to 1.13
-libexec/httpd/netbsd_queue.h   	 up to 1.1
-libexec/httpd/printenv.lua 	 up to 1.3
-libexec/httpd/ssl-bozo.c   	 up to 1.22
-libexec/httpd/tilde-luzah-bozo.c   	 up to 1.14
-libexec/httpd/testsuite/Makefile   	 up to 1.5
-libexec/httpd/testsuite/test-bigfile   	 up to 1.2
-
-	Import bozohttpd 20151028:
-	o  add CGI support for ~user translation (-E switch)
-	o  add redirects to ~user translation
-	o  fix bugs around ~user translation
-	o  add schema detection for absolute redirects
-	o  fixed few memory leaks
-	o  bunch of minor tweaks
-	o  removed -r support
-	o  smarter redirects 
-	Changes in 20150320:
-	o  fix redirection handling
-	o  support transport stream (.ts) and video object (.vob) files
-	o  directory listings show correct file sizes for large files
-	[mspo, ticket #1141]
+libexec/httpd/CHANGESup to 1.22
+libexec/httpd/Makefileup to 1.26
+libexec/httpd/auth-bozo.c			up to 1.18
+libexec/httpd/bozohttpd.8			up to 1.59
+libexec/httpd/bozohttpd.c			up to 1.80
+libexec/httpd/bozohttpd.h			up to 1.45
+libexec/httpd/cgi-bozo.c			up to 1.33
+libexec/httpd/content-bozo.c			up to 1.13
+libexec/httpd/daemon-bozo.c			up to 1.17
+libexec/httpd/dir-index-bozo.c			up to 1.25
+libexec/httpd/lua-bozo.c			up to 1.14
+libexec/httpd/lua/bozo.lua			up to 1.2
+libexec/httpd/lua/glue.c			up to 1.2
+libexec/httpd/main.cup to 1.13
+libexec/httpd/printenv.lua			up to 1.3
+libexec/httpd/ssl-bozo.c			up to 1.22
+libexec/httpd/tilde-luzah-bozo.c		up to 1.14
+libexec/httpd/testsuite/Makefile		up to 1.5
+libexec/httpd/testsuite/test-bigfile		up to 1.2
+
+	Update bozohttpd to 20160415.  Changes:
+	o add CGI support for ~user translation (-E switch)
+	o add redirects to ~user translation
+	o fix bugs around ~user translation
+	o add schema detection for absolute redirects
+	o fixed few memory leaks
+	o bunch of minor tweaks
+	o removed -r support
+	o smarter redirects
+	o fix redirection handling
+	o support transport stream (.ts) and video object (.vob) files
+	o directory listings show correct file sizes for large files
+	o add search-word support for CGI
+	o fix a security issue in CGI suffix handler support which
+	  would allow remote code execution, from s...@netbsd.org
+	o -C option supports now CGI scripts only
+	[mspo/mrg, ticket #1141]
 
 distrib/sets/lists/base/mi			1.1123 via patch
 external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.2

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 15 19:01:05 UTC 2016

Modified Files:
src/libexec/httpd [netbsd-7]: CHANGES bozohttpd.8 bozohttpd.c
bozohttpd.h cgi-bozo.c
src/libexec/httpd/lua [netbsd-7]: bozo.lua glue.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1141):
libexec/httpd/CHANGES: up to 1.22
libexec/httpd/bozohttpd.8: up to 1.59
libexec/httpd/bozohttpd.c: up to 1.80
libexec/httpd/bozohttpd.h: up to 1.45
libexec/httpd/cgi-bozo.c: up to 1.33
libexec/httpd/lua/bozo.lua: up to 1.2
libexec/httpd/lua/glue.c: up to 1.2
Import bozohttpd 20151028:
o  add CGI support for ~user translation (-E switch)
o  add redirects to ~user translation
o  fix bugs around ~user translation
o  add schema detection for absolute redirects
o  fixed few memory leaks
o  bunch of minor tweaks
o  removed -r support
o  smarter redirects
--
Changes in 20150320:
o  fix redirection handling
o  support transport stream (.ts) and video object (.vob) files
o  directory listings show correct file sizes for large files
--
updates and bozohttpd 20160415:
o  add search-word support for CGI
o  fix a security issue in CGI suffix handler support which would
   allow remote code execution, from s...@netbsd.org
o  -C option supports now CGI scripts only


To generate a diff of this commit:
cvs rdiff -u -r1.19.2.2 -r1.19.2.3 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.46.4.5 -r1.46.4.6 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.56.2.5 -r1.56.2.6 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.33.2.3 -r1.33.2.4 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.25.2.3 -r1.25.2.4 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.30.1 src/libexec/httpd/lua/bozo.lua \
src/libexec/httpd/lua/glue.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/CHANGES
diff -u src/libexec/httpd/CHANGES:1.19.2.2 src/libexec/httpd/CHANGES:1.19.2.3
--- src/libexec/httpd/CHANGES:1.19.2.2	Sun Apr 10 10:33:11 2016
+++ src/libexec/httpd/CHANGES	Fri Apr 15 19:01:05 2016
@@ -1,5 +1,11 @@
 $eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $
 
+changes in bozohttpd 20160415:
+	o  add search-word support for CGI
+	o  fix a security issue in CGI suffix handler support which would
+	   allow remote code execution, from s...@netbsd.org
+	o  -C option supports now CGI scripts only
+
 changes in bozohttpd 20151028:
 	o  add CGI support for ~user translation (-E switch)
 	o  add redirects to ~user translation

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.46.4.5 src/libexec/httpd/bozohttpd.8:1.46.4.6
--- src/libexec/httpd/bozohttpd.8:1.46.4.5	Sun Apr 10 10:33:11 2016
+++ src/libexec/httpd/bozohttpd.8	Fri Apr 15 19:01:05 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bozohttpd.8,v 1.46.4.5 2016/04/10 10:33:11 martin Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.46.4.6 2016/04/15 19:01:05 snj Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
@@ -507,7 +507,7 @@ with PHP, one must use the
 option to specify a CGI handler for a particular file type.
 Typically this will be like:
 .Bd -literal
-httpd -C .php /usr/pkg/bin/php /var/www
+httpd -C .php /usr/pkg/bin/php-cgi /var/www
 .Ed
 .Sh SEE ALSO
 .Xr inetd.conf 5 ,
@@ -615,7 +615,8 @@ provided many fixes and enhancements for
 .Aq Mt s...@netbsd.org
 fixed memory leaks, various issues with userdir support,
 information disclosure issues, added support for using CGI handlers
-with directory indexing and provided various other fixes.
+with directory indexing, found several security issues and provided
+various other fixes.
 .It
 .An Arnaud Lacombe
 .Aq Mt a...@netbsd.org

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.56.2.5 src/libexec/httpd/bozohttpd.c:1.56.2.6
--- src/libexec/httpd/bozohttpd.c:1.56.2.5	Sun Apr 10 10:33:11 2016
+++ src/libexec/httpd/bozohttpd.c	Fri Apr 15 19:01:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.c,v 1.56.2.5 2016/04/10 10:33:11 martin Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.56.2.6 2016/04/15 19:01:05 snj Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -109,7 +109,7 @@
 #define INDEX_HTML		"index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE		"bozohttpd/20151231"
+#define SERVER_SOFTWARE		"bozohttpd/20160415"
 #endif
 #ifndef DIRECT_ACCESS_FILE
 #define DIRECT_ACCESS_FILE	".bzdirect"
@@ -348,6 +348,15 @@ bozo_clean_request(bozo_httpreq_t *reque
 		ohdr = hdr;
 	}
 	free(ohdr);
+	ohdr = NULL;
+	for (hdr = SIMPLEQ_FIRST(>hr_replheaders); hdr;
+	hdr = SIMPLEQ_NEXT(hdr, h_next)) {
+		free(hdr->h_value);
+		free(hdr->h_header);
+		free(ohdr);
+		ohdr = hdr;
+	}
+	free(ohdr);
 
 	free(request);
 }
@@ -363,20 +372,33 @@ alarmer(int sig)
 }
 
 /*
+ * a list of header quirks: currently, a list of headers that
+ * can't be folded into a single line.
+ 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 15 09:04:28 UTC 2016

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

Log Message:
tickets 1142, 1145, 1156, 1157, 1158


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.77 src/doc/CHANGES-7.1:1.1.2.78
--- src/doc/CHANGES-7.1:1.1.2.77	Tue Apr 12 06:36:33 2016
+++ src/doc/CHANGES-7.1	Fri Apr 15 09:04:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.77 2016/04/12 06:36:33 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.78 2016/04/15 09:04:28 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3713,3 +3713,69 @@ etc/namedb/root.cache1.20
 	 record has changed.
 	[taca, ticket #1150]
 
+usr.sbin/makemandb/apropos-utils.c		1.18, 1.19
+
+	Don't bother formatting if ti == NULL
+	--
+	PR/50344: apropos shows formatting on console with vt100 term type.
+	Can't print terminfo sequences directly; need to process them with
+	ti_puts() to handle padding.
+	[christos, ticket #1142]
+
+crypto/dist/ipsec-tools/src/racoon/isakmp.c	1.75
+crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c	1.26
+crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c 1.14
+crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c 1.28
+
+	racoon:
+	- Fix memory leak (PR 50918).
+	- Allow using IKE Mode Config in a plain "rsasig" (signed
+	  certificates only) configurations.
+	[phx, ticket #1145]
+
+sys/external/bsd/drm2/dist/drm/i915/intel_pm.c	1.9
+
+	Cast uint8_t to uint32_t before shifting left by 24.
+	Otherwise this is undefined behaviour unless int is 32-bit and
+	the uint8_t value happens to be <=127.
+	[riastradh, ticket #1156]
+
+sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_subdev.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c 1.9, 1.10
+sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/namedb.h 1.2
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar/nouveau_subdev_bar_base.c 1.4, 1.5
+sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv40.c 1.3
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c 1.8
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h 1.4
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c 1.4
+sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c 1.3
+sys/external/bsd/drm2/include/linux/delay.h	1.4
+sys/external/bsd/drm2/include/linux/spinlock.h	1.7
+sys/external/bsd/drm2/nouveau/files.nouveau	1.14
+sys/external/bsd/drm2/nouveau/nouveau_pci.c	1.7
+
+	nouveau fixes:
+	- Set nouveau to a reasonable debug level matching default in
+	  Linux.
+	- Pass correct device pointer to suspend/resume ops.
+	- Fix bus_space_subregion error branch to return error, not
+	  success.
+	- Make bootstrap MMIO mapping size match Linux.
+	- Print error code for failure to map PRAMIN BAR.
+	- Fix display mode flag test in xf86-video-nouveau.
+	- Busy-wait, don't sleep, if cold to avoid crash during boot.
+	- Do the *intended* integer truncation to fix PR kern/50372.
+	- Explicitly destroy various locks so nouveau runs under
+	  LOCKDEBUG.
+	- Implement recursive-reader semantics for Linux spin rwlocks.
+	[riastradh, ticket #1157]
+
+xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c 1.2
+xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp 1.2
+xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c 1.5
+xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c 1.2
+
+	Replace atexit() calls by destructor attributes - this shared
+	library is dlopen/dlclose'd !
+	[riastradh, ticket #1158]
+

CVS commit: [netbsd-7] src/sys/external/bsd/drm2

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 15 08:46:42 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau [netbsd-7]: nouveau_drm.c
nouveau_drm.h nouveau_fence.c nouveau_nv10_fence.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/core [netbsd-7]:
nouveau_core_subdev.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device 
[netbsd-7]:
nouveau_engine_device_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core [netbsd-7]:
namedb.h
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar [netbsd-7]:
nouveau_subdev_bar_base.c
src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem 
[netbsd-7]:
nouveau_subdev_instmem_nv40.c
src/sys/external/bsd/drm2/include/linux [netbsd-7]: delay.h spinlock.h
src/sys/external/bsd/drm2/nouveau [netbsd-7]: files.nouveau
nouveau_pci.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1157):
sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_subdev.c: 
revision 1.3

sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c:
 revisions 1.9, 1.10
sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/namedb.h: 
revision 1.2

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar/nouveau_subdev_bar_base.c:
 revisions 1.4, 1.5

sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv40.c:
 revision 1.3
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: revision 1.8
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h: revision 1.4
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c: revision 1.4
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c: revision 
1.3
sys/external/bsd/drm2/include/linux/delay.h: revision 1.4
sys/external/bsd/drm2/include/linux/spinlock.h: revision 1.7
sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.14
sys/external/bsd/drm2/nouveau/nouveau_pci.c: revision 1.7
Set nouveau to a more reasonable debug level.
Match the compile-time and default run-time settings in Linux.
--
Pass a sensible device state pointer to nouveau suspend/resume ops.
Gives nouveau half a chance of suspending and resuming -- not that it
works on my test laptop yet, but it's a start.
--
Fix bus_space_subregion error branch.
Return error code, not 0 (!), on bus_space_subregion failure.
In answer to `XXX error branch' comment: if nouveau_barobj_ctor
fails, then the caller will call nouveau_barobj_dtor too.  So there's
no leak here.
Unlikely to fix any observed bugs with nouveau -- there's no error
branch in the Linux side here.  But maybe it will catch some other
bug earlier.
--
Map the same mmio size as Linux does.
Unlikely to have practical consequences -- just reduces differences
in behaviour from upstream, to rule them out.
--
Print error code for failure to map PRAMIN BAR.
--
In msleep use mdelay if cold
--
Use only the low 32 bits of the bar object's vma offset as intended.
Should fix PR kern/50372, seen by everyone trying to use nouveau on
amd64 with hardware that uses nv50-style BARs and not nvc0-style
BARs.
--
Destroy the lock before caller frees memory.
--
Destroy spin locks appropriately.
--
Destroy the mutex before free.
--
Provide reader/writer semantics with recursive readers.
--
Exclude VRAM and FIFO regions from MMIO register mapping.
Nouveau maps those separately, and it is not trivial to convert those
mappings to bus_space_subregion.


To generate a diff of this commit:
cvs rdiff -u -r1.2.4.4 -r1.2.4.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c
cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.h
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c
cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv10_fence.c
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/core/nouveau_core_subdev.c
cvs rdiff -u -r1.2.4.3 -r1.2.4.4 \

src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \
src/sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/namedb.h
cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \

src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bar/nouveau_subdev_bar_base.c
cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \

src/sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/instmem/nouveau_subdev_instmem_nv40.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/external/bsd/drm2/include/linux/delay.h
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 \
src/sys/external/bsd/drm2/include/linux/spinlock.h
cvs rdiff -u -r1.2.4.4 -r1.2.4.5 \
src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs 

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/i915

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 15 08:02:34 UTC 2016

Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: intel_pm.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1156):
sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.9
Cast uint8_t to uint32_t before shifting left by 24.
Otherwise this is undefined behaviour unless int is 32-bit and the
uint8_t value happens to be <=127.


To generate a diff of this commit:
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.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/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.4.2.4 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.4.2.5
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.4.2.4	Thu Feb 11 22:52:58 2016
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c	Fri Apr 15 08:02:34 2016
@@ -4487,8 +4487,8 @@ static void intel_init_emon(struct drm_d
 	pxw[15] = 0;
 
 	for (i = 0; i < 4; i++) {
-		u32 val = (pxw[i*4] << 24) | (pxw[(i*4)+1] << 16) |
-			(pxw[(i*4)+2] << 8) | (pxw[(i*4)+3]);
+		u32 val = ((u32)pxw[i*4] << 24) | ((u32)pxw[(i*4)+1] << 16) |
+			((u32)pxw[(i*4)+2] << 8) | ((u32)pxw[(i*4)+3]);
 		I915_WRITE(PXW + (i * 4), val);
 	}
 

CVS commit: [netbsd-7] src/crypto/dist/ipsec-tools/src/racoon

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 15 07:52:15 UTC 2016

Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [netbsd-7]: isakmp.c
isakmp_cfg.c isakmp_ident.c isakmp_xauth.c

Log Message:
Pull up following revision(s) (requested by phx in ticket #1145):
crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c: revision 1.26
crypto/dist/ipsec-tools/src/racoon/isakmp.c: revision 1.75
crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c: revision 1.28
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c: revision 1.14
PR/50918: David Binderman: Fix memory leak
--
>From Frank Wille:
Request "IKE mode config" in "rsasig" (certificates on both sides only)
authentication mode, if "mode_cfg" is configured to "on".
Tested with a Lancom router, using the following configuration:
path include "/etc/racoon";
path certificate "/etc/racoon/certs";
path script "/etc/racoon/scripts";
remote "wpsd"
{
remote_address 1.2.3.4;
exchange_mode main,base;
my_identifier asn1dn;
certificate_type x509 "vpnclient15.crt" "vpnclient15.key";
ca_type x509 "ca.crt";
mode_cfg on;
dpd_delay 20;
nat_traversal on;
lifetime time 8 hour;
script "phase1-up.sh" phase1_up;
script "phase1-down.sh" phase1_down;
proposal {
encryption_algorithm aes;
hash_algorithm md5;
authentication_method rsasig;
dh_group 2;
}
proposal_check obey;
}
sainfo anonymous
{
pfs_group 2;
lifetime time 8 hour;
encryption_algorithm aes;
authentication_algorithm hmac_md5;
compression_algorithm deflate;
}


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.74.20.1 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
cvs rdiff -u -r1.25 -r1.25.8.1 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
cvs rdiff -u -r1.13 -r1.13.28.1 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
cvs rdiff -u -r1.27 -r1.27.4.1 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.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/isakmp.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.74 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.74.20.1
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.74	Sun Jan  1 15:57:31 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp.c	Fri Apr 15 07:52:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp.c,v 1.74 2012/01/01 15:57:31 tteras Exp $	*/
+/*	$NetBSD: isakmp.c,v 1.74.20.1 2016/04/15 07:52:15 snj Exp $	*/
 
 /* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
 
@@ -890,6 +890,10 @@ ph1_main(iph1, msg)
 /* XXX Don't process INITIAL_CONTACT */
 iph1->rmconf->ini_contact = 0;
 break;
+			case OAKLEY_ATTR_AUTH_METHOD_RSASIG:
+if (iph1->rmconf->mode_cfg)
+	error = isakmp_cfg_getconfig(iph1);
+break;
 			default:
 break;
 			}
@@ -945,6 +949,10 @@ ph1_main(iph1, msg)
 break;
 			}
 		}
+		if ((iph1->rmconf->mode_cfg) &&
+		!(iph1->mode_cfg->flags & ISAKMP_CFG_VENDORID_XAUTH)) {
+			error = isakmp_cfg_getconfig(iph1);
+		}
 	}
 
 	return 0;

Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.25 src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.25.8.1
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.25	Fri Apr 12 10:03:45 2013
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c	Fri Apr 15 07:52:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_cfg.c,v 1.25 2013/04/12 10:03:45 tteras Exp $	*/
+/*	$NetBSD: isakmp_cfg.c,v 1.25.8.1 2016/04/15 07:52:15 snj Exp $	*/
 
 /* Id: isakmp_cfg.c,v 1.55 2006/08/22 18:17:17 manubsd Exp */
 
@@ -457,6 +457,7 @@ isakmp_cfg_reply(iph1, attrpl)
 		case OAKLEY_ATTR_AUTH_METHOD_XAUTH_RSASIG_I:
 		case OAKLEY_ATTR_AUTH_METHOD_XAUTH_RSAENC_I: 
 		case OAKLEY_ATTR_AUTH_METHOD_XAUTH_RSAREV_I: 
+		case OAKLEY_ATTR_AUTH_METHOD_RSASIG:
 			script_hook(iph1, SCRIPT_PHASE1_UP);
 			break;
 		default:
@@ -639,6 +640,7 @@ isakmp_cfg_request(iph1, attrpl)
 		case OAKLEY_ATTR_AUTH_METHOD_XAUTH_RSASIG_R:
 		case OAKLEY_ATTR_AUTH_METHOD_XAUTH_RSAENC_R: 
 		case OAKLEY_ATTR_AUTH_METHOD_XAUTH_RSAREV_R: 
+		case OAKLEY_ATTR_AUTH_METHOD_RSASIG:
 			script_hook(iph1, SCRIPT_PHASE1_UP);
 			break;
 		default:

Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.13 src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.13.28.1
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.13	Fri Sep 18 10:31:11 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c	Fri Apr 15 07:52:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: isakmp_ident.c,v 1.13 2009/09/18 10:31:11 tteras Exp $	*/
+/*	$NetBSD: isakmp_ident.c,v 1.13.28.1 2016/04/15 07:52:15 snj Exp $	*/
 
 /* Id: isakmp_ident.c,v 1.21 2006/04/06 16:46:08 manubsd Exp */
 
@@ 

CVS commit: [netbsd-7] src/usr.sbin/makemandb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 15 07:47:30 UTC 2016

Modified Files:
src/usr.sbin/makemandb [netbsd-7]: apropos-utils.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1142):
usr.sbin/makemandb/apropos-utils.c: revisions 1.18, 1.19
CID 1341551: Don't bother formatting if ti == NULL
--
PR/50344: Stephen Fisher: apropos shows formatting on console with vt100 term
type. Can't print terminfo sequences directly; need to process them with
ti_puts() to handle padding. This removes the padding delays, and stricly
could break on slow terminal hardware, but they way the code is structured
makes it impossible to fix properly (since the formatting strings are
passed in the query).


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 src/usr.sbin/makemandb/apropos-utils.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/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.16 src/usr.sbin/makemandb/apropos-utils.c:1.16.2.1
--- src/usr.sbin/makemandb/apropos-utils.c:1.16	Fri Aug  1 12:55:00 2014
+++ src/usr.sbin/makemandb/apropos-utils.c	Fri Apr 15 07:47:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: apropos-utils.c,v 1.16 2014/08/01 12:55:00 wiz Exp $	*/
+/*	$NetBSD: apropos-utils.c,v 1.16.2.1 2016/04/15 07:47:29 snj Exp $	*/
 /*-
  * Copyright (c) 2011 Abhinav Upadhyay 
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: apropos-utils.c,v 1.16 2014/08/01 12:55:00 wiz Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.16.2.1 2016/04/15 07:47:29 snj Exp $");
 
 #include 
 #include 
@@ -891,6 +891,36 @@ run_query_pager(sqlite3 *db, query_args 
 	return run_query_internal(db, snippet_args, args);
 }
 
+struct nv {
+	char *s;
+	size_t l;
+};
+
+static int
+term_putc(int c, void *p)
+{
+	struct nv *nv = p;
+	nv->s[nv->l++] = c;
+	return 0;
+}
+
+static char *
+term_fix_seq(TERMINAL *ti, const char *seq)
+{
+	char *res = estrdup(seq);
+	struct nv nv;
+
+	if (ti == NULL)
+	return res;
+
+	nv.s = res;
+	nv.l = 0;
+	ti_puts(ti, seq, 1, term_putc, );
+	nv.s[nv.l] = '\0';
+
+	return res;
+}
+
 static void
 term_init(int fd, const char *sa[5])
 {
@@ -920,11 +950,12 @@ term_init(int fd, const char *sa[5])
 			smul = rmul = "";
 	}
 
-	sa[0] = estrdup(bold ? bold : smso);
-	sa[1] = estrdup(sgr0 ? sgr0 : rmso);
+	sa[0] = term_fix_seq(ti, bold ? bold : smso);
+	sa[1] = term_fix_seq(ti, sgr0 ? sgr0 : rmso);
 	sa[2] = estrdup("...");
-	sa[3] = estrdup(smul);
-	sa[4] = estrdup(rmul);
+	sa[3] = term_fix_seq(ti, smul);
+	sa[4] = term_fix_seq(ti, rmul);
+
 	if (ti)
 		del_curterm(ti);
 }

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Apr 12 06:36:33 UTC 2016

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

Log Message:
amend 1143


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.76 src/doc/CHANGES-7.1:1.1.2.77
--- src/doc/CHANGES-7.1:1.1.2.76	Mon Apr 11 10:12:27 2016
+++ src/doc/CHANGES-7.1	Tue Apr 12 06:36:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.76 2016/04/11 10:12:27 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.77 2016/04/12 06:36:33 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3681,6 +3681,7 @@ libexec/httpd/testsuite/test-bigfile
 	o  directory listings show correct file sizes for large files
 	[mspo, ticket #1141]
 
+distrib/sets/lists/base/mi			1.1123 via patch
 external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.2
 external/public-domain/tz/dist/LICENSE  up to 1.1.1.1
 external/public-domain/tz/dist/Makefile up to 1.1.1.10

CVS commit: [netbsd-7] src/distrib/sets/lists/base

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Apr 12 06:34:09 UTC 2016

Modified Files:
src/distrib/sets/lists/base [netbsd-7]: mi

Log Message:
Pull up following revision(s) (not requested by christos in ticket #1143):
distrib/sets/lists/base/mi: revision 1.1123 via patch
add new zoneinfo files


To generate a diff of this commit:
cvs rdiff -u -r1.1087.2.7 -r1.1087.2.8 src/distrib/sets/lists/base/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/mi
diff -u src/distrib/sets/lists/base/mi:1.1087.2.7 src/distrib/sets/lists/base/mi:1.1087.2.8
--- src/distrib/sets/lists/base/mi:1.1087.2.7	Thu May  7 03:48:27 2015
+++ src/distrib/sets/lists/base/mi	Tue Apr 12 06:34:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1087.2.7 2015/05/07 03:48:27 snj Exp $
+# $NetBSD: mi,v 1.1087.2.8 2016/04/12 06:34:09 snj Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -5268,6 +5268,7 @@
 ./usr/share/zoneinfo/America/Eirunepe		base-sys-share		share
 ./usr/share/zoneinfo/America/El_Salvador	base-sys-share		share
 ./usr/share/zoneinfo/America/Ensenada		base-sys-share		share
+./usr/share/zoneinfo/America/Fort_Nelson	base-sys-share		share
 ./usr/share/zoneinfo/America/Fort_Wayne		base-sys-share		share
 ./usr/share/zoneinfo/America/Fortaleza		base-sys-share		share
 ./usr/share/zoneinfo/America/Glace_Bay		base-sys-share		share
@@ -5408,6 +5409,7 @@
 ./usr/share/zoneinfo/Asia/Bahrain		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Baku			base-sys-share		share
 ./usr/share/zoneinfo/Asia/Bangkok		base-sys-share		share
+./usr/share/zoneinfo/Asia/Barnaul		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Beirut		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Bishkek		base-sys-share		share
 ./usr/share/zoneinfo/Asia/Brunei		base-sys-share		share
@@ -5596,6 +5598,7 @@
 ./usr/share/zoneinfo/Europe			base-sys-share
 ./usr/share/zoneinfo/Europe/Amsterdam		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Andorra		base-sys-share		share
+./usr/share/zoneinfo/Europe/Astrakhan		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Athens		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Belfast		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Belgrade		base-sys-share		share
@@ -5644,6 +5647,7 @@
 ./usr/share/zoneinfo/Europe/Tallinn		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Tirane		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Tiraspol		base-sys-share		share
+./usr/share/zoneinfo/Europe/Ulyanovsk		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Uzhgorod		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Vaduz		base-sys-share		share
 ./usr/share/zoneinfo/Europe/Vatican		base-sys-share		share

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Apr 11 10:12:27 UTC 2016

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

Log Message:
1143, 1150


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.75 src/doc/CHANGES-7.1:1.1.2.76
--- src/doc/CHANGES-7.1:1.1.2.75	Sun Apr 10 12:46:25 2016
+++ src/doc/CHANGES-7.1	Mon Apr 11 10:12:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.75 2016/04/10 12:46:25 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.76 2016/04/11 10:12:27 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3680,3 +3680,35 @@ libexec/httpd/testsuite/test-bigfile
 	o  support transport stream (.ts) and video object (.vob) files
 	o  directory listings show correct file sizes for large files
 	[mspo, ticket #1141]
+
+external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.2
+external/public-domain/tz/dist/LICENSE  up to 1.1.1.1
+external/public-domain/tz/dist/Makefile up to 1.1.1.10
+external/public-domain/tz/dist/NEWS up to 1.1.1.10
+external/public-domain/tz/dist/README   up to 1.1.1.3
+external/public-domain/tz/dist/Theory   up to 1.1.1.5
+external/public-domain/tz/dist/asia up to 1.1.1.9
+external/public-domain/tz/dist/australasia  up to 1.1.1.6
+external/public-domain/tz/dist/backward up to 1.1.1.5
+external/public-domain/tz/dist/backzone up to 1.1.1.8
+external/public-domain/tz/dist/checklinks.awk   up to 1.1.1.2
+external/public-domain/tz/dist/checktab.awk up to 1.1.1.8
+external/public-domain/tz/dist/europe   up to 1.1.1.10
+external/public-domain/tz/dist/iso3166.tab  up to 1.1.1.3
+external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.5
+external/public-domain/tz/dist/leapseconds  up to 1.1.1.6
+external/public-domain/tz/dist/leapseconds.awk  up to 1.1.1.5
+external/public-domain/tz/dist/northamerica up to 1.1.1.10
+external/public-domain/tz/dist/zone.tab up to 1.1.1.6
+external/public-domain/tz/dist/zone1970.tab up to 1.1.1.8
+external/public-domain/tz/tzdata2netbsd up to 1.8
+
+	Update tzdata to 2016b.
+	[christos, ticket #1143]
+
+etc/namedb/root.cache1.20
+
+	Update root.cache to 2016/3/23 version, l.root-servers.net's
+	 record has changed.
+	[taca, ticket #1150]
+

CVS commit: [netbsd-7] src/etc/namedb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Apr 11 10:02:57 UTC 2016

Modified Files:
src/etc/namedb [netbsd-7]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1150):
etc/namedb/root.cache: revision 1.20
Update root.cache to 2016/3/23 version, l.root-servers.net's  record
has changed.


To generate a diff of this commit:
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/etc/namedb/root.cache

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.18.2.1 src/etc/namedb/root.cache:1.18.2.2
--- src/etc/namedb/root.cache:1.18.2.1	Tue Jan  5 22:13:55 2016
+++ src/etc/namedb/root.cache	Mon Apr 11 10:02:57 2016
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.18.2.1 2016/01/05 22:13:55 snj Exp $
+;	$NetBSD: root.cache,v 1.18.2.2 2016/04/11 10:02:57 snj Exp $
 ;   This file holds the information on root name servers needed to
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -10,8 +10,8 @@
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:December 01, 2015
-;   related version of root zone:   2015120100
+;   last update:March 23, 2016
+;   related version of root zone:   2016032301
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -81,7 +81,7 @@ K.ROOT-SERVERS.NET.  360  AA
 ;
 .360  NSL.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.  360  A 199.7.83.42
-L.ROOT-SERVERS.NET.  360    2001:500:3::42
+L.ROOT-SERVERS.NET.  360    2001:500:9f::42
 ;
 ; OPERATED BY WIDE
 ;

CVS commit: [netbsd-7] src/external/public-domain/tz

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Apr 11 09:59:00 UTC 2016

Modified Files:
src/external/public-domain/tz [netbsd-7]: tzdata2netbsd
src/external/public-domain/tz/dist [netbsd-7]: CONTRIBUTING Makefile
NEWS README Theory asia australasia backward backzone
checklinks.awk checktab.awk europe iso3166.tab leap-seconds.list
leapseconds leapseconds.awk northamerica zone.tab zone1970.tab
Added Files:
src/external/public-domain/tz/dist [netbsd-7]: LICENSE

Log Message:
Pull up following revision(s) (requested by christos in ticket #1143):
external/public-domain/tz/dist/CONTRIBUTING: up to 1.1.1.2
external/public-domain/tz/dist/LICENSE: up to 1.1.1.1
external/public-domain/tz/dist/Makefile: up to 1.1.1.10
external/public-domain/tz/dist/NEWS: up to 1.1.1.10
external/public-domain/tz/dist/README: up to 1.1.1.3
external/public-domain/tz/dist/Theory: up to 1.1.1.5
external/public-domain/tz/dist/asia: up to 1.1.1.9
external/public-domain/tz/dist/australasia: up to 1.1.1.6
external/public-domain/tz/dist/backward: up to 1.1.1.5
external/public-domain/tz/dist/backzone: up to 1.1.1.8
external/public-domain/tz/dist/checklinks.awk: up to 1.1.1.2
external/public-domain/tz/dist/checktab.awk: up to 1.1.1.8
external/public-domain/tz/dist/europe: up to 1.1.1.10
external/public-domain/tz/dist/iso3166.tab: up to 1.1.1.3
external/public-domain/tz/dist/leap-seconds.list: up to 1.1.1.5
external/public-domain/tz/dist/leapseconds.awk: up to 1.1.1.5
external/public-domain/tz/dist/leapseconds: up to 1.1.1.6
external/public-domain/tz/dist/northamerica: up to 1.1.1.10
external/public-domain/tz/dist/zone.tab: up to 1.1.1.6
external/public-domain/tz/dist/zone1970.tab: up to 1.1.1.8
external/public-domain/tz/tzdata2netbsd: up to 1.8
Update tzdata to 2016b.


To generate a diff of this commit:
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/external/public-domain/tz/tzdata2netbsd
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
src/external/public-domain/tz/dist/CONTRIBUTING \
src/external/public-domain/tz/dist/checklinks.awk
cvs rdiff -u -r0 -r1.1.1.1.2.2 src/external/public-domain/tz/dist/LICENSE
cvs rdiff -u -r1.1.1.1.4.4 -r1.1.1.1.4.5 \
src/external/public-domain/tz/dist/Makefile \
src/external/public-domain/tz/dist/NEWS \
src/external/public-domain/tz/dist/asia \
src/external/public-domain/tz/dist/europe \
src/external/public-domain/tz/dist/leapseconds \
src/external/public-domain/tz/dist/northamerica \
src/external/public-domain/tz/dist/zone.tab \
src/external/public-domain/tz/dist/zone1970.tab
cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \
src/external/public-domain/tz/dist/README \
src/external/public-domain/tz/dist/iso3166.tab
cvs rdiff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6 \
src/external/public-domain/tz/dist/Theory \
src/external/public-domain/tz/dist/backzone \
src/external/public-domain/tz/dist/checktab.awk
cvs rdiff -u -r1.1.1.1.4.3 -r1.1.1.1.4.4 \
src/external/public-domain/tz/dist/australasia \
src/external/public-domain/tz/dist/backward \
src/external/public-domain/tz/dist/leapseconds.awk
cvs rdiff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3 \
src/external/public-domain/tz/dist/leap-seconds.list

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

Modified files:

Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.2.4.2 src/external/public-domain/tz/tzdata2netbsd:1.2.4.3
--- src/external/public-domain/tz/tzdata2netbsd:1.2.4.2	Thu Sep 10 03:00:37 2015
+++ src/external/public-domain/tz/tzdata2netbsd	Mon Apr 11 09:59:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.2.4.2 2015/09/10 03:00:37 snj Exp $
+# $NetBSD: tzdata2netbsd,v 1.2.4.3 2016/04/11 09:59:00 snj Exp $
 
 # For use by NetBSD developers when updating to new versions of tzdata.
 #
@@ -13,8 +13,8 @@
 #redo non-trivial work done by earlier runs.
 #
 
-OLDVER=2015e
-NEWVER=2015f
+OLDVER=2015f
+NEWVER=2016b
 
 # Uppercase variants of OLDVER and NEWVER
 OLDVER_UC="$( echo "${OLDVER}" | tr '[a-z]' '[A-Z]' )"

Index: src/external/public-domain/tz/dist/CONTRIBUTING
diff -u src/external/public-domain/tz/dist/CONTRIBUTING:1.1.1.1.2.2 src/external/public-domain/tz/dist/CONTRIBUTING:1.1.1.1.2.3
--- src/external/public-domain/tz/dist/CONTRIBUTING:1.1.1.1.2.2	Sun Sep 21 18:50:41 2014
+++ src/external/public-domain/tz/dist/CONTRIBUTING	Mon Apr 11 09:59:00 2016
@@ -67,3 +67,7 @@ Git repository.  If you use Git the foll
 Please do not create issues or pull requests on GitHub, as the
 proper procedure for proposing and distributing patches is via
 email as illustrated above.
+
+-
+
+This file is in the public domain.
Index: src/external/public-domain/tz/dist/checklinks.awk
diff -u 

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Apr 10 12:46:25 UTC 2016

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

Log Message:
Note tickets #1076 and #1141


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.74 src/doc/CHANGES-7.1:1.1.2.75
--- src/doc/CHANGES-7.1:1.1.2.74	Mon Apr  4 10:05:18 2016
+++ src/doc/CHANGES-7.1	Sun Apr 10 12:46:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.74 2016/04/04 10:05:18 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.75 2016/04/10 12:46:25 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3637,3 +3637,46 @@ external/bsd/bind/include/isc/platform.h
 	Disable SIT (Source Identity Token).
 	[spz, ticket #1151]
 
+usr.sbin/vnconfig/vnconfig.8			1.41
+usr.sbin/vnconfig/vnconfig.c			1.43-1.44
+
+	Since now the kernel returns ENXIO again for devices exceeding the
+	number of devices configured in the kernel, use that instead of
+	scanning /dev.
+	Cosmetic tweaks to vncfonfig -l output to restore compatibility
+	for old scripts trying to find free vnodes.
+	[christos, ticket #1076]
+
+libexec/httpd/CHANGES  	 up to 1.21
+libexec/httpd/Makefile 	 up to 1.26
+libexec/httpd/auth-bozo.c  	 up to 1.18
+libexec/httpd/bozohttpd.8  	 up to 1.58
+libexec/httpd/bozohttpd.c  	 up to 1.79
+libexec/httpd/bozohttpd.h  	 up to 1.44
+libexec/httpd/cgi-bozo.c   	 up to 1.32
+libexec/httpd/content-bozo.c   	 up to 1.13
+libexec/httpd/daemon-bozo.c	 up to 1.17
+libexec/httpd/dir-index-bozo.c 	 up to 1.25
+libexec/httpd/lua-bozo.c   	 up to 1.14
+libexec/httpd/main.c   	 up to 1.13
+libexec/httpd/netbsd_queue.h   	 up to 1.1
+libexec/httpd/printenv.lua 	 up to 1.3
+libexec/httpd/ssl-bozo.c   	 up to 1.22
+libexec/httpd/tilde-luzah-bozo.c   	 up to 1.14
+libexec/httpd/testsuite/Makefile   	 up to 1.5
+libexec/httpd/testsuite/test-bigfile   	 up to 1.2
+
+	Import bozohttpd 20151028:
+	o  add CGI support for ~user translation (-E switch)
+	o  add redirects to ~user translation
+	o  fix bugs around ~user translation
+	o  add schema detection for absolute redirects
+	o  fixed few memory leaks
+	o  bunch of minor tweaks
+	o  removed -r support
+	o  smarter redirects 
+	Changes in 20150320:
+	o  fix redirection handling
+	o  support transport stream (.ts) and video object (.vob) files
+	o  directory listings show correct file sizes for large files
+	[mspo, ticket #1141]

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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Apr 10 10:33:11 UTC 2016

Modified Files:
src/libexec/httpd [netbsd-7]: CHANGES Makefile auth-bozo.c bozohttpd.8
bozohttpd.c bozohttpd.h cgi-bozo.c content-bozo.c daemon-bozo.c
dir-index-bozo.c lua-bozo.c main.c printenv.lua ssl-bozo.c
tilde-luzah-bozo.c
src/libexec/httpd/testsuite [netbsd-7]: Makefile test-bigfile

Log Message:
Catch up to -current (via patch), requested by mspo in #1141:

libexec/httpd/CHANGESup to 1.21
libexec/httpd/Makefile   up to 1.26
libexec/httpd/auth-bozo.cup to 1.18
libexec/httpd/bozohttpd.8up to 1.58
libexec/httpd/bozohttpd.cup to 1.79
libexec/httpd/bozohttpd.hup to 1.44
libexec/httpd/cgi-bozo.c up to 1.32
libexec/httpd/content-bozo.c up to 1.13
libexec/httpd/daemon-bozo.c  up to 1.17
libexec/httpd/dir-index-bozo.c   up to 1.25
libexec/httpd/lua-bozo.c up to 1.14
libexec/httpd/main.c up to 1.13
libexec/httpd/netbsd_queue.h up to 1.1
libexec/httpd/printenv.lua   up to 1.3
libexec/httpd/ssl-bozo.c up to 1.22
libexec/httpd/tilde-luzah-bozo.c up to 1.14
libexec/httpd/testsuite/Makefile up to 1.5
libexec/httpd/testsuite/test-bigfile up to 1.2

Import bozohttpd 20151028:
o  add CGI support for ~user translation (-E switch)
o  add redirects to ~user translation
o  fix bugs around ~user translation
o  add schema detection for absolute redirects
o  fixed few memory leaks
o  bunch of minor tweaks
o  removed -r support
o  smarter redirects
Changes in 20150320:
o  fix redirection handling
o  support transport stream (.ts) and video object (.vob) files
o  directory listings show correct file sizes for large files


To generate a diff of this commit:
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/libexec/httpd/Makefile
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.46.4.4 -r1.46.4.5 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.56.2.4 -r1.56.2.5 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.33.2.2 -r1.33.2.3 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.25.2.2 -r1.25.2.3 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/libexec/httpd/content-bozo.c
cvs rdiff -u -r1.16 -r1.16.4.1 src/libexec/httpd/daemon-bozo.c
cvs rdiff -u -r1.19.4.1 -r1.19.4.2 src/libexec/httpd/dir-index-bozo.c
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 src/libexec/httpd/lua-bozo.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/libexec/httpd/main.c
cvs rdiff -u -r1.2 -r1.2.18.1 src/libexec/httpd/printenv.lua
cvs rdiff -u -r1.18 -r1.18.2.1 src/libexec/httpd/ssl-bozo.c
cvs rdiff -u -r1.10 -r1.10.4.1 src/libexec/httpd/tilde-luzah-bozo.c
cvs rdiff -u -r1.4 -r1.4.24.1 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.30.1 \
src/libexec/httpd/testsuite/test-bigfile

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

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.19.2.1 src/libexec/httpd/CHANGES:1.19.2.2
--- src/libexec/httpd/CHANGES:1.19.2.1	Sun Apr 19 04:44:03 2015
+++ src/libexec/httpd/CHANGES	Sun Apr 10 10:33:11 2016
@@ -1,5 +1,15 @@
 $eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $
 
+changes in bozohttpd 20151028:
+	o  add CGI support for ~user translation (-E switch)
+	o  add redirects to ~user translation
+	o  fix bugs around ~user translation
+	o  add schema detection for absolute redirects
+	o  fixed few memory leaks
+	o  bunch of minor tweaks
+	o  removed -r support
+	o  smarter redirects 
+
 changes in bozohttpd 20150320:
 	o  fix redirection handling
 	o  support transport stream (.ts) and video object (.vob) files

Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.22.2.1 src/libexec/httpd/Makefile:1.22.2.2
--- src/libexec/httpd/Makefile:1.22.2.1	Thu Apr 23 19:38:11 2015
+++ src/libexec/httpd/Makefile	Sun Apr 10 10:33:11 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22.2.1 2015/04/23 19:38:11 snj Exp $
+#	$NetBSD: Makefile,v 1.22.2.2 2016/04/10 10:33:11 martin Exp $
 #
 #	$eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -15,6 +15,10 @@
 #	DO_HTPASSWD		/* support .htpasswd files */
 #	NO_LUA_SUPPORT		/* don't support Lua for dynamic content */
 #
+# other system specific defines:
+#	HAVE_NBUTIL_H		/* netbsd compat is in 
+#(don't forget to also enable -lnbutil)
+#
 # these are usually set via the "COPTS" variable, or some other method
 

CVS commit: [netbsd-7] src/usr.sbin/vnconfig

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Apr 10 09:43:37 UTC 2016

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

Log Message:
Pull up following revision(s) (requested by christos in ticket #1076):
usr.sbin/vnconfig/vnconfig.8: revision 1.41
usr.sbin/vnconfig/vnconfig.c: revision 1.43-1.44
Since now the kernel returns ENXIO again for devices exceeding the
number of devices configured in the kernel, use that instead of
scanning /dev.
Cosmetic tweaks to vncfonfig -l output.
This should restore compatibility for old scripts
trying to find free vnodes in the new cloning world order.


To generate a diff of this commit:
cvs rdiff -u -r1.39.6.1 -r1.39.6.2 src/usr.sbin/vnconfig/vnconfig.8
cvs rdiff -u -r1.42 -r1.42.2.1 src/usr.sbin/vnconfig/vnconfig.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/vnconfig/vnconfig.8
diff -u src/usr.sbin/vnconfig/vnconfig.8:1.39.6.1 src/usr.sbin/vnconfig/vnconfig.8:1.39.6.2
--- src/usr.sbin/vnconfig/vnconfig.8:1.39.6.1	Sun Nov  8 02:05:25 2015
+++ src/usr.sbin/vnconfig/vnconfig.8	Sun Apr 10 09:43:37 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: vnconfig.8,v 1.39.6.1 2015/11/08 02:05:25 riz Exp $
+.\"	$NetBSD: vnconfig.8,v 1.39.6.2 2016/04/10 09:43:37 martin Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -69,6 +69,7 @@
 .Nd configure vnode disks
 .Sh SYNOPSIS
 .Nm
+.\" Fcf:lm:rt:uvz
 .Op Fl crvz
 .Op Fl f Ar disktab
 .Op Fl t Ar typename
@@ -81,7 +82,8 @@
 .Ar vnode_disk
 .Nm
 .Fl l
-.Op Ar vnode_disk
+.Op Fl m Ar min
+.Op Ar vnode_disk ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -124,7 +126,7 @@ If geometry is not specified, the kernel
 cylinders.
 .Ar secsize
 is the number of bytes per sector.
-It must be an even multiple of 512.
+It must be a power of two, and at least 512.
 .Ar nsectors
 is the number of sectors per track.
 .Ar ntracks
@@ -144,9 +146,28 @@ instead of in
 .Pa /etc/disktab .
 .It Fl l
 List the vnd devices and indicate which ones are in use.
-If a specific
-.Ar vnode_disk
-is given, then only that will be described.
+If one or more specific
+.Ar vnode_disks
+are given, then only those will be described.
+.It Fl m Ar min
+Together with
+.Fl l
+and if no specific devices are given,
+causes at least
+.Ar min
+devices to be listed.
+The default for
+.Ar min
+is 4,
+but all vnd devices up to (and sometimes just beyond)
+the highest numbered vnd device configured since
+the system last booted will be listed.
+If
+.Ar min
+is set to 0,
+then only vnd devices currently in use will be shown.
+.It Fl r
+Configure the device as read-only.
 .It Fl t Ar typename
 If configuring the device, look up
 .Ar typename
@@ -156,8 +177,6 @@ and use the geometry specified in the en
 This option and the
 .Ar geomspec
 argument are mutually exclusive.
-.It Fl r
-Configure the device as read-only.
 .It Fl u
 Unconfigures the device.
 .It Fl v
@@ -172,9 +191,25 @@ See the
 manpage on how to create such an image.
 .El
 .Pp
-If no action option is given,
+If no action option
+.Op Fl clu
+is given,
 .Fl c
 is assumed.
+.Sh EXIT STATUS
+.Nm
+will exit with status 0 if the operation requested
+completed successfully,
+or 1 otherwise.
+Unsuccessful completion can be caused by unknown or
+incorrectly used options;
+attempting to configure a vnd that is already configured;
+or unconfigure one that is not, or without
+.Fl F ,
+one which is still in use;
+or if devices are specified that do not exist or are not
+.Xr vnd 4
+devices, giving an improper geometry, etc.
 .Sh FILES
 .Bl -tag -width /etc/disktab -compact
 .It Pa /dev/rvnd??
@@ -190,6 +225,10 @@ Configures the vnode disk
 .Pa vnd0 .
 Please note that use of the second form of the command is discouraged because
 it requires knowledge of the raw partition which varies between architectures.
+For the first form, be aware that there must not be a file
+.Ar vnd0
+in the current directory, or it will be assumed to be the vnd device to
+be configured (which will usually fail.)
 .Pp
 .Dl vndconfig vnd0 /tmp/floppy.img 512/18/2/80
 .Pp
@@ -212,6 +251,22 @@ entry in
 Unconfigures the
 .Pa vnd0
 device.
+.Pp
+To obtain status on all vnd devices listed in /dev
+(assuming a system where the
+.Sq d
+partition is the whole device (RAW_PART)), use:
+.Pp
+.Dl vndconfig -l /dev/vnd*d
+.Pp
+Using
+.Dl vndconfig -m0 -l /dev/vnd*d
+will omit those devices that are not in use, whereas
+.Dl vnconfig -l
+will list all devices known to the kernel (at least 4
+without
+.Fl m )
+regardless of what might appear in /dev (or elsewhere.)
 .Sh SEE ALSO
 .Xr vndcompress 1 ,
 .Xr opendisk 3 ,
@@ -229,4 +284,5 @@ It was renamed to
 in
 .Nx 7.0
 for consistency with other similar commands.
-(The original name was also retained for backwards compatability.)
+(The original name was also retained as an alternative
+for backwards compatibility.)

Index: 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Apr  4 10:05:18 UTC 2016

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

Log Message:
1151


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.73 src/doc/CHANGES-7.1:1.1.2.74
--- src/doc/CHANGES-7.1:1.1.2.73	Tue Mar 22 09:05:07 2016
+++ src/doc/CHANGES-7.1	Mon Apr  4 10:05:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.73 2016/03/22 09:05:07 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.74 2016/04/04 10:05:18 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3631,3 +3631,9 @@ lib/librt/shm.c	1.2, 1.3
 	Allow /var/shm to be a symlink to a properly set up directory.
 	[martin, ticket #1144]
 
+external/bsd/bind/include/config.h		patch
+external/bsd/bind/include/isc/platform.h	patch
+
+	Disable SIT (Source Identity Token).
+	[spz, ticket #1151]
+

CVS commit: [netbsd-7] src/external/bsd/bind/include

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Apr  4 10:03:48 UTC 2016

Modified Files:
src/external/bsd/bind/include [netbsd-7]: config.h
src/external/bsd/bind/include/isc [netbsd-7]: platform.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1151):
external/bsd/bind/include/config.h: patch
external/bsd/bind/include/isc/platform.h: patch
Disable SIT (Source Identity Token).


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.3 -r1.14.2.4 src/external/bsd/bind/include/config.h
cvs rdiff -u -r1.16.2.4 -r1.16.2.5 \
src/external/bsd/bind/include/isc/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/bsd/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.14.2.3 src/external/bsd/bind/include/config.h:1.14.2.4
--- src/external/bsd/bind/include/config.h:1.14.2.3	Sun Mar 13 08:06:16 2016
+++ src/external/bsd/bind/include/config.h	Mon Apr  4 10:03:47 2016
@@ -162,7 +162,7 @@ int sigwait(const unsigned int *set, int
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Use AES for Source Identity Token generation */
-#define AES_SIT 1
+/* #undef AES_SIT */
 
 /* Define to enable the "filter--on-v4" and "filter--on-v6" options.
*/

Index: src/external/bsd/bind/include/isc/platform.h
diff -u src/external/bsd/bind/include/isc/platform.h:1.16.2.4 src/external/bsd/bind/include/isc/platform.h:1.16.2.5
--- src/external/bsd/bind/include/isc/platform.h:1.16.2.4	Sun Mar 13 08:06:17 2016
+++ src/external/bsd/bind/include/isc/platform.h	Mon Apr  4 10:03:48 2016
@@ -346,7 +346,7 @@
 /*
  * Defined if we are enabling SIT (Source Identity Token).
  */
-#define ISC_PLATFORM_USESIT 1
+#undef ISC_PLATFORM_USESIT
 
 /***
  ***	Windows dll support.

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Mar 22 09:05:07 UTC 2016

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

Log Message:
1144


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.72 src/doc/CHANGES-7.1:1.1.2.73
--- src/doc/CHANGES-7.1:1.1.2.72	Sun Mar 13 12:16:40 2016
+++ src/doc/CHANGES-7.1	Tue Mar 22 09:05:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.72 2016/03/13 12:16:40 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.73 2016/03/22 09:05:07 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3626,3 +3626,8 @@ external/mit/lua/dist/src/lvm.c			1.8
 	int.
 	[roy, ticket #1139]
 
+lib/librt/shm.c	1.2, 1.3
+
+	Allow /var/shm to be a symlink to a properly set up directory.
+	[martin, ticket #1144]
+

CVS commit: [netbsd-7] src/lib/librt

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Tue Mar 22 09:04:20 UTC 2016

Modified Files:
src/lib/librt [netbsd-7]: shm.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #1144):
lib/librt/shm.c: revisions 1.2, 1.3
Allow /var/shm to be a symlink to a properly set up directory.
--
Simplify previous by just doing an open() on the directory and then using
the fstat* family to test for all relevant details.
Clean up buffer sizes and clarify a length check. Based on input from dholland.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/lib/librt/shm.c

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

Modified files:

Index: src/lib/librt/shm.c
diff -u src/lib/librt/shm.c:1.1 src/lib/librt/shm.c:1.1.6.1
--- src/lib/librt/shm.c:1.1	Thu Dec 19 19:11:50 2013
+++ src/lib/librt/shm.c	Tue Mar 22 09:04:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: shm.c,v 1.1 2013/12/19 19:11:50 rmind Exp $	*/
+/*	$NetBSD: shm.c,v 1.1.6.1 2016/03/22 09:04:19 snj Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: shm.c,v 1.1 2013/12/19 19:11:50 rmind Exp $");
+__RCSID("$NetBSD: shm.c,v 1.1.6.1 2016/03/22 09:04:19 snj Exp $");
 
 #include 
 #include 
@@ -57,31 +57,36 @@ __RCSID("$NetBSD: shm.c,v 1.1 2013/12/19
 
 #define	MOUNT_SHMFS		MOUNT_TMPFS
 
-static const char *		_shmfs_path = NULL;
+static bool			shm_ok = false;
 
 static bool
 _shm_check_fs(void)
 {
-	const char *shmfs = SHMFS_DIR_PATH;
+	int fd;
 	struct statvfs sv;
 	struct stat st;
 
-	if (statvfs1(shmfs, , ST_NOWAIT) == -1) {
+	fd = open(SHMFS_DIR_PATH, O_DIRECTORY|O_RDONLY);
+	if (fd == -1)
 		return false;
-	}
-	if (strncmp(sv.f_fstypename, MOUNT_SHMFS, sizeof(sv.f_fstypename))) {
-		return false;
-	}
 
-	if (lstat(shmfs, ) == -1) {
-		return false;
-	}
-	if ((st.st_mode & SHMFS_DIR_MODE) != SHMFS_DIR_MODE) {
-		return false;
-	}
+	if (fstatvfs1(fd, , ST_NOWAIT) == -1)
+		goto out;
+
+	if (strncmp(sv.f_fstypename, MOUNT_SHMFS, sizeof(sv.f_fstypename)))
+		goto out;
+
+	if (fstat(fd, ) == -1)
+		goto out;
+
+	if ((st.st_mode & SHMFS_DIR_MODE) != SHMFS_DIR_MODE)
+		goto out;
+
+	shm_ok = true;
 
-	_shmfs_path = shmfs;
-	return true;
+out:
+	close(fd);
+	return shm_ok;
 }
 
 static bool
@@ -89,7 +94,7 @@ _shm_get_path(char *buf, size_t len, con
 {
 	int ret;
 
-	if (__predict_false(!_shmfs_path) && !_shm_check_fs()) {
+	if (__predict_false(!shm_ok) && !_shm_check_fs()) {
 		errno = ENOTSUP;
 		return false;
 	}
@@ -103,10 +108,10 @@ _shm_get_path(char *buf, size_t len, con
 		return false;
 	}
 
-	ret = snprintf(buf, len, "%s/%s%s",
-	_shmfs_path, SHMFS_OBJ_PREFIX, name);
+	ret = snprintf(buf, len, SHMFS_DIR_PATH "/" SHMFS_OBJ_PREFIX "%s",
+	name);
 
-	if ((size_t)ret >= PATH_MAX) {
+	if ((size_t)ret >= len) {
 		errno = ENAMETOOLONG;
 		return false;
 	}
@@ -116,7 +121,7 @@ _shm_get_path(char *buf, size_t len, con
 int
 shm_open(const char *name, int oflag, mode_t mode)
 {
-	char path[PATH_MAX + 1];
+	char path[PATH_MAX];
 
 	if (!_shm_get_path(path, sizeof(path), name)) {
 		return -1;
@@ -127,7 +132,7 @@ shm_open(const char *name, int oflag, mo
 int
 shm_unlink(const char *name)
 {
-	char path[PATH_MAX + 1];
+	char path[PATH_MAX];
 
 	if (!_shm_get_path(path, sizeof(path), name)) {
 		return -1;

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sun Mar 13 12:16:41 UTC 2016

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

Log Message:
Tickets #1133, #1136, #1137 and #1139


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.71 src/doc/CHANGES-7.1:1.1.2.72
--- src/doc/CHANGES-7.1:1.1.2.71	Sun Mar 13 08:07:53 2016
+++ src/doc/CHANGES-7.1	Sun Mar 13 12:16:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.71 2016/03/13 08:07:53 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.72 2016/03/13 12:16:40 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -3585,3 +3585,44 @@ external/bsd/bind/lib/liblwres/shlib_ver
 	Update BIND to 9.10.3-P4.
 	[snj, ticket #1140]
 
+usr.bin/ftp/cmds.c1.136-1.137
+usr.bin/ftp/fetch.c1.208-1.221
+usr.bin/ftp/ftp.c1.165-1.166
+usr.bin/ftp/ftp_var.h1.84
+usr.bin/ftp/ssl.c1.5
+
+	Workaround const issues of SSL_set_tlsext_host_name.
+	Use the proper format "[IPv6 address]:port" when reporting connection
+	attempts to IPv6 endpoints.
+	Fix build without IPv6 support.
+	Various code refactorings, separate no_proxy handling.
+	Factor the proxy handling code out.
+	CONNECT method support.
+	Fix downloads of local files using file:// URLs.
+	Fix an array overrun.
+	[nonakap, ticket #1133]
+
+sys/netipsec/key.c1.92-1.97
+sys/netipsec/key_debug.h			1.7
+
+	Add more debugging, no functional change.
+	Gather more information from mbuf.
+	Fix port matching; we need to ignore ports when they are 0 not only in
+	the second saidx but the first one too. Fixes NAT-T issue with NetBSD
+	being the host behind NAT.
+	Simplify the port comparison code further.
+	[christos, ticket #1136]
+
+usr.bin/finger/util.c1.29
+
+	In find_idle_and_ttywrite(), initialize idletime and writable to 0
+	when stat() fails.  this prevents a coredump later in stimeprint()
+	due to gmtime() returning NULL for an uninitialized idletime.
+	[chs, ticket #1137]
+
+external/mit/lua/dist/src/lvm.c			1.8
+
+	No floating point in the kernel, also make sure we always return an
+	int.
+	[roy, ticket #1139]
+