CVS commit: src/external/mit/xorg/lib/fontconfig/etc

2014-06-05 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Thu Jun  5 10:45:39 UTC 2014

Modified Files:
src/external/mit/xorg/lib/fontconfig/etc: fonts.conf

Log Message:
Also look in new pkgsrc default path, /usr/pkg/share/fonts.
Noted by tsutsui.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf

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

Modified files:

Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf
diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.6 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7
--- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.6	Mon Jun  3 06:46:53 2013
+++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf	Thu Jun  5 10:45:39 2014
@@ -1,6 +1,6 @@
 ?xml version=1.0?
 !DOCTYPE fontconfig SYSTEM fonts.dtd
-!-- $NetBSD: fonts.conf,v 1.6 2013/06/03 06:46:53 mrg Exp $ --
+!-- $NetBSD: fonts.conf,v 1.7 2014/06/05 10:45:39 wiz Exp $ --
 !-- /etc/fonts/fonts.conf file to configure system font access --
 fontconfig
 
@@ -26,6 +26,7 @@
 
 	dir/usr/X11R7/lib/X11/fonts/dir
 	dir/usr/pkg/lib/X11/fonts/dir
+	dir/usr/pkg/share/fonts/dir
 	dir prefix=xdgfonts/dir
 	!-- the following element will be removed in the future --
 	dir~/.fonts/dir

CVS commit: src/lib/libquota

2014-06-05 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Jun  5 13:14:23 UTC 2014

Modified Files:
src/lib/libquota: quota_nfs.c

Log Message:
If a rpc for quota values fails with ENOTCONN translate this to ENOENT - we
certainly don't have any quotas if they are disabled on the file server.
This silences warnings from things like quota -u -v when NFS mounts
are present and no quotas are in use on the file server.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libquota/quota_nfs.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/libquota/quota_nfs.c
diff -u src/lib/libquota/quota_nfs.c:1.2 src/lib/libquota/quota_nfs.c:1.3
--- src/lib/libquota/quota_nfs.c:1.2	Mon Jan 30 06:39:26 2012
+++ src/lib/libquota/quota_nfs.c	Thu Jun  5 13:14:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: quota_nfs.c,v 1.2 2012/01/30 06:39:26 dholland Exp $	*/
+/*	$NetBSD: quota_nfs.c,v 1.3 2014/06/05 13:14:23 martin Exp $	*/
 /*-
   * Copyright (c) 2011 Manuel Bouyer
   * All rights reserved.
@@ -26,7 +26,7 @@
   */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: quota_nfs.c,v 1.2 2012/01/30 06:39:26 dholland Exp $);
+__RCSID($NetBSD: quota_nfs.c,v 1.3 2014/06/05 13:14:23 martin Exp $);
 
 #include sys/types.h
 #include sys/param.h /* XXX for DEV_BSIZE */
@@ -191,7 +191,9 @@ __quota_nfs_get(struct quotahandle *qh, 
 	free(host);
 
 	if (ret != RPC_SUCCESS) {
-		errno = sverrno;
+		/* if the file server does not support any quotas at all,
+		   return ENOENT */
+		errno = sverrno == ENOTCONN ? ENOENT : sverrno;
 		return -1;
 	}

CVS commit: src/doc

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun  5 14:41:13 UTC 2014

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new OpenSSL


To generate a diff of this commit:
cvs rdiff -u -r1.1117 -r1.1118 src/doc/3RDPARTY
cvs rdiff -u -r1.1929 -r1.1930 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.1117 src/doc/3RDPARTY:1.1118
--- src/doc/3RDPARTY:1.1117	Wed May 28 15:14:17 2014
+++ src/doc/3RDPARTY	Thu Jun  5 10:41:13 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1117 2014/05/28 19:14:17 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1118 2014/06/05 14:41:13 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -971,8 +971,8 @@ markus is very cooperative about it):
 - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes.
 
 Package:	OpenSSL
-Version:	1.0.1g
-Current Vers:	1.0.1g with AES-NI patch
+Version:	1.0.1h
+Current Vers:	1.0.1h with AES-NI patch
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1929 src/doc/CHANGES:1.1930
--- src/doc/CHANGES:1.1929	Wed May 28 15:14:17 2014
+++ src/doc/CHANGES	Thu Jun  5 10:41:13 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1929 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1930 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -424,3 +424,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	gcc(1): Import version 4.8.3.  [skrll 20140527]
 	openldap: Import 2.4.39 [tron 20140528]
 	libc: Update to tzcode2014d. [christos 20140528]
+	OpenSSL: Imported 1.0.1h [christos 20140605]

CVS commit: src

2014-06-05 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Thu Jun  5 16:06:49 UTC 2014

Modified Files:
src/sys/netinet6: in6.h in6_ifattach.c ip6_input.c nd6.c nd6.h
src/usr.sbin/ndp: ndp.8 ndp.c

Log Message:
Add IPV6CTL_AUTO_LINKLOCAL and ND6_IFF_AUTO_LINKLOCAL toggles which
control the automatic creation of IPv6 link-local addresses when an
interface is brought up.

Taken from FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/netinet6/in6.h
cvs rdiff -u -r1.90 -r1.91 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.146 -r1.147 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.150 -r1.151 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.58 -r1.59 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/ndp/ndp.8
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/ndp/ndp.c

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

Modified files:

Index: src/sys/netinet6/in6.h
diff -u src/sys/netinet6/in6.h:1.76 src/sys/netinet6/in6.h:1.77
--- src/sys/netinet6/in6.h:1.76	Fri May 30 01:39:03 2014
+++ src/sys/netinet6/in6.h	Thu Jun  5 16:06:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6.h,v 1.76 2014/05/30 01:39:03 christos Exp $	*/
+/*	$NetBSD: in6.h,v 1.77 2014/06/05 16:06:49 roy Exp $	*/
 /*	$KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $	*/
 
 /*
@@ -571,7 +571,9 @@ struct ip6_mtuinfo {
 #define IPV6CTL_ANONPORTMAX	29	/* maximum ephemeral port */
 #define IPV6CTL_LOWPORTMIN	30	/* minimum reserved port */
 #define IPV6CTL_LOWPORTMAX	31	/* maximum reserved port */
-/* 32 to 38: reserved */
+/* 32 to 34: reserved */
+#define IPV6CTL_AUTO_LINKLOCAL	35	/* automatic link-local addr assign */
+/* 36 to 38: reserved */
 #define IPV6CTL_USE_DEFAULTZONE	39	/* use default scope zone */
 /* 40: reserved */
 #define IPV6CTL_MAXFRAGS	41	/* max fragments */

Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.90 src/sys/netinet6/in6_ifattach.c:1.91
--- src/sys/netinet6/in6_ifattach.c:1.90	Sat May 17 20:44:24 2014
+++ src/sys/netinet6/in6_ifattach.c	Thu Jun  5 16:06:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_ifattach.c,v 1.90 2014/05/17 20:44:24 rmind Exp $	*/
+/*	$NetBSD: in6_ifattach.c,v 1.91 2014/06/05 16:06:49 roy Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6_ifattach.c,v 1.90 2014/05/17 20:44:24 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6_ifattach.c,v 1.91 2014/06/05 16:06:49 roy Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -754,6 +754,8 @@ in6_ifattach(struct ifnet *ifp, struct i
 #ifdef IFT_PFSYNC
 	case IFT_PFSYNC:
 #endif
+		ND_IFINFO(ifp)-flags = ~ND6_IFF_AUTO_LINKLOCAL;
+		ND_IFINFO(ifp)-flags |= ND6_IFF_IFDISABLED;
 		return;
 	}
 
@@ -784,6 +786,7 @@ in6_ifattach(struct ifnet *ifp, struct i
 		 * linklocals for 6to4 interface, but there's no use and
 		 * it is rather harmful to have one.
 		 */
+		ND_IFINFO(ifp)-flags = ~ND6_IFF_AUTO_LINKLOCAL;
 		return;
 #endif
 	case IFT_CARP:
