date:20150813

CVS commit: src/sys/net

2015-08-13 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Aug 13 07:59:05 UTC 2015

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

Log Message:
Move rtfree to a common place

This change also plugs a missing rtfree on an error path.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/net/route.c

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

Modified files:

Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.146 src/sys/net/route.c:1.147
--- src/sys/net/route.c:1.146	Fri Jul 17 02:21:08 2015
+++ src/sys/net/route.c	Thu Aug 13 07:59:05 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.146 2015/07/17 02:21:08 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.147 2015/08/13 07:59:05 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
 #include opt_route.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: route.c,v 1.146 2015/07/17 02:21:08 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: route.c,v 1.147 2015/08/13 07:59:05 ozaki-r Exp $);
 
 #include sys/param.h
 #ifdef RTFLUSH_DEBUG
@@ -1041,7 +1041,6 @@ rtinit(struct ifaddr *ifa, int cmd, int 
 	switch (cmd) {
 	case RTM_DELETE:
 		rt_newmsg(cmd, rt);
-		rtfree(rt);
 		break;
 	case RTM_LLINFO_UPD:
 		RT_DPRINTF(%s: updating%s\n, __func__,
@@ -1061,7 +1060,6 @@ rtinit(struct ifaddr *ifa, int cmd, int 
 		if (cmd == RTM_LLINFO_UPD  ifa-ifa_rtrequest != NULL)
 			ifa-ifa_rtrequest(RTM_LLINFO_UPD, rt, info);
 		rt_newmsg(RTM_CHANGE, rt);
-		rtfree(rt);
 		break;
 	case RTM_ADD:
 		if (rt-rt_ifa != ifa) {
@@ -1077,9 +1075,9 @@ rtinit(struct ifaddr *ifa, int cmd, int 
 ifa-ifa_rtrequest(RTM_ADD, rt, info);
 		}
 		rt_newmsg(cmd, rt);
-		rtfree(rt);
 		break;
 	}
+	rtfree(rt);
 	return error;
 }

CVS commit: src/sys/net

2015-08-13 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Aug 13 07:59:05 UTC 2015

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

Log Message:
Move rtfree to a common place

This change also plugs a missing rtfree on an error path.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/net/route.c

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

CVS commit: src/libexec/httpd

2015-08-13 Thread Mateusz Kocielski

Module Name:src
Committed By:   shm
Date:   Thu Aug 13 09:00:29 UTC 2015

Modified Files:
src/libexec/httpd: bozohttpd.8

Log Message:
Extend AUTHORS section. Nobody likes a braggart.

OK mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/libexec/httpd/bozohttpd.8

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/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.51 src/libexec/httpd/bozohttpd.8:1.52
--- src/libexec/httpd/bozohttpd.8:1.51	Sat May  2 11:35:48 2015
+++ src/libexec/httpd/bozohttpd.8	Thu Aug 13 09:00:29 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: bozohttpd.8,v 1.51 2015/05/02 11:35:48 mrg Exp $
+.\	$NetBSD: bozohttpd.8,v 1.52 2015/08/13 09:00:29 shm Exp $
 .\
 .\	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\
@@ -597,8 +597,9 @@ provided many fixes and enhancements for
 .It
 .An Mateusz Kocielski
 .Aq Mt s...@netbsd.org
-fixed memory leaks, information disclosure issues and added support
-for using CGI handlers with directory indexing.
+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.
 .It
 .An Arnaud Lacombe
 .Aq Mt a...@netbsd.org

CVS commit: src/libexec/httpd

2015-08-13 Thread Mateusz Kocielski

Module Name:src
Committed By:   shm
Date:   Thu Aug 13 09:00:29 UTC 2015

Modified Files:
src/libexec/httpd: bozohttpd.8

Log Message:
Extend AUTHORS section. Nobody likes a braggart.

OK mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/libexec/httpd/bozohttpd.8

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

CVS commit: src/doc

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:36:31 UTC 2015

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new openssh


To generate a diff of this commit:
cvs rdiff -u -r1.1242 -r1.1243 src/doc/3RDPARTY
cvs rdiff -u -r1.2090 -r1.2091 src/doc/CHANGES

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

CVS commit: src/doc

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:36:31 UTC 2015

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new openssh


To generate a diff of this commit:
cvs rdiff -u -r1.1242 -r1.1243 src/doc/3RDPARTY
cvs rdiff -u -r1.2090 -r1.2091 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1242 src/doc/3RDPARTY:1.1243
--- src/doc/3RDPARTY:1.1242	Tue Aug 11 14:11:11 2015
+++ src/doc/3RDPARTY	Thu Aug 13 06:36:31 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1242 2015/08/11 18:11:11 apb Exp $
+#	$NetBSD: 3RDPARTY,v 1.1243 2015/08/13 10:36:31 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -997,8 +997,8 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	6.9
-Current Vers:	6.9 / portable 6.9p1
+Version:	7.0
+Current Vers:	7.0 / portable 7.0p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html
 Home Page:	http://www.openssh.com/portable.html

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2090 src/doc/CHANGES:1.2091
--- src/doc/CHANGES:1.2090	Tue Aug 11 14:12:21 2015
+++ src/doc/CHANGES	Thu Aug 13 06:36:31 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2090 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2091 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -183,3 +183,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	amlogicsdhc(4): Add support for UHS-I and MMC HS200 transfer modes.
 		[jmcneill 20150808]
 	zoneinfo: Import tzdata2015f. [apb 20150811]
+	OpenSSH: Imported 7.0. [christos 20150813]

CVS commit: src/distrib/sets/lists

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:36:38 UTC 2015

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

Log Message:
bump for openssh


To generate a diff of this commit:
cvs rdiff -u -r1.746 -r1.747 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.746 src/distrib/sets/lists/base/shl.mi:1.747
--- src/distrib/sets/lists/base/shl.mi:1.746	Sun Aug  9 23:21:44 2015
+++ src/distrib/sets/lists/base/shl.mi	Thu Aug 13 06:36:38 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.746 2015/08/10 03:21:44 mrg Exp $
+# $NetBSD: shl.mi,v 1.747 2015/08/13 10:36:38 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -746,8 +746,8 @@
 ./usr/lib/libsqlite3.so.1.2			base-sys-shlib		compatfile
 ./usr/lib/libss.sobase-obsolete		obsolete
 ./usr/lib/libssh.sobase-secsh-shlib	compatfile,crypto
-./usr/lib/libssh.so.25base-secsh-shlib	compatfile,crypto
-./usr/lib/libssh.so.25.0			base-secsh-shlib	compatfile,crypto
+./usr/lib/libssh.so.26base-secsh-shlib	compatfile,crypto
+./usr/lib/libssh.so.26.0			base-secsh-shlib	compatfile,crypto
 ./usr/lib/libssl.sobase-crypto-shlib	compatfile,crypto
 ./usr/lib/libssl.so.10base-crypto-shlib	compatfile,crypto
 ./usr/lib/libssl.so.10.5			base-crypto-shlib	compatfile,crypto

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.107 src/distrib/sets/lists/debug/shl.mi:1.108
--- src/distrib/sets/lists/debug/shl.mi:1.107	Sun Aug  9 23:21:44 2015
+++ src/distrib/sets/lists/debug/shl.mi	Thu Aug 13 06:36:38 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.107 2015/08/10 03:21:44 mrg Exp $
+# $NetBSD: shl.mi,v 1.108 2015/08/13 10:36:38 christos Exp $
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libc.so.12.197.debug			comp-sys-debug	debug,dynamicroot
@@ -250,7 +250,7 @@
 ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug		comp-sys-debug	debug,compatfile,skey
 ./usr/libdata/debug/usr/lib/libsl.so.5.0.debug			comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libsqlite3.so.1.2.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libssh.so.25.0.debug		comp-secsh-debug	debug,compatfile,crypto
+./usr/libdata/debug/usr/lib/libssh.so.26.0.debug		comp-secsh-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libssl.so.10.5.debug		comp-crypto-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libstdc++.so.7.3.debug		comp-sys-debug	debug,compatfile,gcc,cxx,libstdcxx
 ./usr/libdata/debug/usr/lib/libterminfo.so.1.0.debug		comp-sys-debug	debug,compatfile

CVS commit: src/distrib/sets/lists

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:36:38 UTC 2015

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

Log Message:
bump for openssh


To generate a diff of this commit:
cvs rdiff -u -r1.746 -r1.747 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/debug/shl.mi

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

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

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Thu Aug 13 10:03:38 UTC 2015

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

Log Message:
 Reduce diff against FreeBSD r280181.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/ixgbe/ixgbe_api.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixv.c

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

Modified files:

Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.34 src/sys/dev/pci/ixgbe/ixgbe.c:1.35
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.34	Thu Aug 13 04:56:43 2015
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Thu Aug 13 10:03:37 2015
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 279805 2015-03-09 10:29:15Z araujo $*/
-/*$NetBSD: ixgbe.c,v 1.34 2015/08/13 04:56:43 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.35 2015/08/13 10:03:37 msaitoh Exp $*/
 
 #include opt_inet.h
 #include opt_inet6.h
@@ -136,15 +136,15 @@ static int  ixgbe_detach(device_t, i
 #if 0
 static int  ixgbe_shutdown(device_t);
 #endif
-#if IXGBE_LEGACY_TX
+#ifdef IXGBE_LEGACY_TX
 static void ixgbe_start(struct ifnet *);
 static void ixgbe_start_locked(struct tx_ring *, struct ifnet *);
-#else
+#else /* ! IXGBE_LEGACY_TX */
 static int	ixgbe_mq_start(struct ifnet *, struct mbuf *);
 static int	ixgbe_mq_start_locked(struct ifnet *, struct tx_ring *);
 static void	ixgbe_qflush(struct ifnet *);
-static void	ixgbe_deferred_mq_start(void *);
-#endif
+static void	ixgbe_deferred_mq_start(void *, int);
+#endif /* IXGBE_LEGACY_TX */
 static int  ixgbe_ioctl(struct ifnet *, u_long, void *);
 static void	ixgbe_ifstop(struct ifnet *, int);
 static int	ixgbe_init(struct ifnet *);
@@ -338,7 +338,7 @@ SYSCTL_INT(hw.ixgbe.rxd, ixgbe_rxd);
 ** of unsupported SFP+ modules, note that
 ** doing so you are on your own :)
 */
-static int allow_unsupported_sfp = true;
+static int allow_unsupported_sfp = false;
 SYSCTL_INT(hw.ix.unsupported_sfp, allow_unsupported_sfp);
 
 /*
@@ -608,8 +608,7 @@ ixgbe_attach(device_t parent, device_t d
 		*/
 		adapter-sfp_probe = TRUE;
 		error = 0;
-	} else if ((error == IXGBE_ERR_SFP_NOT_SUPPORTED)
-	 (hw-allow_unsupported_sfp == false)) {
+	} else if (error == IXGBE_ERR_SFP_NOT_SUPPORTED) {
 		aprint_error_dev(dev,Unsupported SFP+ module detected!\n);
 		error = EIO;
 		goto err_late;
@@ -1094,7 +1093,7 @@ ixgbe_mq_start_locked(struct ifnet *ifp,
  * Called from a taskqueue to drain queued transmit packets.
  */
 static void
-ixgbe_deferred_mq_start(void *arg)
+ixgbe_deferred_mq_start(void *arg, int pending)
 {
 	struct tx_ring *txr = arg;
 	struct adapter *adapter = txr-adapter;
@@ -1341,7 +1340,7 @@ ixgbe_init_locked(struct adapter *adapte
 	/* Enable Fan Failure Interrupt */
 	gpie |= IXGBE_SDP1_GPIEN;
 
-	/* Add for Thermal detection */
+	/* Add for Module detection */
 	if (hw-mac.type == ixgbe_mac_82599EB)
 		gpie |= IXGBE_SDP2_GPIEN;
 
@@ -1633,11 +1632,12 @@ ixgbe_legacy_irq(void *arg)
 	struct ix_queue *que = arg;
 	struct adapter	*adapter = que-adapter;
 	struct ixgbe_hw	*hw = adapter-hw;
-	struct ifnet   *ifp = adapter-ifp;
+	struct ifnet*ifp = adapter-ifp;
 	struct 		tx_ring *txr = adapter-tx_rings;
 	bool		more = false;
 	u32   	reg_eicr;
 
+
 	reg_eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
 
 	adapter-stats.legint.ev_count++;
@@ -2669,6 +2669,7 @@ ixgbe_allocate_msix(struct adapter *adap
 		que-msix = vector;
 	adapter-que_mask |= (u64)(1  que-msix);
 #ifdef	RSS
+		/*
 		 * The queue ID is used as the RSS layer bucket ID.
 		 * We look up the queue ID - RSS CPU ID and select
 		 * that.
@@ -2677,7 +2678,7 @@ ixgbe_allocate_msix(struct adapter *adap
 #else
 		/*
 		 * Bind the msix vector, and thus the
-		 * ring to the corresponding cpu.
+		 * rings to the corresponding cpu.
 		 *
 		 * This just happens to match the default RSS round-robin
 		 * bucket - queue - CPU allocation.
@@ -4112,6 +4113,7 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr,
 			mp = rxbuf-buf;
 
 		mp-m_pkthdr.len = mp-m_len = rxr-mbuf_sz;
+
 		/* If we're dealing with an mbuf that was copied rather
 		 * than replaced, there's no need to go through busdma.
 		 */
@@ -4823,6 +4825,7 @@ ixgbe_rx_discard(struct rx_ring *rxr, in
 
 	rbuf = rxr-rx_buffers[i];
 
+
 	/*
 	** With advanced descriptors the writeback
 	** clobbers the buffer addrs, so its easier
@@ -4830,16 +4833,17 @@ ixgbe_rx_discard(struct rx_ring *rxr, in
 	** the normal refresh path to get new buffers
 	** and mapping.
 	*/
+
 	if (rbuf-buf != NULL) {/* Partial chain ? */
 		rbuf-fmp-m_flags |= M_PKTHDR;
 		m_freem(rbuf-fmp);
 		rbuf-fmp = NULL;
 		rbuf-buf = NULL; /* rbuf-buf is part of fmp's chain */

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

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Thu Aug 13 10:03:38 UTC 2015

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

Log Message:
 Reduce diff against FreeBSD r280181.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/ixgbe/ixgbe_api.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixv.c

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

CVS commit: src/lib/libc/time

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 11:21:18 UTC 2015

Modified Files:
src/lib/libc/time: Makefile NEWS Theory difftime.c localtime.c
private.h strftime.c tz-art.htm tz-link.htm zdump.c zic.8 zic.c

Log Message:
merge 2015f


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/time/Makefile
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/time/NEWS
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/time/Theory
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/difftime.c
cvs rdiff -u -r1.95 -r1.96 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/time/private.h
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/tz-art.htm
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/time/tz-link.htm
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/time/zic.8
cvs rdiff -u -r1.54 -r1.55 src/lib/libc/time/zic.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/Makefile
diff -u src/lib/libc/time/Makefile:1.29 src/lib/libc/time/Makefile:1.30
--- src/lib/libc/time/Makefile:1.29	Sun Jun 21 12:06:51 2015
+++ src/lib/libc/time/Makefile	Thu Aug 13 07:21:18 2015
@@ -5,7 +5,7 @@
 PACKAGE=	tzcode
 
 # Version numbers of the code and data distributions.
-VERSION=	2015e
+VERSION=	2015f
 
 # Email address for bug reports.
 BUGEMAIL=	t...@iana.org
@@ -102,7 +102,6 @@ LDLIBS=
 
 # Add the following to the end of the CFLAGS= line as needed.
 #  -DBIG_BANG=-999LL if the Big Bang occurred at time -999 (see zic.c)
-#  -DHAVE_ADJTIME=0 if 'adjtime' does not exist (SVR0?)
 #  -DHAVE_DOS_FILE_NAMES if file names have drive specifiers etc. (MS-DOS)
 #  -DHAVE_GETTEXT=1 if 'gettext' works (GNU, Linux, Solaris); also see LDLIBS
 #  -DHAVE_INCOMPATIBLE_CTIME_R=1 if your system's time.h declares
@@ -113,10 +112,6 @@ LDLIBS=
 #  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
 #	This defaults to 1 if a working localtime_rz seems to be available.
 #	localtime_rz can make zdump significantly faster, but is nonstandard.
-#  -DHAVE_SETTIMEOFDAY=0 if settimeofday does not exist (SVR0?)
-#  -DHAVE_SETTIMEOFDAY=1 if settimeofday has just 1 arg (SVR4)
-#  -DHAVE_SETTIMEOFDAY=2 if settimeofday uses 2nd arg (4.3BSD)
-#  -DHAVE_SETTIMEOFDAY=3 if settimeofday ignores 2nd arg (4.4BSD)
 #  -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with stdint.h
 #  -DHAVE_STRFTIME_L=1 if time.h declares locale_t and strftime_l
 #	This defaults to 0 if _POSIX_VERSION  200809, 1 otherwise.
@@ -126,7 +121,6 @@ LDLIBS=
 #  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a sys/wait.h
 #  -DHAVE_TZSET=0 if your system lacks a tzset function
 #  -DHAVE_UNISTD_H=0 if your compiler lacks a unistd.h (Microsoft C++ 7?)
-#  -DHAVE_UTMPX_H=1 if your compiler has a utmpx.h
 #  -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1
 #	if you do not want run time warnings about formats that may cause
 #	year 2000 grief
@@ -148,7 +142,7 @@ LDLIBS=
 #  -DZIC_MAX_ABBR_LEN_WO_WARN=3
 #	(or some other number) to set the maximum time zone abbreviation length
 #	that zic will accept without a warning (the default is 6)
-#  $(GCC_DEBUG_FLAGS) if you are using GCC and want lots of checking
+#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
 GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
 	-Wall -Wextra \
 	-Wbad-function-cast -Wcast-align -Wdate-time \

Index: src/lib/libc/time/NEWS
diff -u src/lib/libc/time/NEWS:1.12 src/lib/libc/time/NEWS:1.13
--- src/lib/libc/time/NEWS:1.12	Sun Jun 21 12:06:51 2015
+++ src/lib/libc/time/NEWS	Thu Aug 13 07:21:18 2015
@@ -1,5 +1,71 @@
 News for the tz database
 
+Release 2015f - 2015-08-10 18:06:56 -0700
+
+  Changes affecting future time stamps
+
+North Korea switches to +0830 on 2015-08-15.  (Thanks to Steffen Thorsen.)
+The abbreviation remains KST.  (Thanks to Robert Elz.)
+
+Uruguay no longer observes DST.  (Thanks to Steffen Thorsen
+and Pablo Camargo.)
+
+  Changes affecting past and future time stamps
+
+Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
+(Thanks to Roman Tudos.)
+
+  Changes affecting data format and code
+
+zic's '-y YEARISTYPE' option is no longer documented.  The TYPE
+field of a Rule line should now be '-'; the old values 'even',
+'odd', 'uspres', 'nonpres', 'nonuspres' were already undocumented.
+Although the implementation has not changed, these features do not
+work in the default installation, they are not used in the data,
+and they are now considered obsolescent.
+
+zic now checks that two rules don't take effect at the same time.
+(Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
+simultaneity are now documented.
+
+The two characters '%z' in a zone format now stand for the UTC
+offset, e.g., '-07' for seven

CVS commit: src/lib/libc/time

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 11:21:18 UTC 2015

Modified Files:
src/lib/libc/time: Makefile NEWS Theory difftime.c localtime.c
private.h strftime.c tz-art.htm tz-link.htm zdump.c zic.8 zic.c

Log Message:
merge 2015f


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/time/Makefile
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/time/NEWS
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/time/Theory
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/time/difftime.c
cvs rdiff -u -r1.95 -r1.96 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/time/private.h
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/tz-art.htm
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/time/tz-link.htm
cvs rdiff -u -r1.41 -r1.42 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/time/zic.8
cvs rdiff -u -r1.54 -r1.55 src/lib/libc/time/zic.c

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

CVS commit: src/sys/net

2015-08-13 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Aug 13 10:14:26 UTC 2015

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

Log Message:
Remove extra rt_refcnt++ in rtalloc1

rtrequest has already done it. So we don't need to do it once more.

This fixes regressed behavior of ARP cache expiration which an expired
cache doesn't disappear.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/net/route.c

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

Modified files:

Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.147 src/sys/net/route.c:1.148
--- src/sys/net/route.c:1.147	Thu Aug 13 07:59:05 2015
+++ src/sys/net/route.c	Thu Aug 13 10:14:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.147 2015/08/13 07:59:05 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.148 2015/08/13 10:14:26 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
 #include opt_route.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: route.c,v 1.147 2015/08/13 07:59:05 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: route.c,v 1.148 2015/08/13 10:14:26 ozaki-r Exp $);
 
 #include sys/param.h
 #ifdef RTFLUSH_DEBUG
@@ -379,7 +379,6 @@ rtalloc1(const struct sockaddr *dst, int
 			}
 			KASSERT(newrt != NULL);
 			rt = newrt;
-			rt-rt_refcnt++;
 			if (rt-rt_flags  RTF_XRESOLVE) {
 msgtype = RTM_RESOLVE;
 goto miss;

CVS commit: src/sys/net

2015-08-13 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Aug 13 10:14:26 UTC 2015

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

Log Message:
Remove extra rt_refcnt++ in rtalloc1

rtrequest has already done it. So we don't need to do it once more.

This fixes regressed behavior of ARP cache expiration which an expired
cache doesn't disappear.


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/net/route.c

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

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

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:26:16 UTC 2015

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18268

Log Message:
import openssh-7.0

Changes since OpenSSH 6.9
=

This focus of this release is primarily to deprecate weak, legacy
and/or unsafe cryptography.

Security


 * sshd(8): OpenSSH 6.8 and 6.9 incorrectly set TTYs to be world-
   writable. Local attackers may be able to write arbitrary messages
   to logged-in users, including terminal escape sequences.
   Reported by Nikolay Edigaryev.

 * sshd(8): Portable OpenSSH only: Fixed a privilege separation
   weakness related to PAM support. Attackers who could successfully
   compromise the pre-authentication process for remote code
   execution and who had valid credentials on the host could
   impersonate other users.  Reported by Moritz Jodeit.

 * sshd(8): Portable OpenSSH only: Fixed a use-after-free bug
   related to PAM support that was reachable by attackers who could
   compromise the pre-authentication process for remote code
   execution. Also reported by Moritz Jodeit.

 * sshd(8): fix circumvention of MaxAuthTries using keyboard-
   interactive authentication. By specifying a long, repeating
   keyboard-interactive devices string, an attacker could request
   the same authentication method be tried thousands of times in
   a single pass. The LoginGraceTime timeout in sshd(8) and any
   authentication failure delays implemented by the authentication
   mechanism itself were still applied. Found by Kingcope.

Potentially-incompatible Changes


 * Support for the legacy SSH version 1 protocol is disabled by
   default at compile time.

 * Support for the 1024-bit diffie-hellman-group1-sha1 key exchange
   is disabled by default at run-time. It may be re-enabled using
   the instructions at http://www.openssh.com/legacy.html

 * Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled
   by default at run-time. These may be re-enabled using the
   instructions at http://www.openssh.com/legacy.html

 * Support for the legacy v00 cert format has been removed.

 * The default for the sshd_config(5) PermitRootLogin option has
   changed from yes to prohibit-password.

 * PermitRootLogin=without-password/prohibit-password now bans all
   interactive authentication methods, allowing only public-key,
   hostbased and GSSAPI authentication (previously it permitted
   keyboard-interactive and password-less authentication if those
   were enabled).

New Features


 * ssh_config(5): add PubkeyAcceptedKeyTypes option to control which
   public key types are available for user authentication.

 * sshd_config(5): add HostKeyAlgorithms option to control which
   public key types are offered for host authentications.

 * ssh(1), sshd(8): extend Ciphers, MACs, KexAlgorithms,
   HostKeyAlgorithms, PubkeyAcceptedKeyTypes and HostbasedKeyTypes
   options to allow appending to the default set of algorithms
   instead of replacing it. Options may now be prefixed with a '+'
   to append to the default, e.g. HostKeyAlgorithms=+ssh-dss.

 * sshd_config(5): PermitRootLogin now accepts an argument of
   'prohibit-password' as a less-ambiguous synonym of 'without-
   password'.

Bugfixes


 * ssh(1), sshd(8): add compatability workarounds for Cisco and more
   PuTTY versions. bz#2424

 * Fix some omissions and errors in the PROTOCOL and PROTOCOL.mux
   documentation relating to Unix domain socket forwarding;
   bz#2421 bz#2422

 * ssh(1): Improve the ssh(1) manual page to include a better
   description of Unix domain socket forwarding; bz#2423

 * ssh(1), ssh-agent(1): skip uninitialised PKCS#11 slots, fixing
   failures to load keys when they are present. bz#2427

 * ssh(1), ssh-agent(1): do not ignore PKCS#11 hosted keys that wth
   empty CKA_ID; bz#2429

 * sshd(8): clarify documentation for UseDNS option; bz#2045


Status:

Vendor Tag: OPENSSH
Release Tags:   v70-20150812

U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent
U src/crypto/external/bsd/openssh/dist/hostfile.c
U src/crypto/external/bsd/openssh/dist/LICENCE
C src/crypto/external/bsd/openssh/dist/OVERVIEW
C src/crypto/external/bsd/openssh/dist/PROTOCOL
U src/crypto/external/bsd/openssh/dist/PROTOCOL.chacha20poly1305
U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c
U src/crypto/external/bsd/openssh/dist/PROTOCOL.key
U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl
C src/crypto/external/bsd/openssh/dist/PROTOCOL.mux
U src/crypto/external/bsd/openssh/dist/README
C src/crypto/external/bsd/openssh/dist/addrmatch.c
U src/crypto/external/bsd/openssh/dist/atomicio.c
U src/crypto/external/bsd/openssh/dist/atomicio.h
U src/crypto/external/bsd/openssh/dist/canohost.c
U src/crypto/external/bsd/openssh/dist/auth-chall.c
U

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

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:32:36 UTC 2015

Modified Files:
src/crypto/external/bsd/openssh/lib: shlib_version

Log Message:
bump version


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/lib/shlib_version

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

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

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:32:36 UTC 2015

Modified Files:
src/crypto/external/bsd/openssh/lib: shlib_version

Log Message:
bump version


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/lib/shlib_version

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/lib/shlib_version
diff -u src/crypto/external/bsd/openssh/lib/shlib_version:1.14 src/crypto/external/bsd/openssh/lib/shlib_version:1.15
--- src/crypto/external/bsd/openssh/lib/shlib_version:1.14	Thu Jul  2 21:00:00 2015
+++ src/crypto/external/bsd/openssh/lib/shlib_version	Thu Aug 13 06:32:36 2015
@@ -1,5 +1,5 @@
-#	$NetBSD: shlib_version,v 1.14 2015/07/03 01:00:00 christos Exp $
+#	$NetBSD: shlib_version,v 1.15 2015/08/13 10:32:36 christos Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
-major=25
+major=26
 minor=0

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

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:26:16 UTC 2015

Update of /cvsroot/src/crypto/external/bsd/openssh/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv18268

Log Message:
import openssh-7.0

Changes since OpenSSH 6.9
=

This focus of this release is primarily to deprecate weak, legacy
and/or unsafe cryptography.

Security


 * sshd(8): OpenSSH 6.8 and 6.9 incorrectly set TTYs to be world-
   writable. Local attackers may be able to write arbitrary messages
   to logged-in users, including terminal escape sequences.
   Reported by Nikolay Edigaryev.

 * sshd(8): Portable OpenSSH only: Fixed a privilege separation
   weakness related to PAM support. Attackers who could successfully
   compromise the pre-authentication process for remote code
   execution and who had valid credentials on the host could
   impersonate other users.  Reported by Moritz Jodeit.

 * sshd(8): Portable OpenSSH only: Fixed a use-after-free bug
   related to PAM support that was reachable by attackers who could
   compromise the pre-authentication process for remote code
   execution. Also reported by Moritz Jodeit.

 * sshd(8): fix circumvention of MaxAuthTries using keyboard-
   interactive authentication. By specifying a long, repeating
   keyboard-interactive devices string, an attacker could request
   the same authentication method be tried thousands of times in
   a single pass. The LoginGraceTime timeout in sshd(8) and any
   authentication failure delays implemented by the authentication
   mechanism itself were still applied. Found by Kingcope.

Potentially-incompatible Changes


 * Support for the legacy SSH version 1 protocol is disabled by
   default at compile time.

 * Support for the 1024-bit diffie-hellman-group1-sha1 key exchange
   is disabled by default at run-time. It may be re-enabled using
   the instructions at http://www.openssh.com/legacy.html

 * Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled
   by default at run-time. These may be re-enabled using the
   instructions at http://www.openssh.com/legacy.html

 * Support for the legacy v00 cert format has been removed.

 * The default for the sshd_config(5) PermitRootLogin option has
   changed from yes to prohibit-password.

 * PermitRootLogin=without-password/prohibit-password now bans all
   interactive authentication methods, allowing only public-key,
   hostbased and GSSAPI authentication (previously it permitted
   keyboard-interactive and password-less authentication if those
   were enabled).

New Features


 * ssh_config(5): add PubkeyAcceptedKeyTypes option to control which
   public key types are available for user authentication.

 * sshd_config(5): add HostKeyAlgorithms option to control which
   public key types are offered for host authentications.

 * ssh(1), sshd(8): extend Ciphers, MACs, KexAlgorithms,
   HostKeyAlgorithms, PubkeyAcceptedKeyTypes and HostbasedKeyTypes
   options to allow appending to the default set of algorithms
   instead of replacing it. Options may now be prefixed with a '+'
   to append to the default, e.g. HostKeyAlgorithms=+ssh-dss.

 * sshd_config(5): PermitRootLogin now accepts an argument of
   'prohibit-password' as a less-ambiguous synonym of 'without-
   password'.

Bugfixes


 * ssh(1), sshd(8): add compatability workarounds for Cisco and more
   PuTTY versions. bz#2424

 * Fix some omissions and errors in the PROTOCOL and PROTOCOL.mux
   documentation relating to Unix domain socket forwarding;
   bz#2421 bz#2422

 * ssh(1): Improve the ssh(1) manual page to include a better
   description of Unix domain socket forwarding; bz#2423

 * ssh(1), ssh-agent(1): skip uninitialised PKCS#11 slots, fixing
   failures to load keys when they are present. bz#2427

 * ssh(1), ssh-agent(1): do not ignore PKCS#11 hosted keys that wth
   empty CKA_ID; bz#2429

 * sshd(8): clarify documentation for UseDNS option; bz#2045


Status:

Vendor Tag: OPENSSH
Release Tags:   v70-20150812

U src/crypto/external/bsd/openssh/dist/PROTOCOL.agent
U src/crypto/external/bsd/openssh/dist/hostfile.c
U src/crypto/external/bsd/openssh/dist/LICENCE
C src/crypto/external/bsd/openssh/dist/OVERVIEW
C src/crypto/external/bsd/openssh/dist/PROTOCOL
U src/crypto/external/bsd/openssh/dist/PROTOCOL.chacha20poly1305
U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys
U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c
U src/crypto/external/bsd/openssh/dist/PROTOCOL.key
U src/crypto/external/bsd/openssh/dist/PROTOCOL.krl
C src/crypto/external/bsd/openssh/dist/PROTOCOL.mux
U src/crypto/external/bsd/openssh/dist/README
C src/crypto/external/bsd/openssh/dist/addrmatch.c
U src/crypto/external/bsd/openssh/dist/atomicio.c
U src/crypto/external/bsd/openssh/dist/atomicio.h
U src/crypto/external/bsd/openssh/dist/canohost.c
U src/crypto/external/bsd/openssh/dist/auth-chall.c
U

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

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:33:21 UTC 2015

Modified Files:
src/crypto/external/bsd/openssh/dist: OVERVIEW PROTOCOL PROTOCOL.mux
addrmatch.c auth-options.c auth.c auth2-chall.c authfd.c authfile.c
cipher.h clientloop.c compat.c kex.c kex.h key.c key.h krl.c log.c
monitor.c myproposal.h packet.c readconf.c readconf.h scp.1
servconf.c servconf.h ssh-add.c ssh-agent.c ssh-keygen.1
ssh-keygen.c ssh-keysign.c ssh-pkcs11.c ssh.1 ssh.c ssh.h
ssh_config.5 sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5
sshkey.c sshpty.c version.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/OVERVIEW \
src/crypto/external/bsd/openssh/dist/sshkey.c \
src/crypto/external/bsd/openssh/dist/sshpty.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \
src/crypto/external/bsd/openssh/dist/cipher.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/addrmatch.c \
src/crypto/external/bsd/openssh/dist/auth2-chall.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssh/dist/auth-options.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/key.h \
src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/compat.c \
src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/myproposal.h \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/ssh_config.5 \
src/crypto/external/bsd/openssh/dist/sshd.8 \
src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/key.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/log.c \
src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/servconf.h
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/ssh-agent.c \
src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/ssh.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/ssh.h
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/sshd.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/OVERVIEW
diff -u src/crypto/external/bsd/openssh/dist/OVERVIEW:1.4 src/crypto/external/bsd/openssh/dist/OVERVIEW:1.5
--- src/crypto/external/bsd/openssh/dist/OVERVIEW:1.4	Fri Apr  3 19:58:19 2015
+++ src/crypto/external/bsd/openssh/dist/OVERVIEW	Thu Aug 13 06:33:21 2015
@@ -65,8 +65,8 @@ these programs.
   packets.  CRC code comes from crc32.c.
 
 - The code in packet.c calls the buffer manipulation routines
-  (buffer.c, bufaux.c), compression routines (compress.c, zlib),
-  and the encryption routines.
+  (buffer.c, bufaux.c), compression routines (zlib), and the
+  encryption routines.
 
   X11, TCP/IP, and Agent forwarding
 
@@ -165,5 +165,5 @@ these programs.
 	uidswap.cuid-swapping
 	xmalloc.csafe malloc routines
 
-$OpenBSD: OVERVIEW,v 1.11 2006/08/03 03:34:41 deraadt Exp $
-$NetBSD: OVERVIEW,v 1.4 2015/04/03 23:58:19 christos Exp $
+$OpenBSD: OVERVIEW,v 1.12 2015/07/08 19:01:15 markus Exp $
+$NetBSD: OVERVIEW,v 1.5 2015/08/13 10:33:21 christos Exp $
Index: src/crypto/external/bsd/openssh/dist/sshkey.c
diff -u src/crypto/external/bsd/openssh/dist/sshkey.c:1.4 src/crypto/external/bsd/openssh/dist/sshkey.c:1.5
--- src/crypto/external/bsd/openssh/dist/sshkey.c:1.4	Thu Jul  2 21:00:00 2015
+++ src/crypto/external/bsd/openssh/dist/sshkey.c	Thu Aug 13 06:33:21 2015
@@ -1,5 +1,5 @@
-/*	$NetBSD: sshkey.c,v 1.4 2015/07/03 01:00:00

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

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 10:33:21 UTC 2015

Modified Files:
src/crypto/external/bsd/openssh/dist: OVERVIEW PROTOCOL PROTOCOL.mux
addrmatch.c auth-options.c auth.c auth2-chall.c authfd.c authfile.c
cipher.h clientloop.c compat.c kex.c kex.h key.c key.h krl.c log.c
monitor.c myproposal.h packet.c readconf.c readconf.h scp.1
servconf.c servconf.h ssh-add.c ssh-agent.c ssh-keygen.1
ssh-keygen.c ssh-keysign.c ssh-pkcs11.c ssh.1 ssh.c ssh.h
ssh_config.5 sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5
sshkey.c sshpty.c version.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/OVERVIEW \
src/crypto/external/bsd/openssh/dist/sshkey.c \
src/crypto/external/bsd/openssh/dist/sshpty.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/PROTOCOL \
src/crypto/external/bsd/openssh/dist/krl.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \
src/crypto/external/bsd/openssh/dist/cipher.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/addrmatch.c \
src/crypto/external/bsd/openssh/dist/auth2-chall.c \
src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssh/dist/auth-options.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/auth.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssh/dist/authfd.c \
src/crypto/external/bsd/openssh/dist/kex.h \
src/crypto/external/bsd/openssh/dist/key.h \
src/crypto/external/bsd/openssh/dist/scp.1 \
src/crypto/external/bsd/openssh/dist/ssh-keysign.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/authfile.c \
src/crypto/external/bsd/openssh/dist/compat.c \
src/crypto/external/bsd/openssh/dist/kex.c \
src/crypto/external/bsd/openssh/dist/myproposal.h \
src/crypto/external/bsd/openssh/dist/ssh-add.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/clientloop.c \
src/crypto/external/bsd/openssh/dist/ssh_config.5 \
src/crypto/external/bsd/openssh/dist/sshd.8 \
src/crypto/external/bsd/openssh/dist/sshd_config
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/key.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/log.c \
src/crypto/external/bsd/openssh/dist/readconf.h \
src/crypto/external/bsd/openssh/dist/servconf.h
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/monitor.c \
src/crypto/external/bsd/openssh/dist/readconf.c \
src/crypto/external/bsd/openssh/dist/ssh-agent.c \
src/crypto/external/bsd/openssh/dist/ssh.1 \
src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/servconf.c \
src/crypto/external/bsd/openssh/dist/ssh.c \
src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/ssh.h
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/sshconnect2.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/sshd.c

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

CVS commit: src/doc

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 11:30:17 UTC 2015

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
New tzcode


To generate a diff of this commit:
cvs rdiff -u -r1.1243 -r1.1244 src/doc/3RDPARTY
cvs rdiff -u -r1.2091 -r1.2092 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1243 src/doc/3RDPARTY:1.1244
--- src/doc/3RDPARTY:1.1243	Thu Aug 13 06:36:31 2015
+++ src/doc/3RDPARTY	Thu Aug 13 07:30:17 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1243 2015/08/13 10:36:31 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1244 2015/08/13 11:30:17 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1338,7 +1338,7 @@ Notes:
 Added changes from a5 - a12 manually.
 
 Package:	tz
-Version:	tzcode2015d / tzdata2015f
+Version:	tzcode2015f / tzdata2015f
 Current Vers:	tzcode2015f / tzdata2015f
 Maintainer:	Paul Eggert egg...@cs.ucla.edu
 Archive Site:	ftp://ftp.iana.org/tz/releases/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2091 src/doc/CHANGES:1.2092
--- src/doc/CHANGES:1.2091	Thu Aug 13 06:36:31 2015
+++ src/doc/CHANGES	Thu Aug 13 07:30:17 2015
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2091 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.2092 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -184,3 +184,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		[jmcneill 20150808]
 	zoneinfo: Import tzdata2015f. [apb 20150811]
 	OpenSSH: Imported 7.0. [christos 20150813]
+	libc: Update to tzcode2015f. [christos 20150813]

CVS commit: src/doc

2015-08-13 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Aug 13 11:30:17 UTC 2015

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
New tzcode


To generate a diff of this commit:
cvs rdiff -u -r1.1243 -r1.1244 src/doc/3RDPARTY
cvs rdiff -u -r1.2091 -r1.2092 src/doc/CHANGES

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

CVS commit: src/tests/net/arp

2015-08-13 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Aug 13 10:22:21 UTC 2015

Modified Files:
src/tests/net/arp: t_arp.sh

Log Message:
Reflect a fix on rt_refcnt

The test was adjusted based on wrong behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/arp/t_arp.sh

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

Modified files:

Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.7 src/tests/net/arp/t_arp.sh:1.8
--- src/tests/net/arp/t_arp.sh:1.7	Fri Aug  7 05:32:12 2015
+++ src/tests/net/arp/t_arp.sh	Thu Aug 13 10:22:21 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: t_arp.sh,v 1.7 2015/08/07 05:32:12 ozaki-r Exp $
+#	$NetBSD: t_arp.sh,v 1.8 2015/08/13 10:22:21 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -140,8 +140,7 @@ test_cache_expiration()
 	$DEBUG  rump.arp -n -a
 	atf_check -s exit:0 -o ignore rump.arp -n $IP4SRC
 	# Should be expired
-	#atf_check -s not-exit:0 -e ignore rump.arp -n $IP4DST
-	atf_check -s exit:0 -o match:'incomplete' rump.arp -n $IP4DST
+	atf_check -s not-exit:0 -e ignore rump.arp -n $IP4DST
 }
 
 cache_expiration_5s_body()
@@ -227,7 +226,7 @@ command_body()
 	# Hm? the cache doesn't expire...
 	atf_check -s exit:0 sleep $(($arp_keep + $arp_prune + $bonus))
 	$DEBUG  rump.arp -n -a
-	#atf_check -s exit:0 -o match:'incomplete' rump.arp -n 10.0.1.10
+	#atf_check -s not-exit:0 -e ignore rump.arp -n 10.0.1.10
 
 	return 0
 }

CVS commit: src/tests/net/arp

2015-08-13 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Aug 13 10:22:21 UTC 2015

Modified Files:
src/tests/net/arp: t_arp.sh

Log Message:
Reflect a fix on rt_refcnt

The test was adjusted based on wrong behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/arp/t_arp.sh

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

CVS commit: src/distrib/notes/common

2015-08-13 Thread Leonardo Taccari

Module Name:src
Committed By:   leot
Date:   Thu Aug 13 13:21:04 UTC 2015

Modified Files:
src/distrib/notes/common: main

Log Message:
Add myself.


To generate a diff of this commit:
cvs rdiff -u -r1.523 -r1.524 src/distrib/notes/common/main

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.523 src/distrib/notes/common/main:1.524
--- src/distrib/notes/common/main:1.523	Wed Jul  8 08:48:19 2015
+++ src/distrib/notes/common/main	Thu Aug 13 13:21:04 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: main,v 1.523 2015/07/08 08:48:19 kamil Exp $
+.\	$NetBSD: main,v 1.524 2015/08/13 13:21:04 leot Exp $
 .\
 .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -1397,6 +1397,7 @@ If you're one of them, and would like to
 .It Ta Gr\('egoire Sutre Ta Mt gsu...@netbsd.org
 .It Ta Sergey Svishchev Ta Mt shatte...@netbsd.org
 .It Ta Robert Swindells Ta Mt r...@netbsd.org
+.It Ta Leonardo Taccari Ta Mt l...@netbsd.org
 .It Ta Shin Takemura Ta Mt takem...@netbsd.org
 .It Ta TAMURA Kent Ta Mt k...@netbsd.org
 .It Ta Shin'ichiro TAYA Ta Mt t...@netbsd.org

CVS commit: src/distrib/notes/common

2015-08-13 Thread Leonardo Taccari

Module Name:src
Committed By:   leot
Date:   Thu Aug 13 13:21:04 UTC 2015

Modified Files:
src/distrib/notes/common: main

Log Message:
Add myself.


To generate a diff of this commit:
cvs rdiff -u -r1.523 -r1.524 src/distrib/notes/common/main

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

CVS commit: src/libexec/httpd

2015-08-13 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Aug 13 12:30:08 UTC 2015

Modified Files:
src/libexec/httpd: bozohttpd.8

Log Message:
Remove trailing space in boast.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/libexec/httpd/bozohttpd.8

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/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.52 src/libexec/httpd/bozohttpd.8:1.53
--- src/libexec/httpd/bozohttpd.8:1.52	Thu Aug 13 09:00:29 2015
+++ src/libexec/httpd/bozohttpd.8	Thu Aug 13 12:30:08 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: bozohttpd.8,v 1.52 2015/08/13 09:00:29 shm Exp $
+.\	$NetBSD: bozohttpd.8,v 1.53 2015/08/13 12:30:08 wiz Exp $
 .\
 .\	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\
@@ -597,7 +597,7 @@ provided many fixes and enhancements for
 .It
 .An Mateusz Kocielski
 .Aq Mt s...@netbsd.org
-fixed memory leaks, various issues with userdir support, 
+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.
 .It

CVS commit: src/libexec/httpd

2015-08-13 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Aug 13 12:30:08 UTC 2015

Modified Files:
src/libexec/httpd: bozohttpd.8

Log Message:
Remove trailing space in boast.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/libexec/httpd/bozohttpd.8

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

CVS commit: src/sys/dev/cadence

2015-08-13 Thread Robert Swindells

Module Name:src
Committed By:   rjs
Date:   Thu Aug 13 14:51:35 UTC 2015

Modified Files:
src/sys/dev/cadence: cemacreg.h if_cemac.c

Log Message:
Add gem versions of collision counters.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/cadence/cemacreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cadence/if_cemac.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/cadence/cemacreg.h
diff -u src/sys/dev/cadence/cemacreg.h:1.1 src/sys/dev/cadence/cemacreg.h:1.2
--- src/sys/dev/cadence/cemacreg.h:1.1	Fri Jan 23 12:34:09 2015
+++ src/sys/dev/cadence/cemacreg.h	Thu Aug 13 14:51:35 2015
@@ -1,4 +1,4 @@
-/*  $NetBSD: cemacreg.h,v 1.1 2015/01/23 12:34:09 hkenken Exp $	*/
+/*  $NetBSD: cemacreg.h,v 1.2 2015/08/13 14:51:35 rjs Exp $	*/
 
 /*-
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
@@ -109,6 +109,8 @@
 #define	GEM_SA3H	0x009C
 #define	GEM_SA4L	0x0090
 #define	GEM_SA4H	0x0094
+#define	GEM_SCOL	0x0138
+#define	GEM_MCOL	0x013C
 #define	GEM_DCFG2	0x0284
 #define	GEM_DCFG3	0x0288
 #define	GEM_DCFG4	0x028C

Index: src/sys/dev/cadence/if_cemac.c
diff -u src/sys/dev/cadence/if_cemac.c:1.2 src/sys/dev/cadence/if_cemac.c:1.3
--- src/sys/dev/cadence/if_cemac.c:1.2	Wed May 20 09:17:18 2015
+++ src/sys/dev/cadence/if_cemac.c	Thu Aug 13 14:51:35 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $	*/
+/*	$NetBSD: if_cemac.c,v 1.3 2015/08/13 14:51:35 rjs Exp $	*/
 
 /*
  * Copyright (c) 2015  Genetec Corporation.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.2 2015/05/20 09:17:18 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_cemac.c,v 1.3 2015/08/13 14:51:35 rjs Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -689,7 +689,11 @@ cemac_tick(void *arg)
 	struct ifnet * ifp = sc-sc_ethercom.ec_if;
 	int s;
 
-	ifp-if_collisions += CEMAC_READ(ETH_SCOL) + CEMAC_READ(ETH_MCOL);
+	if (ISSET(sc-cemac_flags, CEMAC_FLAG_GEM))
+		ifp-if_collisions += CEMAC_READ(GEM_SCOL) + CEMAC_READ(GEM_MCOL);
+	else
+		ifp-if_collisions += CEMAC_READ(ETH_SCOL) + CEMAC_READ(ETH_MCOL);
+
 	/* These misses are ok, they will happen if the RAM/CPU can't keep up */
 	if (!ISSET(sc-cemac_flags, CEMAC_FLAG_GEM)) {
 		uint32_t misses = CEMAC_READ(ETH_DRFC);

CVS commit: src/sys/dev/cadence

2015-08-13 Thread Robert Swindells

Module Name:src
Committed By:   rjs
Date:   Thu Aug 13 14:51:35 UTC 2015

Modified Files:
src/sys/dev/cadence: cemacreg.h if_cemac.c

Log Message:
Add gem versions of collision counters.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/cadence/cemacreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cadence/if_cemac.c

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

CVS commit: src/sys/dev/mii

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 01:26:38 UTC 2015

Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/mii/miidevs_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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.126 src/sys/dev/mii/miidevs.h:1.127
--- src/sys/dev/mii/miidevs.h:1.126	Tue Jun  9 21:41:55 2015
+++ src/sys/dev/mii/miidevs.h	Fri Aug 14 01:26:38 2015
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs.h,v 1.126 2015/06/09 21:41:55 matt Exp $	*/
+/*	$NetBSD: miidevs.h,v 1.127 2015/08/14 01:26:38 knakahara Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.123 2015/06/09 21:41:23 matt Exp
+ *	NetBSD: miidevs,v 1.124 2015/08/14 01:23:17 knakahara Exp
  */
 
 /*-
@@ -385,6 +385,8 @@
 #define	MII_STR_xxMARVELL_E1145	Marvell 88E1145 Quad Gigabit PHY
 #define	MII_MODEL_xxMARVELL_E6060	0x0010
 #define	MII_STR_xxMARVELL_E6060	Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch
+#define	MII_MODEL_xxMARVELL_E1512	0x001d
+#define	MII_STR_xxMARVELL_E1512	Marvell 88E1512 Gigabit PHY
 #define	MII_MODEL_xxMARVELL_E1116	0x0021
 #define	MII_STR_xxMARVELL_E1116	Marvell 88E1116 Gigabit PHY
 #define	MII_MODEL_xxMARVELL_E1118	0x0022

Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.114 src/sys/dev/mii/miidevs_data.h:1.115
--- src/sys/dev/mii/miidevs_data.h:1.114	Tue Jun  9 21:41:55 2015
+++ src/sys/dev/mii/miidevs_data.h	Fri Aug 14 01:26:38 2015
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs_data.h,v 1.114 2015/06/09 21:41:55 matt Exp $	*/
+/*	$NetBSD: miidevs_data.h,v 1.115 2015/08/14 01:26:38 knakahara Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.123 2015/06/09 21:41:23 matt Exp
+ *	NetBSD: miidevs,v 1.124 2015/08/14 01:23:17 knakahara Exp
  */
 
 /*-
@@ -153,6 +153,7 @@ struct mii_knowndev mii_knowndevs[] = {
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E, MII_STR_xxMARVELL_E },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1145, MII_STR_xxMARVELL_E1145 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E6060, MII_STR_xxMARVELL_E6060 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1512, MII_STR_xxMARVELL_E1512 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1118, MII_STR_xxMARVELL_E1118 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },

CVS commit: src/sys/dev/mii

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 01:23:17 UTC 2015

Modified Files:
src/sys/dev/mii: miidevs

Log Message:
Add Marvell 88E1512.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/mii/miidevs

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/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.123 src/sys/dev/mii/miidevs:1.124
--- src/sys/dev/mii/miidevs:1.123	Tue Jun  9 21:41:23 2015
+++ src/sys/dev/mii/miidevs	Fri Aug 14 01:23:17 2015
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.123 2015/06/09 21:41:23 matt Exp $
+$NetBSD: miidevs,v 1.124 2015/08/14 01:23:17 knakahara Exp $
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -262,6 +262,7 @@ model xxMARVELL E1149		0x000b Marvell 88
 model xxMARVELL E		0x000c Marvell 88E Gigabit PHY
 model xxMARVELL E1145		0x000d Marvell 88E1145 Quad Gigabit PHY
 model xxMARVELL E6060		0x0010 Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch
+model xxMARVELL E1512		0x001d Marvell 88E1512 Gigabit PHY
 model xxMARVELL E1116		0x0021 Marvell 88E1116 Gigabit PHY
 model xxMARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
 model xxMARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY

CVS commit: src/sys/dev/mii

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 01:26:38 UTC 2015

Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/mii/miidevs_data.h

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

CVS commit: src/sys/dev/mii

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 01:23:17 UTC 2015

Modified Files:
src/sys/dev/mii: miidevs

Log Message:
Add Marvell 88E1512.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/mii/miidevs

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

CVS commit: src/sys/dev/pci

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 01:11:49 UTC 2015

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

Log Message:
Add Marvell Armada38x.


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

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1229 src/sys/dev/pci/pcidevs:1.1230
--- src/sys/dev/pci/pcidevs:1.1229	Thu Aug 13 04:27:16 2015
+++ src/sys/dev/pci/pcidevs	Fri Aug 14 01:11:49 2015
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1229 2015/08/13 04:27:16 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1230 2015/08/14 01:11:49 knakahara Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2354,6 +2354,9 @@ product MARVELL MV78200		0x7820	MV78200 
 product MARVELL MV78230		0x7823	MV78230 SoC Armada XP
 product MARVELL MV78260		0x7826	MV78260 SoC Armada XP
 product MARVELL MV78460		0x7846	MV78460 SoC Armada XP
+product MARVELL 88F6810 0x6810  88F6810 SoC Armada 38x 
+product MARVELL 88F6820 0x6820  88F6820 SoC Armada 38x 
+product MARVELL 88F6828 0x6828  88F6828 SoC Armada 38x 
 product MARVELL 88W8660		0x8660	88W8660 SoC Orion1
 
 product MARVELL2 88SE9120	0x9120	88SE9120 SATA

CVS commit: src/sys/dev/pci

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 01:15:39 UTC 2015

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.1223 -r1.1224 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1222 -r1.1223 src/sys/dev/pci/pcidevs_data.h

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

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

2015-08-13 Thread Takeshi Nakayama

Module Name:src
Committed By:   nakayama
Date:   Fri Aug 14 02:28:18 UTC 2015

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

Log Message:
Detect a boot device more precisely on QEMU by checking the device
name.


To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/sparc64/sparc64/autoconf.c

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

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

2015-08-13 Thread Takeshi Nakayama

Module Name:src
Committed By:   nakayama
Date:   Fri Aug 14 02:28:18 UTC 2015

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

Log Message:
Detect a boot device more precisely on QEMU by checking the device
name.


To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/sparc64/sparc64/autoconf.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/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.203 src/sys/arch/sparc64/sparc64/autoconf.c:1.204
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.203	Sun Jun 14 19:05:27 2015
+++ src/sys/arch/sparc64/sparc64/autoconf.c	Fri Aug 14 02:28:18 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.203 2015/06/14 19:05:27 martin Exp $ */
+/*	$NetBSD: autoconf.c,v 1.204 2015/08/14 02:28:18 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.203 2015/06/14 19:05:27 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.204 2015/08/14 02:28:18 nakayama Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -843,7 +843,8 @@ dev_path_drive_match(device_t dev, int c
 			snprintf(buf, sizeof(buf), %s@w%016 PRIx64 ,%d,
 			name, wwn, lun);
 		else if (ide_node)
-			snprintf(buf, sizeof(buf), %s@0, name);
+			snprintf(buf, sizeof(buf), %s@0,
+			device_is_a(dev, cd) ? cdrom : disk);
 		else
 			snprintf(buf, sizeof(buf), %s@%d,%d,
 			name, target, lun);

CVS commit: src/sys/dev/pci

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 01:11:49 UTC 2015

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

Log Message:
Add Marvell Armada38x.


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

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

CVS commit: src/share/man/man9

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 02:04:16 UTC 2015

Modified Files:
src/share/man/man9: Makefile pci.9

Log Message:
Add pci_get_ht_capability(9) man.


To generate a diff of this commit:
cvs rdiff -u -r1.389 -r1.390 src/share/man/man9/Makefile
cvs rdiff -u -r1.38 -r1.39 src/share/man/man9/pci.9

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

Modified files:

Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.389 src/share/man/man9/Makefile:1.390
--- src/share/man/man9/Makefile:1.389	Tue Jul 21 03:12:50 2015
+++ src/share/man/man9/Makefile	Fri Aug 14 02:04:16 2015
@@ -1,4 +1,4 @@
-#   $NetBSD: Makefile,v 1.389 2015/07/21 03:12:50 knakahara Exp $
+#   $NetBSD: Makefile,v 1.390 2015/08/14 02:04:16 knakahara Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
 
@@ -558,6 +558,7 @@ MLINKS+=pci.9 pci_conf_read.9 \
 	pci.9 pci_conf_print.9 \
 	pci.9 pci_find_device.9 \
 	pci.9 pci_get_capability.9 \
+	pci.9 pci_get_ht_capability.9 \
 	pci.9 pci_mapreg_type.9 \
 	pci.9 pci_mapreg_map.9 \
 	pci.9 pci_mapreg_info.9 \

Index: src/share/man/man9/pci.9
diff -u src/share/man/man9/pci.9:1.38 src/share/man/man9/pci.9:1.39
--- src/share/man/man9/pci.9:1.38	Mon Oct 27 14:41:42 2014
+++ src/share/man/man9/pci.9	Fri Aug 14 02:04:16 2015
@@ -1,4 +1,4 @@
-.\ $NetBSD: pci.9,v 1.38 2014/10/27 14:41:42 wiz Exp $
+.\ $NetBSD: pci.9,v 1.39 2015/08/14 02:04:16 knakahara Exp $
 .\
 .\ Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd October 27, 2014
+.Dd August 14, 2015
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -43,6 +43,7 @@
 .Nm pci_conf_restore ,
 .Nm pci_find_device ,
 .Nm pci_get_capability ,
+.Nm pci_get_ht_capability ,
 .Nm pci_mapreg_type ,
 .Nm pci_mapreg_map ,
 .Nm pci_mapreg_info ,
@@ -99,6 +100,9 @@
 .Ft int
 .Fn pci_get_capability pci_chipset_tag_t pc pcitag_t tag \
 int capid int *offsetp pcireg_t *valuep
+.Ft int
+.Fn pci_get_ht_capability pci_chipset_tag_t pc pcitag_t tag \
+int *offsetp pcireg_t *valuep
 .Ft pcireg_t
 .Fn pci_mapreg_type pci_chipset_tag_t pc pcitag_t tag int reg
 .Ft int
@@ -462,6 +466,10 @@ If the capability was not found, it retu
 and
 .Fa valuep
 remain unchanged.
+.It Fn pci_get_ht_capability pc tag offsetp valuep
+This function is about the same as
+.Fn pci_get_capability .
+This function specializes in HyperTransport capability.
 .It Fn pci_mapreg_type pc tag reg
 Interrogates the Base Address Register (BAR) in configuration space
 specified by

CVS commit: src/share/man/man9

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 02:04:16 UTC 2015

Modified Files:
src/share/man/man9: Makefile pci.9

Log Message:
Add pci_get_ht_capability(9) man.


To generate a diff of this commit:
cvs rdiff -u -r1.389 -r1.390 src/share/man/man9/Makefile
cvs rdiff -u -r1.38 -r1.39 src/share/man/man9/pci.9

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

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

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 02:35:32 UTC 2015

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
fix: missing pci_get_ht_capability(9) to distrib/sets/lists.


To generate a diff of this commit:
cvs rdiff -u -r1.1978 -r1.1979 src/distrib/sets/lists/comp/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1978 src/distrib/sets/lists/comp/mi:1.1979
--- src/distrib/sets/lists/comp/mi:1.1978	Mon Aug 10 03:21:44 2015
+++ src/distrib/sets/lists/comp/mi	Fri Aug 14 02:35:32 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1978 2015/08/10 03:21:44 mrg Exp $
+#	$NetBSD: mi,v 1.1979 2015/08/14 02:35:32 knakahara Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -10187,6 +10187,7 @@
 ./usr/share/man/cat9/pci_find_device.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/pci_findvendor.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/pci_get_capability.0	comp-sys-catman		.cat
+./usr/share/man/cat9/pci_get_ht_capability.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/pci_get_powerstate.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/pci_intr.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/pci_intr_alloc.0		comp-sys-catman		.cat
@@ -16995,6 +16996,7 @@
 ./usr/share/man/html9/pci_find_device.html	comp-sys-htmlman	html
 ./usr/share/man/html9/pci_findvendor.html	comp-sys-htmlman	html
 ./usr/share/man/html9/pci_get_capability.html	comp-sys-htmlman	html
+./usr/share/man/html9/pci_get_ht_capability.html	comp-sys-htmlman	html
 ./usr/share/man/html9/pci_get_powerstate.html	comp-sys-htmlman	html
 ./usr/share/man/html9/pci_intr.html		comp-sys-htmlman	html
 ./usr/share/man/html9/pci_intr_alloc.html	comp-sys-htmlman	html
@@ -23965,6 +23967,7 @@
 ./usr/share/man/man9/pci_find_device.9		comp-sys-man		.man
 ./usr/share/man/man9/pci_findvendor.9		comp-sys-man		.man
 ./usr/share/man/man9/pci_get_capability.9	comp-sys-man		.man
+./usr/share/man/man9/pci_get_ht_capability.9	comp-sys-man		.man
 ./usr/share/man/man9/pci_get_powerstate.9	comp-sys-man		.man
 ./usr/share/man/man9/pci_intr.9			comp-sys-man		.man
 ./usr/share/man/man9/pci_intr_alloc.9		comp-sys-man		.man

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

2015-08-13 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Aug 14 02:35:32 UTC 2015

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
fix: missing pci_get_ht_capability(9) to distrib/sets/lists.


To generate a diff of this commit:
cvs rdiff -u -r1.1978 -r1.1979 src/distrib/sets/lists/comp/mi

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

libutil shlib_version lossage

2015-08-13 Thread Taylor R Campbell

Something very strange happened recently, which I noticed by tracing
the forced update in joerg@'s Git mirror:

+Author: christos christos
+Date:   Sat Apr 7 16:44:39 2012 +
+
+Bump shlib minor for new function: ereallocarr(3)
+
+Noted by mrg
+
 diff --git a/lib/libutil/shlib_version b/lib/libutil/shlib_version
 index a658a26..7115edc 100644
 --- a/lib/libutil/shlib_version
@@ -50118645,7 +50118653,9 @@
 Author: christos christos
 Date:   Wed Jul 8 17:29:56 2015 +

-bump bind libraries
+Bump shlib minor for new function: ereallocarr(3)
+
+Noted by mrg

 diff --git a/distrib/sets/lists/base/shl.mi 
b/distrib/sets/lists/base/shl.mi

The CVS log for lib/libutil/shlib_version now shows an anachronistic
commit about ereallocarr:

revision 1.52
date: 2015-07-26 15:15:31 +;  author: kamil;  state: Exp;  lines: +2 
-2;  co
mmitid: axBRfUsc0duU7Ouy;
Bump shalib minor for new function: ereallocarr(3)

Noted by mrg

revision 1.51
date: 2012-04-07 16:44:39 +;  author: christos;  state: Exp;  lines: +2 
-2;
Bump shlib minor for new function: ereallocarr(3)

Noted by mrg

Likewise the CVS log for distrib/sets/lists/base/shl.mi:

   revision 1.744
   date: 2015-07-26 15:15:31 +;  author: kamil;  state: Exp;  lines: +3 -3; 
 co
   mmitid: axBRfUsc0duU7Ouy;
   Bump shalib minor for new function: ereallocarr(3)

   Noted by mrg
   
   revision 1.743
   date: 2015-07-08 17:29:56 +;  author: christos;  state: Exp;  lines: +8 
-8; 
commitid: zxPJFEcgglAbsvsy; 
   Bump shlib minor for new function: ereallocarr(3)

   Noted by mrg

Whisky tango foxtrot?  Did someone botch a cvs admin?

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

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:29:14 UTC 2015

Modified Files:
src/sys/ufs/ffs [netbsd-7]: ffs_alloc.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #949):
sys/ufs/ffs/ffs_alloc.c: revision 1.151
Need wapbl transaction around ffs_blkfree_cg.  Fixes wapbl+discard.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.146.2.1 src/sys/ufs/ffs/ffs_alloc.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/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.146 src/sys/ufs/ffs/ffs_alloc.c:1.146.2.1
--- src/sys/ufs/ffs/ffs_alloc.c:1.146	Fri Jul 25 08:24:31 2014
+++ src/sys/ufs/ffs/ffs_alloc.c	Fri Aug 14 05:29:14 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_alloc.c,v 1.146 2014/07/25 08:24:31 dholland Exp $	*/
+/*	$NetBSD: ffs_alloc.c,v 1.146.2.1 2015/08/14 05:29:14 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_alloc.c,v 1.146 2014/07/25 08:24:31 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_alloc.c,v 1.146.2.1 2015/08/14 05:29:14 msaitoh Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_ffs.h
@@ -1604,12 +1604,21 @@ struct discarddata {
 static void
 ffs_blkfree_td(struct fs *fs, struct discardopdata *td)
 {
+	struct mount *mp = spec_node_getmountedfs(td-devvp);
 	long todo;
+	int error;
 
 	while (td-size) {
 		todo = min(td-size,
 		  ffs_lfragtosize(fs, (fs-fs_frag - ffs_fragnum(fs, td-bno;
+		error = UFS_WAPBL_BEGIN(mp);
+		if (error) {
+			printf(ffs: failed to begin wapbl transaction
+			 for discard: %d\n, error);
+			break;
+		}
 		ffs_blkfree_cg(fs, td-devvp, td-bno, todo);
+		UFS_WAPBL_END(mp);
 		td-bno += ffs_numfrags(fs, todo);
 		td-size -= todo;
 	}

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

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:29:14 UTC 2015

Modified Files:
src/sys/ufs/ffs [netbsd-7]: ffs_alloc.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #949):
sys/ufs/ffs/ffs_alloc.c: revision 1.151
Need wapbl transaction around ffs_blkfree_cg.  Fixes wapbl+discard.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.146.2.1 src/sys/ufs/ffs/ffs_alloc.c

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

CVS commit: [netbsd-5-2] src/crypto/dist/openssl

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:58:12 UTC 2015

Modified Files:
src/crypto/dist/openssl [netbsd-5-2]: e_os2.h
src/crypto/dist/openssl/crypto/asn1 [netbsd-5-2]: a_int.c tasn_new.c
src/crypto/dist/openssl/crypto/bn [netbsd-5-2]: bn.h bn_err.c
bn_print.c bn_rand.c bn_shift.c
src/crypto/dist/openssl/crypto/cms [netbsd-5-2]: cms_smime.c
src/crypto/dist/openssl/crypto/ec [netbsd-5-2]: ec2_smpl.c ec_check.c
ec_key.c ec_lib.c ecp_smpl.c ectest.c
src/crypto/dist/openssl/crypto/ecdsa [netbsd-5-2]: ecdsatest.c
ecs_ossl.c
src/crypto/dist/openssl/crypto/objects [netbsd-5-2]: obj_dat.c
src/crypto/dist/openssl/crypto/ocsp [netbsd-5-2]: ocsp_vfy.c
src/crypto/dist/openssl/crypto/pem [netbsd-5-2]: pem_pk8.c
src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5-2]: pk7_doit.c
src/crypto/dist/openssl/crypto/x509 [netbsd-5-2]: x509_lu.c x509_vfy.c
src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: BN_rand.pod
BN_set_bit.pod pem.pod
src/crypto/dist/openssl/ssl [netbsd-5-2]: d1_lib.c s3_clnt.c s3_srvr.c
ssl.h ssl_err.c ssl_lib.c ssl_locl.h ssl_sess.c
src/crypto/dist/openssl/util [netbsd-5-2]: mkerr.pl

Log Message:
Pull up following revision(s) (requested by spz in ticket #1976):

crypto/dist/openssl/e_os2.h patch
crypto/dist/openssl/crypto/asn1/a_int.c patch
crypto/dist/openssl/crypto/asn1/tasn_new.c  patch
crypto/dist/openssl/crypto/bn/bn.h  patch
crypto/dist/openssl/crypto/bn/bn_err.c  patch
crypto/dist/openssl/crypto/bn/bn_print.cpatch
crypto/dist/openssl/crypto/bn/bn_rand.c patch
crypto/dist/openssl/crypto/bn/bn_shift.cpatch
crypto/dist/openssl/crypto/cms/cms_smime.c  patch
crypto/dist/openssl/crypto/ec/ec2_smpl.cpatch
crypto/dist/openssl/crypto/ec/ec_check.cpatch
crypto/dist/openssl/crypto/ec/ec_key.c  patch
crypto/dist/openssl/crypto/ec/ec_lib.c  patch
crypto/dist/openssl/crypto/ec/ecp_smpl.cpatch
crypto/dist/openssl/crypto/ec/ectest.c  patch
crypto/dist/openssl/crypto/ecdsa/ecdsatest.cpatch
crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch
crypto/dist/openssl/crypto/objects/obj_dat.cpatch
crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c  patch
crypto/dist/openssl/crypto/pem/pem_pk8.cpatch
crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch
crypto/dist/openssl/crypto/x509/x509_lu.c   patch
crypto/dist/openssl/crypto/x509/x509_vfy.c  patch
crypto/dist/openssl/doc/crypto/BN_rand.pod  patch
crypto/dist/openssl/doc/crypto/BN_set_bit.pod   patch
crypto/dist/openssl/doc/crypto/pem.pod  patch
crypto/dist/openssl/ssl/d1_lib.cpatch
crypto/dist/openssl/ssl/s3_clnt.c   patch
crypto/dist/openssl/ssl/s3_srvr.c   patch
crypto/dist/openssl/ssl/ssl.h   patch
crypto/dist/openssl/ssl/ssl_err.c   patch
crypto/dist/openssl/ssl/ssl_lib.c   patch
crypto/dist/openssl/ssl/ssl_locl.h  patch
crypto/dist/openssl/ssl/ssl_sess.c  patch
crypto/dist/openssl/util/mkerr.pl   patch

This change covers the vulnerabilities relevant to netbsd-5 from the
June OpenSSL advisory, and also fixes a regression introduced with the
POODLE fix in October last year that caused the SSL server side to
fail to handshake.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 src/crypto/dist/openssl/e_os2.h
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \
src/crypto/dist/openssl/crypto/asn1/a_int.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
src/crypto/dist/openssl/crypto/asn1/tasn_new.c
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/crypto/dist/openssl/crypto/bn/bn.h
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \
src/crypto/dist/openssl/crypto/bn/bn_err.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/crypto/dist/openssl/crypto/bn/bn_print.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.38.1 \
src/crypto/dist/openssl/crypto/bn/bn_rand.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \
src/crypto/dist/openssl/crypto/bn/bn_shift.c
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.1.10.1 \
src/crypto/dist/openssl/crypto/cms/cms_smime.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
src/crypto/dist/openssl/crypto/ec/ec2_smpl.c \
src/crypto/dist/openssl/crypto/ec/ectest.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.38.1 \
src/crypto/dist/openssl/crypto/ec/ec_check.c
cvs rdiff -u -r1.1.1.1.38.1 -r1.1.1.1.38.2 \
src/crypto/dist/openssl/crypto/ec/ec_key.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
src/crypto/dist/openssl/crypto/ec/ec_lib.c
cvs rdiff -u -r1.1.1.4.38.1 -r1.1.1.4.38.2 \
src/crypto/dist/openssl/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecdsatest.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c

CVS commit: [netbsd-5-2] src/crypto/dist/openssl

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:58:12 UTC 2015

Modified Files:
src/crypto/dist/openssl [netbsd-5-2]: e_os2.h
src/crypto/dist/openssl/crypto/asn1 [netbsd-5-2]: a_int.c tasn_new.c
src/crypto/dist/openssl/crypto/bn [netbsd-5-2]: bn.h bn_err.c
bn_print.c bn_rand.c bn_shift.c
src/crypto/dist/openssl/crypto/cms [netbsd-5-2]: cms_smime.c
src/crypto/dist/openssl/crypto/ec [netbsd-5-2]: ec2_smpl.c ec_check.c
ec_key.c ec_lib.c ecp_smpl.c ectest.c
src/crypto/dist/openssl/crypto/ecdsa [netbsd-5-2]: ecdsatest.c
ecs_ossl.c
src/crypto/dist/openssl/crypto/objects [netbsd-5-2]: obj_dat.c
src/crypto/dist/openssl/crypto/ocsp [netbsd-5-2]: ocsp_vfy.c
src/crypto/dist/openssl/crypto/pem [netbsd-5-2]: pem_pk8.c
src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5-2]: pk7_doit.c
src/crypto/dist/openssl/crypto/x509 [netbsd-5-2]: x509_lu.c x509_vfy.c
src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: BN_rand.pod
BN_set_bit.pod pem.pod
src/crypto/dist/openssl/ssl [netbsd-5-2]: d1_lib.c s3_clnt.c s3_srvr.c
ssl.h ssl_err.c ssl_lib.c ssl_locl.h ssl_sess.c
src/crypto/dist/openssl/util [netbsd-5-2]: mkerr.pl

Log Message:
Pull up following revision(s) (requested by spz in ticket #1976):

crypto/dist/openssl/e_os2.h patch
crypto/dist/openssl/crypto/asn1/a_int.c patch
crypto/dist/openssl/crypto/asn1/tasn_new.c  patch
crypto/dist/openssl/crypto/bn/bn.h  patch
crypto/dist/openssl/crypto/bn/bn_err.c  patch
crypto/dist/openssl/crypto/bn/bn_print.cpatch
crypto/dist/openssl/crypto/bn/bn_rand.c patch
crypto/dist/openssl/crypto/bn/bn_shift.cpatch
crypto/dist/openssl/crypto/cms/cms_smime.c  patch
crypto/dist/openssl/crypto/ec/ec2_smpl.cpatch
crypto/dist/openssl/crypto/ec/ec_check.cpatch
crypto/dist/openssl/crypto/ec/ec_key.c  patch
crypto/dist/openssl/crypto/ec/ec_lib.c  patch
crypto/dist/openssl/crypto/ec/ecp_smpl.cpatch
crypto/dist/openssl/crypto/ec/ectest.c  patch
crypto/dist/openssl/crypto/ecdsa/ecdsatest.cpatch
crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch
crypto/dist/openssl/crypto/objects/obj_dat.cpatch
crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c  patch
crypto/dist/openssl/crypto/pem/pem_pk8.cpatch
crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch
crypto/dist/openssl/crypto/x509/x509_lu.c   patch
crypto/dist/openssl/crypto/x509/x509_vfy.c  patch
crypto/dist/openssl/doc/crypto/BN_rand.pod  patch
crypto/dist/openssl/doc/crypto/BN_set_bit.pod   patch
crypto/dist/openssl/doc/crypto/pem.pod  patch
crypto/dist/openssl/ssl/d1_lib.cpatch
crypto/dist/openssl/ssl/s3_clnt.c   patch
crypto/dist/openssl/ssl/s3_srvr.c   patch
crypto/dist/openssl/ssl/ssl.h   patch
crypto/dist/openssl/ssl/ssl_err.c   patch
crypto/dist/openssl/ssl/ssl_lib.c   patch
crypto/dist/openssl/ssl/ssl_locl.h  patch
crypto/dist/openssl/ssl/ssl_sess.c  patch
crypto/dist/openssl/util/mkerr.pl   patch

This change covers the vulnerabilities relevant to netbsd-5 from the
June OpenSSL advisory, and also fixes a regression introduced with the
POODLE fix in October last year that caused the SSL server side to
fail to handshake.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 src/crypto/dist/openssl/e_os2.h
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \
src/crypto/dist/openssl/crypto/asn1/a_int.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
src/crypto/dist/openssl/crypto/asn1/tasn_new.c
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/crypto/dist/openssl/crypto/bn/bn.h
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \
src/crypto/dist/openssl/crypto/bn/bn_err.c
cvs rdiff -u -r1.9 -r1.9.2.1 src/crypto/dist/openssl/crypto/bn/bn_print.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.38.1 \
src/crypto/dist/openssl/crypto/bn/bn_rand.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \
src/crypto/dist/openssl/crypto/bn/bn_shift.c
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.1.10.1 \
src/crypto/dist/openssl/crypto/cms/cms_smime.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
src/crypto/dist/openssl/crypto/ec/ec2_smpl.c \
src/crypto/dist/openssl/crypto/ec/ectest.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.38.1 \
src/crypto/dist/openssl/crypto/ec/ec_check.c
cvs rdiff -u -r1.1.1.1.38.1 -r1.1.1.1.38.2 \
src/crypto/dist/openssl/crypto/ec/ec_key.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
src/crypto/dist/openssl/crypto/ec/ec_lib.c
cvs rdiff -u -r1.1.1.4.38.1 -r1.1.1.4.38.2 \
src/crypto/dist/openssl/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecdsatest.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c

CVS commit: [netbsd-5] src/crypto/dist/openssl

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:56:28 UTC 2015

Modified Files:
src/crypto/dist/openssl [netbsd-5]: e_os2.h
src/crypto/dist/openssl/crypto/asn1 [netbsd-5]: a_int.c tasn_new.c
src/crypto/dist/openssl/crypto/bn [netbsd-5]: bn.h bn_err.c bn_print.c
bn_rand.c bn_shift.c
src/crypto/dist/openssl/crypto/cms [netbsd-5]: cms_smime.c
src/crypto/dist/openssl/crypto/ec [netbsd-5]: ec2_smpl.c ec_check.c
ec_key.c ec_lib.c ecp_smpl.c ectest.c
src/crypto/dist/openssl/crypto/ecdsa [netbsd-5]: ecdsatest.c ecs_ossl.c
src/crypto/dist/openssl/crypto/objects [netbsd-5]: obj_dat.c
src/crypto/dist/openssl/crypto/ocsp [netbsd-5]: ocsp_vfy.c
src/crypto/dist/openssl/crypto/pem [netbsd-5]: pem_pk8.c
src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5]: pk7_doit.c
src/crypto/dist/openssl/crypto/x509 [netbsd-5]: x509_lu.c x509_vfy.c
src/crypto/dist/openssl/doc/crypto [netbsd-5]: BN_rand.pod
BN_set_bit.pod pem.pod
src/crypto/dist/openssl/ssl [netbsd-5]: d1_lib.c s3_clnt.c s3_srvr.c
ssl.h ssl_err.c ssl_lib.c ssl_locl.h ssl_sess.c
src/crypto/dist/openssl/util [netbsd-5]: mkerr.pl

Log Message:
Pull up following revision(s) (requested by spz in ticket #1976):

crypto/dist/openssl/e_os2.h patch
crypto/dist/openssl/crypto/asn1/a_int.c patch
crypto/dist/openssl/crypto/asn1/tasn_new.c  patch
crypto/dist/openssl/crypto/bn/bn.h  patch
crypto/dist/openssl/crypto/bn/bn_err.c  patch
crypto/dist/openssl/crypto/bn/bn_print.cpatch
crypto/dist/openssl/crypto/bn/bn_rand.c patch
crypto/dist/openssl/crypto/bn/bn_shift.cpatch
crypto/dist/openssl/crypto/cms/cms_smime.c  patch
crypto/dist/openssl/crypto/ec/ec2_smpl.cpatch
crypto/dist/openssl/crypto/ec/ec_check.cpatch
crypto/dist/openssl/crypto/ec/ec_key.c  patch
crypto/dist/openssl/crypto/ec/ec_lib.c  patch
crypto/dist/openssl/crypto/ec/ecp_smpl.cpatch
crypto/dist/openssl/crypto/ec/ectest.c  patch
crypto/dist/openssl/crypto/ecdsa/ecdsatest.cpatch
crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch
crypto/dist/openssl/crypto/objects/obj_dat.cpatch
crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c  patch
crypto/dist/openssl/crypto/pem/pem_pk8.cpatch
crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch
crypto/dist/openssl/crypto/x509/x509_lu.c   patch
crypto/dist/openssl/crypto/x509/x509_vfy.c  patch
crypto/dist/openssl/doc/crypto/BN_rand.pod  patch
crypto/dist/openssl/doc/crypto/BN_set_bit.pod   patch
crypto/dist/openssl/doc/crypto/pem.pod  patch
crypto/dist/openssl/ssl/d1_lib.cpatch
crypto/dist/openssl/ssl/s3_clnt.c   patch
crypto/dist/openssl/ssl/s3_srvr.c   patch
crypto/dist/openssl/ssl/ssl.h   patch
crypto/dist/openssl/ssl/ssl_err.c   patch
crypto/dist/openssl/ssl/ssl_lib.c   patch
crypto/dist/openssl/ssl/ssl_locl.h  patch
crypto/dist/openssl/ssl/ssl_sess.c  patch
crypto/dist/openssl/util/mkerr.pl   patch

This change covers the vulnerabilities relevant to netbsd-5 from the
June OpenSSL advisory, and also fixes a regression introduced with the
POODLE fix in October last year that caused the SSL server side to
fail to handshake.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/crypto/dist/openssl/e_os2.h
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.4.1 \
src/crypto/dist/openssl/crypto/asn1/a_int.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
src/crypto/dist/openssl/crypto/asn1/tasn_new.c
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 src/crypto/dist/openssl/crypto/bn/bn.h
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
src/crypto/dist/openssl/crypto/bn/bn_err.c
cvs rdiff -u -r1.9 -r1.9.4.1 src/crypto/dist/openssl/crypto/bn/bn_print.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.26.1 \
src/crypto/dist/openssl/crypto/bn/bn_rand.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.26.1 \
src/crypto/dist/openssl/crypto/bn/bn_shift.c
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \
src/crypto/dist/openssl/crypto/cms/cms_smime.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
src/crypto/dist/openssl/crypto/ec/ec2_smpl.c \
src/crypto/dist/openssl/crypto/ec/ectest.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.26.1 \
src/crypto/dist/openssl/crypto/ec/ec_check.c
cvs rdiff -u -r1.1.1.1.26.1 -r1.1.1.1.26.2 \
src/crypto/dist/openssl/crypto/ec/ec_key.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \
src/crypto/dist/openssl/crypto/ec/ec_lib.c
cvs rdiff -u -r1.1.1.4.26.1 -r1.1.1.4.26.2 \
src/crypto/dist/openssl/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecdsatest.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 \

CVS commit: [netbsd-5] src/crypto/dist/openssl

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:56:28 UTC 2015

Modified Files:
src/crypto/dist/openssl [netbsd-5]: e_os2.h
src/crypto/dist/openssl/crypto/asn1 [netbsd-5]: a_int.c tasn_new.c
src/crypto/dist/openssl/crypto/bn [netbsd-5]: bn.h bn_err.c bn_print.c
bn_rand.c bn_shift.c
src/crypto/dist/openssl/crypto/cms [netbsd-5]: cms_smime.c
src/crypto/dist/openssl/crypto/ec [netbsd-5]: ec2_smpl.c ec_check.c
ec_key.c ec_lib.c ecp_smpl.c ectest.c
src/crypto/dist/openssl/crypto/ecdsa [netbsd-5]: ecdsatest.c ecs_ossl.c
src/crypto/dist/openssl/crypto/objects [netbsd-5]: obj_dat.c
src/crypto/dist/openssl/crypto/ocsp [netbsd-5]: ocsp_vfy.c
src/crypto/dist/openssl/crypto/pem [netbsd-5]: pem_pk8.c
src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5]: pk7_doit.c
src/crypto/dist/openssl/crypto/x509 [netbsd-5]: x509_lu.c x509_vfy.c
src/crypto/dist/openssl/doc/crypto [netbsd-5]: BN_rand.pod
BN_set_bit.pod pem.pod
src/crypto/dist/openssl/ssl [netbsd-5]: d1_lib.c s3_clnt.c s3_srvr.c
ssl.h ssl_err.c ssl_lib.c ssl_locl.h ssl_sess.c
src/crypto/dist/openssl/util [netbsd-5]: mkerr.pl

Log Message:
Pull up following revision(s) (requested by spz in ticket #1976):

crypto/dist/openssl/e_os2.h patch
crypto/dist/openssl/crypto/asn1/a_int.c patch
crypto/dist/openssl/crypto/asn1/tasn_new.c  patch
crypto/dist/openssl/crypto/bn/bn.h  patch
crypto/dist/openssl/crypto/bn/bn_err.c  patch
crypto/dist/openssl/crypto/bn/bn_print.cpatch
crypto/dist/openssl/crypto/bn/bn_rand.c patch
crypto/dist/openssl/crypto/bn/bn_shift.cpatch
crypto/dist/openssl/crypto/cms/cms_smime.c  patch
crypto/dist/openssl/crypto/ec/ec2_smpl.cpatch
crypto/dist/openssl/crypto/ec/ec_check.cpatch
crypto/dist/openssl/crypto/ec/ec_key.c  patch
crypto/dist/openssl/crypto/ec/ec_lib.c  patch
crypto/dist/openssl/crypto/ec/ecp_smpl.cpatch
crypto/dist/openssl/crypto/ec/ectest.c  patch
crypto/dist/openssl/crypto/ecdsa/ecdsatest.cpatch
crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c patch
crypto/dist/openssl/crypto/objects/obj_dat.cpatch
crypto/dist/openssl/crypto/ocsp/ocsp_vfy.c  patch
crypto/dist/openssl/crypto/pem/pem_pk8.cpatch
crypto/dist/openssl/crypto/pkcs7/pk7_doit.c patch
crypto/dist/openssl/crypto/x509/x509_lu.c   patch
crypto/dist/openssl/crypto/x509/x509_vfy.c  patch
crypto/dist/openssl/doc/crypto/BN_rand.pod  patch
crypto/dist/openssl/doc/crypto/BN_set_bit.pod   patch
crypto/dist/openssl/doc/crypto/pem.pod  patch
crypto/dist/openssl/ssl/d1_lib.cpatch
crypto/dist/openssl/ssl/s3_clnt.c   patch
crypto/dist/openssl/ssl/s3_srvr.c   patch
crypto/dist/openssl/ssl/ssl.h   patch
crypto/dist/openssl/ssl/ssl_err.c   patch
crypto/dist/openssl/ssl/ssl_lib.c   patch
crypto/dist/openssl/ssl/ssl_locl.h  patch
crypto/dist/openssl/ssl/ssl_sess.c  patch
crypto/dist/openssl/util/mkerr.pl   patch

This change covers the vulnerabilities relevant to netbsd-5 from the
June OpenSSL advisory, and also fixes a regression introduced with the
POODLE fix in October last year that caused the SSL server side to
fail to handshake.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/crypto/dist/openssl/e_os2.h
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.4.1 \
src/crypto/dist/openssl/crypto/asn1/a_int.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
src/crypto/dist/openssl/crypto/asn1/tasn_new.c
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 src/crypto/dist/openssl/crypto/bn/bn.h
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
src/crypto/dist/openssl/crypto/bn/bn_err.c
cvs rdiff -u -r1.9 -r1.9.4.1 src/crypto/dist/openssl/crypto/bn/bn_print.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.26.1 \
src/crypto/dist/openssl/crypto/bn/bn_rand.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.26.1 \
src/crypto/dist/openssl/crypto/bn/bn_shift.c
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \
src/crypto/dist/openssl/crypto/cms/cms_smime.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
src/crypto/dist/openssl/crypto/ec/ec2_smpl.c \
src/crypto/dist/openssl/crypto/ec/ectest.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.26.1 \
src/crypto/dist/openssl/crypto/ec/ec_check.c
cvs rdiff -u -r1.1.1.1.26.1 -r1.1.1.1.26.2 \
src/crypto/dist/openssl/crypto/ec/ec_key.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \
src/crypto/dist/openssl/crypto/ec/ec_lib.c
cvs rdiff -u -r1.1.1.4.26.1 -r1.1.1.4.26.2 \
src/crypto/dist/openssl/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecdsatest.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
src/crypto/dist/openssl/crypto/ecdsa/ecs_ossl.c
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 \

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

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:32:40 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by christos in ticket #950):

crypto/external/bsd/openssh/dist/monitor.c  patch

OpenSSH PAM fix (BFS-SA-2015-002).


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/crypto/external/bsd/openssh/dist/monitor.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/monitor.c
diff -u src/crypto/external/bsd/openssh/dist/monitor.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/monitor.c:1.12.4.2
--- src/crypto/external/bsd/openssh/dist/monitor.c:1.12.4.1	Thu Apr 30 06:07:30 2015
+++ src/crypto/external/bsd/openssh/dist/monitor.c	Fri Aug 14 05:32:39 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: monitor.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $	*/
+/*	$NetBSD: monitor.c,v 1.12.4.2 2015/08/14 05:32:39 msaitoh Exp $	*/
 /* $OpenBSD: monitor.c,v 1.145 2015/02/20 22:17:21 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos pro...@citi.umich.edu
@@ -27,7 +27,7 @@
  */
 
 #include includes.h
-__RCSID($NetBSD: monitor.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $);
+__RCSID($NetBSD: monitor.c,v 1.12.4.2 2015/08/14 05:32:39 msaitoh Exp $);
 #include sys/types.h
 #include sys/wait.h
 #include sys/socket.h
@@ -1061,9 +1061,7 @@ extern KbdintDevice sshpam_device;
 int
 mm_answer_pam_init_ctx(int sock, Buffer *m)
 {
-
 	debug3(%s, __func__);
-	authctxt-user = buffer_get_string(m, NULL);
 	sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
 	sshpam_authok = NULL;
 	buffer_clear(m);
@@ -1145,13 +1143,15 @@ mm_answer_pam_respond(int sock, Buffer *
 int
 mm_answer_pam_free_ctx(int sock, Buffer *m)
 {
+	int r = sshpam_authok != NULL  sshpam_authok == sshpam_ctxt;
 
 	debug3(%s, __func__);
 	(sshpam_device.free_ctx)(sshpam_ctxt);
+	sshpam_ctxt = sshpam_authok = NULL;
 	buffer_clear(m);
 	mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
 	auth_method = keyboard-interactive/pam;
-	return (sshpam_authok == sshpam_ctxt);
+	return r;
 }
 #endif

CVS commit: [netbsd-7] src/doc

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:33:34 UTC 2015

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

Log Message:
Ticket 949 and 950.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.366 -r1.1.2.367 src/doc/CHANGES-7.0

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

Modified files:

Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.366 src/doc/CHANGES-7.0:1.1.2.367
--- src/doc/CHANGES-7.0:1.1.2.366	Tue Aug 11 08:29:03 2015
+++ src/doc/CHANGES-7.0	Fri Aug 14 05:33:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.366 2015/08/11 08:29:03 sborrill Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.367 2015/08/14 05:33:34 msaitoh Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -33913,3 +33913,12 @@ sys/sys/param.h	patched by hand
 	Welcome to 7.0_RC3!
 	[snj]
 
+sys/ufs/ffs/ffs_alloc.c1.151
+
+	Need wapbl transaction around ffs_blkfree_cg.  Fixes wapbl+discard.
+	[riastradh, ticket #949]
+
+crypto/external/bsd/openssh/dist/monitor.c	patch
+
+	OpenSSH PAM fix (BFS-SA-2015-002).
+	[christos, ticket #950]

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

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:32:40 UTC 2015

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

Log Message:
Pull up following revision(s) (requested by christos in ticket #950):

crypto/external/bsd/openssh/dist/monitor.c  patch

OpenSSH PAM fix (BFS-SA-2015-002).


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \
src/crypto/external/bsd/openssh/dist/monitor.c

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

CVS commit: [netbsd-7] src/doc

2015-08-13 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug 14 05:33:34 UTC 2015

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

Log Message:
Ticket 949 and 950.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.366 -r1.1.2.367 src/doc/CHANGES-7.0

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

54 matches

Mail list logo