CVS commit: src/usr.bin/tip/aculib

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:56:46 UTC 2016

Modified Files:
src/usr.bin/tip/aculib: v831.c

Log Message:
PR 51192 David Binderman: fix wrong logic (probably)

XXX: this file should probably just be deleted


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/tip/aculib/v831.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/tip/aculib/v831.c
diff -u src/usr.bin/tip/aculib/v831.c:1.12 src/usr.bin/tip/aculib/v831.c:1.13
--- src/usr.bin/tip/aculib/v831.c:1.12	Thu Dec 14 17:09:43 2006
+++ src/usr.bin/tip/aculib/v831.c	Thu Jun 30 05:56:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: v831.c,v 1.12 2006/12/14 17:09:43 christos Exp $	*/
+/*	$NetBSD: v831.c,v 1.13 2016/06/30 05:56:46 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)v831.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: v831.c,v 1.12 2006/12/14 17:09:43 christos Exp $");
+__RCSID("$NetBSD: v831.c,v 1.13 2016/06/30 05:56:46 dholland Exp $");
 #endif /* not lint */
 
 /*
@@ -249,7 +249,7 @@ sanitize(char *s)
 char *cp;
 
 for (cp = buf; *s && buf + sizeof buf - cp > 1; s++) {
-		if (!isdigit((unsigned char)*s) && *s == '<' && *s != '_')
+		if (!isdigit((unsigned char)*s) && *s != '<' && *s != '_')
 			continue;
 		if (*s == '_')
 			*s = '=';

CVS commit: src/usr.bin/tip/aculib

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:56:46 UTC 2016

Modified Files:
src/usr.bin/tip/aculib: v831.c

Log Message:
PR 51192 David Binderman: fix wrong logic (probably)

XXX: this file should probably just be deleted


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/tip/aculib/v831.c

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

CVS commit: src/usr.bin/make

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:34:04 UTC 2016

Modified Files:
src/usr.bin/make: suff.c

Log Message:
Fix DEBUG_SRC build. Partly from PR 51191.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/make/suff.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/make/suff.c
diff -u src/usr.bin/make/suff.c:1.83 src/usr.bin/make/suff.c:1.84
--- src/usr.bin/make/suff.c:1.83	Thu Jun 30 05:31:00 2016
+++ src/usr.bin/make/suff.c	Thu Jun 30 05:34:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.83 2016/06/30 05:31:00 dholland Exp $	*/
+/*	$NetBSD: suff.c,v 1.84 2016/06/30 05:34:04 dholland Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.83 2016/06/30 05:31:00 dholland Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.84 2016/06/30 05:34:04 dholland Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.83 2016/06/30 05:31:00 dholland Exp $");
+__RCSID("$NetBSD: suff.c,v 1.84 2016/06/30 05:34:04 dholland Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1217,7 +1217,7 @@ SuffAddSrc(void *sp, void *lsp)
 #ifdef DEBUG_SRC
 	s2->cp = Lst_Init(FALSE);
 	Lst_AtEnd(targ->cp, s2);
-	fprintf(debug_file, "1 add %x %x to %x:", targ, s2, ls->l);
+	fprintf(debug_file, "1 add %p %p to %p:", targ, s2, ls->l);
 	Lst_ForEach(ls->l, PrintAddr, NULL);
 	fprintf(debug_file, "\n");
 #endif
@@ -1235,7 +1235,7 @@ SuffAddSrc(void *sp, void *lsp)
 #ifdef DEBUG_SRC
 s2->cp = Lst_Init(FALSE);
 Lst_AtEnd(targ->cp, s2);
-fprintf(debug_file, "2 add %x %x to %x:", targ, s2, ls->l);
+fprintf(debug_file, "2 add %p %p to %p:", targ, s2, ls->l);
 Lst_ForEach(ls->l, PrintAddr, NULL);
 fprintf(debug_file, "\n");
 #endif
@@ -1307,14 +1307,14 @@ SuffRemoveSrc(Lst l)
 		free(s->pref);
 	else {
 #ifdef DEBUG_SRC
-		LstNode ln = Lst_Member(s->parent->cp, s);
-		if (ln != NULL)
-		Lst_Remove(s->parent->cp, ln);
+		LstNode ln2 = Lst_Member(s->parent->cp, s);
+		if (ln2 != NULL)
+		Lst_Remove(s->parent->cp, ln2);
 #endif
 		--s->parent->children;
 	}
 #ifdef DEBUG_SRC
-	fprintf(debug_file, "free: [l=%x] p=%x %d\n", l, s, s->children);
+	fprintf(debug_file, "free: [l=%p] p=%p %d\n", l, s, s->children);
 	Lst_Destroy(s->cp, NULL);
 #endif
 	Lst_Remove(l, ln);
@@ -1325,7 +1325,7 @@ SuffRemoveSrc(Lst l)
 	}
 #ifdef DEBUG_SRC
 	else {
-	fprintf(debug_file, "keep: [l=%x] p=%x %d: ", l, s, s->children);
+	fprintf(debug_file, "keep: [l=%p] p=%p %d: ", l, s, s->children);
 	Lst_ForEach(s->cp, PrintAddr, NULL);
 	fprintf(debug_file, "\n");
 	}
@@ -1374,7 +1374,7 @@ SuffFindThem(Lst srcs, Lst slst)
 	 */
 	if (Targ_FindNode(s->file, TARG_NOCREATE) != NULL) {
 #ifdef DEBUG_SRC
-	fprintf(debug_file, "remove %x from %x\n", s, srcs);
+	fprintf(debug_file, "remove %p from %p\n", s, srcs);
 #endif
 	rs = s;
 	break;
@@ -1383,7 +1383,7 @@ SuffFindThem(Lst srcs, Lst slst)
 	if ((ptr = Dir_FindFile(s->file, s->suff->searchPath)) != NULL) {
 	rs = s;
 #ifdef DEBUG_SRC
-	fprintf(debug_file, "remove %x from %x\n", s, srcs);
+	fprintf(debug_file, "remove %p from %p\n", s, srcs);
 #endif
 	free(ptr);
 	break;
@@ -1499,7 +1499,7 @@ SuffFindCmds(Src *targ, Lst slst)
 targ->children += 1;
 #ifdef DEBUG_SRC
 ret->cp = Lst_Init(FALSE);
-fprintf(debug_file, "3 add %x %x\n", targ, ret);
+fprintf(debug_file, "3 add %p %p\n", targ, ret);
 Lst_AtEnd(targ->cp, ret);
 #endif
 Lst_AtEnd(slst, ret);

CVS commit: src/usr.bin/make

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:34:04 UTC 2016

Modified Files:
src/usr.bin/make: suff.c

Log Message:
Fix DEBUG_SRC build. Partly from PR 51191.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/make/suff.c

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

CVS commit: src/usr.bin/make

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:31:00 UTC 2016

Modified Files:
src/usr.bin/make: suff.c

Log Message:
Cleanse an old mangy way of avoiding an unused variable warning.
PR 51191 from David Binderman.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/make/suff.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/make/suff.c
diff -u src/usr.bin/make/suff.c:1.82 src/usr.bin/make/suff.c:1.83
--- src/usr.bin/make/suff.c:1.82	Thu Jun 30 05:28:23 2016
+++ src/usr.bin/make/suff.c	Thu Jun 30 05:31:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.82 2016/06/30 05:28:23 dholland Exp $	*/
+/*	$NetBSD: suff.c,v 1.83 2016/06/30 05:31:00 dholland Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.82 2016/06/30 05:28:23 dholland Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.83 2016/06/30 05:31:00 dholland Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.82 2016/06/30 05:28:23 dholland Exp $");
+__RCSID("$NetBSD: suff.c,v 1.83 2016/06/30 05:31:00 dholland Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -766,6 +766,8 @@ Suff_EndTransform(void *gnp, void *dummy
 {
 GNode *gn = (GNode *)gnp;
 
+(void)dummy;
+
 if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (gn->cohorts))
 	gn = (GNode *)Lst_Datum(Lst_Last(gn->cohorts));
 if ((gn->type & OP_TRANSFORM) && Lst_IsEmpty(gn->commands) &&
@@ -809,7 +811,7 @@ Suff_EndTransform(void *gnp, void *dummy
 	fprintf(debug_file, "transformation %s complete\n", gn->name);
 }
 
-return(dummy ? 0 : 0);
+return 0;
 }
 
 /*-
@@ -2597,8 +2599,10 @@ Suff_End(void)
 
 static int SuffPrintName(void *s, void *dummy)
 {
+(void)dummy;
+
 fprintf(debug_file, "%s ", ((Suff *)s)->name);
-return (dummy ? 0 : 0);
+return 0;
 }
 
 static int
@@ -2608,6 +2612,8 @@ SuffPrintSuff(void *sp, void *dummy)
 int	flags;
 int	flag;
 
+(void)dummy;
+
 fprintf(debug_file, "# `%s' [%d] ", s->name, s->refCount);
 
 flags = s->flags;
@@ -2640,7 +2646,7 @@ SuffPrintSuff(void *sp, void *dummy)
 fprintf(debug_file, "#\tSearch Path: ");
 Dir_PrintPath(s->searchPath);
 fputc('\n', debug_file);
-return (dummy ? 0 : 0);
+return 0;
 }
 
 static int
@@ -2648,12 +2654,14 @@ SuffPrintTrans(void *tp, void *dummy)
 {
 GNode   *t = (GNode *)tp;
 
+(void)dummy;
+
 fprintf(debug_file, "%-16s: ", t->name);
 Targ_PrintType(t->type);
 fputc('\n', debug_file);
 Lst_ForEach(t->commands, Targ_PrintCmd, NULL);
 fputc('\n', debug_file);
-return(dummy ? 0 : 0);
+return 0;
 }
 
 void

CVS commit: src/usr.bin/make

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:31:00 UTC 2016

Modified Files:
src/usr.bin/make: suff.c

Log Message:
Cleanse an old mangy way of avoiding an unused variable warning.
PR 51191 from David Binderman.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/make/suff.c

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

CVS commit: src/usr.bin/make

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:28:23 UTC 2016

Modified Files:
src/usr.bin/make: suff.c

Log Message:
Fix botched logic; PR 51191 from David Binderman.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/make/suff.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/make/suff.c
diff -u src/usr.bin/make/suff.c:1.81 src/usr.bin/make/suff.c:1.82
--- src/usr.bin/make/suff.c:1.81	Tue Mar 15 18:30:14 2016
+++ src/usr.bin/make/suff.c	Thu Jun 30 05:28:23 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $	*/
+/*	$NetBSD: suff.c,v 1.82 2016/06/30 05:28:23 dholland Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.82 2016/06/30 05:28:23 dholland Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $");
+__RCSID("$NetBSD: suff.c,v 1.82 2016/06/30 05:28:23 dholland Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1616,7 +1616,7 @@ SuffExpandChildren(LstNode cln, GNode *p
 		}
 
 		free(freeIt);
-		} else if (*cp == '\\' && *cp != '\0') {
+		} else if (*cp == '\\' && cp[1] != '\0') {
 		/*
 		 * Escaped something -- skip over it
 		 */

CVS commit: src/usr.bin/make

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 30 05:28:23 UTC 2016

Modified Files:
src/usr.bin/make: suff.c

Log Message:
Fix botched logic; PR 51191 from David Binderman.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/make/suff.c

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

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Jun 30 04:12:37 UTC 2016

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

Log Message:
Fix the build.


To generate a diff of this commit:
cvs rdiff -u -r1.2045 -r1.2046 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.2045 src/distrib/sets/lists/comp/mi:1.2046
--- src/distrib/sets/lists/comp/mi:1.2045	Wed Jun 29 23:23:05 2016
+++ src/distrib/sets/lists/comp/mi	Thu Jun 30 04:12:36 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2045 2016/06/29 23:23:05 christos Exp $
+#	$NetBSD: mi,v 1.2046 2016/06/30 04:12:36 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -8376,7 +8376,7 @@
 #./usr/share/man/cat3/pthread_condattr_setpshared.0	comp-c-catman	.cat
 ./usr/share/man/cat3/pthread_condattr_init.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_condattr_setclock.0	comp-c-catman		.cat
-./usr/share/man/cat3/pthread_condattr_getclock.0	comp-c-catmat	.cat
+#./usr/share/man/cat3/pthread_condattr_getclock.0	comp-c-catmat	.cat
 ./usr/share/man/cat3/pthread_create.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_curcpu_np.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_detach.0		comp-c-catman		.cat
@@ -8398,9 +8398,9 @@
 ./usr/share/man/cat3/pthread_mutex_lock.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_mutex_trylock.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_mutex_unlock.0	comp-c-catman		.cat
-./usr/share/man/cat3/pthread_mutex_timedlock.0	comp-c-catman		.cat
-./usr/share/man/cat3/pthread_mutex_getprioceiling.0	comp-c-catman	.cat
-./usr/share/man/cat3/pthread_mutex_setprioceiling.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_mutex_timedlock.0	comp-c-catman		.cat
+#./usr/share/man/cat3/pthread_mutex_getprioceiling.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_mutex_setprioceiling.0	comp-c-catman	.cat
 ./usr/share/man/cat3/pthread_mutexattr.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_mutexattr_destroy.0	comp-c-catman		.cat
 #./usr/share/man/cat3/pthread_mutexattr_getpshared.0	comp-c-catman	.cat
@@ -8408,10 +8408,10 @@
 ./usr/share/man/cat3/pthread_mutexattr_gettype.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_mutexattr_init.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_mutexattr_settype.0	comp-c-catman		.cat
-./usr/share/man/cat3/pthread_mutexattr_getprotocol.0	comp-c-catman	.cat
-./usr/share/man/cat3/pthread_mutexattr_setprotocol.0	comp-c-catman	.cat
-./usr/share/man/cat3/pthread_mutexattr_getprioceiling.0	comp-c-catman	.cat
-./usr/share/man/cat3/pthread_mutexattr_setprioceiling.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_mutexattr_getprotocol.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_mutexattr_setprotocol.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_mutexattr_getprioceiling.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_mutexattr_setprioceiling.0	comp-c-catman	.cat
 ./usr/share/man/cat3/pthread_once.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_resume_np.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_rwlock.0		comp-c-catman		.cat
@@ -15564,7 +15564,7 @@
 #./usr/share/man/html3/pthread_condattr_setpshared.html	comp-c-htmlman	html
 ./usr/share/man/html3/pthread_condattr_init.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_condattr_setclock.html	comp-c-htmlman		html
-./usr/share/man/html3/pthread_condattr_getclock.html	comp-c-htmlman	html
+#./usr/share/man/html3/pthread_condattr_getclock.html	comp-c-htmlman	html
 ./usr/share/man/html3/pthread_create.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_curcpu_np.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_detach.html	comp-c-htmlman		html
@@ -15586,9 +15586,9 @@
 ./usr/share/man/html3/pthread_mutex_lock.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_mutex_trylock.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_mutex_unlock.html comp-c-htmlman		html
-./usr/share/man/html3/pthread_mutex_timedlock.html	comp-c-htmlman	html
-./usr/share/man/html3/pthread_mutex_getprioceiling.html	comp-c-htmlman	html
-./usr/share/man/html3/pthread_mutex_setprioceiling.html	comp-c-htmlman	html
+#./usr/share/man/html3/pthread_mutex_timedlock.html	comp-c-htmlman	html
+#./usr/share/man/html3/pthread_mutex_getprioceiling.html	comp-c-htmlman	html
+#./usr/share/man/html3/pthread_mutex_setprioceiling.html	comp-c-htmlman	html
 ./usr/share/man/html3/pthread_mutexattr.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_mutexattr_destroy.html	comp-c-htmlman		html
 #./usr/share/man/html3/pthread_mutexattr_getpshared.html	comp-c-htmlman	html
@@ -15596,10 +15596,10 @@
 ./usr/share/man/html3/pthread_mutexattr_gettype.html	comp-c-htmlman		html
 ./usr/share/man/html3/pthread_mutexattr_init.html	comp-c-htmlman		html
 

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

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Jun 30 04:12:37 UTC 2016

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

Log Message:
Fix the build.


To generate a diff of this commit:
cvs rdiff -u -r1.2045 -r1.2046 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.

Re: build break for postfix/libexec/smtpd

[Paul Goyette]

(Note I fixed the subject line!)

Christos just fixed this.  Thanks!



On Thu, 30 Jun 2016, Paul Goyette wrote:


Module Name:src
Committed By:   christos
Date:   Wed Jun 29 20:07:52 UTC 2016

Modified Files:
src/external/ibm-public/postfix/libexec/smtpd: Makefile

Log Message:
Fix MKCRYPTO=no


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile


This change breaks the build for both MKCRYPTO=yes and MKCRYPTO=no

#create  smtpd/smtpd.d
CC=/build/netbsd-local/tools/x86_64/amd64/bin/x86_64--netbsd-gcc 
/build/netbsd-local/tools/x86_64/amd64/bin/nbmkdep -f smtpd.d.tmp  --

-std=gnu99--sysroot=/build/netbsd-local/dest/amd64 -DNETBSD4
-DUSE_SASL_AUTH  -I/build/netbsd-local/src/external/ibm-public/postfix/dist 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/dns 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/global 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/master 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/util 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/tls 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/milter 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/xsasl
-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\" -DHAS_SQLITE 
-DDEF_HTML_DIR=\"/usr/share/doc/reference/ref8/postfix\"

-DDEF_README_DIR=\"/usr/share/examples/postfix\"
-DDEF_SAMPLE_DIR=\"/usr/share/examples/postfix\"
-DDEF_MANPAGE_DIR=\"/usr/share/man\"
/build/netbsd-local/src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c && 
mv smtpd.d.tmp smtpd.d
/build/netbsd-local/src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1123:25: 
fatal error: smtpd_token.h: No such file or directory

compilation terminated.
nbmkdep: compile failed.



+--+--++
| Paul Goyette | PGP Key fingerprint: | E-mail addresses:  |
| (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com   |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org |
+--+--++



+--+--++
| Paul Goyette | PGP Key fingerprint: | E-mail addresses:  |
| (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com   |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org |
+--+--++

CVS commit: src/external/ibm-public/postfix/libexec/smtpd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 30 03:05:45 UTC 2016

Modified Files:
src/external/ibm-public/postfix/libexec/smtpd: Makefile

Log Message:
Makefile.inc needs -I${DIST} to be the source dir of the program we are
compiling, make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile

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

CVS commit: src/external/ibm-public/postfix/libexec/smtpd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 30 03:05:45 UTC 2016

Modified Files:
src/external/ibm-public/postfix/libexec/smtpd: Makefile

Log Message:
Makefile.inc needs -I${DIST} to be the source dir of the program we are
compiling, make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile

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

Modified files:

Index: src/external/ibm-public/postfix/libexec/smtpd/Makefile
diff -u src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.4 src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.5
--- src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.4	Wed Jun 29 16:07:52 2016
+++ src/external/ibm-public/postfix/libexec/smtpd/Makefile	Wed Jun 29 23:05:45 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2016/06/29 20:07:52 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2016/06/30 03:05:45 christos Exp $
 
 NOMAN=	# defined
 
@@ -6,8 +6,9 @@ NOMAN=	# defined
 
 PROG=	smtpd
 
-DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist
-.PATH:	${DIST}/src/${PROG}
+TOP=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist
+DIST=${TOP}/src/${PROG}
+.PATH:	${DIST}
 
 SRCS=	smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
 	smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
@@ -21,7 +22,7 @@ LDADD+= ${LIBPMASTER} ${LIBPMILTER} ${LI
 DPADD+=	${LIBPTLS} ${LIBSSL} ${LIBCRYPTO}
 LDADD+=	${LIBPTLS} -lssl -lcrypto
 .else
-.PATH:	${DIST}/src/tls
+.PATH:	${TOP}/src/tls
 SRCS+=	tls_level.c
 .endif
 

[no subject]

[Paul Goyette]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 20:07:52 UTC 2016

Modified Files:
src/external/ibm-public/postfix/libexec/smtpd: Makefile

Log Message:
Fix MKCRYPTO=no


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile


This change breaks the build for both MKCRYPTO=yes and MKCRYPTO=no

#create  smtpd/smtpd.d
CC=/build/netbsd-local/tools/x86_64/amd64/bin/x86_64--netbsd-gcc 
/build/netbsd-local/tools/x86_64/amd64/bin/nbmkdep -f smtpd.d.tmp  --

-std=gnu99--sysroot=/build/netbsd-local/dest/amd64 -DNETBSD4
-DUSE_SASL_AUTH  -I/build/netbsd-local/src/external/ibm-public/postfix/dist 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/dns 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/global 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/master 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/util 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/tls 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/milter 
-I/build/netbsd-local/src/external/ibm-public/postfix/dist/src/xsasl
-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\"dovecot\" -DHAS_SQLITE 
-DDEF_HTML_DIR=\"/usr/share/doc/reference/ref8/postfix\"

-DDEF_README_DIR=\"/usr/share/examples/postfix\"
-DDEF_SAMPLE_DIR=\"/usr/share/examples/postfix\"
-DDEF_MANPAGE_DIR=\"/usr/share/man\"
/build/netbsd-local/src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c &&  
mv smtpd.d.tmp smtpd.d
/build/netbsd-local/src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c:1123:25:
 fatal error: smtpd_token.h: No such file or directory
compilation terminated.
nbmkdep: compile failed.



+--+--++
| Paul Goyette | PGP Key fingerprint: | E-mail addresses:  |
| (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com   |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org |
+--+--++

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jun 30 01:44:49 UTC 2016

Modified Files:
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64: backtrace-supported.h
config.h
src/external/gpl3/gcc/lib/libgcc/arch/ia64: auto-target.h defs.mk
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64: defs.mk gcov-iov.h
src/external/gpl3/gcc/lib/libgomp/arch/ia64: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libiberty/arch/ia64: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64: auto-host.h bversion.h
configargs.h defs.mk gtyp-input.list plugin-version.h tm.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/ia64: config.h

Log Message:
mknative-gcc for GCC 5.4 and ia64.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libgcc/arch/ia64/auto-target.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/ia64/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64/defs.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64/gcov-iov.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgomp/arch/ia64/config.h \
src/external/gpl3/gcc/lib/libgomp/arch/ia64/libgomp.spec \
src/external/gpl3/gcc/lib/libgomp/arch/ia64/libgomp_f.h \
src/external/gpl3/gcc/lib/libgomp/arch/ia64/omp.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libiberty/arch/ia64/config.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/defs.mk \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/cxxabi_tweaks.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gthr-posix.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gthr-single.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gthr.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/bversion.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/configargs.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/defs.mk \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/plugin-version.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/gtyp-input.list \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/tm.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/libcpp/arch/ia64/config.h

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

Modified files:

Index: src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h:1.2 src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h:1.3
--- src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h:1.2	Fri Apr 17 12:41:47 2015
+++ src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h	Thu Jun 30 01:44:48 2016
@@ -1,9 +1,9 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.81 2015/01/31 08:50:01 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* backtrace-supported.h.in -- Whether stack backtrace is supported.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2015 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without
Index: src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h:1.2 src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h:1.3
--- src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h:1.2	Fri Apr 17 12:41:47 2015
+++ src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h	Thu Jun 30 01:44:48 2016
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.81 2015/01/31 08:50:01 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* config.h.  Generated from config.h.in by configure.  */
@@ -8,6 +8,9 @@
 /* ELF size: 32 or 64 */
 #define BACKTRACE_ELF_SIZE 64
 
+/* Define to 1 if you have the __atomic functions */

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jun 30 01:44:49 UTC 2016

Modified Files:
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64: backtrace-supported.h
config.h
src/external/gpl3/gcc/lib/libgcc/arch/ia64: auto-target.h defs.mk
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64: defs.mk gcov-iov.h
src/external/gpl3/gcc/lib/libgomp/arch/ia64: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libiberty/arch/ia64: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64: auto-host.h bversion.h
configargs.h defs.mk gtyp-input.list plugin-version.h tm.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/ia64: config.h

Log Message:
mknative-gcc for GCC 5.4 and ia64.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/ia64/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libgcc/arch/ia64/auto-target.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/ia64/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64/defs.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libgcc/libgcov/arch/ia64/gcov-iov.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgomp/arch/ia64/config.h \
src/external/gpl3/gcc/lib/libgomp/arch/ia64/libgomp.spec \
src/external/gpl3/gcc/lib/libgomp/arch/ia64/libgomp_f.h \
src/external/gpl3/gcc/lib/libgomp/arch/ia64/omp.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libiberty/arch/ia64/config.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/defs.mk \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gstdint.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/cxxabi_tweaks.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gthr-posix.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gthr-single.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/gthr.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/bversion.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/configargs.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/defs.mk \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/plugin-version.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/gtyp-input.list \
src/external/gpl3/gcc/usr.bin/gcc/arch/ia64/tm.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/libcpp/arch/ia64/config.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/ia64/include

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jun 30 01:41:05 UTC 2016

Modified Files:
src/sys/arch/ia64/include: mcontext.h

Log Message:
add a definition for _UC_MACHINE_PC which libasan wants.

XXX: i'm not 100% sure i picked the right register.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/mcontext.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/ia64/include/mcontext.h
diff -u src/sys/arch/ia64/include/mcontext.h:1.3 src/sys/arch/ia64/include/mcontext.h:1.4
--- src/sys/arch/ia64/include/mcontext.h:1.3	Wed Dec 26 19:43:10 2012
+++ src/sys/arch/ia64/include/mcontext.h	Thu Jun 30 01:41:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcontext.h,v 1.3 2012/12/26 19:43:10 martin Exp $	*/
+/*	$NetBSD: mcontext.h,v 1.4 2016/06/30 01:41:05 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -91,9 +91,8 @@ typedef struct __mcontext {
 	struct _high_fp		mc_high_fp;
 } mcontext_t;
 
-#ifndef _UC_MACHINE_SP
 #define _UC_MACHINE_SP(uc)	((uc)->uc_mcontext.mc_special.sp)
-#endif
+#define	_UC_MACHINE_PC(uc)	((uc)->uc_mcontext.mc_special.rp)
 
 static __inline void *
 __lwp_getprivate_fast(void)

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jun 30 01:41:05 UTC 2016

Modified Files:
src/sys/arch/ia64/include: mcontext.h

Log Message:
add a definition for _UC_MACHINE_PC which libasan wants.

XXX: i'm not 100% sure i picked the right register.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/mcontext.h

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

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jun 30 01:34:53 UTC 2016

Modified Files:
src/sys/net: if_spppsubr.c
src/sys/netinet: if_arp.c in.c
src/sys/netinet6: in6.c nd6.c

Log Message:
Make sure that ifaddr is published after its initialization finished

Basically we should insert an item to a collection (say a list) after
item's initialization has been completed to avoid accessing an item
that is initialized halfway. ifaddr (in{,6}_ifaddr) isn't processed
like so and needs to be fixed.

In order to do so, we need to tweak {arp,nd6}_rtrequest that depend
on that an ifaddr is inserted during its initialization; they explore
interface's address list to determine that rt_getkey(rt) of a given
rtentry is in the list to know whether the route's interface should
be a loopback, which doesn't work after the change. To make it work,
first check RTF_LOCAL flag that is set in rt_ifa_addlocal that calls
{arp,nd6}_rtrequest eventually. Note that we still need the original
code for the case to remove and re-add a local interface route.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.213 -r1.214 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.168 -r1.169 src/sys/netinet/in.c
cvs rdiff -u -r1.201 -r1.202 src/sys/netinet6/in6.c
cvs rdiff -u -r1.197 -r1.198 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_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.143 src/sys/net/if_spppsubr.c:1.144
--- src/sys/net/if_spppsubr.c:1.143	Mon Jun 20 08:30:59 2016
+++ src/sys/net/if_spppsubr.c	Thu Jun 30 01:34:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_spppsubr.c,v 1.143 2016/06/20 08:30:59 knakahara Exp $	 */
+/*	$NetBSD: if_spppsubr.c,v 1.144 2016/06/30 01:34:53 ozaki-r Exp $	 */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.143 2016/06/20 08:30:59 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.144 2016/06/30 01:34:53 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -4897,7 +4897,10 @@ found:
 *dest = new_dst; /* fix dstaddr in place */
 			}
 		}
+		LIST_REMOVE(ifatoia(ifa), ia_hash);
 		error = in_ifinit(ifp, ifatoia(ifa), _sin, 0, hostIsNew);
+		LIST_INSERT_HEAD(_IFADDR_HASH(ifatoia(ifa)->ia_addr.sin_addr.s_addr),
+		ifatoia(ifa), ia_hash);
 		if (debug && error)
 		{
 			log(LOG_DEBUG, "%s: sppp_set_ip_addrs: in_ifinit "
@@ -4950,7 +4953,10 @@ found:
 		if (sp->ipcp.flags & IPCP_HISADDR_DYN)
 			/* replace peer addr in place */
 			dest->sin_addr.s_addr = sp->ipcp.saved_hisaddr;
+		LIST_REMOVE(ifatoia(ifa), ia_hash);
 		in_ifinit(ifp, ifatoia(ifa), _sin, 0, 0);
+		LIST_INSERT_HEAD(_IFADDR_HASH(ifatoia(ifa)->ia_addr.sin_addr.s_addr),
+		ifatoia(ifa), ia_hash);
 		(void)pfil_run_hooks(if_pfil,
 		(struct mbuf **)SIOCDIFADDR, ifp, PFIL_IFADDR);
 	}

Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.213 src/sys/netinet/if_arp.c:1.214
--- src/sys/netinet/if_arp.c:1.213	Tue Jun 28 02:02:56 2016
+++ src/sys/netinet/if_arp.c	Thu Jun 30 01:34:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_arp.c,v 1.213 2016/06/28 02:02:56 ozaki-r Exp $	*/
+/*	$NetBSD: if_arp.c,v 1.214 2016/06/30 01:34:53 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.213 2016/06/28 02:02:56 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.214 2016/06/30 01:34:53 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -589,6 +589,20 @@ arp_rtrequest(int req, struct rtentry *r
 		if (rt->rt_flags & RTF_BROADCAST)
 			break;
 
+		/*
+		 * When called from rt_ifa_addlocal, we cannot depend on that
+		 * the address (rt_getkey(rt)) exits in the address list of the
+		 * interface. So check RTF_LOCAL instead.
+		 */
+		if (rt->rt_flags & RTF_LOCAL) {
+			rt->rt_expire = 0;
+			if (useloopback) {
+rt->rt_ifp = lo0ifp;
+rt->rt_rmx.rmx_mtu = 0;
+			}
+			break;
+		}
+
 		INADDR_TO_IA(satocsin(rt_getkey(rt))->sin_addr, ia);
 		while (ia && ia->ia_ifp != ifp)
 			NEXT_IA_WITH_SAME_ADDR(ia);

Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.168 src/sys/netinet/in.c:1.169
--- src/sys/netinet/in.c:1.168	Thu Jun 23 06:40:48 2016
+++ src/sys/netinet/in.c	Thu Jun 30 01:34:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in.c,v 1.168 2016/06/23 06:40:48 ozaki-r Exp $	*/
+/*	$NetBSD: in.c,v 1.169 2016/06/30 01:34:53 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.168 2016/06/23 06:40:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.169 2016/06/30 01:34:53 ozaki-r Exp $");
 
 #include "arp.h"
 
@@ -359,6 +359,8 @@ in_control(struct socket *so, u_long cmd
 	struct 

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jun 30 01:34:53 UTC 2016

Modified Files:
src/sys/net: if_spppsubr.c
src/sys/netinet: if_arp.c in.c
src/sys/netinet6: in6.c nd6.c

Log Message:
Make sure that ifaddr is published after its initialization finished

Basically we should insert an item to a collection (say a list) after
item's initialization has been completed to avoid accessing an item
that is initialized halfway. ifaddr (in{,6}_ifaddr) isn't processed
like so and needs to be fixed.

In order to do so, we need to tweak {arp,nd6}_rtrequest that depend
on that an ifaddr is inserted during its initialization; they explore
interface's address list to determine that rt_getkey(rt) of a given
rtentry is in the list to know whether the route's interface should
be a loopback, which doesn't work after the change. To make it work,
first check RTF_LOCAL flag that is set in rt_ifa_addlocal that calls
{arp,nd6}_rtrequest eventually. Note that we still need the original
code for the case to remove and re-add a local interface route.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.213 -r1.214 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.168 -r1.169 src/sys/netinet/in.c
cvs rdiff -u -r1.201 -r1.202 src/sys/netinet6/in6.c
cvs rdiff -u -r1.197 -r1.198 src/sys/netinet6/nd6.c

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

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Jun 30 00:23:36 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_module.c

Log Message:
Add missing dp_proc_unlock() in error path.

>From PR kern/51285 (Henning Petersen)

XXX Pullup to 7 and 7-0


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c

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

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Jun 30 00:23:36 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_module.c

Log Message:
Add missing dp_proc_unlock() in error path.

>From PR kern/51285 (Henning Petersen)

XXX Pullup to 7 and 7-0


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c

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

Modified files:

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.13 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.14
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.13	Thu Apr 28 00:02:40 2016
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c	Thu Jun 30 00:23:36 2016
@@ -713,6 +713,7 @@ dt_module_load_proc(dtrace_hdl_t *dtp, d
 	arg.dpa_count = 0;
 	if (Pobject_iter_resolved(p, dt_module_load_proc_count, ) != 0) {
 		dt_dprintf("failed to iterate objects\n");
+		dt_proc_unlock(dtp, p);
 		dt_proc_release(dtp, p);
 		return (dt_set_errno(dtp, EDT_CANTLOAD));
 	}

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 23:23:05 UTC 2016

Modified Files:
src/distrib/sets/lists/base: mi shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/tests: mi

Log Message:
fix sets for MKCRYPTO=no


To generate a diff of this commit:
cvs rdiff -u -r1.1129 -r1.1130 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.776 -r1.777 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2044 -r1.2045 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.291 -r1.292 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1528 -r1.1529 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.197 -r1.198 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.675 -r1.676 src/distrib/sets/lists/tests/mi

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1129 src/distrib/sets/lists/base/mi:1.1130
--- src/distrib/sets/lists/base/mi:1.1129	Sat Jun 25 14:05:57 2016
+++ src/distrib/sets/lists/base/mi	Wed Jun 29 19:23:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1129 2016/06/25 18:05:57 maya Exp $
+# $NetBSD: mi,v 1.1130 2016/06/29 23:23:05 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1758,7 +1758,7 @@
 ./usr/sbin/nslookupbase-obsolete		obsolete
 ./usr/sbin/nsquerybase-obsolete		obsolete
 ./usr/sbin/nstestbase-obsolete		obsolete
-./usr/sbin/ntp-keygenbase-ntp-bin		crypto
+./usr/sbin/ntp-keygenbase-ntp-bin
 ./usr/sbin/ntpd	base-ntp-bin
 ./usr/sbin/ntpdatebase-ntp-bin
 ./usr/sbin/ntpdcbase-ntp-bin

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.776 src/distrib/sets/lists/base/shl.mi:1.777
--- src/distrib/sets/lists/base/shl.mi:1.776	Sat Jun  4 21:31:03 2016
+++ src/distrib/sets/lists/base/shl.mi	Wed Jun 29 19:23:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.776 2016/06/05 01:31:03 christos Exp $
+# $NetBSD: shl.mi,v 1.777 2016/06/29 23:23:05 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -22,9 +22,9 @@
 ./lib/libcrypt.sobase-sys-shlib		dynamicroot
 ./lib/libcrypt.so.1base-sys-shlib		dynamicroot
 ./lib/libcrypt.so.1.0base-sys-shlib		dynamicroot
-./lib/libcrypto.sobase-crypto-shlib	dynamicroot
-./lib/libcrypto.so.11base-crypto-shlib	dynamicroot
-./lib/libcrypto.so.11.0base-crypto-shlib	dynamicroot
+./lib/libcrypto.sobase-crypto-shlib	dynamicroot,crypto
+./lib/libcrypto.so.11base-crypto-shlib	dynamicroot,crypto
+./lib/libcrypto.so.11.0base-crypto-shlib	dynamicroot,crypto
 ./lib/libdevmapper.sobase-lvm-shlib		dynamicroot
 ./lib/libdevmapper.so.1base-lvm-shlib		dynamicroot
 ./lib/libdevmapper.so.1.0			base-lvm-shlib		dynamicroot

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2044 src/distrib/sets/lists/comp/mi:1.2045
--- src/distrib/sets/lists/comp/mi:1.2044	Wed Jun  8 18:32:01 2016
+++ src/distrib/sets/lists/comp/mi	Wed Jun 29 19:23:05 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2044 2016/06/08 22:32:01 mrg Exp $
+#	$NetBSD: mi,v 1.2045 2016/06/29 23:23:05 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -8357,6 +8357,8 @@
 ./usr/share/man/cat3/pthread_barrier_wait.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_barrierattr.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_barrierattr_destroy.0	comp-c-catman		.cat
+#./usr/share/man/cat3/pthread_barrierattr_getpshared.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_barrierattr_setpshared.0	comp-c-catman	.cat
 ./usr/share/man/cat3/pthread_barrierattr_init.0 comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_cancel.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_cleanup_pop.0	comp-c-catman		.cat
@@ -8370,8 +8372,11 @@
 ./usr/share/man/cat3/pthread_cond_wait.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_condattr.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_condattr_destroy.0 comp-c-catman		.cat
+#./usr/share/man/cat3/pthread_condattr_getpshared.0	comp-c-catman	.cat
+#./usr/share/man/cat3/pthread_condattr_setpshared.0	comp-c-catman	.cat
 ./usr/share/man/cat3/pthread_condattr_init.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_condattr_setclock.0	comp-c-catman		.cat
+./usr/share/man/cat3/pthread_condattr_getclock.0	comp-c-catmat	.cat
 ./usr/share/man/cat3/pthread_create.0		comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_curcpu_np.0	comp-c-catman		.cat
 ./usr/share/man/cat3/pthread_detach.0		comp-c-catman		

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 23:23:05 UTC 2016

Modified Files:
src/distrib/sets/lists/base: mi shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/misc: mi
src/distrib/sets/lists/tests: mi

Log Message:
fix sets for MKCRYPTO=no


To generate a diff of this commit:
cvs rdiff -u -r1.1129 -r1.1130 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.776 -r1.777 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2044 -r1.2045 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.291 -r1.292 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1528 -r1.1529 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.197 -r1.198 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.675 -r1.676 src/distrib/sets/lists/tests/mi

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

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 23:03:24 UTC 2016

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

Log Message:
always build ntp_keygen


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

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

Modified files:

Index: src/external/bsd/ntp/bin/Makefile
diff -u src/external/bsd/ntp/bin/Makefile:1.2 src/external/bsd/ntp/bin/Makefile:1.3
--- src/external/bsd/ntp/bin/Makefile:1.2	Sat Aug 28 11:42:46 2010
+++ src/external/bsd/ntp/bin/Makefile	Wed Jun 29 19:03:24 2016
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2010/08/28 15:42:46 kardel Exp $
+#	$NetBSD: Makefile,v 1.3 2016/06/29 23:03:24 christos Exp $
 
 SUBDIR= ntp-keygen ntpd ntpdate ntpdc ntpq ntptime ntptrace sntp 
 
 .if ("${MKCRYPTO}" != "no")
-SUBDIR+= ntp-keygen
 CPPFLAGS+=-DOPENSSL
 .endif
 

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 23:03:24 UTC 2016

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

Log Message:
always build ntp_keygen


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

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

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Wed Jun 29 22:10:08 UTC 2016

Modified Files:
src/usr.bin/make: meta.c

Log Message:
meta_compat_parent: fflush each line


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/make/meta.c

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

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Wed Jun 29 22:10:08 UTC 2016

Modified Files:
src/usr.bin/make: meta.c

Log Message:
meta_compat_parent: fflush each line


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/make/meta.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/make/meta.c
diff -u src/usr.bin/make/meta.c:1.62 src/usr.bin/make/meta.c:1.63
--- src/usr.bin/make/meta.c:1.62	Tue Jun 14 18:16:06 2016
+++ src/usr.bin/make/meta.c	Wed Jun 29 22:10:08 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: meta.c,v 1.62 2016/06/14 18:16:06 sjg Exp $ */
+/*  $NetBSD: meta.c,v 1.63 2016/06/29 22:10:08 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -1543,6 +1543,7 @@ meta_compat_parent(void)
 while (fgets(buf, sizeof(buf), fp)) {
 	meta_job_output(NULL, buf, "");
 	printf("%s", buf);
+	fflush(stdout);
 }
 fclose(fp);
 }

CVS commit: src/usr.sbin/npf/npfctl

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 21:40:20 UTC 2016

Modified Files:
src/usr.sbin/npf/npfctl: npfctl.c

Log Message:
use sha1 from libc


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/npf/npfctl/npfctl.c

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

CVS commit: src/usr.sbin/npf/npfctl

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 21:40:20 UTC 2016

Modified Files:
src/usr.sbin/npf/npfctl: npfctl.c

Log Message:
use sha1 from libc


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/npf/npfctl/npfctl.c

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

Modified files:

Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.46 src/usr.sbin/npf/npfctl/npfctl.c:1.47
--- src/usr.sbin/npf/npfctl/npfctl.c:1.46	Sun Jan  4 15:02:15 2015
+++ src/usr.sbin/npf/npfctl/npfctl.c	Wed Jun 29 17:40:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npfctl.c,v 1.46 2015/01/04 20:02:15 christos Exp $	*/
+/*	$NetBSD: npfctl.c,v 1.47 2016/06/29 21:40:20 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: npfctl.c,v 1.46 2015/01/04 20:02:15 christos Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.47 2016/06/29 21:40:20 christos Exp $");
 
 #include 
 #include 
@@ -44,8 +44,7 @@ __RCSID("$NetBSD: npfctl.c,v 1.46 2015/0
 #include 
 #include 
 #include 
-
-#include 
+#include 
 
 #include "npfctl.h"
 
@@ -386,6 +385,17 @@ npfctl_parse_rule(int argc, char **argv)
 }
 
 static void
+SHA1(const uint8_t *d, unsigned int n, uint8_t *md)
+{
+SHA1_CTX c;
+
+SHA1Init();
+SHA1Update(, d, n);
+SHA1Final(md, );
+memset(, 0, sizeof(c));
+}
+
+static void
 npfctl_generate_key(nl_rule_t *rl, void *key)
 {
 	void *meta;
@@ -394,9 +404,9 @@ npfctl_generate_key(nl_rule_t *rl, void 
 	if ((meta = npf_rule_export(rl, )) == NULL) {
 		errx(EXIT_FAILURE, "error generating rule key");
 	}
-	__CTASSERT(NPF_RULE_MAXKEYLEN >= SHA_DIGEST_LENGTH);
+	__CTASSERT(NPF_RULE_MAXKEYLEN >= SHA1_DIGEST_LENGTH);
 	memset(key, 0, NPF_RULE_MAXKEYLEN);
-	SHA1(meta, len, key);
+	SHA1(meta, (unsigned int)len, key);
 	free(meta);
 }
 

CVS commit: src/usr.sbin/npf/npfctl

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 21:40:10 UTC 2016

Modified Files:
src/usr.sbin/npf/npfctl: Makefile

Log Message:
remove libcrypto dependency, fix other dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npfctl/Makefile

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

Modified files:

Index: src/usr.sbin/npf/npfctl/Makefile
diff -u src/usr.sbin/npf/npfctl/Makefile:1.11 src/usr.sbin/npf/npfctl/Makefile:1.12
--- src/usr.sbin/npf/npfctl/Makefile:1.11	Wed Sep 18 21:04:45 2013
+++ src/usr.sbin/npf/npfctl/Makefile	Wed Jun 29 17:40:10 2016
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/09/19 01:04:45 rmind Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/29 21:40:10 christos Exp $
+
+.include 
 
 PROG=		npfctl
 MAN=		npfctl.8 npf.conf.5
@@ -11,8 +13,8 @@ CPPFLAGS+=	-I${.CURDIR}
 SRCS+=		npf_scan.l npf_parse.y
 YHEADER=	1
 
-LDADD+=		-lnpf -lprop -lcrypto -lpcap -lutil -ly
-DPADD+=		${LIBNPF} ${LIBPROP} ${LIBUTIL}
+LDADD+=		-lnpf -lprop -lpcap -lutil -ly
+DPADD+=		${LIBNPF} ${LIBPROP} ${LIBUTIL} ${LIBPCAP} ${LIBUTIL} ${LIBY}
 
 WARNS=		5
 NOLINT=		# disabled deliberately

CVS commit: src/usr.sbin/npf/npfctl

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 21:40:10 UTC 2016

Modified Files:
src/usr.sbin/npf/npfctl: Makefile

Log Message:
remove libcrypto dependency, fix other dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npfctl/Makefile

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

CVS commit: src/external/ibm-public/postfix/libexec/smtpd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 20:07:52 UTC 2016

Modified Files:
src/external/ibm-public/postfix/libexec/smtpd: Makefile

Log Message:
Fix MKCRYPTO=no


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile

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

CVS commit: src/external/ibm-public/postfix/libexec/smtpd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 20:07:52 UTC 2016

Modified Files:
src/external/ibm-public/postfix/libexec/smtpd: Makefile

Log Message:
Fix MKCRYPTO=no


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile

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

Modified files:

Index: src/external/ibm-public/postfix/libexec/smtpd/Makefile
diff -u src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.3 src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.4
--- src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.3	Wed Sep 25 15:25:08 2013
+++ src/external/ibm-public/postfix/libexec/smtpd/Makefile	Wed Jun 29 16:07:52 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2013/09/25 19:25:08 tron Exp $
+#	$NetBSD: Makefile,v 1.4 2016/06/29 20:07:52 christos Exp $
 
 NOMAN=	# defined
 
@@ -6,8 +6,8 @@ NOMAN=	# defined
 
 PROG=	smtpd
 
-DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG}
-.PATH:	${DIST}
+DIST=	${NETBSDSRCDIR}/external/ibm-public/postfix/dist
+.PATH:	${DIST}/src/${PROG}
 
 SRCS=	smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
 	smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
@@ -20,6 +20,9 @@ LDADD+= ${LIBPMASTER} ${LIBPMILTER} ${LI
 .if ${MKCRYPTO} != "no"
 DPADD+=	${LIBPTLS} ${LIBSSL} ${LIBCRYPTO}
 LDADD+=	${LIBPTLS} -lssl -lcrypto
+.else
+.PATH:	${DIST}/src/tls
+SRCS+=	tls_level.c
 .endif
 
 DPADD+=	${LIBPUTIL}

CVS commit: src/external/bsd/tcpdump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:45:14 UTC 2016

Modified Files:
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/tcpdump/include: config.h

Log Message:
Fix MKCRYPTO=no build


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/include/config.h

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

Modified files:

Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.13 src/external/bsd/tcpdump/bin/Makefile:1.14
--- src/external/bsd/tcpdump/bin/Makefile:1.13	Tue Mar 31 17:59:35 2015
+++ src/external/bsd/tcpdump/bin/Makefile	Wed Jun 29 15:45:14 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2015/03/31 21:59:35 christos Exp $	
+#	$NetBSD: Makefile,v 1.14 2016/06/29 19:45:14 christos Exp $	
 
 WARNS?=	1	# XXX: need to cleanup later
 
@@ -183,7 +183,7 @@ CPPFLAGS+=-DINET6=1 -DHAVE_RES_USE_INET6
 .endif
 
 .if (${MKCRYPTO} != "no")
-CPPFLAGS+=-DHAVE_LIBCRYPTO=1 
+CPPFLAGS+=-DHAVE_LIBCRYPTO=1 -DHAVE_OPENSSL_EVP_H 
 LDADD+=	-lcrypto -lcrypt
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT}
 .endif

Index: src/external/bsd/tcpdump/include/config.h
diff -u src/external/bsd/tcpdump/include/config.h:1.7 src/external/bsd/tcpdump/include/config.h:1.8
--- src/external/bsd/tcpdump/include/config.h:1.7	Tue Mar 31 17:59:35 2015
+++ src/external/bsd/tcpdump/include/config.h	Wed Jun 29 15:45:14 2016
@@ -60,7 +60,8 @@
 /* #undef HAVE_LIBCAP_NG */
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
-#define HAVE_LIBCRYPTO 1
+/* in the Makefile */
+/* #undef HAVE_LIBCRYPTO */
 
 /* Define to 1 if you have the `rpc' library (-lrpc). */
 /* #undef HAVE_LIBRPC */
@@ -87,7 +88,8 @@
 #define HAVE_OPENAT 1
 
 /* Define to 1 if you have the  header file. */
-#define HAVE_OPENSSL_EVP_H 1
+/* in the Makefile */
+/* #undef HAVE_OPENSSL_EVP_H */
 
 /* if there's an os_proto.h for this platform, to use additional prototypes */
 /* #undef HAVE_OS_PROTO_H */

CVS commit: src/external/bsd/tcpdump

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:45:14 UTC 2016

Modified Files:
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/tcpdump/include: config.h

Log Message:
Fix MKCRYPTO=no build


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/include/config.h

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

CVS commit: src/external/mit/xorg/server/xorg-server/hw

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:36:56 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile

Log Message:
Fix MKCRYPTO=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11	Tue Aug  2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile	Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2016/06/29 19:36:56 christos Exp $
 
 .include 
 
@@ -81,8 +81,7 @@ LDADD+=	${LDADD.dix} \
 	-lpixman-1 \
 	-lXdmcp \
 	-lz \
-	-lm \
-	-lcrypto
+	-lm
 
 DPADD+=	${DPADD.dix} \
 	${DPADD.fb} \
@@ -111,8 +110,12 @@ DPADD+=	${DPADD.dix} \
 	${LIBPIXMAN1} \
 	${LIBXDMCP} \
 	${LIBZ} \
-	${LIBM} \
-	${LIBCRYPTO}
+	${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=	-li386

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7	Thu Jul 23 04:03:25 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2015/07/23 08:03:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2016/06/29 19:36:56 christos Exp $
 
 .include 
 
@@ -62,7 +62,6 @@ LDADD+=	${LDADD.hw/xfree86/dixmods/fb}
 LDADD+=	${LDADD.hw/xfree86/dixmods/xorgxkb}
 LDADD+=	-lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
 LDADD+=	-lpciaccess -ldrm
-LDADD+=	-lcrypto
 LDADD+=	-Wl,--no-whole-archive
 
 .if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.hw/xfree86/i2c} \
 	${LIBCWRAPPER} \
 	${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
-	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
-	${LIBCRYPTO}
+	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 SYMLINKS=	${X11BINDIR}/Xorg ${X11BINDIR}/X
 

Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14	Tue Aug  2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile	Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2016/06/29 19:36:56 christos Exp $
 
 .include 
 
@@ -71,7 +71,7 @@ LDADD+=	${LDADD.dix} \
 	${LDADD.glx} \
 	-lXfont -lXext -lfontenc \
 	-lpixman-1 -lX11 -lXau \
-	-lXdmcp -lfreetype -lm -lcrypto
+	-lXdmcp -lfreetype -lm
 
 DPADD+=	${LDADD.dix} \
 	${DPADD.fb} \
@@ -95,7 +95,12 @@ DPADD+=	${LDADD.dix} \
 	${DPADD.glx} \
 	${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
 	${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
-	${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+	${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=	-li386

CVS commit: src/external/mit/xorg/server/xorg-server/hw

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:36:56 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile

Log Message:
Fix MKCRYPTO=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile

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

CVS commit: src/external/mit/xorg/server/xorg-server.old/hw

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:36:35 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xnest: Makefile

Log Message:
Fix MKCRYPTO=no build


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.1.1.1	Thu Jun  9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile	Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
 
 .include 
 
@@ -81,8 +81,7 @@ LDADD+=	${LDADD.dix} \
 	-lpixman-1 \
 	-lXdmcp \
 	-lz \
-	-lm \
-	-lcrypto
+	-lm
 
 DPADD+=	${DPADD.dix} \
 	${DPADD.fb} \
@@ -111,8 +110,12 @@ DPADD+=	${DPADD.dix} \
 	${LIBPIXMAN1} \
 	${LIBXDMCP} \
 	${LIBZ} \
-	${LIBM} \
-	${LIBCRYPTO}
+	${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=	-li386

Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.1.1.1	Thu Jun  9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile	Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
 
 .include 
 
@@ -62,7 +62,6 @@ LDADD+=	${LDADD.hw/xfree86/dixmods/fb}
 LDADD+=	${LDADD.hw/xfree86/dixmods/xorgxkb}
 LDADD+=	-lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
 LDADD+=	-lpciaccess -ldrm
-LDADD+=	-lcrypto
 LDADD+=	-Wl,--no-whole-archive
 
 .if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.hw/xfree86/i2c} \
 	${LIBCWRAPPER} \
 	${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
-	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
-	${LIBCRYPTO}
+	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 SYMLINKS=	${X11BINDIR}/Xorg ${X11BINDIR}/X
 

Index: src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.1.1.1	Thu Jun  9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile	Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
 
 .include 
 
@@ -71,7 +71,7 @@ LDADD+=	${LDADD.dix} \
 	${LDADD.glx} \
 	-lXfont -lXext -lfontenc \
 	-lpixman-1 -lX11 -lXau \
-	-lXdmcp -lfreetype -lm -lcrypto
+	-lXdmcp -lfreetype -lm
 
 DPADD+=	${LDADD.dix} \
 	${DPADD.fb} \
@@ -95,7 +95,12 @@ DPADD+=	${LDADD.dix} \
 	${DPADD.glx} \
 	${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
 	${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
-	${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+	${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=	-li386

CVS commit: src/external/mit/xorg/server/xorg-server.old/hw

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:36:35 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xnest: Makefile

Log Message:
Fix MKCRYPTO=no build


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile

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

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:16:23 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile aes-xinternal.c
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile aes-xinternal.c

Log Message:
Fix MKCRYPTO=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/hostapd/aes-xinternal.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c

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

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:16:23 UTC 2016

Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile aes-xinternal.c
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile aes-xinternal.c

Log Message:
Fix MKCRYPTO=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/hostapd/aes-xinternal.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.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/bsd/wpa/bin/hostapd/Makefile
diff -u src/external/bsd/wpa/bin/hostapd/Makefile:1.8 src/external/bsd/wpa/bin/hostapd/Makefile:1.9
--- src/external/bsd/wpa/bin/hostapd/Makefile:1.8	Wed Apr  1 15:45:14 2015
+++ src/external/bsd/wpa/bin/hostapd/Makefile	Wed Jun 29 15:16:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/04/01 19:45:14 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -86,7 +86,6 @@ eap_server_methods.c
 
 # crypto
 SRCS+= \
-crypto_openssl.c \
 random.c \
 sha1-prf.c
 
@@ -150,6 +149,7 @@ aes-ctr.c \
 aes-eax.c \
 aes-encblock.c \
 aes-omac1.c \
+crypto_openssl.c \
 dh_groups.c \
 fips_prf_openssl.c \
 ms_funcs.c \
@@ -196,7 +196,9 @@ DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBDES}
 LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1 -DCONFIG_NO_PBKDF2
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
 SRCS+=  tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 .include 

Index: src/external/bsd/wpa/bin/hostapd/aes-xinternal.c
diff -u src/external/bsd/wpa/bin/hostapd/aes-xinternal.c:1.1 src/external/bsd/wpa/bin/hostapd/aes-xinternal.c:1.2
--- src/external/bsd/wpa/bin/hostapd/aes-xinternal.c:1.1	Wed Aug  4 13:12:33 2010
+++ src/external/bsd/wpa/bin/hostapd/aes-xinternal.c	Wed Jun 29 15:16:23 2016
@@ -4,7 +4,7 @@
 #include "aes.h"
 #include "aes_wrap.h"
 
-int aes_wrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
+int aes_wrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 *plain)
 {
 	return -1;
 }

Index: src/external/bsd/wpa/bin/wpa_passphrase/Makefile
diff -u src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.3 src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.4
--- src/external/bsd/wpa/bin/wpa_passphrase/Makefile:1.3	Wed Apr  1 15:45:14 2015
+++ src/external/bsd/wpa/bin/wpa_passphrase/Makefile	Wed Jun 29 15:16:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/01 19:45:14 christos Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -18,7 +18,9 @@ DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBDES}
 LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
 SRCS+=	tls_none.c md5-internal.c sha1-internal.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 

Index: src/external/bsd/wpa/bin/wpa_supplicant/Makefile
diff -u src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.7 src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.8
--- src/external/bsd/wpa/bin/wpa_supplicant/Makefile:1.7	Wed Mar 23 05:35:25 2016
+++ src/external/bsd/wpa/bin/wpa_supplicant/Makefile	Wed Jun 29 15:16:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/03/23 09:35:25 roy Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/29 19:16:23 christos Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -33,6 +33,7 @@ pmksa_cache.c \
 preauth.c \
 random.c \
 scan.c \
+sha1-prf.c \
 wmm_ac.c \
 wpa.c \
 wpa_common.c \
@@ -102,7 +103,6 @@ eap_ttls.c \
 ms_funcs.c \
 mschapv2.c \
 sha1-tlsprf.c \
-sha1-prf.c \
 tls_openssl.c
 
 SRCS+=aes-ctr.c \
@@ -119,7 +119,9 @@ LDADD+= -lssl -lcrypto -ldes
 .else
 CPPFLAGS+= -DINTERNAL_AES -DINTERNAL_MD5 -DINTERNAL_SHA1 -DCONFIG_NO_PBKDF2
 SRCS+= tls_none.c sha1-internal.c md5-internal.c aes-xinternal.c rc4.c
-SRCS+= aes-unwrap.c md5.c
+CPPFLAGS+= -DCONFIG_CRYPTO_INTERNAL
+#SRCS+= aes-unwrap.c md5.c
+SRCS+= sha1-pbkdf2.c sha1.c md5.c
 .endif
 
 .endif

Index: src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c
diff -u src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c:1.1 src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c:1.2
--- src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c:1.1	Wed Aug  4 13:12:34 2010
+++ src/external/bsd/wpa/bin/wpa_supplicant/aes-xinternal.c	Wed Jun 29 15:16:23 2016
@@ -4,7 +4,7 @@
 #include "aes.h"
 #include "aes_wrap.h"
 
-int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
+int aes_unwrap(const u8 *kek, size_t kek_len, int n, const u8 *cipher, u8 

CVS commit: src/external/bsd/ntp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 18:42:18 UTC 2016

Modified Files:
src/external/bsd/ntp: Makefile.inc
src/external/bsd/ntp/dist/include: ntp_md5.h
src/external/bsd/ntp/dist/libntp: a_md5encrypt.c
src/external/bsd/ntp/dist/ntpd: ntp_control.c ntp_proto.c
src/external/bsd/ntp/dist/sntp: crypto.c
src/external/bsd/ntp/include: config.h

Log Message:
Fix MKCRYPTO=no build


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/include/ntp_md5.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/a_md5encrypt.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpd/ntp_control.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/sntp/crypto.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/include/config.h

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

CVS commit: src/external/bsd/bind

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 17:52:28 UTC 2016

Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/include: config.h

Log Message:
the decision to use AES_SIT and GOST belongs in the Makefile for MKCRYPT


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/include/config.h

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

Modified files:

Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.22 src/external/bsd/bind/Makefile.inc:1.23
--- src/external/bsd/bind/Makefile.inc:1.22	Mon Aug 18 00:40:51 2014
+++ src/external/bsd/bind/Makefile.inc	Wed Jun 29 13:52:28 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.22 2014/08/18 04:40:51 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.23 2016/06/29 17:52:28 christos Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -90,7 +90,7 @@ LIBDPLIBS+=  pthread  ${NETBSDSRCDIR
 .endif
 
 .if ${NAMED_USE_OPENSSL} == "yes"
-CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO
+CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO -DHAVE_OPENSSL_GOST -DAES_SIT
 .if ${MKKERBEROS} != "no"
 CPPFLAGS+=-DGSSAPI
 .endif

Index: src/external/bsd/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.19 src/external/bsd/bind/include/config.h:1.20
--- src/external/bsd/bind/include/config.h:1.19	Thu May 26 12:50:01 2016
+++ src/external/bsd/bind/include/config.h	Wed Jun 29 13:52:28 2016
@@ -165,7 +165,8 @@ int sigwait(const unsigned int *set, int
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Use AES for Source Identity Token generation */
-#define AES_SIT 1
+/* In Makefile */
+/* #undef AES_SIT */
 
 /* Define to enable the "filter--on-v4" and "filter--on-v6" options.
*/
@@ -369,7 +370,8 @@ int sigwait(const unsigned int *set, int
 #define HAVE_OPENSSL_EVP_AES 1
 
 /* Define if your OpenSSL version supports GOST. */
-#define HAVE_OPENSSL_GOST 1
+/* In Makefile */
+/* #undef HAVE_OPENSSL_GOST */
 
 /* Define if your PKCS11 provider supports ECDSA. */
 /* #undef HAVE_PKCS11_ECDSA */

CVS commit: src/external/bsd/bind

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 17:52:28 UTC 2016

Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/include: config.h

Log Message:
the decision to use AES_SIT and GOST belongs in the Makefile for MKCRYPT


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/include/config.h

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

CVS commit: src/lib/csu/common

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Jun 29 11:16:47 UTC 2016

Modified Files:
src/lib/csu/common: crtbegin.c

Log Message:
For some mind-boogling reasons, GCC 5.4 believes that a weak reference
cannot alias with an extern. While this is clearly bogus, avoid yet
another alias handling bug and use strong aliases. It's actually
slightly simpler, too.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/csu/common/crtbegin.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/csu/common/crtbegin.c
diff -u src/lib/csu/common/crtbegin.c:1.12 src/lib/csu/common/crtbegin.c:1.13
--- src/lib/csu/common/crtbegin.c:1.12	Tue Jun  7 12:07:35 2016
+++ src/lib/csu/common/crtbegin.c	Wed Jun 29 11:16:47 2016
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: crtbegin.c,v 1.12 2016/06/07 12:07:35 joerg Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.13 2016/06/29 11:16:47 joerg Exp $");
 
 #include "crtbegin.h"
 
@@ -39,8 +39,7 @@ __weakref_visible void Jv_RegisterClasse
 	__weak_reference(_Jv_RegisterClasses);
 
 #if !defined(HAVE_INITFINI_ARRAY)
-__weakref_visible const fptr_t __CTOR_LIST__start
-__weak_reference(__CTOR_LIST__);
+extern __dso_hidden const fptr_t __CTOR_LIST__start __asm("__CTOR_LIST__");
 
 __dso_hidden const fptr_t __aligned(sizeof(void *)) __CTOR_LIST__[] __section(".ctors") = {
 	(fptr_t) -1,
@@ -101,8 +100,7 @@ __do_global_ctors_aux(void)
 
 #if !defined(__ARM_EABI__) || defined(SHARED) || defined(__ARM_DWARF_EH__)
 #if !defined(HAVE_INITFINI_ARRAY)
-__weakref_visible const fptr_t __DTOR_LIST__start
-__weak_reference(__DTOR_LIST__);
+extern __dso_hidden const fptr_t __DTOR_LIST__start __asm("__DTOR_LIST__");
 
 __dso_hidden const fptr_t __aligned(sizeof(void *)) __DTOR_LIST__[] __section(".dtors") = {
 	(fptr_t) -1,

CVS commit: src/lib/csu/common

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Jun 29 11:16:47 UTC 2016

Modified Files:
src/lib/csu/common: crtbegin.c

Log Message:
For some mind-boogling reasons, GCC 5.4 believes that a weak reference
cannot alias with an extern. While this is clearly bogus, avoid yet
another alias handling bug and use strong aliases. It's actually
slightly simpler, too.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/csu/common/crtbegin.c

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

CVS commit: src/tests/net/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jun 29 07:29:04 UTC 2016

Modified Files:
src/tests/net/net: t_forwarding.sh

Log Message:
Destroy interfaces at the end of tests

It's useful to know if interface destructions work correctly or not
with complex internal states (e.g., caches).


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/net/net/t_forwarding.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/net/t_forwarding.sh
diff -u src/tests/net/net/t_forwarding.sh:1.13 src/tests/net/net/t_forwarding.sh:1.14
--- src/tests/net/net/t_forwarding.sh:1.13	Tue Jun 21 05:04:16 2016
+++ src/tests/net/net/t_forwarding.sh	Wed Jun 29 07:29:04 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_forwarding.sh,v 1.13 2016/06/21 05:04:16 ozaki-r Exp $
+#	$NetBSD: t_forwarding.sh,v 1.14 2016/06/29 07:29:04 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -268,6 +268,19 @@ teardown_icmp_bmcastecho()
 	atf_check -s exit:0 -o ignore rump.sysctl -w net.inet.icmp.bmcastecho=0
 }
 
+teardown_interfaces()
+{
+	export RUMP_SERVER=$SOCKSRC
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 destroy
+
+	export RUMP_SERVER=$SOCKFWD
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 destroy
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif1 destroy
+
+	export RUMP_SERVER=$SOCKDST
+	atf_check -s exit:0 -o ignore rump.ifconfig shmif0 destroy
+}
+
 test_setup_forwarding()
 {
 	export RUMP_SERVER=$SOCKFWD
@@ -439,6 +452,8 @@ ipforwarding_v4_body()
 	teardown_forwarding
 	test_teardown_forwarding
 	test_ping_failure
+
+	teardown_interfaces
 }
 
 ipforwarding_v6_body()
@@ -454,6 +469,8 @@ ipforwarding_v6_body()
 	teardown_forwarding6
 	test_teardown_forwarding6
 	test_ping6_failure
+
+	teardown_interfaces
 }
 
 ipforwarding_fastforward_v4_body()
@@ -466,6 +483,8 @@ ipforwarding_fastforward_v4_body()
 
 	setup_bozo $IP4DST
 	test_http_get $IP4DST
+
+	teardown_interfaces
 }
 
 ipforwarding_fastforward_v6_body()
@@ -478,6 +497,8 @@ ipforwarding_fastforward_v6_body()
 
 	setup_bozo $IP6DST
 	test_http_get "[$IP6DST]"
+
+	teardown_interfaces
 }
 
 ipforwarding_misc_body()
@@ -495,6 +516,7 @@ ipforwarding_misc_body()
 	setup_bozo $IP4DST
 	test_sysctl_ttl $IP4DST
 
+	teardown_interfaces
 	return 0
 }
 

CVS commit: src/tests/net/net

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jun 29 07:29:04 UTC 2016

Modified Files:
src/tests/net/net: t_forwarding.sh

Log Message:
Destroy interfaces at the end of tests

It's useful to know if interface destructions work correctly or not
with complex internal states (e.g., caches).


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/net/net/t_forwarding.sh

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Jun 29 06:38:12 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: ucom.c

Log Message:
Comment out incorrect KASSERTs


To generate a diff of this commit:
cvs rdiff -u -r1.108.2.16 -r1.108.2.17 src/sys/dev/usb/ucom.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Jun 29 06:38:12 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: ucom.c

Log Message:
Comment out incorrect KASSERTs


To generate a diff of this commit:
cvs rdiff -u -r1.108.2.16 -r1.108.2.17 src/sys/dev/usb/ucom.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/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.108.2.16 src/sys/dev/usb/ucom.c:1.108.2.17
--- src/sys/dev/usb/ucom.c:1.108.2.16	Tue Jun 28 11:47:53 2016
+++ src/sys/dev/usb/ucom.c	Wed Jun 29 06:38:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ucom.c,v 1.108.2.16 2016/06/28 11:47:53 skrll Exp $	*/
+/*	$NetBSD: ucom.c,v 1.108.2.17 2016/06/29 06:38:12 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.16 2016/06/28 11:47:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.17 2016/06/29 06:38:12 skrll Exp $");
 
 #include 
 #include 
@@ -268,8 +268,8 @@ ucom_attach(device_t parent, device_t se
 	prop_dictionary_set_int32(device_properties(self), "port",
 	ucaa->ucaa_portno);
 
-	KASSERT(ucaa->ucaa_bulkin != -1 || (ucaa->ucaa_ipipe && ucaa->ucaa_ixfer));
-	KASSERT(ucaa->ucaa_bulkout != -1 || (ucaa->ucaa_opipe && ucaa->ucaa_oxfer));
+	//KASSERT(ucaa->ucaa_bulkin != -1 || (ucaa->ucaa_ipipe && ucaa->ucaa_ixfer));
+	//KASSERT(ucaa->ucaa_bulkout != -1 || (ucaa->ucaa_opipe && ucaa->ucaa_oxfer));
 
 	sc->sc_dev = self;
 	sc->sc_udev = ucaa->ucaa_device;

CVS commit: src/doc

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Wed Jun 29 06:12:49 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
SQLite 3.13.0 was released.


To generate a diff of this commit:
cvs rdiff -u -r1.1339 -r1.1340 src/doc/3RDPARTY

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.1339 src/doc/3RDPARTY:1.1340
--- src/doc/3RDPARTY:1.1339	Fri Jun 17 19:45:24 2016
+++ src/doc/3RDPARTY	Wed Jun 29 06:12:49 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1339 2016/06/17 19:45:24 roy Exp $
+#	$NetBSD: 3RDPARTY,v 1.1340 2016/06/29 06:12:49 abhinav Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1256,7 +1256,7 @@ original.
 
 Package:	sqlite
 Version:	3.8.3.1
-Current Vers:	3.10
+Current Vers:	3.13.0
 Maintainer:	Richard Hipp 
 Home Page:	http://www.sqlite.org
 Responsible:	joerg

CVS commit: src/doc

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Wed Jun 29 06:12:49 UTC 2016

Modified Files:
src/doc: 3RDPARTY

Log Message:
SQLite 3.13.0 was released.


To generate a diff of this commit:
cvs rdiff -u -r1.1339 -r1.1340 src/doc/3RDPARTY

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