@@ -817,7 +820,9 @@ in6_ifattach(struct ifnet *ifp, struct i
 	/*
 	 * assign a link-local address, if there's none.
 	 */
-	if (ip6_auto_linklocal) {
+	if (!(ND_IFINFO(ifp)-flags  ND6_IFF_IFDISABLED) 
+	ND_IFINFO(ifp)-flags  ND6_IFF_AUTO_LINKLOCAL)
+	{
 		ia = in6ifa_ifpforlinklocal(ifp, 0);
 		if (ia == NULL  in6_ifattach_linklocal(ifp, altifp) != 0) {
 			printf(%s: cannot assign link-local address\n,

Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.146 src/sys/netinet6/ip6_input.c:1.147
--- src/sys/netinet6/ip6_input.c:1.146	Fri May 30 01:39:03 2014
+++ src/sys/netinet6/ip6_input.c	Thu Jun  5 16:06:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.146 2014/05/30 01:39:03 christos Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.147 2014/06/05 16:06:49 roy Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip6_input.c,v 1.146 2014/05/30 01:39:03 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip6_input.c,v 1.147 2014/06/05 16:06:49 roy Exp $);
 
 #include opt_gateway.h
 #include opt_inet.h
@@ -1854,6 +1854,15 @@ sysctl_net_inet6_ip6_setup(struct sysctl
 		   IPV6CTL_V6ONLY, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 		   CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+		   CTLTYPE_INT, auto_linklocal,
+		   SYSCTL_DESCR(Default value of per-interface flag for 
+		adding an IPv6 link-local address to 
+interfaces when attached),
+		   NULL, 0, ip6_auto_linklocal, 0,
+		   CTL_NET, PF_INET6, IPPROTO_IPV6,
+		   IPV6CTL_AUTO_LINKLOCAL, CTL_EOL);
+	sysctl_createv(clog, 0, NULL, NULL,
+		   CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		   CTLTYPE_INT, anonportmin,
 		   SYSCTL_DESCR(Lowest ephemeral port number to assign),
 		   sysctl_net_inet_ip_ports, 0, ip6_anonportmin, 0,

Index: src/sys/netinet6/nd6.c

CVS commit: src/sys/netipsec

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun  5 17:11:54 UTC 2014

Modified Files:
src/sys/netipsec: key.c

Log Message:
CID 274353: Forward NULL


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.88 src/sys/netipsec/key.c:1.89
--- src/sys/netipsec/key.c:1.88	Thu May 29 21:39:03 2014
+++ src/sys/netipsec/key.c	Thu Jun  5 13:11:54 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.88 2014/05/30 01:39:03 christos Exp $	*/
+/*	$NetBSD: key.c,v 1.89 2014/06/05 17:11:54 christos Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: key.c,v 1.88 2014/05/30 01:39:03 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: key.c,v 1.89 2014/06/05 17:11:54 christos Exp $);
 
 /*
  * This code is referd to RFC 2367
@@ -1772,7 +1772,7 @@ key_gather_mbuf(struct mbuf *m, const st
 	}
 	va_end(ap);
 
-	if ((result-m_flags  M_PKTHDR) != 0) {
+	if (result  (result-m_flags  M_PKTHDR) != 0) {
 		result-m_pkthdr.len = 0;
 		for (n = result; n; n = n-m_next)
 			result-m_pkthdr.len += n-m_len;

CVS commit: src/sys/netipsec

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun  5 17:17:26 UTC 2014

Modified Files:
src/sys/netipsec: keysock.c

Log Message:
CID 1220167: NULL Deref


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/netipsec/keysock.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/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.26 src/sys/netipsec/keysock.c:1.27
--- src/sys/netipsec/keysock.c:1.26	Wed May 21 16:46:29 2014
+++ src/sys/netipsec/keysock.c	Thu Jun  5 13:17:26 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: keysock.c,v 1.26 2014/05/21 20:46:29 rmind Exp $	*/
+/*	$NetBSD: keysock.c,v 1.27 2014/06/05 17:17:26 christos Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: keysock.c,v 1.26 2014/05/21 20:46:29 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: keysock.c,v 1.27 2014/06/05 17:17:26 christos Exp $);
 
 #include opt_ipsec.h
 
@@ -243,17 +243,19 @@ key_sendup(struct socket *so, struct sad
 	tlen = len;
 	m = mprev = NULL;
 	while (tlen  0) {
+		int mlen;	
 		if (tlen == len) {
 			MGETHDR(n, M_DONTWAIT, MT_DATA);
-			n-m_len = MHLEN;
+			mlen = MHLEN;
 		} else {
 			MGET(n, M_DONTWAIT, MT_DATA);
-			n-m_len = MLEN;
+			mlen = MLEN;
 		}
 		if (!n) {
 			PFKEY_STATINC(PFKEY_STAT_IN_NOMEM);
 			return ENOBUFS;
 		}
+		n-m_len = mlen;
 		if (tlen = MCLBYTES) {	/*XXX better threshold? */
 			MCLGET(n, M_DONTWAIT);
 			if ((n-m_flags  M_EXT) == 0) {

CVS commit: src/sys/netipsec

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun  5 17:18:19 UTC 2014

Modified Files:
src/sys/netipsec: key.c

Log Message:
CID 1220169: Reverse NULL


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.89 src/sys/netipsec/key.c:1.90
--- src/sys/netipsec/key.c:1.89	Thu Jun  5 13:11:54 2014
+++ src/sys/netipsec/key.c	Thu Jun  5 13:18:19 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.89 2014/06/05 17:11:54 christos Exp $	*/
+/*	$NetBSD: key.c,v 1.90 2014/06/05 17:18:19 christos Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: key.c,v 1.89 2014/06/05 17:11:54 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: key.c,v 1.90 2014/06/05 17:18:19 christos Exp $);
 
 /*
  * This code is referd to RFC 2367
@@ -1220,11 +1220,12 @@ key_freeso(struct socket *so)
 	case PF_INET:
 	{
 		struct inpcb *pcb = sotoinpcb(so);
-		struct inpcbpolicy *sp = pcb-inp_sp;
 
 		/* Does it have a PCB ? */
 		if (pcb == NULL)
 			return;
+
+		struct inpcbpolicy *sp = pcb-inp_sp;
 		key_freesp_so(sp-sp_in);
 		key_freesp_so(sp-sp_out);
 	}

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

2014-06-05 Thread Palle Lyckegaard 
Module Name:src
Committed By:   palle
Date:   Thu Jun  5 18:36:44 UTC 2014

Modified Files:
src/sys/arch/sparc64/include: hypervisor.h

Log Message:
sun4v: ensure that it is possible to include the hypervisor.h file more than 
once


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/include/hypervisor.h

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

Modified files:

Index: src/sys/arch/sparc64/include/hypervisor.h
diff -u src/sys/arch/sparc64/include/hypervisor.h:1.2 src/sys/arch/sparc64/include/hypervisor.h:1.3
--- src/sys/arch/sparc64/include/hypervisor.h:1.2	Sat Dec  7 16:54:43 2013
+++ src/sys/arch/sparc64/include/hypervisor.h	Thu Jun  5 18:36:44 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: hypervisor.h,v 1.2 2013/12/07 16:54:43 palle Exp $ */
+/*	$NetBSD: hypervisor.h,v 1.3 2014/06/05 18:36:44 palle Exp $ */
 /*	$OpenBSD: hypervisor.h,v 1.14 2011/06/26 17:23:46 kettenis Exp $	*/
 
 /*
@@ -17,6 +17,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef	_HYPERVISOR_H_
+#define	_HYPERVISOR_H_
+
 /*
  * UltraSPARC Hypervisor API.
  */
@@ -319,3 +322,5 @@ int64_t	hv_rng_data_read(paddr_t raddr, 
 #define H_ENOMAP	14
 #define H_ETOOMANY	15
 #define H_ECHANNEL	16
+
+#endif	/* _HYPERVISOR_H_ */

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

2014-06-05 Thread Palle Lyckegaard 
Module Name:src
Committed By:   palle
Date:   Thu Jun  5 19:47:24 UTC 2014

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

Log Message:
sun4v: note missing handling in pmap_calculate_colors()


To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 src/sys/arch/sparc64/sparc64/pmap.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.287 src/sys/arch/sparc64/sparc64/pmap.c:1.288
--- src/sys/arch/sparc64/sparc64/pmap.c:1.287	Wed May 21 19:33:51 2014
+++ src/sys/arch/sparc64/sparc64/pmap.c	Thu Jun  5 19:47:24 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.287 2014/05/21 19:33:51 palle Exp $	*/
+/*	$NetBSD: pmap.c,v 1.288 2014/06/05 19:47:24 palle Exp $	*/
 /*
  *
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.287 2014/05/21 19:33:51 palle Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.288 2014/06/05 19:47:24 palle Exp $);
 
 #undef	NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define	HWREF
@@ -484,6 +484,7 @@ static int pmap_calculate_colors(void)
 		/* Found a CPU, get the E$ info. */
 		size = prom_getpropint(node, ecache-size, -1);
 		if (size == -1) {
+			/* XXX sun4v support missing */
 			prom_printf(pmap_calculate_colors: node %x has 
 no ecache-size\n, node);
 			/* If we can't get the E$ size, skip the node */

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

2014-06-05 Thread Palle Lyckegaard 
Module Name:src
Committed By:   palle
Date:   Thu Jun  5 19:49:04 UTC 2014

Modified Files:
src/sys/arch/sparc64/doc: TODO

Log Message:
sun4v: note missing handling in cpu_match()


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/doc/TODO

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/doc/TODO
diff -u src/sys/arch/sparc64/doc/TODO:1.3 src/sys/arch/sparc64/doc/TODO:1.4
--- src/sys/arch/sparc64/doc/TODO:1.3	Sat May 31 18:27:03 2014
+++ src/sys/arch/sparc64/doc/TODO	Thu Jun  5 19:49:04 2014
@@ -1,4 +1,4 @@
- /* $NetBSD: TODO,v 1.3 2014/05/31 18:27:03 palle Exp $ */
+ /* $NetBSD: TODO,v 1.4 2014/06/05 19:49:04 palle Exp $ */
 
 Things to be done:
 
@@ -11,3 +11,4 @@ sun4v:
 - ofwboot: tlb_init_sun4v() hardcodes number of slots to 64
 - locore.s: sun4v_datatrap missing implementation for trap levels 0 and 1
 - pmap.c: pmap_calculate_colors() should known about sun4v
+- cpu.c: cpu_attach() does not emit cache info on sun4v

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

2014-06-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Thu Jun  5 21:00:37 UTC 2014

Modified Files:
src/external/gpl3/gcc/dist/gcc: reload.c

Log Message:
Fix a problem with reloading the inner reg of a subreg when it's a
mode dependent address.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/reload.c

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

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/reload.c
diff -u src/external/gpl3/gcc/dist/gcc/reload.c:1.3 src/external/gpl3/gcc/dist/gcc/reload.c:1.4
--- src/external/gpl3/gcc/dist/gcc/reload.c:1.3	Sat Mar  1 08:58:29 2014
+++ src/external/gpl3/gcc/dist/gcc/reload.c	Thu Jun  5 21:00:36 2014
@@ -846,6 +846,7 @@ static bool
 reload_inner_reg_of_subreg (rtx x, enum machine_mode mode, bool output)
 {
   rtx inner;
+  int regno;
 
   /* Only SUBREGs are problematical.  */
   if (GET_CODE (x) != SUBREG)
@@ -857,10 +858,20 @@ reload_inner_reg_of_subreg (rtx x, enum 
   if (CONSTANT_P (inner) || GET_CODE (inner) == PLUS)
 return true;
 
-  /* If INNER is not a hard register, then INNER will not need reloading.  */
-  if (!(REG_P (inner)  HARD_REGISTER_P (inner)))
+  /* If INNER is not a register, then INNER will not need reloading.  */
+  if (!REG_P (inner))
 return false;
 
+  regno = REGNO (inner);
+
+  /* If INNER is not a hard register, then INNER will not need reloading
+ unless it's a mode dependent memory reference.  */
+  if (regno = FIRST_PSEUDO_REGISTER)
+return !output
+	reg_equiv_mem (regno) != 0
+	mode_dependent_address_p (XEXP (reg_equiv_mem (regno), 0),
+	MEM_ADDR_SPACE (reg_equiv_mem (regno)));
+
   /* If INNER is not ok for MODE, then INNER will need reloading.  */
   if (!HARD_REGNO_MODE_OK (subreg_regno (x), mode))
 return true;
@@ -1142,7 +1153,7 @@ push_reload (rtx in, rtx out, rtx *inloc
 
   if (in != 0  reload_inner_reg_of_subreg (in, inmode, false))
 {
-  if (REG_P (SUBREG_REG (in)))
+  if (REG_P (SUBREG_REG (in))  HARD_REGISTER_P (SUBREG_REG (in)))
 	subreg_in_class
 	  = find_valid_class (inmode, GET_MODE (SUBREG_REG (in)),
 			  subreg_regno_offset (REGNO (SUBREG_REG (in)),
@@ -1150,7 +1161,8 @@ push_reload (rtx in, rtx out, rtx *inloc
 		   SUBREG_BYTE (in),
 		   GET_MODE (in)),
 			  REGNO (SUBREG_REG (in)));
-  else if (GET_CODE (SUBREG_REG (in)) == SYMBOL_REF)
+  else if (REG_P (SUBREG_REG (in))
+   || GET_CODE (SUBREG_REG (in)) == SYMBOL_REF)
 	subreg_in_class = find_valid_class_1 (inmode,
 	  GET_MODE (SUBREG_REG (in)),
 	  rclass);

CVS commit: src/share/mk

2014-06-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Thu Jun  5 21:05:42 UTC 2014

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Switch VAX to default to GCC 4.8


To generate a diff of this commit:
cvs rdiff -u -r1.812 -r1.813 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.812 src/share/mk/bsd.own.mk:1.813
--- src/share/mk/bsd.own.mk:1.812	Fri May 30 18:39:29 2014
+++ src/share/mk/bsd.own.mk	Thu Jun  5 21:05:42 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.812 2014/05/30 18:39:29 joerg Exp $
+#	$NetBSD: bsd.own.mk,v 1.813 2014/06/05 21:05:42 matt Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -51,14 +51,8 @@ TOOLCHAIN_MISSING?=	no
 #
 .if ${MKGCC:Uyes} != no
 
-#
-# Platforms still using GCC 4.1
-#
-.if ${MACHINE_CPU}  == vax
-HAVE_GCC?=4
-
 # Platforms still using GCC 4.5
-.elif \
+.if \
   ${MACHINE_CPU} == ia64 || \
   ${MACHINE_CPU} == m68k || \
   ${MACHINE_CPU} == sh3 || \

CVS commit: src/doc

2014-06-05 Thread Matt Thomas 
Module Name:src
Committed By:   matt
Date:   Thu Jun  5 21:06:48 UTC 2014

Modified Files:
src/doc: CHANGES

Log Message:
Note switch of VAX to GCC 4.8


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

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1930 src/doc/CHANGES:1.1931
--- src/doc/CHANGES:1.1930	Thu Jun  5 14:41:13 2014
+++ src/doc/CHANGES	Thu Jun  5 21:06:47 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1930 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1931 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -425,3 +425,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	openldap: Import 2.4.39 [tron 20140528]
 	libc: Update to tzcode2014d. [christos 20140528]
 	OpenSSL: Imported 1.0.1h [christos 20140605]
+	vax: Switch to GCC 4.8 [matt 20140605]

CVS commit: src/lib/libc/stdlib

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun  5 22:00:22 UTC 2014

Modified Files:
src/lib/libc/stdlib: getopt.3 getopt.c

Log Message:
Bring getopt(3) inline with getopt_long(3): recognize option:: as an optional
option.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/stdlib/getopt.3
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/stdlib/getopt.c

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

Modified files:

Index: src/lib/libc/stdlib/getopt.3
diff -u src/lib/libc/stdlib/getopt.3:1.32 src/lib/libc/stdlib/getopt.3:1.33
--- src/lib/libc/stdlib/getopt.3:1.32	Mon Mar 22 15:30:54 2010
+++ src/lib/libc/stdlib/getopt.3	Thu Jun  5 18:00:22 2014
@@ -1,4 +1,4 @@
-.\	$NetBSD: getopt.3,v 1.32 2010/03/22 19:30:54 joerg Exp $
+.\	$NetBSD: getopt.3,v 1.33 2014/06/05 22:00:22 christos Exp $
 .\
 .\ Copyright (c) 1988, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\ @(#)getopt.3	8.5 (Berkeley) 4/27/95
 .\
-.Dd September 10, 2003
+.Dd June 5, 2014
 .Dt GETOPT 3
 .Os
 .Sh NAME
@@ -64,6 +64,17 @@ The option string
 may contain the following elements: individual characters, and
 characters followed by a colon to indicate an option argument
 is to follow.
+If an individual character is followed by two colons, then the
+option argument is optional;
+.Va optarg 
+is set to the rest of the current
+.Va argv
+word, or
+.Dv NULL
+if there were no more characters in the current word.
+This is a
+.Nx
+extension.
 For example, an option string
 .Qq x
 recognizes an option

Index: src/lib/libc/stdlib/getopt.c
diff -u src/lib/libc/stdlib/getopt.c:1.28 src/lib/libc/stdlib/getopt.c:1.29
--- src/lib/libc/stdlib/getopt.c:1.28	Fri Mar 20 09:56:57 2009
+++ src/lib/libc/stdlib/getopt.c	Thu Jun  5 18:00:22 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: getopt.c,v 1.28 2009/03/20 13:56:57 joerg Exp $	*/
+/*	$NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: getopt.c,v 1.28 2009/03/20 13:56:57 joerg Exp $);
+__RCSID($NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $);
 
 #include namespace.h
 
@@ -116,6 +116,12 @@ getopt(int nargc, char * const nargv[], 
 		   entire next argument. */
 		if (*place)
 			optarg = __UNCONST(place);
+		else if (oli[2] == ':')
+			/*
+			 * GNU Extension, for optional arguments if the rest of
+			 * the argument is empty, we return NULL
+			 */
+			optarg = NULL;
 		else if (nargc  ++optind)
 			optarg = nargv[optind];
 		else {

CVS commit: src/lib/libedit

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Jun  5 22:07:42 UTC 2014

Modified Files:
src/lib/libedit: filecomplete.c

Log Message:
PR/48876: Dmitriy Grigoryev: Core dump in readline lib on attempted expansion
Make sure we have 2 matches before calling strcmp().


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libedit/filecomplete.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/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.31 src/lib/libedit/filecomplete.c:1.32
--- src/lib/libedit/filecomplete.c:1.31	Fri Sep 16 12:13:16 2011
+++ src/lib/libedit/filecomplete.c	Thu Jun  5 18:07:42 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.c,v 1.31 2011/09/16 16:13:16 plunky Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.32 2014/06/05 22:07:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include config.h
 #if !defined(lint)  !defined(SCCSID)
-__RCSID($NetBSD: filecomplete.c,v 1.31 2011/09/16 16:13:16 plunky Exp $);
+__RCSID($NetBSD: filecomplete.c,v 1.32 2014/06/05 22:07:42 christos Exp $);
 #endif /* not lint  not SCCSID */
 
 #include sys/types.h
@@ -490,7 +490,8 @@ fn_complete(EditLine *el,
 		if (what_to_do == '?')
 			goto display_matches;
 
-		if (matches[2] == NULL  strcmp(matches[0], matches[1]) == 0) {
+		if (matches[2] == NULL 
+		(matches[1] == NULL || strcmp(matches[0], matches[1]) == 0)) {
 			/*
 			 * We found exact match. Add a space after
 			 * it, unless we do filename completion and the

CVS commit: src/lib/libc/stdlib

2014-06-05 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Thu Jun  5 22:09:50 UTC 2014

Modified Files:
src/lib/libc/stdlib: getopt.3

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/stdlib/getopt.3

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

Modified files:

Index: src/lib/libc/stdlib/getopt.3
diff -u src/lib/libc/stdlib/getopt.3:1.33 src/lib/libc/stdlib/getopt.3:1.34
--- src/lib/libc/stdlib/getopt.3:1.33	Thu Jun  5 22:00:22 2014
+++ src/lib/libc/stdlib/getopt.3	Thu Jun  5 22:09:50 2014
@@ -1,4 +1,4 @@
-.\	$NetBSD: getopt.3,v 1.33 2014/06/05 22:00:22 christos Exp $
+.\	$NetBSD: getopt.3,v 1.34 2014/06/05 22:09:50 wiz Exp $
 .\
 .\ Copyright (c) 1988, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -66,7 +66,7 @@ characters followed by a colon to indica
 is to follow.
 If an individual character is followed by two colons, then the
 option argument is optional;
-.Va optarg 
+.Va optarg
 is set to the rest of the current
 .Va argv
 word, or

CVS commit: src/sys/rump/librump/rumpkern

2014-06-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Thu Jun  5 23:43:04 UTC 2014

Modified Files:
src/sys/rump/librump/rumpkern: intr.c scheduler.c

Log Message:
librump: add kpreempt_disabled(9) and softint_schedule_cpu(9).


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/rump/librump/rumpkern/intr.c
cvs rdiff -u -r1.37 -r1.38 src/sys/rump/librump/rumpkern/scheduler.c

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

Modified files:

Index: src/sys/rump/librump/rumpkern/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.42 src/sys/rump/librump/rumpkern/intr.c:1.43
--- src/sys/rump/librump/rumpkern/intr.c:1.42	Mon Nov 11 23:11:30 2013
+++ src/sys/rump/librump/rumpkern/intr.c	Thu Jun  5 23:43:04 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.42 2013/11/11 23:11:30 pooka Exp $	*/
+/*	$NetBSD: intr.c,v 1.43 2014/06/05 23:43:04 rmind Exp $	*/
 
 /*
  * Copyright (c) 2008-2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.42 2013/11/11 23:11:30 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.43 2014/06/05 23:43:04 rmind Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -324,6 +324,14 @@ softint_schedule(void *arg)
 	}
 }
 
+void
+softint_schedule_cpu(void *arg, struct cpu_info *ci)
+{
+	/* TODO: implement this properly */
+	KASSERT(curcpu() == ci);
+	softint_schedule(arg);
+}
+
 /*
  * flimsy disestablish: should wait for softints to finish.
  */

Index: src/sys/rump/librump/rumpkern/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.37 src/sys/rump/librump/rumpkern/scheduler.c:1.38
--- src/sys/rump/librump/rumpkern/scheduler.c:1.37	Wed Apr  9 23:53:36 2014
+++ src/sys/rump/librump/rumpkern/scheduler.c	Thu Jun  5 23:43:04 2014
@@ -1,4 +1,4 @@
-/*  $NetBSD: scheduler.c,v 1.37 2014/04/09 23:53:36 pooka Exp $	*/
+/*  $NetBSD: scheduler.c,v 1.38 2014/06/05 23:43:04 rmind Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.37 2014/04/09 23:53:36 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.38 2014/06/05 23:43:04 rmind Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -523,6 +523,15 @@ kpreempt_enable(void)
 	KPREEMPT_ENABLE(curlwp);
 }
 
+bool
+kpreempt_disabled(void)
+{
+	const lwp_t *l = curlwp;
+
+	return l-l_nopreempt != 0 || l-l_stat == LSZOMB ||
+	(l-l_flag  LW_IDLE) != 0 /* || cpu_kpreempt_disabled() */;
+}
+
 void
 suspendsched(void)
 {

CVS commit: src/sys/rump/librump/rumpkern

2014-06-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Thu Jun  5 23:42:25 UTC 2014

Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern

Log Message:
librump: include pcq(9) interface.


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/rump/librump/rumpkern/Makefile.rumpkern

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

Modified files:

Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.146 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.147
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.146	Sun Apr 27 15:15:13 2014
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern	Thu Jun  5 23:42:25 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.rumpkern,v 1.146 2014/04/27 15:15:13 pooka Exp $
+#	$NetBSD: Makefile.rumpkern,v 1.147 2014/06/05 23:42:25 rmind Exp $
 #
 
 .include ${RUMPTOP}/Makefile.rump
@@ -115,6 +115,7 @@ SRCS+=	init_sysctl_base.c	\
 	subr_log.c		\
 	subr_lwp_specificdata.c	\
 	subr_once.c		\
+	subr_pcq.c		\
 	subr_percpu.c		\
 	subr_prf.c		\
 	subr_pserialize.c	\

CVS commit: src/usr.bin/sed

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jun  6 00:14:55 UTC 2014

Modified Files:
src/usr.bin/sed: extern.h

Log Message:
add netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/sed/extern.h

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

Modified files:

Index: src/usr.bin/sed/extern.h
diff -u src/usr.bin/sed/extern.h:1.12 src/usr.bin/sed/extern.h:1.13
--- src/usr.bin/sed/extern.h:1.12	Thu Jun  5 20:13:13 2014
+++ src/usr.bin/sed/extern.h	Thu Jun  5 20:14:55 2014
@@ -1,3 +1,5 @@
+/*	$NetBSD: extern.h,v 1.13 2014/06/06 00:14:55 christos Exp $	*/
+
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.
  * Copyright (c) 1992, 1993

CVS commit: src/sys/netinet

2014-06-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Fri Jun  6 00:11:19 UTC 2014

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

Log Message:
ip_output: zero iproute structure only when needed; reduce the scope
of some variables.


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

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

Modified files:

Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.229 src/sys/netinet/ip_output.c:1.230
--- src/sys/netinet/ip_output.c:1.229	Fri May 30 01:39:03 2014
+++ src/sys/netinet/ip_output.c	Fri Jun  6 00:11:19 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_output.c,v 1.229 2014/05/30 01:39:03 christos Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.230 2014/06/06 00:11:19 rmind Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.229 2014/05/30 01:39:03 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_output.c,v 1.230 2014/06/06 00:11:19 rmind Exp $);
 
 #include opt_inet.h
 #include opt_ipsec.h
@@ -161,7 +161,6 @@ ip_output(struct mbuf *m0, ...)
 	struct route iproute;
 	const struct sockaddr_in *dst;
 	struct in_ifaddr *ia;
-	struct ifaddr *xifa;
 	struct mbuf *opt;
 	struct route *ro;
 	int flags, sw_csum;
@@ -173,7 +172,7 @@ ip_output(struct mbuf *m0, ...)
 	struct secpolicy *sp = NULL;
 #endif
 	bool natt_frag = false;
-	bool __unused done = false;
+	bool rtmtu_nolock;
 	union {
 		struct sockaddr		dst;
 		struct sockaddr_in	dst4;
@@ -221,9 +220,10 @@ ip_output(struct mbuf *m0, ...)
 	/*
 	 * Route packet.
 	 */
-	memset(iproute, 0, sizeof(iproute));
-	if (ro == NULL)
+	if (ro == NULL) {
+		memset(iproute, 0, sizeof(iproute));
 		ro = iproute;
+	}
 	sockaddr_in_init(u.dst4, ip-ip_dst, 0);
 	dst = satocsin(rtcache_getdst(ro));
 
@@ -277,6 +277,7 @@ ip_output(struct mbuf *m0, ...)
 		if (rt-rt_flags  RTF_GATEWAY)
 			dst = satosin(rt-rt_gateway);
 	}
+	rtmtu_nolock = rt  (rt-rt_rmx.rmx_locks  RTV_MTU) == 0;
 
 	if (IN_MULTICAST(ip-ip_dst.s_addr) ||
 	(ip-ip_dst.s_addr == INADDR_BROADCAST)) {
@@ -320,6 +321,7 @@ ip_output(struct mbuf *m0, ...)
 		 */
 		if (in_nullhost(ip-ip_src)) {
 			struct in_ifaddr *xia;
+			struct ifaddr *xifa;
 
 			IFP_TO_IA(ifp, xia);
 			if (!xia) {
@@ -378,14 +380,16 @@ ip_output(struct mbuf *m0, ...)
 			m_freem(m);
 			goto done;
 		}
-
 		goto sendit;
 	}
+
 	/*
 	 * If source address not specified yet, use address
 	 * of outgoing interface.
 	 */
 	if (in_nullhost(ip-ip_src)) {
+		struct ifaddr *xifa;
+
 		xifa = ia-ia_ifa;
 		if (xifa-ifa_getifa != NULL)
 			ia = ifatoia((*xifa-ifa_getifa)(xifa, rdst));
@@ -403,9 +407,8 @@ ip_output(struct mbuf *m0, ...)
 	}
 
 	/*
-	 * Look for broadcast address and
-	 * and verify user is allowed to send
-	 * such a packet.
+	 * Look for broadcast address and and verify user is allowed to
+	 * send such a packet.
 	 */
 	if (in_broadcast(dst-sin_addr, ifp)) {
 		if ((ifp-if_flags  IFF_BROADCAST) == 0) {
@@ -450,20 +453,23 @@ sendit:
 			ip-ip_id = ip_newid_range(ia, num);
 		}
 	}
+
 	/*
 	 * If we're doing Path MTU Discovery, we need to set DF unless
 	 * the route's MTU is locked.
 	 */
-	if ((flags  IP_MTUDISC) != 0  rt != NULL 
-	(rt-rt_rmx.rmx_locks  RTV_MTU) == 0)
+	if ((flags  IP_MTUDISC) != 0  rtmtu_nolock) {
 		ip-ip_off |= htons(IP_DF);
+	}
 
 #ifdef IPSEC
 	if (ipsec_used) {
+		bool ipsec_done = false;
+
 		/* Perform IPsec processing, if any. */
 		error = ipsec4_output(m, so, flags, sp, mtu, natt_frag,
-		done);
-		if (error || done)
+		ipsec_done);
+		if (error || ipsec_done)
 			goto done;
 	}
 #endif
@@ -471,7 +477,8 @@ sendit:
 	/*
 	 * Run through list of hooks for output packets.
 	 */
-	if ((error = pfil_run_hooks(inet_pfil_hook, m, ifp, PFIL_OUT)) != 0)
+	error = pfil_run_hooks(inet_pfil_hook, m, ifp, PFIL_OUT);
+	if (error)
 		goto done;
 	if (m == NULL)
 		goto done;
@@ -500,6 +507,8 @@ sendit:
 	 */
 	if (ntohs(ip-ip_len) = mtu ||
 	(m-m_pkthdr.csum_flags  M_CSUM_TSOv4) != 0) {
+		const struct sockaddr *sa;
+
 #if IFA_STATS
 		if (ia)
 			ia-ia_ifa.ifa_data.ifad_outbytes += ntohs(ip-ip_len);
@@ -533,22 +542,15 @@ sendit:
 			}
 		}
 
+		sa = (m-m_flags  M_MCAST) ? sintocsa(rdst) : sintocsa(dst);
 		if (__predict_true(
 		(m-m_pkthdr.csum_flags  M_CSUM_TSOv4) == 0 ||
 		(ifp-if_capenable  IFCAP_TSOv4) != 0)) {
 			KERNEL_LOCK(1, NULL);
-			error =
-			(*ifp-if_output)(ifp, m,
-(m-m_flags  M_MCAST) ?
-sintocsa(rdst) : sintocsa(dst),
-rt);
+			error = (*ifp-if_output)(ifp, m, sa, rt);
 			KERNEL_UNLOCK_ONE(NULL);
 		} else {
-			error =
-			ip_tso_output(ifp, m,
-(m-m_flags  M_MCAST) ?
-sintocsa(rdst) : sintocsa(dst),
-rt);
+			error = ip_tso_output(ifp, m, sa, rt);
 		}
 		goto done;
 	}
@@ -593,39 +595,41 @@ sendit:
 	for (; m; m = m0) {
 		m0 = m-m_nextpkt;
 		m-m_nextpkt = 0;
-

CVS import: src/usr.bin/sed

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jun  6 00:10:05 UTC 2014

Update of /cvsroot/src/usr.bin/sed
In directory ivanova.netbsd.org:/tmp/cvs-serv9463

Log Message:
import today's FreeBSD sed.

Status:

Vendor Tag: FREEBSD
Release Tags:   FREEBSD20140605

C src/usr.bin/sed/misc.c
C src/usr.bin/sed/Makefile
C src/usr.bin/sed/process.c
C src/usr.bin/sed/POSIX
C src/usr.bin/sed/main.c
C src/usr.bin/sed/defs.h
C src/usr.bin/sed/compile.c
C src/usr.bin/sed/sed.1
C src/usr.bin/sed/extern.h

9 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jFREEBSD:yesterday -jFREEBSD src/usr.bin/sed

CVS commit: src/sys/net

2014-06-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Fri Jun  6 00:25:28 UTC 2014

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

Log Message:
Adjust previous change for the #ifdef mess and fix the build.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/net/if_fddisubr.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/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.86 src/sys/net/if_fddisubr.c:1.87
--- src/sys/net/if_fddisubr.c:1.86	Thu Jun  5 23:48:16 2014
+++ src/sys/net/if_fddisubr.c	Fri Jun  6 00:25:28 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_fddisubr.c,v 1.86 2014/06/05 23:48:16 rmind Exp $	*/
+/*	$NetBSD: if_fddisubr.c,v 1.87 2014/06/06 00:25:28 rmind Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_fddisubr.c,v 1.86 2014/06/05 23:48:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_fddisubr.c,v 1.87 2014/06/06 00:25:28 rmind Exp $);
 
 #include opt_gateway.h
 #include opt_inet.h
@@ -462,7 +462,7 @@ fddi_input(struct ifnet *ifp, struct mbu
 #if defined(INET) || defined(INET6)
 	pktqueue_t *pktq = NULL;
 #endif
-#if defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
+#if defined(INET) || defined(INET6) || defined(NS) || defined(DECNET) || defined(IPX) || defined(NETATALK)
 	struct ifqueue *inq = NULL;
 	int s;
 #endif

CVS commit: src/sys

2014-06-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Fri Jun  6 01:02:47 UTC 2014

Modified Files:
src/sys/net: if.c if_faith.c if_mpls.c route.c route.h
src/sys/netinet: ip_carp.c
src/sys/netinet6: icmp6.c in6.c nd6.c

Log Message:
- Eliminate RTFREE() macro in favour of rtfree() function.
- Make rtcache() function static.


To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/net/if.c
cvs rdiff -u -r1.48 -r1.49 src/sys/net/if_faith.c
cvs rdiff -u -r1.13 -r1.14 src/sys/net/if_mpls.c
cvs rdiff -u -r1.130 -r1.131 src/sys/net/route.c
cvs rdiff -u -r1.83 -r1.84 src/sys/net/route.h
cvs rdiff -u -r1.56 -r1.57 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.168 -r1.169 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.170 -r1.171 src/sys/netinet6/in6.c
cvs rdiff -u -r1.151 -r1.152 src/sys/netinet6/nd6.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/if.c
diff -u src/sys/net/if.c:1.276 src/sys/net/if.c:1.277
--- src/sys/net/if.c:1.276	Thu Jun  5 23:48:16 2014
+++ src/sys/net/if.c	Fri Jun  6 01:02:47 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.276 2014/06/05 23:48:16 rmind Exp $	*/
+/*	$NetBSD: if.c,v 1.277 2014/06/06 01:02:47 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if.c,v 1.276 2014/06/05 23:48:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if.c,v 1.277 2014/06/06 01:02:47 rmind Exp $);
 
 #include opt_inet.h
 
@@ -927,7 +927,7 @@ if_rt_walktree(struct rtentry *rt, void 
 	rt_mask(rt), rt-rt_flags, NULL);
 	KASSERT((rt-rt_flags  RTF_UP) == 0);
 	rt-rt_ifp = NULL;
-	RTFREE(rt);
+	rtfree(rt);
 	if (error != 0)
 		printf(%s: warning: unable to delete rtentry @ %p, 
 		error = %d\n, ifp-if_xname, rt, error);

Index: src/sys/net/if_faith.c
diff -u src/sys/net/if_faith.c:1.48 src/sys/net/if_faith.c:1.49
--- src/sys/net/if_faith.c:1.48	Thu Jun  5 23:48:16 2014
+++ src/sys/net/if_faith.c	Fri Jun  6 01:02:47 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_faith.c,v 1.48 2014/06/05 23:48:16 rmind Exp $	*/
+/*	$NetBSD: if_faith.c,v 1.49 2014/06/06 01:02:47 rmind Exp $	*/
 /*	$KAME: if_faith.c,v 1.21 2001/02/20 07:59:26 itojun Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_faith.c,v 1.48 2014/06/05 23:48:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_faith.c,v 1.49 2014/06/06 01:02:47 rmind Exp $);
 
 #include opt_inet.h
 
@@ -290,7 +290,7 @@ faithprefix(struct in6_addr *in6)
 	else
 		ret = 0;
 	if (rt)
-		RTFREE(rt);
+		rtfree(rt);
 	return ret;
 }
 #endif

Index: src/sys/net/if_mpls.c
diff -u src/sys/net/if_mpls.c:1.13 src/sys/net/if_mpls.c:1.14
--- src/sys/net/if_mpls.c:1.13	Thu Jun  5 23:48:16 2014
+++ src/sys/net/if_mpls.c	Fri Jun  6 01:02:47 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mpls.c,v 1.13 2014/06/05 23:48:16 rmind Exp $ */
+/*	$NetBSD: if_mpls.c,v 1.14 2014/06/06 01:02:47 rmind Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.13 2014/06/05 23:48:16 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_mpls.c,v 1.14 2014/06/06 01:02:47 rmind Exp $);
 
 #include opt_inet.h
 #include opt_mpls.h
@@ -268,7 +268,7 @@ mpls_output(struct ifnet *ifp, struct mb
 	}
 
 	err = mpls_send_frame(m, rt1-rt_ifp, rt);
-	RTFREE(rt1);
+	rtfree(rt1);
 	return err;
 }
 
@@ -439,7 +439,7 @@ done:
 	if (error != 0  m != NULL)
 		m_freem(m);
 	if (rt != NULL)
-		RTFREE(rt);
+		rtfree(rt);
 
 	return error;
 }

Index: src/sys/net/route.c
diff -u src/sys/net/route.c:1.130 src/sys/net/route.c:1.131
--- src/sys/net/route.c:1.130	Sat Apr 26 11:10:10 2014
+++ src/sys/net/route.c	Fri Jun  6 01:02:47 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.130 2014/04/26 11:10:10 pooka Exp $	*/
+/*	$NetBSD: route.c,v 1.131 2014/06/06 01:02:47 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
 #include opt_route.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: route.c,v 1.130 2014/04/26 11:10:10 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: route.c,v 1.131 2014/06/06 01:02:47 rmind Exp $);
 
 #include sys/param.h
 #include sys/kmem.h
@@ -301,7 +301,7 @@ rtflushall(int family)
 	rtcache_invalidate(dom-dom_rtcache);
 }
 
-void
+static void
 rtcache(struct route *ro)
 {
 	struct domain *dom;
@@ -703,7 +703,7 @@ rtrequest1(int req, struct rt_addrinfo *
 		if ((rt = rt_deladdr(rtbl, dst, netmask)) == NULL)
 			senderr(ESRCH);
 		if (rt-rt_gwroute) {
-			RTFREE(rt-rt_gwroute);
+			rtfree(rt-rt_gwroute);
 			rt-rt_gwroute = NULL;
 		}
 		if (rt-rt_parent) {
@@ -795,7 +795,7 @@ rtrequest1(int req, struct rt_addrinfo *
 rtdeletemsg(crt);
 rc = rt_addaddr(rtbl, rt, netmask);
 			}
-			RTFREE(crt);
+			rtfree(crt);
 			RT_DPRINTF(rt-_rt_key = %p\n, (void *)rt-_rt_key);
 		}
 		RT_DPRINTF(rt-_rt_key = %p\n, (void

CVS commit: src/sys/net

2014-06-05 Thread Mindaugas Rasiukevicius 
Module Name:src
Committed By:   rmind
Date:   Fri Jun  6 01:27:32 UTC 2014

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

Log Message:
rtfree: let's assert for a non-negative reference count and see what happens.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 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.131 src/sys/net/route.c:1.132
--- src/sys/net/route.c:1.131	Fri Jun  6 01:02:47 2014
+++ src/sys/net/route.c	Fri Jun  6 01:27:32 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.131 2014/06/06 01:02:47 rmind Exp $	*/
+/*	$NetBSD: route.c,v 1.132 2014/06/06 01:27:32 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
 #include opt_route.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: route.c,v 1.131 2014/06/06 01:02:47 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: route.c,v 1.132 2014/06/06 01:27:32 rmind Exp $);
 
 #include sys/param.h
 #include sys/kmem.h
@@ -376,16 +376,13 @@ rtfree(struct rtentry *rt)
 {
 	struct ifaddr *ifa;
 
-	if (rt == NULL)
-		panic(rtfree);
+	KASSERT(rt != NULL);
+	KASSERT(rt-rt_refcnt  0);
+
 	rt-rt_refcnt--;
-	if (rt-rt_refcnt = 0  (rt-rt_flags  RTF_UP) == 0) {
+	if (rt-rt_refcnt == 0  (rt-rt_flags  RTF_UP) == 0) {
 		rt_assert_inactive(rt);
 		rttrash--;
-		if (rt-rt_refcnt  0) {
-			printf(rtfree: %p not freed (neg refs)\n, rt);
-			return;
-		}
 		rt_timer_remove_all(rt, 0);
 		ifa = rt-rt_ifa;
 		rt-rt_ifa = NULL;

CVS commit: src/lib/libc/gen

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jun  6 01:41:00 UTC 2014

Modified Files:
src/lib/libc/gen: errc.c verrc.c vwarnc.c warnc.c

Log Message:
be friendlier to nbcompat


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/gen/errc.c src/lib/libc/gen/verrc.c \
src/lib/libc/gen/vwarnc.c src/lib/libc/gen/warnc.c

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

Modified files:

Index: src/lib/libc/gen/errc.c
diff -u src/lib/libc/gen/errc.c:1.1 src/lib/libc/gen/errc.c:1.2
--- src/lib/libc/gen/errc.c:1.1	Thu Jan 16 12:21:38 2014
+++ src/lib/libc/gen/errc.c	Thu Jun  5 21:41:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: errc.c,v 1.1 2014/01/16 17:21:38 christos Exp $	*/
+/*	$NetBSD: errc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 #if defined(LIBC_SCCS)  !defined(lint)
-__RCSID($NetBSD: errc.c,v 1.1 2014/01/16 17:21:38 christos Exp $);
+__RCSID($NetBSD: errc.c,v 1.2 2014/06/06 01:41:00 christos Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include namespace.h
@@ -46,7 +46,7 @@ __RCSID($NetBSD: errc.c,v 1.1 2014/01/1
 __weak_alias(errc, _errc)
 #endif
 
-#if !HAVE_ERR_H
+#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_ERRC)
 __dead void
 errc(int eval, int code, const char *fmt, ...)
 {
Index: src/lib/libc/gen/verrc.c
diff -u src/lib/libc/gen/verrc.c:1.1 src/lib/libc/gen/verrc.c:1.2
--- src/lib/libc/gen/verrc.c:1.1	Thu Jan 16 12:21:38 2014
+++ src/lib/libc/gen/verrc.c	Thu Jun  5 21:41:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: verrc.c,v 1.1 2014/01/16 17:21:38 christos Exp $	*/
+/*	$NetBSD: verrc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = @(#)err.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: verrc.c,v 1.1 2014/01/16 17:21:38 christos Exp $);
+__RCSID($NetBSD: verrc.c,v 1.2 2014/06/06 01:41:00 christos Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,7 +53,7 @@ __RCSID($NetBSD: verrc.c,v 1.1 2014/01/
 __weak_alias(verrc, _verrc)
 #endif
 
-#if !HAVE_ERR_H
+#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_ERRC)
 __dead void
 verrc(int eval, int code, const char *fmt, va_list ap)
 {
Index: src/lib/libc/gen/vwarnc.c
diff -u src/lib/libc/gen/vwarnc.c:1.1 src/lib/libc/gen/vwarnc.c:1.2
--- src/lib/libc/gen/vwarnc.c:1.1	Thu Jan 16 12:21:38 2014
+++ src/lib/libc/gen/vwarnc.c	Thu Jun  5 21:41:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: vwarnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $	*/
+/*	$NetBSD: vwarnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = @(#)err.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: vwarnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $);
+__RCSID($NetBSD: vwarnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,7 +53,7 @@ __RCSID($NetBSD: vwarnc.c,v 1.1 2014/01
 __weak_alias(vwarnc, _vwarnc)
 #endif
 
-#if !HAVE_ERR_H
+#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_VWARNC)
 void
 vwarnc(int code, const char *fmt, va_list ap)
 {
Index: src/lib/libc/gen/warnc.c
diff -u src/lib/libc/gen/warnc.c:1.1 src/lib/libc/gen/warnc.c:1.2
--- src/lib/libc/gen/warnc.c:1.1	Thu Jan 16 12:21:38 2014
+++ src/lib/libc/gen/warnc.c	Thu Jun  5 21:41:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: warnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $	*/
+/*	$NetBSD: warnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = @(#)err.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: warnc.c,v 1.1 2014/01/16 17:21:38 christos Exp $);
+__RCSID($NetBSD: warnc.c,v 1.2 2014/06/06 01:41:00 christos Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -50,7 +50,7 @@ __RCSID($NetBSD: warnc.c,v 1.1 2014/01/
 __weak_alias(warnc, _warnc)
 #endif
 
-#if !HAVE_ERR_H
+#if !defined(HAVE_ERR_H) || !defined(HAVE_DECL_WARNC)
 void
 warnc(int code, const char *fmt, ...)
 {

CVS commit: src/usr.bin/sed

2014-06-05 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Fri Jun  6 01:45:11 UTC 2014

Modified Files:
src/usr.bin/sed: main.c

Log Message:
Prefer setvbuf for those who have it.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/sed/main.c

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

Modified files:

Index: src/usr.bin/sed/main.c
diff -u src/usr.bin/sed/main.c:1.22 src/usr.bin/sed/main.c:1.23
--- src/usr.bin/sed/main.c:1.22	Thu Jun  5 20:13:13 2014
+++ src/usr.bin/sed/main.c	Thu Jun  5 21:45:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.22 2014/06/06 00:13:13 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.23 2014/06/06 01:45:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
 #endif
 
 #include sys/cdefs.h
-__RCSID($NetBSD: main.c,v 1.22 2014/06/06 00:13:13 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.23 2014/06/06 01:45:11 christos Exp $);
 #ifdef __FBSDID
 __FBSDID($FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $);
 #endif
@@ -170,8 +170,13 @@ main(int argc, char *argv[])
 			ispan = 0;	/* don't span across input files */
 			break;
 		case 'l':
-			if(setlinebuf(stdout) != 0)
-warnx(setlinebuf() failed);
+#ifdef _IOLBF
+			c = setvbuf(stdout, NULL, _IOLBF, 0);
+#else
+			c = setlinebuf(stdout);
+#endif
+			if (c)
+warn(setting line buffered output failed);
 			break;
 		case 'n':
 			nflag = 1;

CVS commit: [netbsd-6] src/doc

2014-06-05 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri Jun  6 05:10:59 UTC 2014

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Ticket 1078.


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

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

Modified files:

Index: src/doc/CHANGES-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.116 src/doc/CHANGES-6.2:1.1.2.117
--- src/doc/CHANGES-6.2:1.1.2.116	Tue Jun  3 15:48:10 2014
+++ src/doc/CHANGES-6.2	Fri Jun  6 05:10:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.116 2014/06/03 15:48:10 msaitoh Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.117 2014/06/06 05:10:59 msaitoh Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -2439,3 +2439,451 @@ sys/arch/powerpc/stand/mkbootimage/pef.h
 	Fixed mkbootimage for 64-bit architectures. Now I can create a working
 	BeBox boot.fs under NetBSD/amd64.
 	[phx, ticket #1074]
+
+crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS	1.1.1.2
+crypto/external/bsd/openssl/dist/CHANGES		1.1.1.10
+crypto/external/bsd/openssl/dist/Makefile		1.1.1.6
+crypto/external/bsd/openssl/dist/NEWS			1.1.1.8
+crypto/external/bsd/openssl/dist/README			1.1.1.9
+crypto/external/bsd/openssl/dist/apps/enc.c		1.1.1.5
+crypto/external/bsd/openssl/dist/apps/ocsp.c		1.5
+crypto/external/bsd/openssl/dist/apps/req.c		1.1.1.7
+crypto/external/bsd/openssl/dist/apps/s_cb.c		1.1.1.7
+crypto/external/bsd/openssl/dist/apps/s_socket.c	1.1.1.4
+crypto/external/bsd/openssl/dist/apps/smime.c		1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/asn1/a_strnid.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/bio/bss_dgram.c	1.1.1.8
+crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h	1.2
+crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c	1.5
+crypto/external/bsd/openssl/dist/crypto/cms/cms_env.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/cms/cms_sd.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/cms/cms_smime.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/cryptlib.h	1.3
+crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c	1.7
+crypto/external/bsd/openssl/dist/crypto/dso/dso_vms.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/evp/bio_b64.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/evp/encode.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-alpha.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-armv4.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-ia64.pl		1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-parisc.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-s390x.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-sparcv9.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-x86.pl		1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-x86_64.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/opensslv.h	1.9
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_crt.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_kiss.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7.h	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7err.c	1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/rsa/rsa_ameth.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/srp/srp_vfy.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/ts/ts_rsp_verify.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/x509v3/v3_purp.c	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/cms.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/enc.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/s_server.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/smime.pod	1.1.1.4
+crypto/external/bsd/openssl/dist/doc/apps/verify.pod	1.1.1.4
+crypto/external/bsd/openssl/dist/doc/apps/version.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/apps/x509v3_config.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CMS_decrypt.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CONF_modules_free.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CONF_modules_load_file.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/OPENSSL_config.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/X509_NAME_ENTRY_get_object.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/fingerprints.txt	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/ssl/SSL_COMP_add_compression_method.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_add_session.pod	1.1.1.2

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

2014-06-05 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri Jun  6 05:36:43 UTC 2014

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.6

Log Message:
Ticket 1078.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-6.0.6

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-6.0.6
diff -u src/doc/CHANGES-6.0.6:1.1.2.8 src/doc/CHANGES-6.0.6:1.1.2.9
--- src/doc/CHANGES-6.0.6:1.1.2.8	Tue Jun  3 15:49:30 2014
+++ src/doc/CHANGES-6.0.6	Fri Jun  6 05:36:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.6,v 1.1.2.8 2014/06/03 15:49:30 msaitoh Exp $
+# $NetBSD: CHANGES-6.0.6,v 1.1.2.9 2014/06/06 05:36:43 msaitoh Exp $
 
 A complete list of changes from the NetBSD 6.0.5 release to the NetBSD 6.0.6
 release:
@@ -142,3 +142,451 @@ sys/net/if_tap.c1.76
 	the call to selrecord() happens at splnet(). 
 	Fixes kern/47506 and kern/46199.
 	[cube, ticket #1071]
+
+crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS	1.1.1.2
+crypto/external/bsd/openssl/dist/CHANGES		1.1.1.10
+crypto/external/bsd/openssl/dist/Makefile		1.1.1.6
+crypto/external/bsd/openssl/dist/NEWS			1.1.1.8
+crypto/external/bsd/openssl/dist/README			1.1.1.9
+crypto/external/bsd/openssl/dist/apps/enc.c		1.1.1.5
+crypto/external/bsd/openssl/dist/apps/ocsp.c		1.5
+crypto/external/bsd/openssl/dist/apps/req.c		1.1.1.7
+crypto/external/bsd/openssl/dist/apps/s_cb.c		1.1.1.7
+crypto/external/bsd/openssl/dist/apps/s_socket.c	1.1.1.4
+crypto/external/bsd/openssl/dist/apps/smime.c		1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/asn1/a_strnid.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/bio/bss_dgram.c	1.1.1.8
+crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h	1.2
+crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c	1.5
+crypto/external/bsd/openssl/dist/crypto/cms/cms_env.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/cms/cms_sd.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/cms/cms_smime.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/cryptlib.h	1.3
+crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c	1.7
+crypto/external/bsd/openssl/dist/crypto/dso/dso_vms.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/evp/bio_b64.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/evp/encode.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-alpha.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-armv4.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-ia64.pl		1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-parisc.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-s390x.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-sparcv9.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-x86.pl		1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-x86_64.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/opensslv.h	1.9
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_crt.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_kiss.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7.h	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7err.c	1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/rsa/rsa_ameth.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/srp/srp_vfy.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/ts/ts_rsp_verify.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/x509v3/v3_purp.c	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/cms.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/enc.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/s_server.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/smime.pod	1.1.1.4
+crypto/external/bsd/openssl/dist/doc/apps/verify.pod	1.1.1.4
+crypto/external/bsd/openssl/dist/doc/apps/version.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/apps/x509v3_config.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CMS_decrypt.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CONF_modules_free.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CONF_modules_load_file.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/OPENSSL_config.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/X509_NAME_ENTRY_get_object.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/fingerprints.txt	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/ssl/SSL_COMP_add_compression_method.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_add_session.pod	1.1.1.2

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

2014-06-05 Thread SAITOH Masanobu 
Module Name:src
Committed By:   msaitoh
Date:   Fri Jun  6 05:33:38 UTC 2014

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.5

Log Message:
Ticket 1078.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-6.1.5

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-6.1.5
diff -u src/doc/CHANGES-6.1.5:1.1.2.8 src/doc/CHANGES-6.1.5:1.1.2.9
--- src/doc/CHANGES-6.1.5:1.1.2.8	Tue Jun  3 15:49:08 2014
+++ src/doc/CHANGES-6.1.5	Fri Jun  6 05:33:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.5,v 1.1.2.8 2014/06/03 15:49:08 msaitoh Exp $
+# $NetBSD: CHANGES-6.1.5,v 1.1.2.9 2014/06/06 05:33:38 msaitoh Exp $
 
 A complete list of changes from the NetBSD 6.1.4 release to the NetBSD 6.1.5
 release:
@@ -142,3 +142,451 @@ sys/net/if_tap.c1.76
 	the call to selrecord() happens at splnet(). 
 	Fixes kern/47506 and kern/46199.
 	[cube, ticket #1071]
+
+crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS	1.1.1.2
+crypto/external/bsd/openssl/dist/CHANGES		1.1.1.10
+crypto/external/bsd/openssl/dist/Makefile		1.1.1.6
+crypto/external/bsd/openssl/dist/NEWS			1.1.1.8
+crypto/external/bsd/openssl/dist/README			1.1.1.9
+crypto/external/bsd/openssl/dist/apps/enc.c		1.1.1.5
+crypto/external/bsd/openssl/dist/apps/ocsp.c		1.5
+crypto/external/bsd/openssl/dist/apps/req.c		1.1.1.7
+crypto/external/bsd/openssl/dist/apps/s_cb.c		1.1.1.7
+crypto/external/bsd/openssl/dist/apps/s_socket.c	1.1.1.4
+crypto/external/bsd/openssl/dist/apps/smime.c		1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/asn1/a_strnid.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/bio/bss_dgram.c	1.1.1.8
+crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h	1.2
+crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c	1.5
+crypto/external/bsd/openssl/dist/crypto/cms/cms_env.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/cms/cms_sd.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/cms/cms_smime.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/cryptlib.h	1.3
+crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c	1.7
+crypto/external/bsd/openssl/dist/crypto/dso/dso_vms.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/evp/bio_b64.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/evp/encode.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-alpha.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-armv4.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-ia64.pl		1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-parisc.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-s390x.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-sparcv9.pl	1.1.1.1
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-x86.pl		1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/modes/asm/ghash-x86_64.pl	1.1.1.1-1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/opensslv.h	1.9
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_crt.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_kiss.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c	1.1.1.5
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7.h	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/pkcs7/pkcs7err.c	1.1.1.2
+crypto/external/bsd/openssl/dist/crypto/rsa/rsa_ameth.c	1.1.1.4
+crypto/external/bsd/openssl/dist/crypto/srp/srp_vfy.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/ts/ts_rsp_verify.c	1.1.1.3
+crypto/external/bsd/openssl/dist/crypto/x509v3/v3_purp.c	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/cms.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/enc.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/s_server.pod	1.1.1.3
+crypto/external/bsd/openssl/dist/doc/apps/smime.pod	1.1.1.4
+crypto/external/bsd/openssl/dist/doc/apps/verify.pod	1.1.1.4
+crypto/external/bsd/openssl/dist/doc/apps/version.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/apps/x509v3_config.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CMS_decrypt.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CONF_modules_free.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/CONF_modules_load_file.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/OPENSSL_config.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/X509_NAME_ENTRY_get_object.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/crypto/X509_STORE_CTX_get_ex_new_index.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/fingerprints.txt	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/ssl/SSL_COMP_add_compression_method.pod	1.1.1.2
+crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_add_session.pod	1.1.1.2