CVS commit: src/lib/libedit

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Fri Apr 21 05:38:03 UTC 2017

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

Log Message:
When doing filename autocompletion, append a trailing slash at the end of 
directory
names. We already do this when there is only one completion option but
in case of of multiple completion options, it wasn't being done.

ok christos@


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libedit/filecomplete.h
cvs rdiff -u -r1.140 -r1.141 src/lib/libedit/readline.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.44 src/lib/libedit/filecomplete.c:1.45
--- src/lib/libedit/filecomplete.c:1.44	Mon Oct 31 17:46:32 2016
+++ src/lib/libedit/filecomplete.c	Fri Apr 21 05:38:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.c,v 1.44 2016/10/31 17:46:32 abhinav Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.45 2017/04/21 05:38:03 abhinav 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.44 2016/10/31 17:46:32 abhinav Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.45 2017/04/21 05:38:03 abhinav Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -354,10 +354,13 @@ _fn_qsort_string_compare(const void *i1,
  * num, so the strings are matches[1] *through* matches[num-1].
  */
 void
-fn_display_match_list (EditLine *el, char **matches, size_t num, size_t width)
+fn_display_match_list(EditLine * el, char **matches, size_t num, size_t width,
+const char *(*app_func) (const char *))
 {
 	size_t line, lines, col, cols, thisguy;
 	int screenwidth = el->el_terminal.t_size.h;
+	if (app_func == NULL)
+		app_func = append_char_function;
 
 	/* Ignore matches[0]. Avoid 1-based array logic below. */
 	matches++;
@@ -385,8 +388,11 @@ fn_display_match_list (EditLine *el, cha
 			thisguy = line + col * lines;
 			if (thisguy >= num)
 break;
-			(void)fprintf(el->el_outfile, "%s%-*s",
-			col == 0 ? "" : " ", (int)width, matches[thisguy]);
+			(void)fprintf(el->el_outfile, "%s%s%s",
+			col == 0 ? "" : " ", matches[thisguy],
+append_char_function(matches[thisguy]));
+			(void)fprintf(el->el_outfile, "%-*s",
+(int) (width - strlen(matches[thisguy])), "");
 		}
 		(void)fprintf(el->el_outfile, "\n");
 	}
@@ -533,7 +539,7 @@ fn_complete(EditLine *el,
  * add 1 to matches_num for the call.
  */
 fn_display_match_list(el, matches,
-matches_num+1, maxlen);
+matches_num+1, maxlen, app_func);
 			}
 			retval = CC_REDISPLAY;
 		} else if (matches[0][0]) {

Index: src/lib/libedit/filecomplete.h
diff -u src/lib/libedit/filecomplete.h:1.10 src/lib/libedit/filecomplete.h:1.11
--- src/lib/libedit/filecomplete.h:1.10	Mon Apr 11 00:50:13 2016
+++ src/lib/libedit/filecomplete.h	Fri Apr 21 05:38:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.h,v 1.10 2016/04/11 00:50:13 christos Exp $	*/
+/*	$NetBSD: filecomplete.h,v 1.11 2017/04/21 05:38:03 abhinav Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,8 @@ int fn_complete(EditLine *,
 const wchar_t *, const wchar_t *, const char *(*)(const char *), size_t,
 int *, int *, int *, int *);
 
-void fn_display_match_list(EditLine *, char **, size_t, size_t);
+void fn_display_match_list(EditLine *, char **, size_t, size_t,
+	const char *(*)(const char *));
 char *fn_tilde_expand(const char *);
 char *fn_filename_completion_function(const char *, int);
 

Index: src/lib/libedit/readline.c
diff -u src/lib/libedit/readline.c:1.140 src/lib/libedit/readline.c:1.141
--- src/lib/libedit/readline.c:1.140	Mon Jan  9 03:09:05 2017
+++ src/lib/libedit/readline.c	Fri Apr 21 05:38:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: readline.c,v 1.140 2017/01/09 03:09:05 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.141 2017/04/21 05:38:03 abhinav Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.140 2017/01/09 03:09:05 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.141 2017/04/21 05:38:03 abhinav Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -1812,18 +1812,6 @@ _el_rl_tstp(EditLine *el __attribute__((
 	return CC_NORM;
 }
 
-/*
- * Display list of strings in columnar format on readline's output stream.
- * 'matches' is list of strings, 'len' is number of strings in 'matches',
- * 'max' is maximum length of string in 'matches'.
- */
-void
-rl_display_match_list(char **matches, int len, int max)
-{
-
-	fn_display_match_list(e, matches, (size_t)len, (size_t)max);
-}
-
 static const char *
 /*ARGSUSED*/
 _rl_completion_append_character_function(const 

CVS commit: src/lib/libedit

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Fri Apr 21 05:38:03 UTC 2017

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

Log Message:
When doing filename autocompletion, append a trailing slash at the end of 
directory
names. We already do this when there is only one completion option but
in case of of multiple completion options, it wasn't being done.

ok christos@


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libedit/filecomplete.h
cvs rdiff -u -r1.140 -r1.141 src/lib/libedit/readline.c

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

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:24:01 UTC 2017

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

Log Message:
1404


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-7.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-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.12 src/doc/CHANGES-7.2:1.1.2.13
--- src/doc/CHANGES-7.2:1.1.2.12	Thu Apr 20 07:07:28 2017
+++ src/doc/CHANGES-7.2	Fri Apr 21 05:24:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.12 2017/04/20 07:07:28 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.13 2017/04/21 05:24:01 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -925,3 +925,75 @@ sys/arch/hppa/hppa/machdep.c			1.7
 	Add 712/* models to cpu_model_cpuid.  PR/52129.
 	[skrll, ticket #1396]
 
+doc/3RDPARTY	1.1430 via patch
+external/bsd/bind/dist/CHANGES  up to 1.26
+external/bsd/bind/dist/COPYRIGHTup to 1.1.1.11
+external/bsd/bind/dist/README   up to 1.14
+external/bsd/bind/dist/bin/named/query.cup to 1.24
+external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl up to 1.1.1.2
+external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db up to 1.1.1.4
+external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db up to 1.1.1.4
+external/bsd/bind/dist/bin/tests/system/dname/tests.sh up to 1.1.1.6
+external/bsd/bind/dist/bin/tests/system/rndc/tests.sh up to 1.1.1.9
+external/bsd/bind/dist/bin/tests/system/rpz/tests.sh up to 1.1.1.13
+external/bsd/bind/dist/bind.keysup to 1.1.1.6
+external/bsd/bind/dist/bind.keys.h  up to 1.1.1.4
+external/bsd/bind/dist/configureup to 1.7
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html up to 1.1.1.24
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html up to 1.1.1.21
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html up to 1.1.1.26
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html up to 1.1.1.27
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html up to 1.1.1.23
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.html  up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.pdf   up to 1.19
+external/bsd/bind/dist/doc/arm/man.arpaname.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.ddns-confgen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.delv.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/man.dig.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-settime.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-verify.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.genrandom.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.host.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.lwresd.html  up to 1.1.1.6
+external/bsd/bind/dist/doc/arm/man.named-checkconf.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-checkzone.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-journalprint.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-rrchecker.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named.conf.html up to 1.1.1.6
+external/bsd/bind/dist/doc/arm/man.named.html   up to 1.14
+external/bsd/bind/dist/doc/arm/man.nsec3hash.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.nsupdate.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc-confgen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc.conf.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/notes.html   up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/notes.pdfup to 1.1.1.12
+external/bsd/bind/dist/doc/arm/notes.xmlup to 1.1.1.12
+external/bsd/bind/dist/lib/dns/api  up to 1.14
+external/bsd/bind/dist/lib/dns/rdataset.c   up to 1.10

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:24:01 UTC 2017

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

Log Message:
1404


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-7.2

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

CVS commit: [netbsd-7] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:23:21 UTC 2017

Modified Files:
src/doc [netbsd-7]: 3RDPARTY
src/external/bsd/bind/dist [netbsd-7]: CHANGES COPYRIGHT README
bind.keys bind.keys.h configure srcid version
src/external/bsd/bind/dist/bin/named [netbsd-7]: query.c
src/external/bsd/bind/dist/bin/tests/system/dname [netbsd-7]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/dname/ans3 [netbsd-7]:
ans.pl
src/external/bsd/bind/dist/bin/tests/system/dname/ns1 [netbsd-7]:
root.db
src/external/bsd/bind/dist/bin/tests/system/dname/ns2 [netbsd-7]:
example.db
src/external/bsd/bind/dist/bin/tests/system/rndc [netbsd-7]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-7]: tests.sh
src/external/bsd/bind/dist/doc/arm [netbsd-7]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7]: api rdataset.c
resolver.c
src/external/bsd/bind/dist/lib/isc [netbsd-7]: lex.c
src/external/bsd/bind/dist/lib/isc/include/isc [netbsd-7]: lex.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1404):
doc/3RDPARTY: 1.1430 via patch
external/bsd/bind/dist/CHANGES: up to 1.26
external/bsd/bind/dist/COPYRIGHT: up to 1.1.1.11
external/bsd/bind/dist/README: up to 1.14
external/bsd/bind/dist/bin/named/query.c: up to 1.24
external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl: up to 1.1.1.2
external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db: up to 1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db: up to 
1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/tests.sh: up to 1.1.1.6
external/bsd/bind/dist/bin/tests/system/rndc/tests.sh: up to 1.1.1.9
external/bsd/bind/dist/bin/tests/system/rpz/tests.sh: up to 1.1.1.13
external/bsd/bind/dist/bind.keys: up to 1.1.1.6
external/bsd/bind/dist/bind.keys.h: up to 1.1.1.4
external/bsd/bind/dist/configure: up to 1.7
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.26
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.27
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.19
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 1.14

CVS commit: [netbsd-7] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:23:21 UTC 2017

Modified Files:
src/doc [netbsd-7]: 3RDPARTY
src/external/bsd/bind/dist [netbsd-7]: CHANGES COPYRIGHT README
bind.keys bind.keys.h configure srcid version
src/external/bsd/bind/dist/bin/named [netbsd-7]: query.c
src/external/bsd/bind/dist/bin/tests/system/dname [netbsd-7]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/dname/ans3 [netbsd-7]:
ans.pl
src/external/bsd/bind/dist/bin/tests/system/dname/ns1 [netbsd-7]:
root.db
src/external/bsd/bind/dist/bin/tests/system/dname/ns2 [netbsd-7]:
example.db
src/external/bsd/bind/dist/bin/tests/system/rndc [netbsd-7]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-7]: tests.sh
src/external/bsd/bind/dist/doc/arm [netbsd-7]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7]: api rdataset.c
resolver.c
src/external/bsd/bind/dist/lib/isc [netbsd-7]: lex.c
src/external/bsd/bind/dist/lib/isc/include/isc [netbsd-7]: lex.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1404):
doc/3RDPARTY: 1.1430 via patch
external/bsd/bind/dist/CHANGES: up to 1.26
external/bsd/bind/dist/COPYRIGHT: up to 1.1.1.11
external/bsd/bind/dist/README: up to 1.14
external/bsd/bind/dist/bin/named/query.c: up to 1.24
external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl: up to 1.1.1.2
external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db: up to 1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db: up to 
1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/tests.sh: up to 1.1.1.6
external/bsd/bind/dist/bin/tests/system/rndc/tests.sh: up to 1.1.1.9
external/bsd/bind/dist/bin/tests/system/rpz/tests.sh: up to 1.1.1.13
external/bsd/bind/dist/bind.keys: up to 1.1.1.6
external/bsd/bind/dist/bind.keys.h: up to 1.1.1.4
external/bsd/bind/dist/configure: up to 1.7
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.26
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.27
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.19
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 1.14

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:22:24 UTC 2017

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

Log Message:
1404


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-7.1.1

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

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:22:24 UTC 2017

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

Log Message:
1404


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/doc/CHANGES-7.1.1

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

Modified files:

Index: src/doc/CHANGES-7.1.1
diff -u src/doc/CHANGES-7.1.1:1.1.2.5 src/doc/CHANGES-7.1.1:1.1.2.6
--- src/doc/CHANGES-7.1.1:1.1.2.5	Thu Apr 20 06:46:16 2017
+++ src/doc/CHANGES-7.1.1	Fri Apr 21 05:22:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.5 2017/04/20 06:46:16 snj Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.6 2017/04/21 05:22:23 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -485,3 +485,75 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p10.
 	[spz, ticket #1405]
 
+doc/3RDPARTY	1.1430 via patch
+external/bsd/bind/dist/CHANGES  up to 1.26
+external/bsd/bind/dist/COPYRIGHTup to 1.1.1.11
+external/bsd/bind/dist/README   up to 1.14
+external/bsd/bind/dist/bin/named/query.cup to 1.24
+external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl up to 1.1.1.2
+external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db up to 1.1.1.4
+external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db up to 1.1.1.4
+external/bsd/bind/dist/bin/tests/system/dname/tests.sh up to 1.1.1.6
+external/bsd/bind/dist/bin/tests/system/rndc/tests.sh up to 1.1.1.9
+external/bsd/bind/dist/bin/tests/system/rpz/tests.sh up to 1.1.1.13
+external/bsd/bind/dist/bind.keysup to 1.1.1.6
+external/bsd/bind/dist/bind.keys.h  up to 1.1.1.4
+external/bsd/bind/dist/configureup to 1.7
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html up to 1.1.1.24
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html up to 1.1.1.21
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html up to 1.1.1.26
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html up to 1.1.1.27
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html up to 1.1.1.23
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.html  up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.pdf   up to 1.19
+external/bsd/bind/dist/doc/arm/man.arpaname.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.ddns-confgen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.delv.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/man.dig.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-settime.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-verify.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.genrandom.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.host.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.lwresd.html  up to 1.1.1.6
+external/bsd/bind/dist/doc/arm/man.named-checkconf.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-checkzone.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-journalprint.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-rrchecker.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named.conf.html up to 1.1.1.6
+external/bsd/bind/dist/doc/arm/man.named.html   up to 1.14
+external/bsd/bind/dist/doc/arm/man.nsec3hash.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.nsupdate.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc-confgen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc.conf.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/notes.html   up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/notes.pdfup to 1.1.1.12
+external/bsd/bind/dist/doc/arm/notes.xmlup to 1.1.1.12
+external/bsd/bind/dist/lib/dns/api  up to 1.14
+external/bsd/bind/dist/lib/dns/rdataset.c   up to 1.10

CVS commit: [netbsd-7-1] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:21:07 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: 3RDPARTY
src/external/bsd/bind/dist [netbsd-7-1]: CHANGES COPYRIGHT README
bind.keys bind.keys.h configure srcid version
src/external/bsd/bind/dist/bin/named [netbsd-7-1]: query.c
src/external/bsd/bind/dist/bin/tests/system/dname [netbsd-7-1]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dname/ans3 [netbsd-7-1]:
ans.pl
src/external/bsd/bind/dist/bin/tests/system/dname/ns1 [netbsd-7-1]:
root.db
src/external/bsd/bind/dist/bin/tests/system/dname/ns2 [netbsd-7-1]:
example.db
src/external/bsd/bind/dist/bin/tests/system/rndc [netbsd-7-1]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-7-1]: tests.sh
src/external/bsd/bind/dist/doc/arm [netbsd-7-1]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7-1]: api rdataset.c
resolver.c
src/external/bsd/bind/dist/lib/isc [netbsd-7-1]: lex.c
src/external/bsd/bind/dist/lib/isc/include/isc [netbsd-7-1]: lex.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1404):
doc/3RDPARTY: 1.1430 via patch
external/bsd/bind/dist/CHANGES: up to 1.26
external/bsd/bind/dist/COPYRIGHT: up to 1.1.1.11
external/bsd/bind/dist/README: up to 1.14
external/bsd/bind/dist/bin/named/query.c: up to 1.24
external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl: up to 1.1.1.2
external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db: up to 1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db: up to 
1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/tests.sh: up to 1.1.1.6
external/bsd/bind/dist/bin/tests/system/rndc/tests.sh: up to 1.1.1.9
external/bsd/bind/dist/bin/tests/system/rpz/tests.sh: up to 1.1.1.13
external/bsd/bind/dist/bind.keys: up to 1.1.1.6
external/bsd/bind/dist/bind.keys.h: up to 1.1.1.4
external/bsd/bind/dist/configure: up to 1.7
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.26
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.27
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.19
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 

CVS commit: [netbsd-7-1] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:21:07 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: 3RDPARTY
src/external/bsd/bind/dist [netbsd-7-1]: CHANGES COPYRIGHT README
bind.keys bind.keys.h configure srcid version
src/external/bsd/bind/dist/bin/named [netbsd-7-1]: query.c
src/external/bsd/bind/dist/bin/tests/system/dname [netbsd-7-1]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dname/ans3 [netbsd-7-1]:
ans.pl
src/external/bsd/bind/dist/bin/tests/system/dname/ns1 [netbsd-7-1]:
root.db
src/external/bsd/bind/dist/bin/tests/system/dname/ns2 [netbsd-7-1]:
example.db
src/external/bsd/bind/dist/bin/tests/system/rndc [netbsd-7-1]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-7-1]: tests.sh
src/external/bsd/bind/dist/doc/arm [netbsd-7-1]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7-1]: api rdataset.c
resolver.c
src/external/bsd/bind/dist/lib/isc [netbsd-7-1]: lex.c
src/external/bsd/bind/dist/lib/isc/include/isc [netbsd-7-1]: lex.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1404):
doc/3RDPARTY: 1.1430 via patch
external/bsd/bind/dist/CHANGES: up to 1.26
external/bsd/bind/dist/COPYRIGHT: up to 1.1.1.11
external/bsd/bind/dist/README: up to 1.14
external/bsd/bind/dist/bin/named/query.c: up to 1.24
external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl: up to 1.1.1.2
external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db: up to 1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db: up to 
1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/tests.sh: up to 1.1.1.6
external/bsd/bind/dist/bin/tests/system/rndc/tests.sh: up to 1.1.1.9
external/bsd/bind/dist/bin/tests/system/rpz/tests.sh: up to 1.1.1.13
external/bsd/bind/dist/bind.keys: up to 1.1.1.6
external/bsd/bind/dist/bind.keys.h: up to 1.1.1.4
external/bsd/bind/dist/configure: up to 1.7
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.26
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.27
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.19
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:18:07 UTC 2017

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

Log Message:
1404


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/doc/CHANGES-7.0.3

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.38 src/doc/CHANGES-7.0.3:1.1.2.39
--- src/doc/CHANGES-7.0.3:1.1.2.38	Thu Apr 20 06:43:48 2017
+++ src/doc/CHANGES-7.0.3	Fri Apr 21 05:18:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.38 2017/04/20 06:43:48 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.39 2017/04/21 05:18:07 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -1792,3 +1792,75 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p10.
 	[spz, ticket #1405]
 
+doc/3RDPARTY	1.1430 via patch
+external/bsd/bind/dist/CHANGES  up to 1.26
+external/bsd/bind/dist/COPYRIGHTup to 1.1.1.11
+external/bsd/bind/dist/README   up to 1.14
+external/bsd/bind/dist/bin/named/query.cup to 1.24
+external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl up to 1.1.1.2
+external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db up to 1.1.1.4
+external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db up to 1.1.1.4
+external/bsd/bind/dist/bin/tests/system/dname/tests.sh up to 1.1.1.6
+external/bsd/bind/dist/bin/tests/system/rndc/tests.sh up to 1.1.1.9
+external/bsd/bind/dist/bin/tests/system/rpz/tests.sh up to 1.1.1.13
+external/bsd/bind/dist/bind.keysup to 1.1.1.6
+external/bsd/bind/dist/bind.keys.h  up to 1.1.1.4
+external/bsd/bind/dist/configureup to 1.7
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html up to 1.1.1.24
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html up to 1.1.1.21
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html up to 1.1.1.26
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html up to 1.1.1.27
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html up to 1.1.1.23
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/Bv9ARM.html  up to 1.14
+external/bsd/bind/dist/doc/arm/Bv9ARM.pdf   up to 1.19
+external/bsd/bind/dist/doc/arm/man.arpaname.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.ddns-confgen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.delv.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/man.dig.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-settime.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.dnssec-verify.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.genrandom.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.host.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.lwresd.html  up to 1.1.1.6
+external/bsd/bind/dist/doc/arm/man.named-checkconf.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-checkzone.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-journalprint.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named-rrchecker.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.named.conf.html up to 1.1.1.6
+external/bsd/bind/dist/doc/arm/man.named.html   up to 1.14
+external/bsd/bind/dist/doc/arm/man.nsec3hash.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.nsupdate.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc-confgen.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc.conf.html up to 1.14
+external/bsd/bind/dist/doc/arm/man.rndc.htmlup to 1.14
+external/bsd/bind/dist/doc/arm/notes.html   up to 1.1.1.12
+external/bsd/bind/dist/doc/arm/notes.pdfup to 1.1.1.12
+external/bsd/bind/dist/doc/arm/notes.xmlup to 1.1.1.12
+external/bsd/bind/dist/lib/dns/api  up to 1.14
+external/bsd/bind/dist/lib/dns/rdataset.c   up to 1.10

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:18:07 UTC 2017

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

Log Message:
1404


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/doc/CHANGES-7.0.3

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

CVS commit: [netbsd-7-0] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:16:42 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: 3RDPARTY
src/external/bsd/bind/dist [netbsd-7-0]: CHANGES COPYRIGHT README
bind.keys bind.keys.h configure srcid version
src/external/bsd/bind/dist/bin/named [netbsd-7-0]: query.c
src/external/bsd/bind/dist/bin/tests/system/dname [netbsd-7-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dname/ans3 [netbsd-7-0]:
ans.pl
src/external/bsd/bind/dist/bin/tests/system/dname/ns1 [netbsd-7-0]:
root.db
src/external/bsd/bind/dist/bin/tests/system/dname/ns2 [netbsd-7-0]:
example.db
src/external/bsd/bind/dist/bin/tests/system/rndc [netbsd-7-0]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-7-0]: tests.sh
src/external/bsd/bind/dist/doc/arm [netbsd-7-0]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7-0]: api rdataset.c
resolver.c
src/external/bsd/bind/dist/lib/isc [netbsd-7-0]: lex.c
src/external/bsd/bind/dist/lib/isc/include/isc [netbsd-7-0]: lex.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1404):
doc/3RDPARTY: 1.1430 via patch
external/bsd/bind/dist/CHANGES: up to 1.26
external/bsd/bind/dist/COPYRIGHT: up to 1.1.1.11
external/bsd/bind/dist/README: up to 1.14
external/bsd/bind/dist/bin/named/query.c: up to 1.24
external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl: up to 1.1.1.2
external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db: up to 1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db: up to 
1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/tests.sh: up to 1.1.1.6
external/bsd/bind/dist/bin/tests/system/rndc/tests.sh: up to 1.1.1.9
external/bsd/bind/dist/bin/tests/system/rpz/tests.sh: up to 1.1.1.13
external/bsd/bind/dist/bind.keys: up to 1.1.1.6
external/bsd/bind/dist/bind.keys.h: up to 1.1.1.4
external/bsd/bind/dist/configure: up to 1.7
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.26
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.27
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.19
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 

CVS commit: [netbsd-7-0] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Fri Apr 21 05:16:42 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: 3RDPARTY
src/external/bsd/bind/dist [netbsd-7-0]: CHANGES COPYRIGHT README
bind.keys bind.keys.h configure srcid version
src/external/bsd/bind/dist/bin/named [netbsd-7-0]: query.c
src/external/bsd/bind/dist/bin/tests/system/dname [netbsd-7-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dname/ans3 [netbsd-7-0]:
ans.pl
src/external/bsd/bind/dist/bin/tests/system/dname/ns1 [netbsd-7-0]:
root.db
src/external/bsd/bind/dist/bin/tests/system/dname/ns2 [netbsd-7-0]:
example.db
src/external/bsd/bind/dist/bin/tests/system/rndc [netbsd-7-0]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-7-0]: tests.sh
src/external/bsd/bind/dist/doc/arm [netbsd-7-0]: Bv9ARM.ch01.html
Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html Bv9ARM.ch05.html
Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html
Bv9ARM.ch10.html Bv9ARM.ch11.html Bv9ARM.ch12.html Bv9ARM.ch13.html
Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html
man.delv.html man.dig.html man.dnssec-checkds.html
man.dnssec-coverage.html man.dnssec-dsfromkey.html
man.dnssec-importkey.html man.dnssec-keyfromlabel.html
man.dnssec-keygen.html man.dnssec-revoke.html
man.dnssec-settime.html man.dnssec-signzone.html
man.dnssec-verify.html man.genrandom.html man.host.html
man.isc-hmac-fixup.html man.lwresd.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.conf.html man.named.html
man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html
man.rndc.conf.html man.rndc.html notes.html notes.pdf notes.xml
src/external/bsd/bind/dist/lib/dns [netbsd-7-0]: api rdataset.c
resolver.c
src/external/bsd/bind/dist/lib/isc [netbsd-7-0]: lex.c
src/external/bsd/bind/dist/lib/isc/include/isc [netbsd-7-0]: lex.h

Log Message:
Pull up following revision(s) (requested by spz in ticket #1404):
doc/3RDPARTY: 1.1430 via patch
external/bsd/bind/dist/CHANGES: up to 1.26
external/bsd/bind/dist/COPYRIGHT: up to 1.1.1.11
external/bsd/bind/dist/README: up to 1.14
external/bsd/bind/dist/bin/named/query.c: up to 1.24
external/bsd/bind/dist/bin/tests/system/dname/ans3/ans.pl: up to 1.1.1.2
external/bsd/bind/dist/bin/tests/system/dname/ns1/root.db: up to 1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/ns2/example.db: up to 
1.1.1.4
external/bsd/bind/dist/bin/tests/system/dname/tests.sh: up to 1.1.1.6
external/bsd/bind/dist/bin/tests/system/rndc/tests.sh: up to 1.1.1.9
external/bsd/bind/dist/bin/tests/system/rpz/tests.sh: up to 1.1.1.13
external/bsd/bind/dist/bind.keys: up to 1.1.1.6
external/bsd/bind/dist/bind.keys.h: up to 1.1.1.4
external/bsd/bind/dist/configure: up to 1.7
external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.24
external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.21
external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.26
external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.27
external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.23
external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.12
external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.14
external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.19
external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.14
external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 

CVS commit: src/bin/ln

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 20 22:57:30 UTC 2017

Modified Files:
src/bin/ln: ln.1

Log Message:
- fix number in copyright
- comment out "simplified link" for now.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/ln/ln.1

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

Modified files:

Index: src/bin/ln/ln.1
diff -u src/bin/ln/ln.1:1.27 src/bin/ln/ln.1:1.28
--- src/bin/ln/ln.1:1.27	Thu Apr 20 17:50:50 2017
+++ src/bin/ln/ln.1	Thu Apr 20 18:57:30 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: ln.1,v 1.27 2017/04/20 21:50:50 christos Exp $
+.\" $NetBSD: ln.1,v 1.28 2017/04/20 22:57:30 christos Exp $
 .\"-
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"notice, this list of conditions and the following disclaimer in the
 .\"documentation and/or other materials provided with the distribution.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"may be used to endorse or promote products derived from this software
 .\"without specific prior written permission.
 .\"
@@ -37,8 +37,9 @@
 .Dt LN 1
 .Os
 .Sh NAME
-.Nm ln ,
-.Nm link
+.\" .Nm ln ,
+.\" .Nm link
+.Nm ln
 .Nd link files
 .Sh SYNOPSIS
 .Nm
@@ -53,8 +54,8 @@
 .Op Fl hnv
 .Ar source_file ...
 .Ar target_dir
-.Nm link
-.Ar source_file Ar target_file
+.\" .Nm link
+.\" .Ar source_file Ar target_file
 .Sh DESCRIPTION
 The
 .Nm
@@ -204,15 +205,15 @@ makes links in
 .Ar target_dir
 to all the named source files.
 The links made will have the same name as the files being linked to.
-.Pp
-When the utility is called as
-.Nm link ,
-exactly two arguments must be supplied,
-neither of which may specify a directory.
-No options may be supplied in this simple mode of operation,
-which performs a
-.Xr link 2
-operation using the two passed arguments.
+.\" .Pp
+.\" When the utility is called as
+.\" .Nm link ,
+.\" exactly two arguments must be supplied,
+.\" neither of which may specify a directory.
+.\" No options may be supplied in this simple mode of operation,
+.\" which performs a
+.\" .Xr link 2
+.\" operation using the two passed arguments.
 .Sh EXAMPLES
 Create a symbolic link named
 .Pa /home/src
@@ -307,11 +308,11 @@ The
 .Nm
 utility conforms to
 .St -p1003.2-92 .
-.Pp
-The simplified
-.Nm link
-command conforms to
-.St -susv2 .
+.\" .Pp
+.\" The simplified
+.\" .Nm link
+.\" command conforms to
+.\" .St -susv2 .
 .Sh HISTORY
 An
 .Nm

CVS commit: src/bin/ln

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 20 22:57:30 UTC 2017

Modified Files:
src/bin/ln: ln.1

Log Message:
- fix number in copyright
- comment out "simplified link" for now.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/bin/ln/ln.1

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

CVS commit: src/bin/ln

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 20 21:50:50 UTC 2017

Modified Files:
src/bin/ln: ln.1 ln.c

Log Message:
Replace ours with the FreeBSD version; it is more versatile and handles
errors better (does not remove files if it is going to fail when -f).


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/bin/ln/ln.1
cvs rdiff -u -r1.35 -r1.36 src/bin/ln/ln.c

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

Modified files:

Index: src/bin/ln/ln.1
diff -u src/bin/ln/ln.1:1.26 src/bin/ln/ln.1:1.27
--- src/bin/ln/ln.1:1.26	Wed Aug 10 13:38:39 2016
+++ src/bin/ln/ln.1	Thu Apr 20 17:50:50 2017
@@ -1,5 +1,5 @@
-.\"	$NetBSD: ln.1,v 1.26 2016/08/10 17:38:39 sevan Exp $
-.\"
+.\" $NetBSD: ln.1,v 1.27 2017/04/20 21:50:50 christos Exp $
+.\"-
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -14,7 +14,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"notice, this list of conditions and the following disclaimer in the
 .\"documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
+.\" 4. Neither the name of the University nor the names of its contributors
 .\"may be used to endorse or promote products derived from this software
 .\"without specific prior written permission.
 .\"
@@ -31,41 +31,94 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
+.\" $FreeBSD: head/bin/ln/ln.1 244791 2012-12-28 22:06:33Z gjb $
 .\"
-.Dd August 10, 2016
+.Dd April 20, 2017
 .Dt LN 1
 .Os
 .Sh NAME
-.Nm ln
-.Nd make links
+.Nm ln ,
+.Nm link
+.Nd link files
 .Sh SYNOPSIS
 .Nm
-.Op Fl fhinsv
+.Op Fl L | Fl P | Fl s Op Fl F
+.Op Fl f | iw
+.Op Fl hnv
 .Ar source_file
 .Op Ar target_file
 .Nm
-.Op Fl fhinsv
-.Ar source_file ... target_dir
+.Op Fl L | Fl P | Fl s Op Fl F
+.Op Fl f | iw
+.Op Fl hnv
+.Ar source_file ...
+.Ar target_dir
+.Nm link
+.Ar source_file Ar target_file
 .Sh DESCRIPTION
 The
 .Nm
-utility creates a new directory entry (linked file) which has the
-same modes as the original file.
+utility creates a new directory entry (linked file) for the file name
+specified by
+.Ar target_file .
+The
+.Ar target_file
+will be created with the same file modes as the
+.Ar source_file .
 It is useful for maintaining multiple copies of a file in many places
 at once without using up storage for the
 .Dq copies ;
 instead, a link
 .Dq points
 to the original copy.
-There are two types of links: hard links and symbolic links.
+There are two types of links; hard links and symbolic links.
 How a link
 .Dq points
-to a file is one of the differences between a hard or symbolic link.
+to a file is one of the differences between a hard and symbolic link.
 .Pp
 The options are as follows:
 .Bl -tag -width flag
+.It Fl F
+If the target file already exists and is a directory, then remove it
+so that the link may occur.
+The
+.Fl F
+option should be used with either
+.Fl f
+or
+.Fl i
+options.
+If none is specified,
+.Fl f
+is implied.
+The
+.Fl F
+option is a no-op unless
+.Fl s
+option is specified.
+.It Fl L
+When creating a hard link to a symbolic link,
+create a hard link to the target of the symbolic link.
+This is the default.
+This option cancels the
+.Fl P
+option.
+.It Fl P
+When creating a hard link to a symbolic link,
+create a hard link to the symbolic link itself.
+This option cancels the
+.Fl L
+option.
 .It Fl f
-Unlink any already existing file, permitting the link to occur.
+If the target file already exists,
+then unlink it so that the link may occur.
+(The
+.Fl f
+option overrides any previous
+.Fl i
+and
+.Fl w
+options.)
 .It Fl h
 If the
 .Ar target_file
@@ -95,24 +148,26 @@ Same as
 .Fl h ,
 for compatibility with other
 .Nm
-implementations, namely GNU coreutils.
+implementations.
 .It Fl s
 Create a symbolic link.
 .It Fl v
 Cause
 .Nm
 to be verbose, showing files as they are processed.
+.It Fl w
+Warn if the source of a symbolic link does not currently exist.
 .El
 .Pp
-By default
+By default,
 .Nm
 makes
 .Em hard
 links.
 A hard link to a file is indistinguishable from the original directory entry;
-any changes to a file are effective independent of the name used to reference
+any changes to a file are effectively independent of the name used to reference
 the file.
-Hard links may not normally refer to directories and may not span file systems.
+Directories may not be hardlinked, and hard links may not span file systems.
 .Pp
 A symbolic link contains the name of the file to
 which it is linked.
@@ -132,7 +187,7 @@ Symbolic links may span file systems and
 Given one or two arguments,
 .Nm
 creates a link to an existing file
-.Ar source_file  .
+.Ar source_file .
 If
 .Ar target_file
 is given, the link has that name;
@@ -141,7 +196,7 @@ may also be a directory in which to plac
 otherwise it 

CVS commit: src/bin/ln

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 20 21:50:50 UTC 2017

Modified Files:
src/bin/ln: ln.1 ln.c

Log Message:
Replace ours with the FreeBSD version; it is more versatile and handles
errors better (does not remove files if it is going to fail when -f).


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/bin/ln/ln.1
cvs rdiff -u -r1.35 -r1.36 src/bin/ln/ln.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/libarchive

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 20:34:25 UTC 2017

Modified Files:
src/external/bsd/libarchive: Makefile.inc

Log Message:
Tell GCC to shut up about strftime format strings.


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

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

Modified files:

Index: src/external/bsd/libarchive/Makefile.inc
diff -u src/external/bsd/libarchive/Makefile.inc:1.2 src/external/bsd/libarchive/Makefile.inc:1.3
--- src/external/bsd/libarchive/Makefile.inc:1.2	Sat Feb 20 02:55:53 2010
+++ src/external/bsd/libarchive/Makefile.inc	Thu Apr 20 20:34:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2010/02/20 02:55:53 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2017/04/20 20:34:24 joerg Exp $
 
 .include 
 
@@ -12,4 +12,8 @@ CPPFLAGS+=	-DPLATFORM_CONFIG_H=\"config_
 LIBARCHIVE_FE_DIR!=	cd ${.PARSEDIR}/lib/libarchive_fe && ${PRINTOBJDIR}
 LIBARCHIVE_FE=		${LIBARCHIVE_FE_DIR}/libarchive_fe.a
 
+# GCC applies the check even for same functions like strftime,
+# completely defeating the purpose.
+CWARNFLAGS.gcc+=	-Wno-format-nonliteral
+
 WARNS?=	4

CVS commit: src/external/bsd/libarchive

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 20:34:25 UTC 2017

Modified Files:
src/external/bsd/libarchive: Makefile.inc

Log Message:
Tell GCC to shut up about strftime format strings.


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

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

CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 20 20:23:49 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
remove ahci timeouts, fixed by Jonathan


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/dev/ata/TODO.ncq

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

Modified files:

Index: src/sys/dev/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.4 src/sys/dev/ata/TODO.ncq:1.1.2.5
--- src/sys/dev/ata/TODO.ncq:1.1.2.4	Thu Apr 20 20:14:42 2017
+++ src/sys/dev/ata/TODO.ncq	Thu Apr 20 20:23:49 2017
@@ -1,6 +1,3 @@
-ahci with NCQ gets frequent timeouts, something's amiss; improve message
-to use dev for the drive, not the controller
-
 under QEMU, the mounted AHCI drive doesn't show directories for ls,
 but cd, mkdir, stat and creating files wroks just fine - what do?
 

CVS commit: [jdolecek-ncq] src/sys/dev/ata

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 20 20:23:49 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
remove ahci timeouts, fixed by Jonathan


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/dev/ata/TODO.ncq

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

CVS commit: [jdolecek-ncq] src/sys/dev

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 20 20:14:42 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq atavar.h
src/sys/dev/usb [jdolecek-ncq]: umass_isdata.c

Log Message:
use a fake ata_channel struct in umass_isdata.c so that the wd(4) calls
to ata_{get,free}_xfer() can work, adjust to ata interface changes

compile tested only


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.92.8.6 -r1.92.8.7 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.33.4.1 -r1.33.4.2 src/sys/dev/usb/umass_isdata.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.3 src/sys/dev/ata/TODO.ncq:1.1.2.4
--- src/sys/dev/ata/TODO.ncq:1.1.2.3	Wed Apr 19 22:02:32 2017
+++ src/sys/dev/ata/TODO.ncq	Thu Apr 20 20:14:42 2017
@@ -1,10 +1,12 @@
-ahci with NCQ gets frequent timeouts, something's amiss
+ahci with NCQ gets frequent timeouts, something's amiss; improve message
+to use dev for the drive, not the controller
 
 under QEMU, the mounted AHCI drive doesn't show directories for ls,
 but cd, mkdir, stat and creating files wroks just fine - what do?
 
-ata_xfer_*() uses wd->drvp->chnl_softc as ata_channel, but it's umass
-softc for wd? at umass*
+test wd* at umass?, confirm the ata_channel kludge works
+
+set PRIO/ICC for NCQ transfers for BPRIO_TIMECRITICAL/BPRIO_TIMELIMITED
 
 protect more of wddone() with mutex?
 

Index: src/sys/dev/ata/atavar.h
diff -u src/sys/dev/ata/atavar.h:1.92.8.6 src/sys/dev/ata/atavar.h:1.92.8.7
--- src/sys/dev/ata/atavar.h:1.92.8.6	Wed Apr 19 21:42:39 2017
+++ src/sys/dev/ata/atavar.h	Thu Apr 20 20:14:42 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: atavar.h,v 1.92.8.6 2017/04/19 21:42:39 jdolecek Exp $	*/
+/*	$NetBSD: atavar.h,v 1.92.8.7 2017/04/20 20:14:42 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -288,7 +288,7 @@ struct ata_drive_datas {
 	void	(*drv_done)(void *, struct ata_xfer *);	/* transfer is done */
 
 	device_t drv_softc;		/* ATA drives softc, if any */
-	void *chnl_softc;		/* channel softc */
+	struct ata_channel *chnl_softc;	/* channel softc */
 
 	/* Context used for I/O */
 	struct disklabel *lp;	/* pointer to drive's label info */

Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.33.4.1 src/sys/dev/usb/umass_isdata.c:1.33.4.2
--- src/sys/dev/usb/umass_isdata.c:1.33.4.1	Sat Apr 15 12:01:24 2017
+++ src/sys/dev/usb/umass_isdata.c	Thu Apr 20 20:14:42 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass_isdata.c,v 1.33.4.1 2017/04/15 12:01:24 jdolecek Exp $	*/
+/*	$NetBSD: umass_isdata.c,v 1.33.4.2 2017/04/20 20:14:42 jdolecek Exp $	*/
 
 /*
  * TODO:
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.33.4.1 2017/04/15 12:01:24 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.33.4.2 2017/04/20 20:14:42 jdolecek Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -92,11 +92,13 @@ struct uisdata_softc {
 	struct umassbus_softc	base;
 
 	struct ata_drive_datas	sc_drv_data;
+	struct ata_channel 	sc_channel;
 	struct isd200_config	sc_isd_config;
-	struct ata_xfer		*sc_ata_xfer;
 	u_long			sc_skip;
 };
 
+#define CH2SELF(chnl_softc)	((void *)chnl_softc->atabus)
+
 #undef DPRINTF
 #undef DPRINTFN
 #ifdef UISDATA_DEBUG
@@ -112,7 +114,7 @@ int  uisdata_bio(struct ata_drive_datas 
 int  uisdata_bio1(struct ata_drive_datas *, struct ata_xfer *);
 void uisdata_reset_drive(struct ata_drive_datas *, int, uint32_t *);
 void uisdata_reset_channel(struct ata_channel *, int);
-int  uisdata_exec_command(struct ata_drive_datas *, struct ata_command *);
+int  uisdata_exec_command(struct ata_drive_datas *, struct ata_xfer *);
 int  uisdata_get_params(struct ata_drive_datas *, uint8_t, struct ataparams *);
 int  uisdata_addref(struct ata_drive_datas *);
 void uisdata_delref(struct ata_drive_datas *);
@@ -216,11 +218,15 @@ umass_isdata_attach(struct umass_softc *
 	memset(, 0, sizeof(struct ata_device));
 	adev.adev_bustype = _bustype;
 	adev.adev_channel = 1;	/* XXX */
-	adev.adev_openings = 1;
 	adev.adev_drv_data = >sc_drv_data;
+
+	/* Fake ATA channel so wd(4) ata_{get,free}_xfer() work */
+	scbus->sc_channel.atabus = (device_t)scbus;
+	scbus->sc_channel.ch_queue = ata_queue_alloc(1);
+
 	scbus->sc_drv_data.drive_type = ATA_DRIVET_ATA;
-	scbus->sc_drv_data.chnl_softc = sc;
-#error chnl_softc is used by ata_get_xfer() as ata_channel
+	scbus->sc_drv_data.chnl_softc = >sc_channel;
+
 	scbus->base.sc_child = config_found(sc->sc_dev, , uwdprint);
 
 	return 0;
@@ -238,7 +244,6 @@ uisdata_bio_cb(struct umass_softc *sc, v
 	DPRINTF(("%s: residue=%d status=%d\n", __func__, residue, status));
 
 	s = splbio();
-	scbus->sc_ata_xfer = NULL;
 	if (status != STATUS_CMD_OK)
 		ata_bio->error = ERR_DF; /* ??? */
 	else
@@ -271,7 +276,7 @@ uisdata_bio_cb(struct umass_softc *sc, v
 

CVS commit: [jdolecek-ncq] src/sys/dev

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Thu Apr 20 20:14:42 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq atavar.h
src/sys/dev/usb [jdolecek-ncq]: umass_isdata.c

Log Message:
use a fake ata_channel struct in umass_isdata.c so that the wd(4) calls
to ata_{get,free}_xfer() can work, adjust to ata interface changes

compile tested only


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.92.8.6 -r1.92.8.7 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.33.4.1 -r1.33.4.2 src/sys/dev/usb/umass_isdata.c

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

CVS commit: [jdolecek-ncq] src/sys/dev/ic

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Apr 20 19:24:25 UTC 2017

Modified Files:
src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c

Log Message:
Don't bail out of handling interrupts at the first inactive slot.

Appears to fix the frequent timeouts issue.


To generate a diff of this commit:
cvs rdiff -u -r1.57.6.7 -r1.57.6.8 src/sys/dev/ic/ahcisata_core.c

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

Modified files:

Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.57.6.7 src/sys/dev/ic/ahcisata_core.c:1.57.6.8
--- src/sys/dev/ic/ahcisata_core.c:1.57.6.7	Wed Apr 19 20:49:17 2017
+++ src/sys/dev/ic/ahcisata_core.c	Thu Apr 20 19:24:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahcisata_core.c,v 1.57.6.7 2017/04/19 20:49:17 jdolecek Exp $	*/
+/*	$NetBSD: ahcisata_core.c,v 1.57.6.8 2017/04/20 19:24:25 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.57.6.7 2017/04/19 20:49:17 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.57.6.8 2017/04/20 19:24:25 jakllsch Exp $");
 
 #include 
 #include 
@@ -607,7 +607,7 @@ ahci_intr_port(struct ahci_softc *sc, st
 
 		for (slot=0; slot < sc->sc_ncmds; slot++) {
 			if ((achp->ahcic_cmds_active & (1 << slot)) == 0)
-return;
+continue;
 			if ((clear & (1 << slot)) == 0) {
 xfer = ata_queue_hwslot_to_xfer(chp->ch_queue,
 slot);

CVS commit: [jdolecek-ncq] src/sys/dev/ic

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Thu Apr 20 19:24:25 UTC 2017

Modified Files:
src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c

Log Message:
Don't bail out of handling interrupts at the first inactive slot.

Appears to fix the frequent timeouts issue.


To generate a diff of this commit:
cvs rdiff -u -r1.57.6.7 -r1.57.6.8 src/sys/dev/ic/ahcisata_core.c

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

CVS commit: src/sys/arch/macppc/stand

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 20 19:09:29 UTC 2017

Modified Files:
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/macppc/stand/bootxx: Makefile
src/sys/arch/macppc/stand/ofwboot: Makefile

Log Message:
Quash .eh_frame unwind tables in boot code.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/macppc/stand/bootxx/Makefile
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/stand/ofwboot/Makefile

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

Modified files:

Index: src/sys/arch/macppc/stand/Makefile.inc
diff -u src/sys/arch/macppc/stand/Makefile.inc:1.3 src/sys/arch/macppc/stand/Makefile.inc:1.4
--- src/sys/arch/macppc/stand/Makefile.inc:1.3	Mon Feb  7 16:26:59 2000
+++ src/sys/arch/macppc/stand/Makefile.inc	Thu Apr 20 19:09:29 2017
@@ -1,3 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.3 2000/02/07 16:26:59 tsubai Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2017/04/20 19:09:29 uwe Exp $
 
 BINDIR=		/usr/mdec
+
+CFLAGS_UNWIND.gcc=	-fno-unwind-tables -fno-asynchronous-unwind-tables
+CFLAGS_UNWIND.clang=	-fno-unwind-tables
+
+LINKFLAGS_UNWIND=	--no-ld-generated-unwind-info

Index: src/sys/arch/macppc/stand/bootxx/Makefile
diff -u src/sys/arch/macppc/stand/bootxx/Makefile:1.15 src/sys/arch/macppc/stand/bootxx/Makefile:1.16
--- src/sys/arch/macppc/stand/bootxx/Makefile:1.15	Sun Aug 10 17:44:26 2014
+++ src/sys/arch/macppc/stand/bootxx/Makefile	Thu Apr 20 19:09:29 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2014/08/10 17:44:26 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2017/04/20 19:09:29 uwe Exp $
 
 S!=	cd ${.CURDIR}/../../../..; pwd
 
@@ -14,9 +14,11 @@ LIBC=		# nothing
 
 CFLAGS=		-Os -Wall -ffreestanding
 CFLAGS+=	${${ACTIVE_CC} == "gcc":? -msoft-float :}
+CFLAGS+=	${CFLAGS_UNWIND.${ACTIVE_CC}}
 CPPFLAGS+=	-D_STANDALONE -DPPC_OEA -I${.OBJDIR} -I${S}
 STRIPFLAG=
 LINKFLAGS=	-x -N -Ttext 4000 -e _start
+LINKFLAGS+=	${LINKFLAGS_UNWIND}
 CLEANFILES+=	${PROG}.sym
 
 ${PROG}: ${OBJS}

Index: src/sys/arch/macppc/stand/ofwboot/Makefile
diff -u src/sys/arch/macppc/stand/ofwboot/Makefile:1.57 src/sys/arch/macppc/stand/ofwboot/Makefile:1.58
--- src/sys/arch/macppc/stand/ofwboot/Makefile:1.57	Thu Apr 20 18:39:28 2017
+++ src/sys/arch/macppc/stand/ofwboot/Makefile	Thu Apr 20 19:09:29 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.57 2017/04/20 18:39:28 uwe Exp $
+#	$NetBSD: Makefile,v 1.58 2017/04/20 19:09:29 uwe Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -9,6 +9,7 @@ XCOFFXTRA=	Xcoffxtra.c
 XCOFFXTRAOBJ=	Xcoffxtra.o
 CFLAGS+=	-ffreestanding
 CFLAGS+=	${${ACTIVE_CC} == "gcc":? -msoft-float :}
+CFLAGS+=	${CFLAGS_UNWIND.${ACTIVE_CC}}
 CFLAGS+=	-Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 #CPPFLAGS+=	-DDEBUG -DNETIF_DEBUG
 CPPFLAGS+=	-D_STANDALONE -DSUPPORT_DHCP
@@ -55,6 +56,9 @@ CPPFLAGS+=	-I. -I${.CURDIR} -I${.CURDIR}
 CPPFLAGS+=	-DRELOC=0x${RELOC} -DRELOC_FLATFILE=0x${RELOC_FLATFILE}
 #CPPFLAGS+=	-DXCOFF_GLUE		# for booting PCI Powermacs
 
+LINKFLAGS=	-N -Ttext ${RELOC} -Bstatic
+LINKFLAGS+=	${LINKFLAGS_UNWIND}
+
 ### find out what to use for libkern
 KERN_AS=	library
 .include "${S}/lib/libkern/Makefile.inc"
@@ -82,7 +86,7 @@ all realall: ${PROG} ${PROG}.xcf ${PROG}
 
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} 
 	${_MKTARGET_LINK}
-	${LD} -s -N -Ttext ${RELOC} -Bstatic -o ${PROG}.el1 \
+	${LD} -s -o ${PROG}.el1 ${LINKFLAGS} \
 	${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${OBJCOPY} -O binary ${PROG}.el1 ${PROG}
 
@@ -91,13 +95,14 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBK
 
 ${PROG}.elf: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${_MKTARGET_LINK}
-	${LD} -s -N -Ttext ${RELOC} -Bstatic -o ${PROG}.elf \
+	${LD} -s -o ${PROG}.elf ${LINKFLAGS} \
 	${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 
 ${PROG}.xcf: ${OBJS} ${XCOFFXTRAOBJ} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${_MKTARGET_LINK}
-	${LD} -N -T ${.CURDIR}/../fixcoff/elf32_powerpc_merge.x -e _entry \
-	-Ttext ${RELOC} -Bstatic -o ${PROG}.mrg  ${XCOFFXTRAOBJ} \
+	${LD} -o ${PROG}.mrg ${LINKFLAGS} \
+	-T ${.CURDIR}/../fixcoff/elf32_powerpc_merge.x \
+	-e _entry ${XCOFFXTRAOBJ} \
 	${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${OBJCOPY} -O aixcoff-rs6000 -R .comment -R .note \
 	${PROG}.mrg ${PROG}.xcf

CVS commit: src/sys/arch/macppc/stand

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 20 19:09:29 UTC 2017

Modified Files:
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/macppc/stand/bootxx: Makefile
src/sys/arch/macppc/stand/ofwboot: Makefile

Log Message:
Quash .eh_frame unwind tables in boot code.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/macppc/stand/bootxx/Makefile
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/stand/ofwboot/Makefile

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

CVS commit: src/sys/arch/macppc/stand/fixcoff

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 20 18:53:12 UTC 2017

Modified Files:
src/sys/arch/macppc/stand/fixcoff: elf32_powerpc_merge.x

Log Message:
Merge .eh_frame_hdr and .eh_frame into .text


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/macppc/stand/fixcoff/elf32_powerpc_merge.x

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/macppc/stand/fixcoff/elf32_powerpc_merge.x
diff -u src/sys/arch/macppc/stand/fixcoff/elf32_powerpc_merge.x:1.3 src/sys/arch/macppc/stand/fixcoff/elf32_powerpc_merge.x:1.4
--- src/sys/arch/macppc/stand/fixcoff/elf32_powerpc_merge.x:1.3	Tue Dec 23 19:03:25 2014
+++ src/sys/arch/macppc/stand/fixcoff/elf32_powerpc_merge.x	Thu Apr 20 18:53:12 2017
@@ -32,6 +32,8 @@ SECTIONS
 *(.rodata.*)
 *(.rodata1)
 *(.got1)
+*(.eh_frame_hdr)
+*(.eh_frame)
   }
   .fini  : { *(.fini)} =0
   .ctors : { *(.ctors)   }

CVS commit: src/sys/arch/macppc/stand/fixcoff

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 20 18:53:12 UTC 2017

Modified Files:
src/sys/arch/macppc/stand/fixcoff: elf32_powerpc_merge.x

Log Message:
Merge .eh_frame_hdr and .eh_frame into .text


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/arch/macppc/stand/fixcoff/elf32_powerpc_merge.x

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

CVS commit: src/sys/arch/macppc/stand/ofwboot

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 20 18:39:29 UTC 2017

Modified Files:
src/sys/arch/macppc/stand/ofwboot: Makefile

Log Message:
Group CLEANFILES assignments.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/macppc/stand/ofwboot/Makefile

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

CVS commit: src/sys/arch/macppc/stand/ofwboot

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Apr 20 18:39:29 UTC 2017

Modified Files:
src/sys/arch/macppc/stand/ofwboot: Makefile

Log Message:
Group CLEANFILES assignments.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/macppc/stand/ofwboot/Makefile

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

Modified files:

Index: src/sys/arch/macppc/stand/ofwboot/Makefile
diff -u src/sys/arch/macppc/stand/ofwboot/Makefile:1.56 src/sys/arch/macppc/stand/ofwboot/Makefile:1.57
--- src/sys/arch/macppc/stand/ofwboot/Makefile:1.56	Sat Apr  8 19:53:21 2017
+++ src/sys/arch/macppc/stand/ofwboot/Makefile	Thu Apr 20 18:39:28 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.56 2017/04/08 19:53:21 christos Exp $
+#	$NetBSD: Makefile,v 1.57 2017/04/20 18:39:28 uwe Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -49,13 +49,12 @@ RELOC=		E0
 ENTRY=		_start
 
 CLEANFILES+=	${PROG}.elf ${PROG}.el1 ${PROG}.mrg ${PROG}.xcf
+CLEANFILES+=	${XCOFFXTRAOBJ}
 
 CPPFLAGS+=	-I. -I${.CURDIR} -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
 CPPFLAGS+=	-DRELOC=0x${RELOC} -DRELOC_FLATFILE=0x${RELOC_FLATFILE}
 #CPPFLAGS+=	-DXCOFF_GLUE		# for booting PCI Powermacs
 
-CLEANFILES+= ${XCOFFXTRAOBJ}
-
 ### find out what to use for libkern
 KERN_AS=	library
 .include "${S}/lib/libkern/Makefile.inc"

CVS commit: [bouyer-socketcan] src/sys/arch/arm/allwinner

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 17:30:52 UTC 2017

Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c

Log Message:
Print some informations for error interrupts.
Fix some registers values.
Now we can transmit frames. Receive still doesn't work.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/arm/allwinner/awin_can.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/arm/allwinner/awin_can.c
diff -u src/sys/arch/arm/allwinner/awin_can.c:1.1.2.3 src/sys/arch/arm/allwinner/awin_can.c:1.1.2.4
--- src/sys/arch/arm/allwinner/awin_can.c:1.1.2.3	Thu Apr 20 13:00:52 2017
+++ src/sys/arch/arm/allwinner/awin_can.c	Thu Apr 20 17:30:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_can.c,v 1.1.2.3 2017/04/20 13:00:52 bouyer Exp $	*/
+/*	$NetBSD: awin_can.c,v 1.1.2.4 2017/04/20 17:30:52 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.3 2017/04/20 13:00:52 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.4 2017/04/20 17:30:52 bouyer Exp $");
 
 #include 
 #include 
@@ -303,6 +303,7 @@ awin_can_tx_intr(struct awin_can_softc *
 		printf("can_input2\n");
 		can_input(ifp, m); /* loopback */
 		sc->sc_m_transmit = NULL;
+		ifp->if_timer = 0;
 	}
 
 	IF_DEQUEUE(>if_snd, m);
@@ -382,13 +383,17 @@ awin_can_err_intr(struct awin_can_softc 
 	struct ifnet * const ifp = sc->sc_ifp;
 	KASSERT(mutex_owned(>sc_intr_lock));
 	int txerr = 0;
+	uint32_t reg;
 
 	if (irq & AWIN_CAN_INT_DATA_OR) {
 		ifp->if_ierrors++;
 		awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_CLR_OR);
 	}
 	if (irq & AWIN_CAN_INT_ERR) {
-		/* XXX todo */
+		reg = awin_can_read(sc, AWIN_CAN_REC_REG);
+		printf("%s: ERR interrupt status 0x%x counters 0x%x\n",
+		device_xname(sc->sc_dev), sts, reg);
+
 	}
 	if (irq & AWIN_CAN_INT_BERR) {
 		if (sts & AWIN_CAN_STA_TX)
@@ -397,7 +402,8 @@ awin_can_err_intr(struct awin_can_softc 
 			ifp->if_ierrors++;
 	}
 	if (irq & AWIN_CAN_INT_ERR_PASSIVE) {
-		/* XXX todo */
+		printf("%s: PASSV interrupt status 0x%x\n",
+		device_xname(sc->sc_dev), sts);
 	}
 	if (irq & AWIN_CAN_INT_ARB_LOST) {
 		txerr++;
@@ -459,7 +465,7 @@ awin_can_ifup(struct awin_can_softc * co
 	uint32_t reg;
 
 	/* setup timings and mode - has to be done in reset */
-	reg = 0;
+	reg = AWIN_CAN_MODSEL_RST;
 	if (sc->sc_linkmodes & CAN_LINKMODE_LISTENONLY)
 		reg |= AWIN_CAN_MODSEL_LST_ONLY;
 

CVS commit: [bouyer-socketcan] src/sys/arch/arm/allwinner

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 17:30:52 UTC 2017

Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c

Log Message:
Print some informations for error interrupts.
Fix some registers values.
Now we can transmit frames. Receive still doesn't work.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/arm/allwinner/awin_can.c

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

CVS commit: [bouyer-socketcan] src/sys/netcan

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 17:29:10 UTC 2017

Modified Files:
src/sys/netcan [bouyer-socketcan]: can.c

Log Message:
If a packet was sent using sendto, the socket pointed to by the tag may
be unbound. Check for this in canintr().
XXX possibly the socket can completely dissapear before we get here.
This needs to be revisited.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/netcan/can.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/netcan/can.c
diff -u src/sys/netcan/can.c:1.1.2.11 src/sys/netcan/can.c:1.1.2.12
--- src/sys/netcan/can.c:1.1.2.11	Thu Apr 20 12:59:11 2017
+++ src/sys/netcan/can.c	Thu Apr 20 17:29:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: can.c,v 1.1.2.11 2017/04/20 12:59:11 bouyer Exp $	*/
+/*	$NetBSD: can.c,v 1.1.2.12 2017/04/20 17:29:10 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.11 2017/04/20 12:59:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.12 2017/04/20 17:29:10 bouyer Exp $");
 
 #include 
 #include 
@@ -323,7 +323,8 @@ canintr(void)
 			sender_canp = sotocanpcb(so);
 			m_tag_delete(m, sotag);
 			/* if the sender doesn't want loopback, don't do it */
-			if (sender_canp->canp_flags & CANP_NO_LOOPBACK) {
+			if (sender_canp &&
+			(sender_canp->canp_flags & CANP_NO_LOOPBACK) != 0) {
 m_freem(m);
 continue;
 			}

CVS commit: [bouyer-socketcan] src/sys/netcan

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 17:29:10 UTC 2017

Modified Files:
src/sys/netcan [bouyer-socketcan]: can.c

Log Message:
If a packet was sent using sendto, the socket pointed to by the tag may
be unbound. Check for this in canintr().
XXX possibly the socket can completely dissapear before we get here.
This needs to be revisited.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/netcan/can.c

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

CVS commit: src/doc

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 14:39:36 UTC 2017

Modified Files:
src/doc: 3RDPARTY

Log Message:
Update libarchive and pkg_install.


To generate a diff of this commit:
cvs rdiff -u -r1.1433 -r1.1434 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.1433 src/doc/3RDPARTY:1.1434
--- src/doc/3RDPARTY:1.1433	Tue Apr 18 18:44:06 2017
+++ src/doc/3RDPARTY	Thu Apr 20 14:39:36 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1433 2017/04/18 18:44:06 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1434 2017/04/20 14:39:36 joerg Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -710,8 +710,8 @@ for importation.  Run ./configure before
 Talk to mrg before importing any new version.
 
 Package:	libarchive
-Version:	2.8.4
-Current Vers:	2.8.5 (legacy) / 3.2.0 (stable)
+Version:	3.3.2pre
+Current Vers:	3.3.1
 Maintainer:	kient...@freebsd.org, jo...@netbsd.org
 Archive Site:	https://github.com/libarchive/libarchive/downloads
 Home Page: 	http://libarchive.github.com/
@@ -1145,8 +1145,8 @@ definition (files.pf).  userland code is
 reachover Makefiles are in src/usr.sbin/pf.
 
 Package:	pkg_install
-Version:	20120221
-Current Vers:	20120221
+Version:	20170419
+Current Vers:	20170419
 Maintainer:	The pkgsrc developers
 Home Page:	http://www.pkgsrc.org/
 Mailing List:	tech-...@netbsd.org

CVS commit: src/doc

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 14:39:36 UTC 2017

Modified Files:
src/doc: 3RDPARTY

Log Message:
Update libarchive and pkg_install.


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

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

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:22:59 UTC 2017

Modified Files:
src/crypto/external/bsd/openssh/dist: servconf.c

Log Message:
GC multistate_privsep.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/servconf.c

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

Modified files:

Index: src/crypto/external/bsd/openssh/dist/servconf.c
diff -u src/crypto/external/bsd/openssh/dist/servconf.c:1.23 src/crypto/external/bsd/openssh/dist/servconf.c:1.24
--- src/crypto/external/bsd/openssh/dist/servconf.c:1.23	Tue Apr 18 18:41:46 2017
+++ src/crypto/external/bsd/openssh/dist/servconf.c	Thu Apr 20 13:22:59 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: servconf.c,v 1.23 2017/04/18 18:41:46 christos Exp $	*/
+/*	$NetBSD: servconf.c,v 1.24 2017/04/20 13:22:59 joerg Exp $	*/
 
 /* $OpenBSD: servconf.c,v 1.306 2017/03/14 07:19:07 djm Exp $ */
 /*
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: servconf.c,v 1.23 2017/04/18 18:41:46 christos Exp $");
+__RCSID("$NetBSD: servconf.c,v 1.24 2017/04/20 13:22:59 joerg Exp $");
 #include 
 #include 
 #include 
@@ -1066,13 +1066,6 @@ static const struct multistate multistat
 	{ "no",0 },
 	{ NULL, -1 }
 };
-static const struct multistate multistate_privsep[] = {
-	{ "yes",			PRIVSEP_NOSANDBOX },
-	{ "sandbox",			PRIVSEP_ON },
-	{ "nosandbox",			PRIVSEP_NOSANDBOX },
-	{ "no",PRIVSEP_OFF },
-	{ NULL, -1 }
-};
 static const struct multistate multistate_tcpfwd[] = {
 	{ "yes",			FORWARD_ALLOW },
 	{ "all",			FORWARD_ALLOW },

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:22:59 UTC 2017

Modified Files:
src/crypto/external/bsd/openssh/dist: servconf.c

Log Message:
GC multistate_privsep.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/servconf.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/pkg_install/sbin

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:18:47 UTC 2017

Modified Files:
src/external/bsd/pkg_install/sbin: Makefile.inc
src/external/bsd/pkg_install/sbin/pkg_add: Makefile

Log Message:
Update build system for pkg_install-20170419.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/sbin/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/pkg_add/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/pkg_install/sbin

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:18:47 UTC 2017

Modified Files:
src/external/bsd/pkg_install/sbin: Makefile.inc
src/external/bsd/pkg_install/sbin/pkg_add: Makefile

Log Message:
Update build system for pkg_install-20170419.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/sbin/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/pkg_add/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/pkg_install/sbin/Makefile.inc
diff -u src/external/bsd/pkg_install/sbin/Makefile.inc:1.3 src/external/bsd/pkg_install/sbin/Makefile.inc:1.4
--- src/external/bsd/pkg_install/sbin/Makefile.inc:1.3	Fri Nov  5 09:09:01 2010
+++ src/external/bsd/pkg_install/sbin/Makefile.inc	Thu Apr 20 13:18:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/11/05 09:09:01 he Exp $
+# $NetBSD: Makefile.inc,v 1.4 2017/04/20 13:18:47 joerg Exp $
 
 .include 
 
@@ -12,8 +12,8 @@ CPPFLAGS+=	-DBINDIR='"${BINDIR}"'
 DPADD+=	${LIBINSTALL}/libinstall.a
 LDADD+=	-L${LIBINSTALL} -linstall -ltermcap
 
-DPADD+=		${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
-LDADD+=		-lfetch -lssl -lcrypto
+DPADD+=		${LIBNETPGPVERIFY} ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
+LDADD+=		-lnetpgpverify -lfetch -lssl -lcrypto
 
 DPADD+=		${LIBARCHIVE}
 LDADD+=		-larchive

Index: src/external/bsd/pkg_install/sbin/pkg_add/Makefile
diff -u src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.2 src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.3
--- src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.2	Mon Feb  2 20:47:21 2009
+++ src/external/bsd/pkg_install/sbin/pkg_add/Makefile	Thu Apr 20 13:18:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/02 20:47:21 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2017/04/20 13:18:47 joerg Exp $
 # Original from FreeBSD, no rcs id.
 
 PROG= pkg_add
@@ -8,6 +8,6 @@ SRCS= main.c perform.c
 
 .PATH:	${DIST}/add
 
-CPPFLAGS+=	-DMACHINE_ARCH=\"${MACHINE_ARCH}\"
+CPPFLAGS+=	-DPKGSRC_MACHINE_ARCH=\"${MACHINE_ARCH}\"
 
 .include 

CVS commit: src/external/bsd/pkg_install/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:18:23 UTC 2017

Modified Files:
src/external/bsd/pkg_install/dist/add: add.h main.c perform.c pkg_add.1
src/external/bsd/pkg_install/dist/admin: audit-packages.8 audit.c
check.c download-vulnerability-list.8 main.c pkg_admin.1
src/external/bsd/pkg_install/dist/create: build.c create.h main.c
perform.c pkg_create.1 pl.c
src/external/bsd/pkg_install/dist/delete: pkg_delete.1 pkg_delete.c
src/external/bsd/pkg_install/dist/info: info.h main.c perform.c
pkg_info.1 show.c
src/external/bsd/pkg_install/dist/lib: automatic.c conflicts.c defs.h
dewey.c dewey.h fexec.c file.c global.c gpgsig.c iterate.c lib.h
license.c lpkg.c opattern.c parse-config.c pkcs7.c
pkg_install.conf.5.in pkg_io.c pkg_signature.c pkg_summary.5
pkgdb.c pkgsrc.7 plist.c remove.c str.c var.c version.c version.h
vulnerabilities-file.c xwrapper.c
src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf pkgsrc.sh

Log Message:
Merge pkg_install-20170419.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/add/add.h
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/pkg_install/dist/add/main.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.1.1.13 -r1.2 src/external/bsd/pkg_install/dist/add/pkg_add.1
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/pkg_install/dist/admin/audit-packages.8 \
src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/admin/audit.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/pkg_install/dist/admin/check.c
cvs rdiff -u -r1.1.1.16 -r1.2 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.1.1.13 -r1.2 \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/create/build.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/pkg_install/dist/create/create.h \
src/external/bsd/pkg_install/dist/create/perform.c
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/create/main.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/create/pkg_create.1
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/create/pl.c
cvs rdiff -u -r1.1.1.9 -r1.2 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.1 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/pkg_install/dist/info/info.h
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/info/main.c
cvs rdiff -u -r1.1.1.14 -r1.2 \
src/external/bsd/pkg_install/dist/info/perform.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/pkg_info.1
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/info/show.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/pkg_install/dist/lib/automatic.c \
src/external/bsd/pkg_install/dist/lib/global.c \
src/external/bsd/pkg_install/dist/lib/lpkg.c \
src/external/bsd/pkg_install/dist/lib/remove.c \
src/external/bsd/pkg_install/dist/lib/str.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/pkg_install/dist/lib/conflicts.c \
src/external/bsd/pkg_install/dist/lib/iterate.c \
src/external/bsd/pkg_install/dist/lib/pkcs7.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/defs.h \
src/external/bsd/pkg_install/dist/lib/license.c \
src/external/bsd/pkg_install/dist/lib/pkg_summary.5
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/dewey.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/pkg_install/dist/lib/dewey.h \
src/external/bsd/pkg_install/dist/lib/pkgsrc.7 \
src/external/bsd/pkg_install/dist/lib/xwrapper.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pkg_install/dist/lib/fexec.c \
src/external/bsd/pkg_install/dist/lib/gpgsig.c \
src/external/bsd/pkg_install/dist/lib/opattern.c \
src/external/bsd/pkg_install/dist/lib/version.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/lib/file.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.1.1.11 -r1.2 \
src/external/bsd/pkg_install/dist/lib/parse-config.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in \
src/external/bsd/pkg_install/dist/lib/pkg_signature.c \
src/external/bsd/pkg_install/dist/lib/var.c
cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/pkg_install/dist/lib/pkg_io.c
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/lib/pkgdb.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/lib/plist.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
cvs rdiff -u -r1.1.1.1 -r1.2 \

CVS commit: src/external/bsd/pkg_install/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:18:23 UTC 2017

Modified Files:
src/external/bsd/pkg_install/dist/add: add.h main.c perform.c pkg_add.1
src/external/bsd/pkg_install/dist/admin: audit-packages.8 audit.c
check.c download-vulnerability-list.8 main.c pkg_admin.1
src/external/bsd/pkg_install/dist/create: build.c create.h main.c
perform.c pkg_create.1 pl.c
src/external/bsd/pkg_install/dist/delete: pkg_delete.1 pkg_delete.c
src/external/bsd/pkg_install/dist/info: info.h main.c perform.c
pkg_info.1 show.c
src/external/bsd/pkg_install/dist/lib: automatic.c conflicts.c defs.h
dewey.c dewey.h fexec.c file.c global.c gpgsig.c iterate.c lib.h
license.c lpkg.c opattern.c parse-config.c pkcs7.c
pkg_install.conf.5.in pkg_io.c pkg_signature.c pkg_summary.5
pkgdb.c pkgsrc.7 plist.c remove.c str.c var.c version.c version.h
vulnerabilities-file.c xwrapper.c
src/external/bsd/pkg_install/dist/x509: pkgsrc.cnf pkgsrc.sh

Log Message:
Merge pkg_install-20170419.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/add/add.h
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/pkg_install/dist/add/main.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.1.1.13 -r1.2 src/external/bsd/pkg_install/dist/add/pkg_add.1
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/pkg_install/dist/admin/audit-packages.8 \
src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/admin/audit.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/pkg_install/dist/admin/check.c
cvs rdiff -u -r1.1.1.16 -r1.2 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.1.1.13 -r1.2 \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/create/build.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/pkg_install/dist/create/create.h \
src/external/bsd/pkg_install/dist/create/perform.c
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/create/main.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/create/pkg_create.1
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/create/pl.c
cvs rdiff -u -r1.1.1.9 -r1.2 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.1 \
src/external/bsd/pkg_install/dist/delete/pkg_delete.c
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/pkg_install/dist/info/info.h
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/pkg_install/dist/info/main.c
cvs rdiff -u -r1.1.1.14 -r1.2 \
src/external/bsd/pkg_install/dist/info/perform.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/info/pkg_info.1
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/info/show.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/pkg_install/dist/lib/automatic.c \
src/external/bsd/pkg_install/dist/lib/global.c \
src/external/bsd/pkg_install/dist/lib/lpkg.c \
src/external/bsd/pkg_install/dist/lib/remove.c \
src/external/bsd/pkg_install/dist/lib/str.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/pkg_install/dist/lib/conflicts.c \
src/external/bsd/pkg_install/dist/lib/iterate.c \
src/external/bsd/pkg_install/dist/lib/pkcs7.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/lib/defs.h \
src/external/bsd/pkg_install/dist/lib/license.c \
src/external/bsd/pkg_install/dist/lib/pkg_summary.5
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/dewey.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/pkg_install/dist/lib/dewey.h \
src/external/bsd/pkg_install/dist/lib/pkgsrc.7 \
src/external/bsd/pkg_install/dist/lib/xwrapper.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/pkg_install/dist/lib/fexec.c \
src/external/bsd/pkg_install/dist/lib/gpgsig.c \
src/external/bsd/pkg_install/dist/lib/opattern.c \
src/external/bsd/pkg_install/dist/lib/version.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/pkg_install/dist/lib/file.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.1.1.11 -r1.2 \
src/external/bsd/pkg_install/dist/lib/parse-config.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in \
src/external/bsd/pkg_install/dist/lib/pkg_signature.c \
src/external/bsd/pkg_install/dist/lib/var.c
cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/pkg_install/dist/lib/pkg_io.c
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/pkg_install/dist/lib/pkgdb.c
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/pkg_install/dist/lib/plist.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
cvs rdiff -u -r1.1.1.1 -r1.2 \

CVS commit: src/external/bsd/libarchive/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:06:29 UTC 2017

Removed Files:
src/external/bsd/libarchive/dist: README
src/external/bsd/libarchive/dist/cpio/test: CMakeLists.txt list.h
main.c test_pathmatch.c
src/external/bsd/libarchive/dist/libarchive: archive_hash.h
archive_read_disk.c archive_read_support_compression_all.c
archive_read_support_compression_bzip2.c
archive_read_support_compression_compress.c
archive_read_support_compression_gzip.c
archive_read_support_compression_none.c
archive_read_support_compression_program.c
archive_read_support_compression_rpm.c
archive_read_support_compression_uu.c
archive_read_support_compression_xz.c archive_write_disk.c
archive_write_set_compression_bzip2.c
archive_write_set_compression_compress.c
archive_write_set_compression_gzip.c
archive_write_set_compression_none.c
archive_write_set_compression_program.c
archive_write_set_compression_xz.c filter_fork.c
src/external/bsd/libarchive/dist/libarchive/test: CMakeLists.txt list.h
main.c test_acl_basic.c test_acl_freebsd.c
test_read_compress_program.c test_read_format_iso_gz.c
test_read_uu.c test_write_compress.c test_write_compress_bzip2.c
test_write_compress_gzip.c test_write_compress_lzma.c
test_write_compress_program.c test_write_compress_xz.c
test_write_format_zip_no_compression.c
src/external/bsd/libarchive/dist/libarchive_fe: matching.c matching.h
pathmatch.c pathmatch.h
src/external/bsd/libarchive/dist/tar: getdate.c tree.c tree.h
src/external/bsd/libarchive/dist/tar/test: CMakeLists.txt list.h main.c
test_getdate.c

Log Message:
GC old files.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libarchive/dist/README
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libarchive/dist/cpio/test/CMakeLists.txt
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libarchive/dist/cpio/test/list.h \
src/external/bsd/libarchive/dist/cpio/test/test_pathmatch.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/libarchive/dist/cpio/test/main.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/libarchive/dist/libarchive/archive_hash.h \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_all.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_gzip.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_none.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_program.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_compress.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_gzip.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_none.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_program.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk.c \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_rpm.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_uu.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_xz.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_xz.c
cvs rdiff -u -r1.1.1.3 -r0 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_bzip2.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_bzip2.c
 \
src/external/bsd/libarchive/dist/libarchive/filter_fork.c
cvs rdiff -u -r1.3 -r0 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_compress.c
cvs rdiff -u -r1.2 -r0 \
src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libarchive/dist/libarchive/test/CMakeLists.txt \
src/external/bsd/libarchive/dist/libarchive/test/test_acl_freebsd.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_uu.c \

src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_bzip2.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_gzip.c 
\
src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_lzma.c 
\
src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_xz.c \

src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_no_compression.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/libarchive/dist/libarchive/test/list.h \
src/external/bsd/libarchive/dist/libarchive/test/test_acl_basic.c \

CVS import: src/external/bsd/pkg_install/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:12:48 UTC 2017

Update of /cvsroot/src/external/bsd/pkg_install/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4633

Log Message:
Import pkg_install-20170419.

Status:

Vendor Tag: PKGSRC
Release Tags:   pkg_install-20170419

U src/external/bsd/pkg_install/dist/x509/signing.txt
U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
U src/external/bsd/pkg_install/dist/delete/pkg_delete.c
U src/external/bsd/pkg_install/dist/delete/pkg_delete.1
C src/external/bsd/pkg_install/dist/add/perform.c
U src/external/bsd/pkg_install/dist/add/main.c
U src/external/bsd/pkg_install/dist/add/add.h
U src/external/bsd/pkg_install/dist/add/pkg_add.1
U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in
U src/external/bsd/pkg_install/dist/admin/audit.c
U src/external/bsd/pkg_install/dist/admin/pkg_admin.1
U src/external/bsd/pkg_install/dist/admin/audit-packages.8
U src/external/bsd/pkg_install/dist/admin/admin.h
U src/external/bsd/pkg_install/dist/admin/check.c
U src/external/bsd/pkg_install/dist/admin/main.c
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
U src/external/bsd/pkg_install/dist/create/build.c
U src/external/bsd/pkg_install/dist/create/util.c
C src/external/bsd/pkg_install/dist/create/pkg_create.1
U src/external/bsd/pkg_install/dist/create/pl.c
U src/external/bsd/pkg_install/dist/create/perform.c
U src/external/bsd/pkg_install/dist/create/main.c
U src/external/bsd/pkg_install/dist/create/create.h
U src/external/bsd/pkg_install/dist/info/show.c
C src/external/bsd/pkg_install/dist/info/pkg_info.1
U src/external/bsd/pkg_install/dist/info/perform.c
U src/external/bsd/pkg_install/dist/info/main.c
U src/external/bsd/pkg_install/dist/info/info.h
U src/external/bsd/pkg_install/dist/lib/conflicts.c
U src/external/bsd/pkg_install/dist/lib/global.c
U src/external/bsd/pkg_install/dist/lib/version.c
U src/external/bsd/pkg_install/dist/lib/fexec.c
C src/external/bsd/pkg_install/dist/lib/license.c
U src/external/bsd/pkg_install/dist/lib/pkcs7.c
U src/external/bsd/pkg_install/dist/lib/dewey.h
U src/external/bsd/pkg_install/dist/lib/pkgsrc.7
U src/external/bsd/pkg_install/dist/lib/dewey.c
U src/external/bsd/pkg_install/dist/lib/pkg_io.c
U src/external/bsd/pkg_install/dist/lib/opattern.c
U src/external/bsd/pkg_install/dist/lib/remove.c
C src/external/bsd/pkg_install/dist/lib/var.c
U src/external/bsd/pkg_install/dist/lib/automatic.c
C src/external/bsd/pkg_install/dist/lib/pkg_signature.c
U src/external/bsd/pkg_install/dist/lib/iterate.c
C src/external/bsd/pkg_install/dist/lib/defs.h
U src/external/bsd/pkg_install/dist/lib/pkg_summary.5
U src/external/bsd/pkg_install/dist/lib/pkgdb.c
C src/external/bsd/pkg_install/dist/lib/version.h
U src/external/bsd/pkg_install/dist/lib/parse-config.c
U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
U src/external/bsd/pkg_install/dist/lib/file.c
U src/external/bsd/pkg_install/dist/lib/xwrapper.c
U src/external/bsd/pkg_install/dist/lib/plist.c
U src/external/bsd/pkg_install/dist/lib/lpkg.c
C src/external/bsd/pkg_install/dist/lib/lib.h
U src/external/bsd/pkg_install/dist/lib/gpgsig.c
U src/external/bsd/pkg_install/dist/lib/str.c
C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
U src/external/bsd/pkg_install/dist/lib/config.h.in

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

cvs checkout -jPKGSRC:yesterday -jPKGSRC 
src/external/bsd/pkg_install/dist

CVS commit: src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:11:35 UTC 2017

Modified Files:
src/usr.bin/unzip: unzip.c
src/usr.sbin/makemandb: makemandb.c

Log Message:
Use libarchive 3.x interface and not obsolete 2.x versions.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/unzip/unzip.c
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/makemandb/makemandb.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/unzip/unzip.c
diff -u src/usr.bin/unzip/unzip.c:1.22 src/usr.bin/unzip/unzip.c:1.23
--- src/usr.bin/unzip/unzip.c:1.22	Mon Dec 21 17:17:02 2015
+++ src/usr.bin/unzip/unzip.c	Thu Apr 20 13:11:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: unzip.c,v 1.22 2015/12/21 17:17:02 christos Exp $ */
+/* $NetBSD: unzip.c,v 1.23 2017/04/20 13:11:35 joerg Exp $ */
 
 /*-
  * Copyright (c) 2009, 2010 Joerg Sonnenberger 
@@ -37,7 +37,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: unzip.c,v 1.22 2015/12/21 17:17:02 christos Exp $");
+__RCSID("$NetBSD: unzip.c,v 1.23 2017/04/20 13:11:35 joerg Exp $");
 
 #include 
 #include 
@@ -902,8 +902,7 @@ unzip(const char *fn)
 		file_count != 1 ? "s" : "");
 	}
 
-	ac(archive_read_close(a));
-	(void)archive_read_finish(a);
+	ac(archive_read_free(a));
 
 	if (t_opt) {
 		if (error_count > 0) {

Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.46 src/usr.sbin/makemandb/makemandb.c:1.47
--- src/usr.sbin/makemandb/makemandb.c:1.46	Mon Dec 19 14:10:57 2016
+++ src/usr.sbin/makemandb/makemandb.c	Thu Apr 20 13:11:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: makemandb.c,v 1.46 2016/12/19 14:10:57 abhinav Exp $	*/
+/*	$NetBSD: makemandb.c,v 1.47 2017/04/20 13:11:35 joerg Exp $	*/
 /*
  * Copyright (c) 2011 Abhinav Upadhyay 
  * Copyright (c) 2011 Kristaps Dzonsons 
@@ -17,7 +17,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: makemandb.c,v 1.46 2016/12/19 14:10:57 abhinav Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.47 2017/04/20 13:11:35 joerg Exp $");
 
 #include 
 #include 
@@ -690,7 +690,7 @@ read_and_decompress(const char *file, vo
 		errx(EXIT_FAILURE, "memory allocation failed");
 
 	*bufp = NULL;
-	if (archive_read_support_compression_all(a) != ARCHIVE_OK ||
+	if (archive_read_support_filter_all(a) != ARCHIVE_OK ||
 	archive_read_support_format_raw(a) != ARCHIVE_OK ||
 	archive_read_open_filename(a, file, 65536) != ARCHIVE_OK ||
 	archive_read_next_header(a, ) != ARCHIVE_OK)
@@ -701,7 +701,7 @@ read_and_decompress(const char *file, vo
 	for (;;) {
 		r = archive_read_data(a, buf + off, *len - off);
 		if (r == ARCHIVE_OK) {
-			archive_read_finish(a);
+			archive_read_free(a);
 			*bufp = buf;
 			*len = off;
 			return 0;
@@ -717,7 +717,7 @@ read_and_decompress(const char *file, vo
 if (mflags.verbosity)
 	warnx("File too large: %s", file);
 free(buf);
-archive_read_finish(a);
+archive_read_free(a);
 return -1;
 			}
 			buf = erealloc(buf, *len);
@@ -726,7 +726,7 @@ read_and_decompress(const char *file, vo
 
 archive_error:
 	warnx("Error while reading `%s': %s", file, archive_error_string(a));
-	archive_read_finish(a);
+	archive_read_free(a);
 	return -1;
 }
 

CVS commit: src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:11:04 UTC 2017

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: shl.mi
src/external/bsd/libarchive: prepare-import.sh
src/external/bsd/libarchive/bin: Makefile.inc
src/external/bsd/libarchive/bin/tar: Makefile
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile shlib_version
src/external/bsd/libarchive/lib/libarchive_fe: Makefile

Log Message:
Update build system for libarchive-3.3.2pre.


To generate a diff of this commit:
cvs rdiff -u -r1.810 -r1.811 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2124 -r1.2125 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/prepare-import.sh
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/bin/tar/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/libarchive/lib/libarchive/shlib_version
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/libarchive/lib/libarchive_fe/Makefile

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

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.810 src/distrib/sets/lists/base/shl.mi:1.811
--- src/distrib/sets/lists/base/shl.mi:1.810	Tue Apr 18 18:43:11 2017
+++ src/distrib/sets/lists/base/shl.mi	Thu Apr 20 13:11:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.810 2017/04/18 18:43:11 christos Exp $
+# $NetBSD: shl.mi,v 1.811 2017/04/20 13:11:03 joerg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -170,8 +170,8 @@
 ./usr/lib/libamu.so.5base-amd-shlib		compatfile
 ./usr/lib/libamu.so.5.0base-amd-shlib		compatfile
 ./usr/lib/libarchive.sobase-sys-shlib		compatfile
-./usr/lib/libarchive.so.3			base-sys-shlib		compatfile
-./usr/lib/libarchive.so.3.1			base-sys-shlib		compatfile
+./usr/lib/libarchive.so.4			base-sys-shlib		compatfile
+./usr/lib/libarchive.so.4.0			base-sys-shlib		compatfile
 ./usr/lib/libasan.sobase-sys-shlib		compatfile,gcc=48
 ./usr/lib/libasan.sobase-sys-shlib		compatfile,gcc=53
 ./usr/lib/libasan.so.0base-sys-shlib		compatfile,gcc=48

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2124 src/distrib/sets/lists/comp/mi:1.2125
--- src/distrib/sets/lists/comp/mi:1.2124	Mon Apr 17 08:59:37 2017
+++ src/distrib/sets/lists/comp/mi	Thu Apr 20 13:11:03 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2124 2017/04/17 08:59:37 riastradh Exp $
+#	$NetBSD: mi,v 1.2125 2017/04/20 13:11:03 joerg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -5074,16 +5074,26 @@
 ./usr/share/man/cat3/archive_compression_name.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_copy_error.0		comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_add_entry.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_add_entry_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_clear.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_count.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_from_text.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_from_text_w.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_next.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_next_w.0 comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_acl_reset.0	comp-c-catman		.cat
-./usr/share/man/cat3/archive_entry_acl_text_w.0 comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_text_w.0	comp-obsolete	obsolete
+./usr/share/man/cat3/archive_entry_acl_to_text.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_to_text_w.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_acl_types.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_atime.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_atime_is_set.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_atime_nsec.0		comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_birthtime.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_birthtime_is_set.0	comp-c-catman		.cat
+./usr/share/man/cat3/archive_entry_birthtime_nsec.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_clear.0	comp-c-catman		.cat
 ./usr/share/man/cat3/archive_entry_clone.0	comp-c-catman		.cat
 

CVS commit: src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:11:35 UTC 2017

Modified Files:
src/usr.bin/unzip: unzip.c
src/usr.sbin/makemandb: makemandb.c

Log Message:
Use libarchive 3.x interface and not obsolete 2.x versions.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/unzip/unzip.c
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/makemandb/makemandb.c

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

CVS commit: src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:11:04 UTC 2017

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: shl.mi
src/external/bsd/libarchive: prepare-import.sh
src/external/bsd/libarchive/bin: Makefile.inc
src/external/bsd/libarchive/bin/tar: Makefile
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile shlib_version
src/external/bsd/libarchive/lib/libarchive_fe: Makefile

Log Message:
Update build system for libarchive-3.3.2pre.


To generate a diff of this commit:
cvs rdiff -u -r1.810 -r1.811 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2124 -r1.2125 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/prepare-import.sh
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/bin/tar/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/libarchive/lib/libarchive/shlib_version
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/libarchive/lib/libarchive_fe/Makefile

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

CVS import: src/external/bsd/pkg_install/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:12:48 UTC 2017

Update of /cvsroot/src/external/bsd/pkg_install/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv4633

Log Message:
Import pkg_install-20170419.

Status:

Vendor Tag: PKGSRC
Release Tags:   pkg_install-20170419

U src/external/bsd/pkg_install/dist/x509/signing.txt
U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf
U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh
U src/external/bsd/pkg_install/dist/delete/pkg_delete.c
U src/external/bsd/pkg_install/dist/delete/pkg_delete.1
C src/external/bsd/pkg_install/dist/add/perform.c
U src/external/bsd/pkg_install/dist/add/main.c
U src/external/bsd/pkg_install/dist/add/add.h
U src/external/bsd/pkg_install/dist/add/pkg_add.1
U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in
U src/external/bsd/pkg_install/dist/admin/audit.c
U src/external/bsd/pkg_install/dist/admin/pkg_admin.1
U src/external/bsd/pkg_install/dist/admin/audit-packages.8
U src/external/bsd/pkg_install/dist/admin/admin.h
U src/external/bsd/pkg_install/dist/admin/check.c
U src/external/bsd/pkg_install/dist/admin/main.c
U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.8
U src/external/bsd/pkg_install/dist/create/build.c
U src/external/bsd/pkg_install/dist/create/util.c
C src/external/bsd/pkg_install/dist/create/pkg_create.1
U src/external/bsd/pkg_install/dist/create/pl.c
U src/external/bsd/pkg_install/dist/create/perform.c
U src/external/bsd/pkg_install/dist/create/main.c
U src/external/bsd/pkg_install/dist/create/create.h
U src/external/bsd/pkg_install/dist/info/show.c
C src/external/bsd/pkg_install/dist/info/pkg_info.1
U src/external/bsd/pkg_install/dist/info/perform.c
U src/external/bsd/pkg_install/dist/info/main.c
U src/external/bsd/pkg_install/dist/info/info.h
U src/external/bsd/pkg_install/dist/lib/conflicts.c
U src/external/bsd/pkg_install/dist/lib/global.c
U src/external/bsd/pkg_install/dist/lib/version.c
U src/external/bsd/pkg_install/dist/lib/fexec.c
C src/external/bsd/pkg_install/dist/lib/license.c
U src/external/bsd/pkg_install/dist/lib/pkcs7.c
U src/external/bsd/pkg_install/dist/lib/dewey.h
U src/external/bsd/pkg_install/dist/lib/pkgsrc.7
U src/external/bsd/pkg_install/dist/lib/dewey.c
U src/external/bsd/pkg_install/dist/lib/pkg_io.c
U src/external/bsd/pkg_install/dist/lib/opattern.c
U src/external/bsd/pkg_install/dist/lib/remove.c
C src/external/bsd/pkg_install/dist/lib/var.c
U src/external/bsd/pkg_install/dist/lib/automatic.c
C src/external/bsd/pkg_install/dist/lib/pkg_signature.c
U src/external/bsd/pkg_install/dist/lib/iterate.c
C src/external/bsd/pkg_install/dist/lib/defs.h
U src/external/bsd/pkg_install/dist/lib/pkg_summary.5
U src/external/bsd/pkg_install/dist/lib/pkgdb.c
C src/external/bsd/pkg_install/dist/lib/version.h
U src/external/bsd/pkg_install/dist/lib/parse-config.c
U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
U src/external/bsd/pkg_install/dist/lib/file.c
U src/external/bsd/pkg_install/dist/lib/xwrapper.c
U src/external/bsd/pkg_install/dist/lib/plist.c
U src/external/bsd/pkg_install/dist/lib/lpkg.c
C src/external/bsd/pkg_install/dist/lib/lib.h
U src/external/bsd/pkg_install/dist/lib/gpgsig.c
U src/external/bsd/pkg_install/dist/lib/str.c
C src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
U src/external/bsd/pkg_install/dist/lib/config.h.in

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

cvs checkout -jPKGSRC:yesterday -jPKGSRC 
src/external/bsd/pkg_install/dist

CVS commit: src/external/bsd/libarchive/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:06:29 UTC 2017

Removed Files:
src/external/bsd/libarchive/dist: README
src/external/bsd/libarchive/dist/cpio/test: CMakeLists.txt list.h
main.c test_pathmatch.c
src/external/bsd/libarchive/dist/libarchive: archive_hash.h
archive_read_disk.c archive_read_support_compression_all.c
archive_read_support_compression_bzip2.c
archive_read_support_compression_compress.c
archive_read_support_compression_gzip.c
archive_read_support_compression_none.c
archive_read_support_compression_program.c
archive_read_support_compression_rpm.c
archive_read_support_compression_uu.c
archive_read_support_compression_xz.c archive_write_disk.c
archive_write_set_compression_bzip2.c
archive_write_set_compression_compress.c
archive_write_set_compression_gzip.c
archive_write_set_compression_none.c
archive_write_set_compression_program.c
archive_write_set_compression_xz.c filter_fork.c
src/external/bsd/libarchive/dist/libarchive/test: CMakeLists.txt list.h
main.c test_acl_basic.c test_acl_freebsd.c
test_read_compress_program.c test_read_format_iso_gz.c
test_read_uu.c test_write_compress.c test_write_compress_bzip2.c
test_write_compress_gzip.c test_write_compress_lzma.c
test_write_compress_program.c test_write_compress_xz.c
test_write_format_zip_no_compression.c
src/external/bsd/libarchive/dist/libarchive_fe: matching.c matching.h
pathmatch.c pathmatch.h
src/external/bsd/libarchive/dist/tar: getdate.c tree.c tree.h
src/external/bsd/libarchive/dist/tar/test: CMakeLists.txt list.h main.c
test_getdate.c

Log Message:
GC old files.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libarchive/dist/README
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libarchive/dist/cpio/test/CMakeLists.txt
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libarchive/dist/cpio/test/list.h \
src/external/bsd/libarchive/dist/cpio/test/test_pathmatch.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/libarchive/dist/cpio/test/main.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/libarchive/dist/libarchive/archive_hash.h \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_all.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_gzip.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_none.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_program.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_compress.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_gzip.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_none.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_program.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk.c \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_rpm.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_uu.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_xz.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_xz.c
cvs rdiff -u -r1.1.1.3 -r0 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_bzip2.c
 \

src/external/bsd/libarchive/dist/libarchive/archive_write_set_compression_bzip2.c
 \
src/external/bsd/libarchive/dist/libarchive/filter_fork.c
cvs rdiff -u -r1.3 -r0 \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_compression_compress.c
cvs rdiff -u -r1.2 -r0 \
src/external/bsd/libarchive/dist/libarchive/archive_write_disk.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libarchive/dist/libarchive/test/CMakeLists.txt \
src/external/bsd/libarchive/dist/libarchive/test/test_acl_freebsd.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_uu.c \

src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_bzip2.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_gzip.c 
\
src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_lzma.c 
\
src/external/bsd/libarchive/dist/libarchive/test/test_write_compress_xz.c \

src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_no_compression.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/libarchive/dist/libarchive/test/list.h \
src/external/bsd/libarchive/dist/libarchive/test/test_acl_basic.c \

CVS commit: src/external/bsd/libarchive/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 13:01:40 UTC 2017

Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive.h
archive_check_magic.c archive_entry.3 archive_pack_dev.c
archive_pack_dev.h archive_read.3 archive_read_disk.3
archive_read_disk_entry_from_file.c
archive_read_support_format_iso9660.c archive_util.3
archive_write.3 archive_write_disk.3 archive_write_set_format_ar.c
archive_write_set_format_shar.c archive_write_set_format_ustar.c
libarchive-formats.5 libarchive.3 libarchive_internals.3 tar.5
src/external/bsd/libarchive/dist/libarchive_fe: err.c err.h

Log Message:
Merge libarchive-3-3-2pre.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/archive.h \
src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c \

src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c
 \
src/external/bsd/libarchive/dist/libarchive/archive_util.3 \
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c \
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c 
\

src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c \
src/external/bsd/libarchive/dist/libarchive/libarchive-formats.5 \
src/external/bsd/libarchive/dist/libarchive/libarchive.3 \
src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3 \
src/external/bsd/libarchive/dist/libarchive/tar.5
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/libarchive/archive_entry.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3 \

src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c 
\
src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.c \
src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/libarchive/dist/libarchive/archive_read.3 \
src/external/bsd/libarchive/dist/libarchive/archive_write.3
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/dist/libarchive_fe/err.c \
src/external/bsd/libarchive/dist/libarchive_fe/err.h

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

CVS commit: [bouyer-socketcan] src/sys/arch/arm/allwinner

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 13:00:52 UTC 2017

Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c

Log Message:
Handle interface errors.
Use a watchdog for transmit.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/allwinner/awin_can.c

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

CVS commit: [bouyer-socketcan] src/sys/arch/arm/allwinner

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 13:00:52 UTC 2017

Modified Files:
src/sys/arch/arm/allwinner [bouyer-socketcan]: awin_can.c

Log Message:
Handle interface errors.
Use a watchdog for transmit.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/allwinner/awin_can.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/arm/allwinner/awin_can.c
diff -u src/sys/arch/arm/allwinner/awin_can.c:1.1.2.2 src/sys/arch/arm/allwinner/awin_can.c:1.1.2.3
--- src/sys/arch/arm/allwinner/awin_can.c:1.1.2.2	Wed Apr 19 17:54:18 2017
+++ src/sys/arch/arm/allwinner/awin_can.c	Thu Apr 20 13:00:52 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_can.c,v 1.1.2.2 2017/04/19 17:54:18 bouyer Exp $	*/
+/*	$NetBSD: awin_can.c,v 1.1.2.3 2017/04/20 13:00:52 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.2 2017/04/19 17:54:18 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_can.c,v 1.1.2.3 2017/04/20 13:00:52 bouyer Exp $");
 
 #include 
 #include 
@@ -60,6 +60,15 @@ __KERNEL_RCSID(1, "$NetBSD: awin_can.c,v
 #include 
 #include 
 
+/* shortcut for all error interrupts */
+#define AWIN_CAN_INT_ALLERRS (\
+	AWIN_CAN_INT_BERR | \
+	AWIN_CAN_INT_ARB_LOST | \
+	AWIN_CAN_INT_ERR_PASSIVE | \
+	AWIN_CAN_INT_DATA_OR | \
+	AWIN_CAN_INT_ERR \
+)
+
 struct awin_can_softc {
 	struct canif_softc sc_cansc;
 	bus_space_tag_t sc_bst;
@@ -164,6 +173,8 @@ awin_can_attach(device_t parent, device_
 	CAN_LINKMODE_3SAMPLES | CAN_LINKMODE_LISTENONLY |
 	CAN_LINKMODE_LOOPBACK;
 	can_ifinit_timings(>sc_cansc);
+	sc->sc_timings.clt_prop = 0;
+	sc->sc_timings.clt_sjw = 1;
 
 	aprint_naive("\n");
 	aprint_normal(": CAN bus controller\n");
@@ -222,6 +233,7 @@ awin_can_rx_intr(struct awin_can_softc *
 	int dlc;
 	int regd, i;
 
+	KASSERT(mutex_owned(>sc_intr_lock));
 	reg0v = awin_can_read(sc, AWIN_CAN_TXBUF0_REG);
 	dlc = reg0v & AWIN_CAN_TXBUF0_DL;
 
@@ -268,6 +280,7 @@ awin_can_rx_intr(struct awin_can_softc *
 	ifp->if_ibytes += m->m_len;
 	m_set_rcvif(m, ifp);
 	bpf_mtap(ifp, m);
+	printf("can_input1\n");
 	can_input(ifp, m);
 }
 
@@ -281,11 +294,13 @@ awin_can_tx_intr(struct awin_can_softc *
 	uint32_t reg0val;
 	int i;
 
+	KASSERT(mutex_owned(>sc_intr_lock));
 	if ((m = sc->sc_m_transmit) != NULL) {
 		ifp->if_obytes += m->m_len;
 		ifp->if_opackets++;
 		can_mbuf_tag_clean(m);
 		m_set_rcvif(m, ifp);
+		printf("can_input2\n");
 		can_input(ifp, m); /* loopback */
 		sc->sc_m_transmit = NULL;
 	}
@@ -331,11 +346,68 @@ awin_can_tx_intr(struct awin_can_softc *
 	}
 	awin_can_write(sc, AWIN_CAN_TXBUF0_REG, reg0val);
 
-	awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_TANS_REQ);
+	if (sc->sc_linkmodes & CAN_LINKMODE_LOOPBACK) {
+		awin_can_write(sc, AWIN_CAN_CMD_REG,
+			AWIN_CAN_CMD_TANS_REQ | AWIN_CAN_CMD_SELF_REQ);
+	} else {
+		awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_TANS_REQ);
+	}
 	ifp->if_flags |= IFF_OACTIVE;
+	ifp->if_timer = 5;
 	bpf_mtap(ifp, m);
 }
 
+static int
+awin_can_tx_abort(struct awin_can_softc *sc)
+{
+	KASSERT(mutex_owned(>sc_intr_lock));
+	if (sc->sc_m_transmit) {
+		m_freem(sc->sc_m_transmit);
+		sc->sc_m_transmit = NULL;
+		sc->sc_ifp->if_timer = 0;
+		/*
+		 * the transmit abort will trigger a TX interrupt
+		 * which will restart the queue or cleae OACTIVE,
+		 * as appropriate
+		 */
+		awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_ABT_REQ);
+		return 1;
+	}
+	return 0;
+}
+
+static void
+awin_can_err_intr(struct awin_can_softc *sc, uint32_t irq, uint32_t sts)
+{
+	struct ifnet * const ifp = sc->sc_ifp;
+	KASSERT(mutex_owned(>sc_intr_lock));
+	int txerr = 0;
+
+	if (irq & AWIN_CAN_INT_DATA_OR) {
+		ifp->if_ierrors++;
+		awin_can_write(sc, AWIN_CAN_CMD_REG, AWIN_CAN_CMD_CLR_OR);
+	}
+	if (irq & AWIN_CAN_INT_ERR) {
+		/* XXX todo */
+	}
+	if (irq & AWIN_CAN_INT_BERR) {
+		if (sts & AWIN_CAN_STA_TX)
+			txerr++;
+		if (sts & AWIN_CAN_STA_RX)
+			ifp->if_ierrors++;
+	}
+	if (irq & AWIN_CAN_INT_ERR_PASSIVE) {
+		/* XXX todo */
+	}
+	if (irq & AWIN_CAN_INT_ARB_LOST) {
+		txerr++;
+	}
+	if (txerr) {
+		ifp->if_oerrors += txerr;
+		(void) awin_can_tx_abort(sc);
+	}
+}
+
 int
 awin_can_intr(void *arg)
 {
@@ -358,6 +430,9 @@ awin_can_intr(void *arg)
 sts = awin_can_read(sc, AWIN_CAN_STA_REG);
 			}
 		}
+		if (irq & AWIN_CAN_INT_ALLERRS) {
+			awin_can_err_intr(sc, irq, sts);
+		}
 		awin_can_write(sc, AWIN_CAN_INT_REG, irq);
 rnd_add_uint32(>sc_rnd_source, irq);
 
@@ -424,7 +499,7 @@ awin_can_ifup(struct awin_can_softc * co
 
 	awin_can_exit_reset(sc);
 	awin_can_write(sc, AWIN_CAN_INTE_REG,
-	AWIN_CAN_INT_TX_FLAG | AWIN_CAN_INT_RX_FLAG);
+	AWIN_CAN_INT_TX_FLAG | AWIN_CAN_INT_RX_FLAG | AWIN_CAN_INT_ALLERRS);
 	sc->sc_ifp->if_flags |= IFF_RUNNING;
 	return 0;
 }
@@ -433,6 +508,7 @@ static void
 awin_can_ifdown(struct 

CVS commit: [bouyer-socketcan] src/sbin/canconfig

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 12:59:54 UTC 2017

Modified Files:
src/sbin/canconfig [bouyer-socketcan]: canconfig.8 canconfig.c

Log Message:
Implement listenonly and loopback flags.
Fix do_canflag()


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sbin/canconfig/canconfig.8
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sbin/canconfig/canconfig.c

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

Modified files:

Index: src/sbin/canconfig/canconfig.8
diff -u src/sbin/canconfig/canconfig.8:1.1.2.1 src/sbin/canconfig/canconfig.8:1.1.2.2
--- src/sbin/canconfig/canconfig.8:1.1.2.1	Mon Apr 17 20:48:36 2017
+++ src/sbin/canconfig/canconfig.8	Thu Apr 20 12:59:54 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: canconfig.8,v 1.1.2.1 2017/04/17 20:48:36 bouyer Exp $
+.\"	$NetBSD: canconfig.8,v 1.1.2.2 2017/04/20 12:59:54 bouyer Exp $
 .\"
 .\" Copyright (c) 2017 Manuel Bouyer.
  *
@@ -100,6 +100,16 @@ set the number of tq for the Synchronisa
 enables triple-sampling.
 .It Cm -3samples
 disables triple-sampling.
+.It Cm listenonly
+enables listenonly mode. In this mode the controller is passive, and
+doesn't send ACKs on the bus.
+.It Cm -listenonly
+disables listenonly mode.
+.It Cm loopback
+enables loopback mode. In this mode, the controller doens't expect ACK from
+the bus.
+.It Cm -loopback
+disables loopback mode.
 .El
 .Sh EXAMPLES
 TODO

Index: src/sbin/canconfig/canconfig.c
diff -u src/sbin/canconfig/canconfig.c:1.1.2.2 src/sbin/canconfig/canconfig.c:1.1.2.3
--- src/sbin/canconfig/canconfig.c:1.1.2.2	Wed Apr 19 17:51:16 2017
+++ src/sbin/canconfig/canconfig.c	Thu Apr 20 12:59:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: canconfig.c,v 1.1.2.2 2017/04/19 17:51:16 bouyer Exp $	*/
+/*	$NetBSD: canconfig.c,v 1.1.2.3 2017/04/20 12:59:54 bouyer Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: canconfig.c,v 1.1.2.2 2017/04/19 17:51:16 bouyer Exp $");
+__RCSID("$NetBSD: canconfig.c,v 1.1.2.3 2017/04/20 12:59:54 bouyer Exp $");
 #endif
 
 
@@ -77,6 +77,8 @@ static void	cmd_phase_seg1(const struct 
 static void	cmd_phase_seg2(const struct command *, int, const char *, char **);
 static void	cmd_sjw(const struct command *, int, const char *, char **);
 static void	cmd_3samples(const struct command *, int, const char *, char **);
+static void	cmd_listenonly(const struct command *, int, const char *, char **);
+static void	cmd_loopback(const struct command *, int, const char *, char **);
 
 static const struct command command_table[] = {
 	{ "up",			0,	0,		cmd_up },
@@ -91,6 +93,12 @@ static const struct command command_tabl
 	{ "3samples",		0,	0,		cmd_3samples },
 	{ "-3samples",		0,	CMD_INVERT,	cmd_3samples },
 
+	{ "listenonly",		0,	0,		cmd_listenonly },
+	{ "-listenonly",	0,	CMD_INVERT,	cmd_listenonly },
+
+	{ "loopback",		0,	0,		cmd_loopback },
+	{ "-loopback",		0,	CMD_INVERT,	cmd_loopback },
+
 	{ NULL,			0,	0,		NULL },
 };
 
@@ -225,6 +233,8 @@ usage(void)
 		" phase_seg2 ",
 		" sjw ",
 		" 3samples | -3samples",
+		" listenonly | -listenonly",
+		" loopback | -loopback",
 		NULL,
 	};
 	extern const char *__progname;
@@ -353,7 +363,7 @@ show_timings(int sock, const char *canif
 	printb("capabilities", cltc.cltc_linkmode_caps, CAN_IFFBITS);
 	printf("\n");
 	printf("%soperational timings:\n", prefix);
-	printf("%s  brp %d prop_seg %d, phase_seg1 %d, phase_seg2 %d, sjw %d\n",
+	printf("%s  brp %d, prop_seg %d, phase_seg1 %d, phase_seg2 %d, sjw %d\n",
 	prefix,
 	clt.clt_brp, clt.clt_prop, clt.clt_ps1, clt.clt_ps2, clt.clt_sjw);
 	printf("%s  ", prefix);
@@ -418,7 +428,7 @@ do_canflag(int sock, const char *canifna
 		cmd = CANSLINKMODE;
 	else
 		cmd = CANCLINKMODE;
-	return do_cmd(sock, canifname, cmd, , sizeof(flag), set);
+	return do_cmd(sock, canifname, cmd, , sizeof(flag), 1);
 }
 
 static void
@@ -506,7 +516,6 @@ cmd_sjw(const struct command *cmd, int s
 	g_clt.clt_sjw = val;
 	g_clt_updated=1;
 }
-
 static void
 cmd_3samples(const struct command *cmd, int sock, const char *canifname,
 char **argv)
@@ -516,3 +525,23 @@ cmd_3samples(const struct command *cmd, 
 		err(1, "%s", cmd->cmd_keyword);
 
 }
+
+static void
+cmd_listenonly(const struct command *cmd, int sock, const char *canifname,
+char **argv)
+{
+if (do_canflag(sock, canifname, CAN_LINKMODE_LISTENONLY,
+	(cmd->cmd_flags & CMD_INVERT) ? 0 : 1) < 0)
+		err(1, "%s", cmd->cmd_keyword);
+
+}
+
+static void
+cmd_loopback(const struct command *cmd, int sock, const char *canifname,
+char **argv)
+{
+if (do_canflag(sock, canifname, CAN_LINKMODE_LOOPBACK,
+	(cmd->cmd_flags & CMD_INVERT) ? 0 : 1) < 0)
+		err(1, "%s", cmd->cmd_keyword);
+
+}

CVS commit: [bouyer-socketcan] src/sbin/canconfig

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 12:59:54 UTC 2017

Modified Files:
src/sbin/canconfig [bouyer-socketcan]: canconfig.8 canconfig.c

Log Message:
Implement listenonly and loopback flags.
Fix do_canflag()


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sbin/canconfig/canconfig.8
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sbin/canconfig/canconfig.c

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

CVS commit: [bouyer-socketcan] src/sys/netcan

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 12:59:11 UTC 2017

Modified Files:
src/sys/netcan [bouyer-socketcan]: can.c

Log Message:
Fix LINKMODE
Refuse to send packets if LISTENONLY is set
Don't forget to unbind in error case.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/netcan/can.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/netcan/can.c
diff -u src/sys/netcan/can.c:1.1.2.10 src/sys/netcan/can.c:1.1.2.11
--- src/sys/netcan/can.c:1.1.2.10	Wed Apr 19 22:19:12 2017
+++ src/sys/netcan/can.c	Thu Apr 20 12:59:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: can.c,v 1.1.2.10 2017/04/19 22:19:12 bouyer Exp $	*/
+/*	$NetBSD: can.c,v 1.1.2.11 2017/04/20 12:59:11 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.10 2017/04/19 22:19:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: can.c,v 1.1.2.11 2017/04/20 12:59:11 bouyer Exp $");
 
 #include 
 #include 
@@ -146,7 +146,7 @@ can_set_netlink(struct ifnet *ifp, struc
 	case CANCLINKMODE:
 		if (ifd->ifd_len != sizeof(uint32_t))
 			return EINVAL;
-		error = copyout(ifd->ifd_data, , ifd->ifd_len);
+		error = copyin(ifd->ifd_data, , ifd->ifd_len);
 		if (error)
 			return error;
 		if ((mode & csc->csc_timecaps.cltc_linkmode_caps) != mode)
@@ -215,6 +215,7 @@ can_output(struct mbuf *m, struct canpcb
 {
 	struct ifnet *ifp;
 	struct m_tag *sotag;
+	struct canif_softc *csc;
 
 	if (canp == NULL) {
 		printf("can_output: no pcb\n");
@@ -224,6 +225,11 @@ can_output(struct mbuf *m, struct canpcb
 	if (ifp == 0) {
 		return EDESTADDRREQ;
 	}
+	csc = ifp->if_softc;
+	if (csc && (csc->csc_linkmodes & CAN_LINKMODE_LISTENONLY)) {
+		return ENETUNREACH;
+	}
+		
 	sotag = m_tag_get(PACKET_TAG_SO, sizeof(struct socket *), PR_NOWAIT);
 	if (sotag == NULL) {
 		ifp->if_oerrors++;
@@ -602,8 +608,6 @@ can_send(struct socket *so, struct mbuf 
 		}
 	}
 	error = can_output(m, canp);
-	if (error)
-		goto err;
 	if (nam) {
 		struct sockaddr_can lscan;
 		memset(, 0, sizeof(lscan));
@@ -611,6 +615,8 @@ can_send(struct socket *so, struct mbuf 
 		lscan.can_len = sizeof(lscan);
 		can_pcbbind(canp, , l);
 	}
+	if (error)
+		goto err;
 	return 0;
 
 err:

CVS commit: [bouyer-socketcan] src/sys/netcan

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu Apr 20 12:59:11 UTC 2017

Modified Files:
src/sys/netcan [bouyer-socketcan]: can.c

Log Message:
Fix LINKMODE
Refuse to send packets if LISTENONLY is set
Don't forget to unbind in error case.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/netcan/can.c

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

CVS import: src/external/bsd/libarchive/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 12:55:58 UTC 2017

Update of /cvsroot/src/external/bsd/libarchive/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12853

Log Message:
Import libarchive 3.3.2pre (7ad477ea7655f3dfcdcfa5adcb792f0ec864969d).

Status:

Vendor Tag: KIENTZLE
Release Tags:   libarchive-3-3-2pre

N src/external/bsd/libarchive/dist/CONTRIBUTING.md
U src/external/bsd/libarchive/dist/NEWS
U src/external/bsd/libarchive/dist/COPYING
N src/external/bsd/libarchive/dist/README.md
N src/external/bsd/libarchive/dist/cat/bsdcat.h
N src/external/bsd/libarchive/dist/cat/bsdcat.1
N src/external/bsd/libarchive/dist/cat/bsdcat_platform.h
N src/external/bsd/libarchive/dist/cat/cmdline.c
N src/external/bsd/libarchive/dist/cat/bsdcat.c
N src/external/bsd/libarchive/dist/cat/test/test_help.c
N src/external/bsd/libarchive/dist/cat/test/test_empty.gz.uu
N src/external/bsd/libarchive/dist/cat/test/test_empty_lz4.c
N src/external/bsd/libarchive/dist/cat/test/test_version.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_gz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_lz4.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_bz2.c
N src/external/bsd/libarchive/dist/cat/test/test_0.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_plain.c
N src/external/bsd/libarchive/dist/cat/test/test_empty.lz4.uu
N src/external/bsd/libarchive/dist/cat/test/test_error_mixed.c
N src/external/bsd/libarchive/dist/cat/test/test.h
N src/external/bsd/libarchive/dist/cat/test/test_empty_xz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_mixed.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_Z.c
N src/external/bsd/libarchive/dist/cat/test/test_empty.xz.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand_xz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand.xz.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.bz2.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.Z.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.lz4.uu
N src/external/bsd/libarchive/dist/cat/test/test_empty_gz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand.plain.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.gz.uu
N src/external/bsd/libarchive/dist/cat/test/test_error.c
N src/external/bsd/libarchive/dist/libarchive_fe/passphrase.c
U src/external/bsd/libarchive/dist/libarchive_fe/line_reader.h
C src/external/bsd/libarchive/dist/libarchive_fe/err.c
N src/external/bsd/libarchive/dist/libarchive_fe/passphrase.h
C src/external/bsd/libarchive/dist/libarchive_fe/err.h
U src/external/bsd/libarchive/dist/libarchive_fe/line_reader.c
U src/external/bsd/libarchive/dist/libarchive_fe/lafe_platform.h
U src/external/bsd/libarchive/dist/cpio/cpio.c
U src/external/bsd/libarchive/dist/cpio/cpio.h
U src/external/bsd/libarchive/dist/cpio/cpio_windows.c
U src/external/bsd/libarchive/dist/cpio/bsdcpio.1
U src/external/bsd/libarchive/dist/cpio/cpio_platform.h
U src/external/bsd/libarchive/dist/cpio/cpio_windows.h
U src/external/bsd/libarchive/dist/cpio/cmdline.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract_cpio_xz.c
U src/external/bsd/libarchive/dist/cpio/test/test_option_m.cpio.uu
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.crc.uu
N src/external/bsd/libarchive/dist/cpio/test/test_missing_file.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.newc.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_J_upper.c
N src/external/bsd/libarchive/dist/cpio/test/test_option_b64encode.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.ustar.uu
N src/external/bsd/libarchive/dist/cpio/test/test_option_lz4.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.bin.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.gz.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.Z.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_t.c
U src/external/bsd/libarchive/dist/cpio/test/test_option_z.c
U src/external/bsd/libarchive/dist/cpio/test/test_option_version.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.lz.uu
N src/external/bsd/libarchive/dist/cpio/test/test_option_xz.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.grz.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_tv.stdout.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.lzma.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_Z_upper.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract_cpio_lzo.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.bin.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_d.c
U src/external/bsd/libarchive/dist/cpio/test/test_0.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.lrz.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.xz.uu
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat.c

CVS import: src/external/bsd/libarchive/dist

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Apr 20 12:55:58 UTC 2017

Update of /cvsroot/src/external/bsd/libarchive/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv12853

Log Message:
Import libarchive 3.3.2pre (7ad477ea7655f3dfcdcfa5adcb792f0ec864969d).

Status:

Vendor Tag: KIENTZLE
Release Tags:   libarchive-3-3-2pre

N src/external/bsd/libarchive/dist/CONTRIBUTING.md
U src/external/bsd/libarchive/dist/NEWS
U src/external/bsd/libarchive/dist/COPYING
N src/external/bsd/libarchive/dist/README.md
N src/external/bsd/libarchive/dist/cat/bsdcat.h
N src/external/bsd/libarchive/dist/cat/bsdcat.1
N src/external/bsd/libarchive/dist/cat/bsdcat_platform.h
N src/external/bsd/libarchive/dist/cat/cmdline.c
N src/external/bsd/libarchive/dist/cat/bsdcat.c
N src/external/bsd/libarchive/dist/cat/test/test_help.c
N src/external/bsd/libarchive/dist/cat/test/test_empty.gz.uu
N src/external/bsd/libarchive/dist/cat/test/test_empty_lz4.c
N src/external/bsd/libarchive/dist/cat/test/test_version.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_gz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_lz4.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_bz2.c
N src/external/bsd/libarchive/dist/cat/test/test_0.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_plain.c
N src/external/bsd/libarchive/dist/cat/test/test_empty.lz4.uu
N src/external/bsd/libarchive/dist/cat/test/test_error_mixed.c
N src/external/bsd/libarchive/dist/cat/test/test.h
N src/external/bsd/libarchive/dist/cat/test/test_empty_xz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_mixed.c
N src/external/bsd/libarchive/dist/cat/test/test_expand_Z.c
N src/external/bsd/libarchive/dist/cat/test/test_empty.xz.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand_xz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand.xz.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.bz2.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.Z.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.lz4.uu
N src/external/bsd/libarchive/dist/cat/test/test_empty_gz.c
N src/external/bsd/libarchive/dist/cat/test/test_expand.plain.uu
N src/external/bsd/libarchive/dist/cat/test/test_expand.gz.uu
N src/external/bsd/libarchive/dist/cat/test/test_error.c
N src/external/bsd/libarchive/dist/libarchive_fe/passphrase.c
U src/external/bsd/libarchive/dist/libarchive_fe/line_reader.h
C src/external/bsd/libarchive/dist/libarchive_fe/err.c
N src/external/bsd/libarchive/dist/libarchive_fe/passphrase.h
C src/external/bsd/libarchive/dist/libarchive_fe/err.h
U src/external/bsd/libarchive/dist/libarchive_fe/line_reader.c
U src/external/bsd/libarchive/dist/libarchive_fe/lafe_platform.h
U src/external/bsd/libarchive/dist/cpio/cpio.c
U src/external/bsd/libarchive/dist/cpio/cpio.h
U src/external/bsd/libarchive/dist/cpio/cpio_windows.c
U src/external/bsd/libarchive/dist/cpio/bsdcpio.1
U src/external/bsd/libarchive/dist/cpio/cpio_platform.h
U src/external/bsd/libarchive/dist/cpio/cpio_windows.h
U src/external/bsd/libarchive/dist/cpio/cmdline.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract_cpio_xz.c
U src/external/bsd/libarchive/dist/cpio/test/test_option_m.cpio.uu
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.crc.uu
N src/external/bsd/libarchive/dist/cpio/test/test_missing_file.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.newc.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_J_upper.c
N src/external/bsd/libarchive/dist/cpio/test/test_option_b64encode.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.ustar.uu
N src/external/bsd/libarchive/dist/cpio/test/test_option_lz4.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref.bin.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.gz.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.Z.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_t.c
U src/external/bsd/libarchive/dist/cpio/test/test_option_z.c
U src/external/bsd/libarchive/dist/cpio/test/test_option_version.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.lz.uu
N src/external/bsd/libarchive/dist/cpio/test/test_option_xz.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.grz.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_tv.stdout.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.lzma.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_Z_upper.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract_cpio_lzo.c
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat_ref_nosym.bin.uu
U src/external/bsd/libarchive/dist/cpio/test/test_option_d.c
U src/external/bsd/libarchive/dist/cpio/test/test_0.c
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.lrz.uu
N src/external/bsd/libarchive/dist/cpio/test/test_extract.cpio.xz.uu
U src/external/bsd/libarchive/dist/cpio/test/test_gcpio_compat.c

Re: CVS commit: src/usr.bin/make

[Christos Zoulas]

In article <20170420035727.ba900f...@cvs.netbsd.org>,
Simon J. Gerraty  wrote:
>-=-=-=-=-=-
>
>Module Name:   src
>Committed By:  sjg
>Date:  Thu Apr 20 03:57:27 UTC 2017
>
>Modified Files:
>   src/usr.bin/make: main.c
>
>Log Message:
>We cannot tollerate things like trailing /.. etc in .CURDIR
>so only accept -C arg "as is" if it contains no relative components.
>

Why?

christos

CVS commit: src/sys/arch/amd64/conf

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 09:56:27 UTC 2017

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0

Log Message:
 Add ixg(4). Fixes PR#52180 from Harry Waddell.

XXX pullup to netbsd-7


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/amd64/conf/XEN3_DOM0

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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.134 src/sys/arch/amd64/conf/XEN3_DOM0:1.135
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.134	Mon Apr 17 09:54:59 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Thu Apr 20 09:56:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.134 2017/04/17 09:54:59 bouyer Exp $
+# $NetBSD: XEN3_DOM0,v 1.135 2017/04/20 09:56:27 msaitoh Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -369,6 +369,7 @@ ipw*	at pci? dev ? function ?	# Intel PR
 iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
 iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
 iwm*	at pci? dev ? function ?	# Intel Wireless WiFi Link 7xxx
+ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
 jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
 le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
 lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet

CVS commit: src/sys/arch/amd64/conf

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 09:56:27 UTC 2017

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0

Log Message:
 Add ixg(4). Fixes PR#52180 from Harry Waddell.

XXX pullup to netbsd-7


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/amd64/conf/XEN3_DOM0

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

CVS commit: src/share/man/man5

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 20 09:48:55 UTC 2017

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
Use Fl, Xr. New sentence, new line. Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/share/man/man5/mk.conf.5

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

Modified files:

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.73 src/share/man/man5/mk.conf.5:1.74
--- src/share/man/man5/mk.conf.5:1.73	Thu Apr 20 09:29:10 2017
+++ src/share/man/man5/mk.conf.5	Thu Apr 20 09:48:55 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.73 2017/04/20 09:29:10 ozaki-r Exp $
+.\"	$NetBSD: mk.conf.5,v 1.74 2017/04/20 09:48:55 wiz Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd February 16, 2017
+.Dd April 20, 2017
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation
@@ -789,10 +789,18 @@ Indicates whether all local symbols shou
 If
 .Dq yes ,
 strip all local symbols from shared libraries;
-the affect is equivalent to -x option of ld(1). If
+the affect is equivalent to the
+.Fl x
+option of
+.Xr ld 1 .
+If
 .Dq no ,
 strip only temporary local symbols; the affect is equivalent
-to -X option of ld(1). Keeping non-temporary local symbols
+to the
+.Fl X
+option of
+.Xr ld 1 .
+Keeping non-temporary local symbols
 such as static function names is useful on using DTrace for
 userland libraries and getting a backtrace from a rump kernel
 loading shared libraries.

CVS commit: src/share/man/man5

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 20 09:48:55 UTC 2017

Modified Files:
src/share/man/man5: mk.conf.5

Log Message:
Use Fl, Xr. New sentence, new line. Bump date for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/share/man/man5/mk.conf.5

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

CVS commit: src

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 20 09:47:53 UTC 2017

Modified Files:
src: BUILDING

Log Message:
regen using regen target in doc.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/BUILDING

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.125 src/BUILDING:1.126
--- src/BUILDING:1.125	Thu Apr 20 09:29:10 2017
+++ src/BUILDING	Thu Apr 20 09:47:52 2017
@@ -9,9 +9,9 @@ REQUIREMENTS
  same NetBSD architecture) or cross compiling (on another architecture or
  OS).
 
- This source tree contains a special subtree, ``tools'', which uses the
- host system to create a build toolchain for the target architecture.  The
- host system must have at least C and C++ compilers in order to create the
+ This source tree contains a special subtree, "tools", which uses the host
+ system to create a build toolchain for the target architecture.  The host
+ system must have at least C and C++ compilers in order to create the
  toolchain (make is not required); all other tools are created as part of
  the NetBSD build process.  (See the environment variables section below
  if you need to override or manually select your compilers.)
@@ -45,9 +45,9 @@ FILES
  crypto/dist/, dist/, gnu/dist/
 Sources imported verbatim from third parties, without
 mangling the existing build structure.  Other source trees
-in bin through usr.sbin use the NetBSD make(1)
-``reachover'' Makefile semantics when building these
-programs for a native host.
+in bin through usr.sbin use the NetBSD make(1) "reachover"
+Makefile semantics when building these programs for a
+native host.
 
  external, sys/external
 Sources and build infrastructure for components imported
@@ -68,7 +68,7 @@ FILES
 
  sys/   NetBSD kernel sources.
 
- tools/ ``Reachover'' build structure for the host build tools.
+ tools/ "Reachover" build structure for the host build tools.
 This has a special method of determining out-of-date
 status.
 
@@ -78,11 +78,11 @@ FILES
 during the build.
 
  external/mit/xorg/
-``Reachover'' build structure for modular Xorg; the source
+"Reachover" build structure for modular Xorg; the source
 is in X11SRCDIR.
 
- extsrc/``Reachover'' build structure for externally added
-programs and libraries; the source is in EXTSRCSRCDIR.
+ extsrc/"Reachover" build structure for externally added programs
+and libraries; the source is in EXTSRCSRCDIR.
 
Build tree layout
  The NetBSD build tree is described in hier(7), and the release layout is
@@ -96,14 +96,14 @@ CONFIGURATION
suitable for use during the build.  The NetBSD build
system requires a modern Bourne-like shell with POSIX-
compliant features, and also requires support for the
-   ``local'' keyword to declare local variables in shell
+   "local" keyword to declare local variables in shell
functions (which is a widely-implemented but non-
standardised feature).
 
Depending on the host system, a suitable shell may be
/bin/sh, /usr/xpg4/bin/sh, /bin/ksh (provided it is a
-   variant of ksh that supports the ``local'' keyword,
-   such as ksh88, but not ksh93), or /usr/local/bin/bash.
+   variant of ksh that supports the "local" keyword, such
+   as ksh88, but not ksh93), or /usr/local/bin/bash.
 
Most parts of the build require HOST_SH to be an
absolute path; however, build.sh allows it to be a
@@ -114,9 +114,9 @@ CONFIGURATION
 
  HOST_CXX  Path name to C++ compiler used to create the toolchain.
 
- MACHINE   Machine type, e.g., ``macppc''.
+ MACHINE   Machine type, e.g., "macppc".
 
- MACHINE_ARCH  Machine architecture, e.g., ``powerpc''.
+ MACHINE_ARCH  Machine architecture, e.g., "powerpc".
 
  MAKE  Path name to invoke make(1) as.
 
@@ -162,7 +162,7 @@ CONFIGURATION
  configuration file in order to set additional build
  parameters, such as compiler flags.  It will also be used as
  part of the kernel version string, which can be printed by
- ``uname -v''.
+ "uname -v".
 
  

CVS commit: src

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 20 09:47:53 UTC 2017

Modified Files:
src: BUILDING

Log Message:
regen using regen target in doc.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/BUILDING

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

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 20 09:47:41 UTC 2017

Modified Files:
src/doc: BUILDING.mdoc

Log Message:
Use Fl and Xr. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/doc/BUILDING.mdoc

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

Modified files:

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.117 src/doc/BUILDING.mdoc:1.118
--- src/doc/BUILDING.mdoc:1.117	Thu Apr 20 09:29:10 2017
+++ src/doc/BUILDING.mdoc	Thu Apr 20 09:47:41 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.117 2017/04/20 09:29:10 ozaki-r Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.118 2017/04/20 09:47:41 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -703,10 +703,18 @@ Indicates whether all local symbols shou
 If
 .Dq yes ,
 strip all local symbols from shared libraries;
-the affect is equivalent to -x option of ld(1). If
+the affect is equivalent to the
+.Fl x
+option of
+.Xr  ld 1 .
+If
 .Dq no ,
 strip only temporary local symbols; the affect is equivalent
-to -X option of ld(1). Keeping non-temporary local symbols
+to the
+.Fl X
+option of
+.Xr ld 1 .
+Keeping non-temporary local symbols
 such as static function names is useful on using DTrace for
 userland libraries and getting a backtrace from a rump kernel
 loading shared libraries.

CVS commit: src/doc

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 20 09:47:41 UTC 2017

Modified Files:
src/doc: BUILDING.mdoc

Log Message:
Use Fl and Xr. New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/doc/BUILDING.mdoc

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

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 20 09:29:11 UTC 2017

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.lib.mk bsd.lua.mk bsd.sys.mk

Log Message:
Introduce MKSTRIPSYM build option

If it's yes, all local symbols of shared libraries are stripped
(default). If it's no, only temporary local symbols are stripped;
for example, symbols of static functions are kept. Keeping such
symbols is useful on using DTrace for userland libraries and
getting a backtrace from a rump server loading modules (shared
libraries).

Proposed and discussed on tech-kern and tech-toolchain


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/BUILDING
cvs rdiff -u -r1.116 -r1.117 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.72 -r1.73 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.358 -r1.359 src/share/mk/bsd.README
cvs rdiff -u -r1.368 -r1.369 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.7 -r1.8 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.270 -r1.271 src/share/mk/bsd.sys.mk

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

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.124 src/BUILDING:1.125
--- src/BUILDING:1.124	Mon Feb 20 21:28:48 2017
+++ src/BUILDING	Thu Apr 20 09:29:10 2017
@@ -396,6 +396,18 @@ CONFIGURATION
 
  Default: ``no''
 
+ MKSTRIPSYM  Can be set to ``yes'' or ``no''.  Indicates whether all local
+ symbols should be stripped from shared libraries.  If ``yes'',
+ strip all local symbols from shared libraries; the affect is
+ equivalent to -x option of ld(1). If ``no'', strip only
+ temporary local symbols; the affect is equivalent to -X
+ option of ld(1). Keeping non-temporary local symbols such as
+ static function names is useful on using DTrace for userland
+ libraries and getting a backtrace from a rump kernel loading
+ shared libraries.
+
+ Default: ``yes''
+
  MKUNPRIVED  Can be set to ``yes'' or ``no''.  Indicates whether an
  unprivileged install will occur.  The user, group,
  permissions, and file flags, will not be set on the installed

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.116 src/doc/BUILDING.mdoc:1.117
--- src/doc/BUILDING.mdoc:1.116	Mon Feb 20 20:56:30 2017
+++ src/doc/BUILDING.mdoc	Thu Apr 20 09:29:10 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.116 2017/02/20 20:56:30 christos Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.117 2017/04/20 09:29:10 ozaki-r Exp $
 .\"
 .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" Toolchain prefix for commands
 .ds toolprefix nb
 .
-.Dd February 20, 2017
+.Dd April 13, 2017
 .Dt BUILDING 8
 .Os NetBSD
 .
@@ -697,6 +697,21 @@ Indicates whether RCS IDs, for use with
 should be stripped from program binaries and shared libraries.
 .DFLTn
 .
+.It Sy MKSTRIPSYM
+.YorN
+Indicates whether all local symbols should be stripped from shared libraries.
+If
+.Dq yes ,
+strip all local symbols from shared libraries;
+the affect is equivalent to -x option of ld(1). If
+.Dq no ,
+strip only temporary local symbols; the affect is equivalent
+to -X option of ld(1). Keeping non-temporary local symbols
+such as static function names is useful on using DTrace for
+userland libraries and getting a backtrace from a rump kernel
+loading shared libraries.
+.DFLTy
+.
 .It Sy MKUNPRIVED
 .YorN
 Indicates whether an unprivileged install will occur.

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.72 src/share/man/man5/mk.conf.5:1.73
--- src/share/man/man5/mk.conf.5:1.72	Thu Feb 16 17:15:26 2017
+++ src/share/man/man5/mk.conf.5	Thu Apr 20 09:29:10 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.72 2017/02/16 17:15:26 rin Exp $
+.\"	$NetBSD: mk.conf.5,v 1.73 2017/04/20 09:29:10 ozaki-r Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -783,6 +783,21 @@ Indicates whether RCS IDs, for use with
 should be stripped from program binaries and shared libraries.
 .DFLTn
 .
+.It Sy MKSTRIPSYM
+.YorN
+Indicates whether all local symbols should be stripped from shared libraries.
+If
+.Dq yes ,
+strip all local symbols from shared libraries;
+the affect is equivalent to -x option of ld(1). If
+.Dq no ,
+strip only temporary local symbols; the affect is equivalent
+to -X option of ld(1). Keeping non-temporary local symbols
+such as static function names is useful on using DTrace for
+userland libraries and getting a backtrace from a rump kernel
+loading shared libraries.
+.DFLTy
+.
 .It Sy MKUNPRIVED
 .YorN
 Indicates whether an unprivileged install will occur.

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.358 src/share/mk/bsd.README:1.359

CVS commit: src

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 20 09:29:11 UTC 2017

Modified Files:
src: BUILDING
src/doc: BUILDING.mdoc
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.lib.mk bsd.lua.mk bsd.sys.mk

Log Message:
Introduce MKSTRIPSYM build option

If it's yes, all local symbols of shared libraries are stripped
(default). If it's no, only temporary local symbols are stripped;
for example, symbols of static functions are kept. Keeping such
symbols is useful on using DTrace for userland libraries and
getting a backtrace from a rump server loading modules (shared
libraries).

Proposed and discussed on tech-kern and tech-toolchain


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/BUILDING
cvs rdiff -u -r1.116 -r1.117 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.72 -r1.73 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.358 -r1.359 src/share/mk/bsd.README
cvs rdiff -u -r1.368 -r1.369 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.7 -r1.8 src/share/mk/bsd.lua.mk
cvs rdiff -u -r1.270 -r1.271 src/share/mk/bsd.sys.mk

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 Apr 20 09:19:19 UTC 2017

Modified Files:
src/sys/netinet: sctp_input.c
src/sys/netinet6: sctp6_usrreq.c

Log Message:
Fix build of kernel with SCTP


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/sctp_input.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet6/sctp6_usrreq.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/sctp_input.c
diff -u src/sys/netinet/sctp_input.c:1.4 src/sys/netinet/sctp_input.c:1.5
--- src/sys/netinet/sctp_input.c:1.4	Thu Apr 20 08:46:07 2017
+++ src/sys/netinet/sctp_input.c	Thu Apr 20 09:19:19 2017
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_input.c,v 1.28 2005/04/21 18:36:21 nishida Exp $	*/
-/*	$NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $	*/
+/*	$NetBSD: sctp_input.c,v 1.5 2017/04/20 09:19:19 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.5 2017/04/20 09:19:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -4237,7 +4237,7 @@ sctp_input(struct mbuf *m, ...)
 	 * I very much doubt any of the IPSEC stuff will work but I have
 	 * no idea, so I will leave it in place.
 	 */
-	if (ipsec_used && ipsec4_in_reject(m, inp)) {
+	if (ipsec_used && ipsec4_in_reject(m, (struct inpcb *)inp)) {
 #if 0
 		ipsecstat.in_polvio++;
 #endif

Index: src/sys/netinet6/sctp6_usrreq.c
diff -u src/sys/netinet6/sctp6_usrreq.c:1.12 src/sys/netinet6/sctp6_usrreq.c:1.13
--- src/sys/netinet6/sctp6_usrreq.c:1.12	Thu Apr 20 08:46:07 2017
+++ src/sys/netinet6/sctp6_usrreq.c	Thu Apr 20 09:19:19 2017
@@ -1,5 +1,5 @@
 /* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
-/* $NetBSD: sctp6_usrreq.c,v 1.12 2017/04/20 08:46:07 ozaki-r Exp $ */
+/* $NetBSD: sctp6_usrreq.c,v 1.13 2017/04/20 09:19:19 ozaki-r Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.12 2017/04/20 08:46:07 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp6_usrreq.c,v 1.13 2017/04/20 09:19:19 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -235,7 +235,7 @@ sctp_skip_csum:
 	/*
 	 * Check AH/ESP integrity.
 	 */
-	if (ipsec_used && ipsec6_in_reject(m, in6p)) {
+	if (ipsec_used && ipsec6_in_reject(m, (struct in6pcb *)in6p_ip)) {
 /* XXX */
 #if 0
 		/* FIX ME: need to find right stat */

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 20 09:19:19 UTC 2017

Modified Files:
src/sys/netinet: sctp_input.c
src/sys/netinet6: sctp6_usrreq.c

Log Message:
Fix build of kernel with SCTP


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/netinet/sctp_input.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet6/sctp6_usrreq.c

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 09:18:05 UTC 2017

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

Log Message:
 5776[0156], 5778[02568] and 5779[015] are not Fast Ethernet but
Gigabit Ethernet.


To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/dev/pci/if_bge.c

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

Modified files:

Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.307 src/sys/dev/pci/if_bge.c:1.308
--- src/sys/dev/pci/if_bge.c:1.307	Thu Apr 20 09:03:04 2017
+++ src/sys/dev/pci/if_bge.c	Thu Apr 20 09:18:05 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.307 2017/04/20 09:03:04 msaitoh Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.308 2017/04/20 09:18:05 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.307 2017/04/20 09:03:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.308 2017/04/20 09:18:05 msaitoh Exp $");
 
 #include 
 #include 
@@ -585,11 +585,11 @@ static const struct bge_product {
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57760,
-	  "Broadcom BCM57760 Fast Ethernet",
+	  "Broadcom BCM57760 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57761,
-	  "Broadcom BCM57761 Fast Ethernet",
+	  "Broadcom BCM57761 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57762,
@@ -597,47 +597,47 @@ static const struct bge_product {
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57765,
-	  "Broadcom BCM57765 Fast Ethernet",
+	  "Broadcom BCM57765 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57766,
-	  "Broadcom BCM57766 Fast Ethernet",
+	  "Broadcom BCM57766 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57780,
-	  "Broadcom BCM57780 Fast Ethernet",
+	  "Broadcom BCM57780 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57781,
-	  "Broadcom BCM57781 Fast Ethernet",
+	  "Broadcom BCM57781 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57782,
-	  "Broadcom BCM57782 Fast Ethernet",
+	  "Broadcom BCM57782 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57785,
-	  "Broadcom BCM57785 Fast Ethernet",
+	  "Broadcom BCM57785 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57786,
-	  "Broadcom BCM57786 Fast Ethernet",
+	  "Broadcom BCM57786 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57788,
-	  "Broadcom BCM57788 Fast Ethernet",
+	  "Broadcom BCM57788 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57790,
-	  "Broadcom BCM57790 Fast Ethernet",
+	  "Broadcom BCM57790 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57791,
-	  "Broadcom BCM57791 Fast Ethernet",
+	  "Broadcom BCM57791 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_BROADCOM,
 	  PCI_PRODUCT_BROADCOM_BCM57795,
-	  "Broadcom BCM57795 Fast Ethernet",
+	  "Broadcom BCM57795 Gigabit Ethernet",
 	  },
 	{ PCI_VENDOR_SCHNEIDERKOCH,
 	  PCI_PRODUCT_SCHNEIDERKOCH_SK_9DX1,

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 09:18:05 UTC 2017

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

Log Message:
 5776[0156], 5778[02568] and 5779[015] are not Fast Ethernet but
Gigabit Ethernet.


To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 src/sys/dev/pci/if_bge.c

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

CVS commit: src/sys/net

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Thu Apr 20 09:11:58 UTC 2017

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

Log Message:
missing if_extflags of l2tp(4). l2tp(4) is already MP-safe.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/net/if_l2tp.c

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

CVS commit: src/sys/net

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Thu Apr 20 09:11:58 UTC 2017

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

Log Message:
missing if_extflags of l2tp(4). l2tp(4) is already MP-safe.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/net/if_l2tp.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_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.9 src/sys/net/if_l2tp.c:1.10
--- src/sys/net/if_l2tp.c:1.9	Thu Apr 13 00:12:10 2017
+++ src/sys/net/if_l2tp.c	Thu Apr 20 09:11:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_l2tp.c,v 1.9 2017/04/13 00:12:10 knakahara Exp $	*/
+/*	$NetBSD: if_l2tp.c,v 1.10 2017/04/20 09:11:58 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.9 2017/04/13 00:12:10 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.10 2017/04/20 09:11:58 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -263,6 +263,7 @@ l2tpattach0(struct l2tp_softc *sc)
 	sc->l2tp_ec.ec_if.if_addrlen = 0;
 	sc->l2tp_ec.ec_if.if_mtu= L2TP_MTU;
 	sc->l2tp_ec.ec_if.if_flags  = IFF_POINTOPOINT|IFF_MULTICAST|IFF_SIMPLEX;
+	sc->l2tp_ec.ec_if.if_extflags  = IFEF_OUTPUT_MPSAFE|IFEF_START_MPSAFE;
 	sc->l2tp_ec.ec_if.if_ioctl  = l2tp_ioctl;
 	sc->l2tp_ec.ec_if.if_output = l2tp_output;
 	sc->l2tp_ec.ec_if.if_type   = IFT_L2TP;

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 09:03:05 UTC 2017

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

Log Message:
 Fix device timeout problem when MSI is used on BCM57762, BCM57765 and
BCM57785. Check correctly for BGEF_TAGGED_STATUS. These devices' ASCI core is
BCM5776[56]. Other BSD's BGE_IS_5717_PLUS() include BCM5776[56] but ours
doesn't (because Linux tg3 does so).

 Tested with snj's MacBook (BCM57765 (BCM57765 B0 ASIC)) and my Acer Aspire
One 756 (BCM57785(BCM57765 B0 ASIC)). Also Thunderbolt Ethernet
(BCM57762 (BCM57766 A0 ASIC)) should work.


To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 src/sys/dev/pci/if_bge.c

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 09:03:05 UTC 2017

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

Log Message:
 Fix device timeout problem when MSI is used on BCM57762, BCM57765 and
BCM57785. Check correctly for BGEF_TAGGED_STATUS. These devices' ASCI core is
BCM5776[56]. Other BSD's BGE_IS_5717_PLUS() include BCM5776[56] but ours
doesn't (because Linux tg3 does so).

 Tested with snj's MacBook (BCM57765 (BCM57765 B0 ASIC)) and my Acer Aspire
One 756 (BCM57785(BCM57765 B0 ASIC)). Also Thunderbolt Ethernet
(BCM57762 (BCM57766 A0 ASIC)) should work.


To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 src/sys/dev/pci/if_bge.c

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

Modified files:

Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.306 src/sys/dev/pci/if_bge.c:1.307
--- src/sys/dev/pci/if_bge.c:1.306	Thu Apr 13 09:25:33 2017
+++ src/sys/dev/pci/if_bge.c	Thu Apr 20 09:03:04 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.306 2017/04/13 09:25:33 msaitoh Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.307 2017/04/20 09:03:04 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.306 2017/04/13 09:25:33 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.307 2017/04/20 09:03:04 msaitoh Exp $");
 
 #include 
 #include 
@@ -3785,7 +3785,7 @@ alloc_retry:
 	 * we use tagged status only for MSI case on BCM5717. Otherwise
 	 * MSI on BCM5717 does not work.
 	 */
-	if (BGE_IS_5717_PLUS(sc) && sc->bge_flags & BGEF_MSI)
+	if (BGE_IS_57765_PLUS(sc) && sc->bge_flags & BGEF_MSI)
 		sc->bge_flags |= BGEF_TAGGED_STATUS;
 
 	/*

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 20 08:46:08 UTC 2017

Modified Files:
src/sys/netinet: raw_ip.c sctp_input.c tcp_input.c udp_usrreq.c
src/sys/netinet6: sctp6_usrreq.c udp6_usrreq.c
src/sys/netipsec: ipsec.c ipsec.h ipsec6.h

Log Message:
Remove unnecessary NULL checks for inp_socket and in6p_socket

They cannot be NULL except for programming errors.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctp_input.c
cvs rdiff -u -r1.356 -r1.357 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.232 -r1.233 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet6/sctp6_usrreq.c
cvs rdiff -u -r1.128 -r1.129 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.42 -r1.43 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.16 -r1.17 src/sys/netipsec/ipsec6.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/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.163 src/sys/netinet/raw_ip.c:1.164
--- src/sys/netinet/raw_ip.c:1.163	Fri Mar  3 07:13:06 2017
+++ src/sys/netinet/raw_ip.c	Thu Apr 20 08:46:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.163 2017/03/03 07:13:06 ozaki-r Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.164 2017/04/20 08:46:07 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.163 2017/03/03 07:13:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.164 2017/04/20 08:46:07 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -213,7 +213,7 @@ rip_input(struct mbuf *m, ...)
 #if defined(IPSEC)
 		/* check AH/ESP integrity. */
 		else if (ipsec_used &&
-		ipsec4_in_reject_so(m, last->inp_socket)) {
+		ipsec4_in_reject(m, last)) {
 			IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
 			/* do not inject data to pcb */
 		}
@@ -228,7 +228,7 @@ rip_input(struct mbuf *m, ...)
 #if defined(IPSEC)
 	/* check AH/ESP integrity. */
 	if (ipsec_used && last != NULL
-	&& ipsec4_in_reject_so(m, last->inp_socket)) {
+	&& ipsec4_in_reject(m, last)) {
 		m_freem(m);
 		IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
 		IP_STATDEC(IP_STAT_DELIVERED);

Index: src/sys/netinet/sctp_input.c
diff -u src/sys/netinet/sctp_input.c:1.3 src/sys/netinet/sctp_input.c:1.4
--- src/sys/netinet/sctp_input.c:1.3	Fri Jun 10 13:31:44 2016
+++ src/sys/netinet/sctp_input.c	Thu Apr 20 08:46:07 2017
@@ -1,5 +1,5 @@
 /*	$KAME: sctp_input.c,v 1.28 2005/04/21 18:36:21 nishida Exp $	*/
-/*	$NetBSD: sctp_input.c,v 1.3 2016/06/10 13:31:44 ozaki-r Exp $	*/
+/*	$NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.3 2016/06/10 13:31:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_input.c,v 1.4 2017/04/20 08:46:07 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
@@ -4237,7 +4237,7 @@ sctp_input(struct mbuf *m, ...)
 	 * I very much doubt any of the IPSEC stuff will work but I have
 	 * no idea, so I will leave it in place.
 	 */
-	if (ipsec_used && ipsec4_in_reject_so(m, inp->ip_inp.inp.inp_socket)) {
+	if (ipsec_used && ipsec4_in_reject(m, inp)) {
 #if 0
 		ipsecstat.in_polvio++;
 #endif

Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.356 src/sys/netinet/tcp_input.c:1.357
--- src/sys/netinet/tcp_input.c:1.356	Fri Mar 31 06:49:44 2017
+++ src/sys/netinet/tcp_input.c	Thu Apr 20 08:46:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_input.c,v 1.356 2017/03/31 06:49:44 ozaki-r Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.357 2017/04/20 08:46:07 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.356 2017/03/31 06:49:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.357 2017/04/20 08:46:07 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1484,7 +1484,7 @@ findpcb:
 #ifdef INET6
 			else if (in6p &&
 			(in6p->in6p_socket->so_options & SO_ACCEPTCONN) == 0
-			&& ipsec6_in_reject_so(m, in6p->in6p_socket)) {
+			&& ipsec6_in_reject(m, in6p)) {
 IPSEC_STATINC(IPSEC_STAT_IN_POLVIO);
 goto drop;
 			}
@@ -1835,7 +1835,8 @@ findpcb:
 	switch (af) {
 #ifdef INET
 	case AF_INET:
-		if (!ipsec4_in_reject_so(m, so))
+		KASSERT(sotoinpcb(so) == inp);
+		if (!ipsec4_in_reject(m, inp))
 			break;
 		IPSEC_STATINC(
 		IPSEC_STAT_IN_POLVIO);
@@ -1844,7 +1845,8 @@ findpcb:
 #endif
 #ifdef INET6
 	case AF_INET6:
-		if (!ipsec6_in_reject_so(m, so))
+		KASSERT(sotoin6pcb(so) == in6p);
+		if (!ipsec6_in_reject(m, in6p))
 			break;
 		IPSEC6_STATINC(
 		

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 08:45:25 UTC 2017

Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h

Log Message:
 Add Downstream Port Containment (DPC) ECN and Enhanced DPC(eDPC) ECN.


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/pci/pcireg.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 Apr 20 08:46:08 UTC 2017

Modified Files:
src/sys/netinet: raw_ip.c sctp_input.c tcp_input.c udp_usrreq.c
src/sys/netinet6: sctp6_usrreq.c udp6_usrreq.c
src/sys/netipsec: ipsec.c ipsec.h ipsec6.h

Log Message:
Remove unnecessary NULL checks for inp_socket and in6p_socket

They cannot be NULL except for programming errors.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctp_input.c
cvs rdiff -u -r1.356 -r1.357 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.232 -r1.233 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet6/sctp6_usrreq.c
cvs rdiff -u -r1.128 -r1.129 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.42 -r1.43 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.16 -r1.17 src/sys/netipsec/ipsec6.h

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

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Thu Apr 20 08:45:25 UTC 2017

Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h

Log Message:
 Add Downstream Port Containment (DPC) ECN and Enhanced DPC(eDPC) ECN.


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/pci/pcireg.h

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

Modified files:

Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.175 src/sys/dev/pci/pci_subr.c:1.176
--- src/sys/dev/pci/pci_subr.c:1.175	Thu Apr 20 05:48:38 2017
+++ src/sys/dev/pci/pci_subr.c	Thu Apr 20 08:45:25 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.175 2017/04/20 05:48:38 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.176 2017/04/20 08:45:25 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.175 2017/04/20 05:48:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.176 2017/04/20 08:45:25 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -3525,7 +3525,145 @@ pci_conf_print_lnr_cap(const pcireg_t *r
 	printf("  LNR Registration Limit: %u\n", num);
 }
 
-/* XXX pci_conf_print_dpc_cap */
+static void
+pci_conf_print_dpc_pio(pcireg_t r)
+{
+	onoff("Cfg Request received UR Completion", r,PCI_DPC_RPPIO_CFGUR_CPL);
+	onoff("Cfg Request received CA Completion", r,PCI_DPC_RPPIO_CFGCA_CPL);
+	onoff("Cfg Request Completion Timeout", r, PCI_DPC_RPPIO_CFG_CTO);
+	onoff("I/O Request received UR Completion", r, PCI_DPC_RPPIO_IOUR_CPL);
+	onoff("I/O Request received CA Completion", r, PCI_DPC_RPPIO_IOCA_CPL);
+	onoff("I/O Request Completion Timeout", r, PCI_DPC_RPPIO_IO_CTO);
+	onoff("Mem Request received UR Completion", r,PCI_DPC_RPPIO_MEMUR_CPL);
+	onoff("Mem Request received CA Completion", r,PCI_DPC_RPPIO_MEMCA_CPL);
+	onoff("Mem Request Completion Timeout", r, PCI_DPC_RPPIO_MEM_CTO);
+}
+
+static void
+pci_conf_print_dpc_cap(const pcireg_t *regs, int capoff, int extcapoff)
+{
+	pcireg_t reg, cap, ctl, stat, errsrc;
+	const char *trigstr;
+	bool rpext;
+
+	printf("\n  Downstream Port Containment\n");
+
+	reg = regs[o2i(extcapoff + PCI_DPC_CCR)];
+	cap = reg & 0x;
+	ctl = reg >> 16;
+	rpext = (reg & PCI_DPCCAP_RPEXT) ? true : false;
+	printf("DPC Capability register: 0x%04x\n", cap);
+	printf("  DPC Interrupt Message Number: %02x\n",
+	(unsigned int)(cap & PCI_DPCCAP_IMSGN));
+	onoff("RP Extensions for DPC", reg, PCI_DPCCAP_RPEXT);
+	onoff("Poisoned TLP Egress Blocking Supported", reg,
+	PCI_DPCCAP_POISONTLPEB);
+	onoff("DPC Software Triggering Supported", reg, PCI_DPCCAP_SWTRIG);
+	printf("  RP PIO Log Size: %u\n",
+	(unsigned int)__SHIFTOUT(reg, PCI_DPCCAP_RPPIOLOGSZ));
+	onoff("DL_Active ERR_COR Signaling Supported", reg,
+	PCI_DPCCAP_DLACTECORS);
+	printf("DPC Control register: 0x%04x\n", ctl);
+	switch (__SHIFTOUT(reg, PCI_DPCCTL_TIRGEN)) {
+	case 0:
+		trigstr = "disabled";
+		break;
+	case 1:
+		trigstr = "enabled(ERR_FATAL)";
+		break;
+	case 2:
+		trigstr = "enabled(ERR_NONFATAL or ERR_FATAL)";
+		break;
+	default:
+		trigstr = "(reserverd)";
+		break;
+	}
+	printf("  DPC Trigger Enable: %s\n", trigstr);
+	printf("  DPC Completion Control: %s Completion Status\n",
+	(reg & PCI_DPCCTL_COMPCTL)
+	? "Unsupported Request(UR)" : "Completer Abort(CA)");
+	onoff("DPC Interrupt Enable", reg, PCI_DPCCTL_IE);
+	onoff("DPC ERR_COR Enable", reg, PCI_DPCCTL_ERRCOREN);
+	onoff("Poisoned TLP Egress Blocking Enable", reg,
+	PCI_DPCCTL_POISONTLPEB);
+	onoff("DPC Software Trigger", reg, PCI_DPCCTL_SWTRIG);
+	onoff("DL_Active ERR_COR Enable", reg, PCI_DPCCTL_DLACTECOR);
+
+	reg = regs[o2i(extcapoff + PCI_DPC_STATESID)];
+	stat = reg & 0x;
+	errsrc = reg >> 16;
+	printf("DPC Status register: 0x%04x\n", stat);
+	onoff("DPC Trigger Status", reg, PCI_DPCSTAT_TSTAT);
+	switch (__SHIFTOUT(reg, PCI_DPCSTAT_TREASON)) {
+	case 0:
+		trigstr = "an unmasked uncorrectable error";
+		break;
+	case 1:
+		trigstr = "receiving an ERR_NONFATAL";
+		break;
+	case 2:
+		trigstr = "receiving an ERR_FATAL";
+		break;
+	case 3:
+		trigstr = "DPC Trigger Reason Extension field";
+		break;
+	}
+	printf("  DPC Trigger Reason: Due to %s\n", trigstr);
+	onoff("DPC Interrupt Status", reg, PCI_DPCSTAT_ISTAT);
+	if (rpext)
+		onoff("DPC RP Busy", reg, PCI_DPCSTAT_RPBUSY);
+	switch (__SHIFTOUT(reg, PCI_DPCSTAT_TREASON)) {
+	case 0:
+		trigstr = "Due to RP PIO error";
+		break;
+	case 1:
+		trigstr = "Due to the DPC Software trigger bit";
+		break;
+	default:
+		trigstr = "(reserved)";
+		break;
+	}
+	printf("  DPC Trigger Reason Extension: %s\n", trigstr);
+	if (rpext)
+		printf("  RP PIO First Error Pointer: %02x\n",
+		(unsigned int)__SHIFTOUT(reg, PCI_DPCSTAT_RPPIOFEP));
+	printf("DPC Error Source ID register: 

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 20 08:45:09 UTC 2017

Modified Files:
src/sys/netinet: in_pcb.c udp_usrreq.c
src/sys/netinet6: in6_pcb.c udp6_usrreq.c

Log Message:
Simplify logic of udp4_sendup and udp6_sendup

They are always passed a socket with the same protocol faimiliy
as its own: AF_INET for udp4_sendup and AF_INET6 for udp6_sendup.


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.231 -r1.232 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.159 -r1.160 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.127 -r1.128 src/sys/netinet6/udp6_usrreq.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/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.176 src/sys/netinet/in_pcb.c:1.177
--- src/sys/netinet/in_pcb.c:1.176	Thu Mar  2 05:29:31 2017
+++ src/sys/netinet/in_pcb.c	Thu Apr 20 08:45:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_pcb.c,v 1.176 2017/03/02 05:29:31 ozaki-r Exp $	*/
+/*	$NetBSD: in_pcb.c,v 1.177 2017/04/20 08:45:09 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.176 2017/03/02 05:29:31 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.177 2017/04/20 08:45:09 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -192,6 +192,8 @@ in_pcballoc(struct socket *so, void *v)
 	struct inpcb *inp;
 	int s;
 
+	KASSERT(so->so_proto->pr_domain->dom_family == AF_INET);
+
 	inp = pool_get(_pool, PR_NOWAIT);
 	if (inp == NULL)
 		return (ENOBUFS);

Index: src/sys/netinet/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.231 src/sys/netinet/udp_usrreq.c:1.232
--- src/sys/netinet/udp_usrreq.c:1.231	Fri Mar  3 07:13:06 2017
+++ src/sys/netinet/udp_usrreq.c	Thu Apr 20 08:45:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.231 2017/03/03 07:13:06 ozaki-r Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.232 2017/04/20 08:45:09 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.231 2017/03/03 07:13:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.232 2017/04/20 08:45:09 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -468,21 +468,13 @@ udp4_sendup(struct mbuf *m, int off /* o
 {
 	struct mbuf *opts = NULL;
 	struct mbuf *n;
-	struct inpcb *inp = NULL;
+	struct inpcb *inp;
 
 	if (!so)
 		return;
-	switch (so->so_proto->pr_domain->dom_family) {
-	case AF_INET:
-		inp = sotoinpcb(so);
-		break;
-#ifdef INET6
-	case AF_INET6:
-		break;
-#endif
-	default:
-		return;
-	}
+	KASSERT(so->so_proto->pr_domain->dom_family == AF_INET);
+	inp = sotoinpcb(so);
+	KASSERT(inp != NULL);
 
 #if defined(IPSEC)
 	/* check AH/ESP integrity. */
@@ -496,11 +488,11 @@ udp4_sendup(struct mbuf *m, int off /* o
 #endif /*IPSEC*/
 
 	if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) {
-		if (inp && (inp->inp_flags & INP_CONTROLOPTS
+		if (inp->inp_flags & INP_CONTROLOPTS
 #ifdef SO_OTIMESTAMP
 			 || so->so_options & SO_OTIMESTAMP
 #endif
-			 || so->so_options & SO_TIMESTAMP)) {
+			 || so->so_options & SO_TIMESTAMP) {
 			struct ip *ip = mtod(n, struct ip *);
 			ip_savecontrol(inp, , ip, n);
 		}

Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.159 src/sys/netinet6/in6_pcb.c:1.160
--- src/sys/netinet6/in6_pcb.c:1.159	Thu Mar  2 05:26:24 2017
+++ src/sys/netinet6/in6_pcb.c	Thu Apr 20 08:45:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_pcb.c,v 1.159 2017/03/02 05:26:24 ozaki-r Exp $	*/
+/*	$NetBSD: in6_pcb.c,v 1.160 2017/04/20 08:45:09 ozaki-r Exp $	*/
 /*	$KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.159 2017/03/02 05:26:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.160 2017/04/20 08:45:09 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -158,6 +158,8 @@ in6_pcballoc(struct socket *so, void *v)
 	struct in6pcb *in6p;
 	int s;
 
+	KASSERT(so->so_proto->pr_domain->dom_family == AF_INET6);
+
 	in6p = pool_get(_pool, PR_NOWAIT);
 	if (in6p == NULL)
 		return (ENOBUFS);

Index: src/sys/netinet6/udp6_usrreq.c
diff -u src/sys/netinet6/udp6_usrreq.c:1.127 src/sys/netinet6/udp6_usrreq.c:1.128
--- src/sys/netinet6/udp6_usrreq.c:1.127	Tue Jan 24 07:09:25 2017
+++ src/sys/netinet6/udp6_usrreq.c	Thu Apr 20 08:45:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp6_usrreq.c,v 1.127 2017/01/24 07:09:25 ozaki-r Exp $	*/
+/*	$NetBSD: udp6_usrreq.c,v 1.128 2017/04/20 08:45:09 ozaki-r Exp $	*/
 /*	$KAME: udp6_usrreq.c,v 1.86 2001/05/27 17:33:00 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.127 2017/01/24 07:09:25 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_usrreq.c,v 1.128 2017/04/20 08:45:09 

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 20 08:45:09 UTC 2017

Modified Files:
src/sys/netinet: in_pcb.c udp_usrreq.c
src/sys/netinet6: in6_pcb.c udp6_usrreq.c

Log Message:
Simplify logic of udp4_sendup and udp6_sendup

They are always passed a socket with the same protocol faimiliy
as its own: AF_INET for udp4_sendup and AF_INET6 for udp6_sendup.


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.231 -r1.232 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.159 -r1.160 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.127 -r1.128 src/sys/netinet6/udp6_usrreq.c

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

CVS commit: src/lib/libterminfo

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Thu Apr 20 08:34:23 UTC 2017

Modified Files:
src/lib/libterminfo: term.c

Log Message:
Whitespace, fit in 80 and extra braces for readability.
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libterminfo/term.c

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

CVS commit: src/lib/libterminfo

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Thu Apr 20 08:34:23 UTC 2017

Modified Files:
src/lib/libterminfo: term.c

Log Message:
Whitespace, fit in 80 and extra braces for readability.
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libterminfo/term.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/libterminfo/term.c
diff -u src/lib/libterminfo/term.c:1.20 src/lib/libterminfo/term.c:1.21
--- src/lib/libterminfo/term.c:1.20	Thu Nov 24 17:09:55 2016
+++ src/lib/libterminfo/term.c	Thu Apr 20 08:34:23 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.20 2016/11/24 17:09:55 christos Exp $ */
+/* $NetBSD: term.c,v 1.21 2017/04/20 08:34:23 roy Exp $ */
 
 /*
  * Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: term.c,v 1.20 2016/11/24 17:09:55 christos Exp $");
+__RCSID("$NetBSD: term.c,v 1.21 2017/04/20 08:34:23 roy Exp $");
 
 #include 
 
@@ -86,14 +86,13 @@ _ti_readterm(TERMINAL *term, const char 
 	if (ver != 1)
 		goto out;
 
-
-	if (allocset(>flags, 0, TIFLAGMAX + 1, sizeof(*term->flags)) == -1)
+	if (allocset(>flags, 0, TIFLAGMAX+1, sizeof(*term->flags)) == -1)
 		return -1;
 
-	if (allocset(>nums, -1, TINUMMAX + 1, sizeof(*term->nums)) == -1)
+	if (allocset(>nums, -1, TINUMMAX+1, sizeof(*term->nums)) == -1)
 		return -1;
 
-	if (allocset(>strs, 0, TISTRMAX + 1, sizeof(*term->strs)) == -1)
+	if (allocset(>strs, 0, TISTRMAX+1, sizeof(*term->strs)) == -1)
 		return -1;
 
 	if (term->_arealen != caplen) {
@@ -293,7 +292,7 @@ _ti_dbgetterm(TERMINAL *term, const char
 	cdbr_close(db);
 	return r;
 
- fail:
+fail:
 	cdbr_close(db);
 	return 0;
 }
@@ -368,9 +367,10 @@ _ti_findterm(TERMINAL *term, const char 
 	_ti_database = NULL;
 	r = 0;
 
-	if ((e = getenv("TERMINFO")) != NULL && *e != '\0')
+	if ((e = getenv("TERMINFO")) != NULL && *e != '\0') {
 		if (e[0] == '/')
 			return _ti_dbgetterm(term, e, name, flags);
+	}
 
 	c = NULL;
 	if (e == NULL && (c = getenv("TERMCAP")) != NULL) {
@@ -422,7 +422,6 @@ _ti_findterm(TERMINAL *term, const char 
 		r = _ti_dbgettermp(term, _PATH_TERMINFO, name, flags);
 
 	return r;
-
 }
 
 int

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 07:07:28 UTC 2017

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

Log Message:
1396, 1405


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-7.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-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.11 src/doc/CHANGES-7.2:1.1.2.12
--- src/doc/CHANGES-7.2:1.1.2.11	Wed Apr 19 17:17:17 2017
+++ src/doc/CHANGES-7.2	Thu Apr 20 07:07:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.11 2017/04/19 17:17:17 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.12 2017/04/20 07:07:28 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -640,3 +640,288 @@ sys/rump/dev/lib/libugenhc/ugenhc.c		1.2
 	Now ugenhc works again after a four-year hiatus.
 	[skrll, ticket #1403]
 
+doc/3RDPARTY	1.1431
+external/bsd/ntp/bin/ntpd/ntp.keys.5up to 1.2
+external/bsd/ntp/dist/COPYRIGHT up to 1.1.1.8
+external/bsd/ntp/dist/ChangeLog up to 1.1.1.12
+external/bsd/ntp/dist/CommitLog up to 1.1.1.12
+external/bsd/ntp/dist/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/NEWS  up to 1.1.1.12
+external/bsd/ntp/dist/aclocal.m4up to 1.1.1.10
+external/bsd/ntp/dist/adjtimed/Makefile.am  up to 1.1.1.4
+external/bsd/ntp/dist/adjtimed/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/clockstuff/Makefile.amup to 1.1.1.3
+external/bsd/ntp/dist/clockstuff/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/config.h.in   up to 1.1.1.9
+external/bsd/ntp/dist/configure up to 1.1.1.12
+external/bsd/ntp/dist/configure.ac  up to 1.1.1.10
+external/bsd/ntp/dist/html/copyright.html   up to 1.1.1.6
+external/bsd/ntp/dist/include/Makefile.in   up to 1.1.1.11
+external/bsd/ntp/dist/include/isc/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/include/libssl_compat.h   up to 1.1.1.2
+external/bsd/ntp/dist/include/ntp_crypto.h  up to 1.5
+external/bsd/ntp/dist/include/ntp_fp.h  up to 1.9
+external/bsd/ntp/dist/include/ntp_md5.h up to 1.7
+external/bsd/ntp/dist/include/ntp_stdlib.h  up to 1.14
+external/bsd/ntp/dist/include/ntpd.hup to 1.10
+external/bsd/ntp/dist/include/ssl_applink.c up to 1.5
+external/bsd/ntp/dist/kernel/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/kernel/sys/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/lib/isc/inet_pton.c   up to 1.8
+external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.8
+external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.11
+external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.8
+external/bsd/ntp/dist/libntp/audio.cup to 1.12
+external/bsd/ntp/dist/libntp/authkeys.c up to 1.11
+external/bsd/ntp/dist/libntp/emalloc.c  up to 1.8
+external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.2
+external/bsd/ntp/dist/libntp/ntp_intres.c   up to 1.11
+external/bsd/ntp/dist/libntp/recvbuff.c up to 1.7
+external/bsd/ntp/dist/libntp/ssl_init.c up to 1.10
+external/bsd/ntp/dist/libntp/statestr.c up to 1.6
+external/bsd/ntp/dist/libntp/work_fork.cup to 1.11
+external/bsd/ntp/dist/libparse/Makefile.am  up to 1.1.1.5
+external/bsd/ntp/dist/libparse/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/libparse/clk_trimtsip.c   up to 1.6
+external/bsd/ntp/dist/libparse/gpstolfp.c   up to 1.6
+external/bsd/ntp/dist/ntpd/Makefile.am  up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc   up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.man.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc   up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.man.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.17
+external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.19
+external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.14
+external/bsd/ntp/dist/ntpd/ntp_io.c up to 1.25
+external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.11
+external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.16
+external/bsd/ntp/dist/ntpd/ntp_peer.c 

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 07:07:28 UTC 2017

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

Log Message:
1396, 1405


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-7.2

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

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 07:04:48 UTC 2017

Modified Files:
src/sys/arch/hppa/hppa [netbsd-7]: machdep.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1396):
sys/arch/hppa/hppa/machdep.c: revision 1.7
PR/52129: NetBSD/hppa 7.1 fails to boot on 712/60
Add 712/* models to cpu_model_cpuid


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/arch/hppa/hppa/machdep.c

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

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 07:04:48 UTC 2017

Modified Files:
src/sys/arch/hppa/hppa [netbsd-7]: machdep.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1396):
sys/arch/hppa/hppa/machdep.c: revision 1.7
PR/52129: NetBSD/hppa 7.1 fails to boot on 712/60
Add 712/* models to cpu_model_cpuid


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/arch/hppa/hppa/machdep.c

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

Modified files:

Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.4 src/sys/arch/hppa/hppa/machdep.c:1.4.6.1
--- src/sys/arch/hppa/hppa/machdep.c:1.4	Fri Apr 18 18:32:00 2014
+++ src/sys/arch/hppa/hppa/machdep.c	Thu Apr 20 07:04:48 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.4 2014/04/18 18:32:00 martin Exp $	*/
+/*	$NetBSD: machdep.c,v 1.4.6.1 2017/04/20 07:04:48 snj Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2014/04/18 18:32:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4.6.1 2017/04/20 07:04:48 snj Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -861,6 +861,9 @@ cpu_model_cpuid(int modelno)
 	case HPPA_BOARD_HPE25:
 	case HPPA_BOARD_HPE35:
 	case HPPA_BOARD_HPE45:
+	case HPPA_BOARD_HP712_60:
+	case HPPA_BOARD_HP712_80:
+	case HPPA_BOARD_HP712_100:
 	case HPPA_BOARD_HP715_80:
 	case HPPA_BOARD_HP715_64:
 	case HPPA_BOARD_HP715_100:

CVS commit: [netbsd-7] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:47:49 UTC 2017

Modified Files:
src/doc [netbsd-7]: 3RDPARTY
src/external/bsd/ntp [netbsd-7]: importdate
src/external/bsd/ntp/bin/ntpd [netbsd-7]: ntp.keys.5
src/external/bsd/ntp/dist [netbsd-7]: COPYRIGHT ChangeLog CommitLog
Makefile.in NEWS aclocal.m4 config.h.in configure configure.ac
packageinfo.sh
src/external/bsd/ntp/dist/adjtimed [netbsd-7]: Makefile.am Makefile.in
src/external/bsd/ntp/dist/clockstuff [netbsd-7]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/html [netbsd-7]: copyright.html
src/external/bsd/ntp/dist/include [netbsd-7]: Makefile.in
libssl_compat.h ntp_crypto.h ntp_fp.h ntp_md5.h ntp_stdlib.h ntpd.h
ssl_applink.c
src/external/bsd/ntp/dist/include/isc [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/kernel [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/kernel/sys [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/lib/isc [netbsd-7]: inet_pton.c
src/external/bsd/ntp/dist/libntp [netbsd-7]: Makefile.am Makefile.in
a_md5encrypt.c audio.c authkeys.c emalloc.c libssl_compat.c
ntp_intres.c recvbuff.c ssl_init.c statestr.c work_fork.c
src/external/bsd/ntp/dist/libparse [netbsd-7]: Makefile.am Makefile.in
clk_trimtsip.c gpstolfp.c
src/external/bsd/ntp/dist/ntpd [netbsd-7]: Makefile.am Makefile.in
invoke-ntp.conf.texi invoke-ntp.keys.texi invoke-ntpd.texi
ntp.conf.5man ntp.conf.5mdoc ntp.conf.html ntp.conf.man.in
ntp.conf.mdoc.in ntp.keys.5man ntp.keys.5mdoc ntp.keys.html
ntp.keys.man.in ntp.keys.mdoc.in ntp_config.c ntp_control.c
ntp_crypto.c ntp_io.c ntp_loopfilter.c ntp_parser.y ntp_peer.c
ntp_proto.c ntp_restrict.c ntp_scanner.c ntpd-opts.c ntpd-opts.h
ntpd.1ntpdman ntpd.1ntpdmdoc ntpd.c ntpd.html ntpd.man.in
ntpd.mdoc.in refclock_datum.c refclock_gpsdjson.c refclock_jjy.c
refclock_mx4200.c refclock_nmea.c refclock_oncore.c
refclock_parse.c
src/external/bsd/ntp/dist/ntpdate [netbsd-7]: Makefile.am Makefile.in
ntpdate.c
src/external/bsd/ntp/dist/ntpdc [netbsd-7]: Makefile.am Makefile.in
invoke-ntpdc.texi ntpdc-opts.c ntpdc-opts.h ntpdc.1ntpdcman
ntpdc.1ntpdcmdoc ntpdc.c ntpdc.html ntpdc.man.in ntpdc.mdoc.in
ntpdc_ops.c
src/external/bsd/ntp/dist/ntpq [netbsd-7]: Makefile.am Makefile.in
invoke-ntpq.texi libntpq.c ntpq-opts.c ntpq-opts.h ntpq-subs.c
ntpq.1ntpqman ntpq.1ntpqmdoc ntpq.c ntpq.html ntpq.man.in
ntpq.mdoc.in
src/external/bsd/ntp/dist/ntpsnmpd [netbsd-7]: Makefile.am Makefile.in
invoke-ntpsnmpd.texi ntpsnmpd-opts.c ntpsnmpd-opts.h
ntpsnmpd.1ntpsnmpdman ntpsnmpd.1ntpsnmpdmdoc ntpsnmpd.html
ntpsnmpd.man.in ntpsnmpd.mdoc.in
src/external/bsd/ntp/dist/parseutil [netbsd-7]: Makefile.am Makefile.in
src/external/bsd/ntp/dist/scripts [netbsd-7]: Makefile.in
invoke-plot_summary.texi invoke-summary.texi plot_summary-opts
plot_summary.1plot_summaryman plot_summary.1plot_summarymdoc
plot_summary.html plot_summary.man.in plot_summary.mdoc.in
summary-opts summary.1summaryman summary.1summarymdoc summary.html
summary.man.in summary.mdoc.in
src/external/bsd/ntp/dist/scripts/build [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/scripts/calc_tickadj [netbsd-7]: Makefile.in
calc_tickadj.1calc_tickadjman calc_tickadj.1calc_tickadjmdoc
calc_tickadj.html calc_tickadj.man.in calc_tickadj.mdoc.in
invoke-calc_tickadj.texi
src/external/bsd/ntp/dist/scripts/lib [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/scripts/ntp-wait [netbsd-7]: Makefile.in
invoke-ntp-wait.texi ntp-wait-opts ntp-wait.1ntp-waitman
ntp-wait.1ntp-waitmdoc ntp-wait.html ntp-wait.man.in
ntp-wait.mdoc.in
src/external/bsd/ntp/dist/scripts/ntpsweep [netbsd-7]: Makefile.in
invoke-ntpsweep.texi ntpsweep-opts ntpsweep.1ntpsweepman
ntpsweep.1ntpsweepmdoc ntpsweep.html ntpsweep.man.in
ntpsweep.mdoc.in
src/external/bsd/ntp/dist/scripts/ntptrace [netbsd-7]: Makefile.in
invoke-ntptrace.texi ntptrace-opts ntptrace.1ntptraceman
ntptrace.1ntptracemdoc ntptrace.html ntptrace.man.in
ntptrace.mdoc.in
src/external/bsd/ntp/dist/scripts/update-leap [netbsd-7]: Makefile.in
invoke-update-leap.texi update-leap-opts
update-leap.1update-leapman update-leap.1update-leapmdoc
update-leap.html update-leap.man.in update-leap.mdoc.in
src/external/bsd/ntp/dist/sntp [netbsd-7]: COPYRIGHT Makefile.am

CVS commit: [netbsd-7] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:47:49 UTC 2017

Modified Files:
src/doc [netbsd-7]: 3RDPARTY
src/external/bsd/ntp [netbsd-7]: importdate
src/external/bsd/ntp/bin/ntpd [netbsd-7]: ntp.keys.5
src/external/bsd/ntp/dist [netbsd-7]: COPYRIGHT ChangeLog CommitLog
Makefile.in NEWS aclocal.m4 config.h.in configure configure.ac
packageinfo.sh
src/external/bsd/ntp/dist/adjtimed [netbsd-7]: Makefile.am Makefile.in
src/external/bsd/ntp/dist/clockstuff [netbsd-7]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/html [netbsd-7]: copyright.html
src/external/bsd/ntp/dist/include [netbsd-7]: Makefile.in
libssl_compat.h ntp_crypto.h ntp_fp.h ntp_md5.h ntp_stdlib.h ntpd.h
ssl_applink.c
src/external/bsd/ntp/dist/include/isc [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/kernel [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/kernel/sys [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/lib/isc [netbsd-7]: inet_pton.c
src/external/bsd/ntp/dist/libntp [netbsd-7]: Makefile.am Makefile.in
a_md5encrypt.c audio.c authkeys.c emalloc.c libssl_compat.c
ntp_intres.c recvbuff.c ssl_init.c statestr.c work_fork.c
src/external/bsd/ntp/dist/libparse [netbsd-7]: Makefile.am Makefile.in
clk_trimtsip.c gpstolfp.c
src/external/bsd/ntp/dist/ntpd [netbsd-7]: Makefile.am Makefile.in
invoke-ntp.conf.texi invoke-ntp.keys.texi invoke-ntpd.texi
ntp.conf.5man ntp.conf.5mdoc ntp.conf.html ntp.conf.man.in
ntp.conf.mdoc.in ntp.keys.5man ntp.keys.5mdoc ntp.keys.html
ntp.keys.man.in ntp.keys.mdoc.in ntp_config.c ntp_control.c
ntp_crypto.c ntp_io.c ntp_loopfilter.c ntp_parser.y ntp_peer.c
ntp_proto.c ntp_restrict.c ntp_scanner.c ntpd-opts.c ntpd-opts.h
ntpd.1ntpdman ntpd.1ntpdmdoc ntpd.c ntpd.html ntpd.man.in
ntpd.mdoc.in refclock_datum.c refclock_gpsdjson.c refclock_jjy.c
refclock_mx4200.c refclock_nmea.c refclock_oncore.c
refclock_parse.c
src/external/bsd/ntp/dist/ntpdate [netbsd-7]: Makefile.am Makefile.in
ntpdate.c
src/external/bsd/ntp/dist/ntpdc [netbsd-7]: Makefile.am Makefile.in
invoke-ntpdc.texi ntpdc-opts.c ntpdc-opts.h ntpdc.1ntpdcman
ntpdc.1ntpdcmdoc ntpdc.c ntpdc.html ntpdc.man.in ntpdc.mdoc.in
ntpdc_ops.c
src/external/bsd/ntp/dist/ntpq [netbsd-7]: Makefile.am Makefile.in
invoke-ntpq.texi libntpq.c ntpq-opts.c ntpq-opts.h ntpq-subs.c
ntpq.1ntpqman ntpq.1ntpqmdoc ntpq.c ntpq.html ntpq.man.in
ntpq.mdoc.in
src/external/bsd/ntp/dist/ntpsnmpd [netbsd-7]: Makefile.am Makefile.in
invoke-ntpsnmpd.texi ntpsnmpd-opts.c ntpsnmpd-opts.h
ntpsnmpd.1ntpsnmpdman ntpsnmpd.1ntpsnmpdmdoc ntpsnmpd.html
ntpsnmpd.man.in ntpsnmpd.mdoc.in
src/external/bsd/ntp/dist/parseutil [netbsd-7]: Makefile.am Makefile.in
src/external/bsd/ntp/dist/scripts [netbsd-7]: Makefile.in
invoke-plot_summary.texi invoke-summary.texi plot_summary-opts
plot_summary.1plot_summaryman plot_summary.1plot_summarymdoc
plot_summary.html plot_summary.man.in plot_summary.mdoc.in
summary-opts summary.1summaryman summary.1summarymdoc summary.html
summary.man.in summary.mdoc.in
src/external/bsd/ntp/dist/scripts/build [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/scripts/calc_tickadj [netbsd-7]: Makefile.in
calc_tickadj.1calc_tickadjman calc_tickadj.1calc_tickadjmdoc
calc_tickadj.html calc_tickadj.man.in calc_tickadj.mdoc.in
invoke-calc_tickadj.texi
src/external/bsd/ntp/dist/scripts/lib [netbsd-7]: Makefile.in
src/external/bsd/ntp/dist/scripts/ntp-wait [netbsd-7]: Makefile.in
invoke-ntp-wait.texi ntp-wait-opts ntp-wait.1ntp-waitman
ntp-wait.1ntp-waitmdoc ntp-wait.html ntp-wait.man.in
ntp-wait.mdoc.in
src/external/bsd/ntp/dist/scripts/ntpsweep [netbsd-7]: Makefile.in
invoke-ntpsweep.texi ntpsweep-opts ntpsweep.1ntpsweepman
ntpsweep.1ntpsweepmdoc ntpsweep.html ntpsweep.man.in
ntpsweep.mdoc.in
src/external/bsd/ntp/dist/scripts/ntptrace [netbsd-7]: Makefile.in
invoke-ntptrace.texi ntptrace-opts ntptrace.1ntptraceman
ntptrace.1ntptracemdoc ntptrace.html ntptrace.man.in
ntptrace.mdoc.in
src/external/bsd/ntp/dist/scripts/update-leap [netbsd-7]: Makefile.in
invoke-update-leap.texi update-leap-opts
update-leap.1update-leapman update-leap.1update-leapmdoc
update-leap.html update-leap.man.in update-leap.mdoc.in
src/external/bsd/ntp/dist/sntp [netbsd-7]: COPYRIGHT Makefile.am

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:46:16 UTC 2017

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

Log Message:
1405


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-7.1.1

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

Modified files:

Index: src/doc/CHANGES-7.1.1
diff -u src/doc/CHANGES-7.1.1:1.1.2.4 src/doc/CHANGES-7.1.1:1.1.2.5
--- src/doc/CHANGES-7.1.1:1.1.2.4	Tue Apr 11 16:49:54 2017
+++ src/doc/CHANGES-7.1.1	Thu Apr 20 06:46:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.4 2017/04/11 16:49:54 martin Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.5 2017/04/20 06:46:16 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -205,3 +205,283 @@ etc/ssh/ssh_known_hosts1.10
 	Update ssh keys of various NetBSD.org machines.
  	[spz, ticket #1393]
 
+doc/3RDPARTY	1.1431
+external/bsd/ntp/bin/ntpd/ntp.keys.5up to 1.2
+external/bsd/ntp/dist/COPYRIGHT up to 1.1.1.8
+external/bsd/ntp/dist/ChangeLog up to 1.1.1.12
+external/bsd/ntp/dist/CommitLog up to 1.1.1.12
+external/bsd/ntp/dist/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/NEWS  up to 1.1.1.12
+external/bsd/ntp/dist/aclocal.m4up to 1.1.1.10
+external/bsd/ntp/dist/adjtimed/Makefile.am  up to 1.1.1.4
+external/bsd/ntp/dist/adjtimed/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/clockstuff/Makefile.amup to 1.1.1.3
+external/bsd/ntp/dist/clockstuff/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/config.h.in   up to 1.1.1.9
+external/bsd/ntp/dist/configure up to 1.1.1.12
+external/bsd/ntp/dist/configure.ac  up to 1.1.1.10
+external/bsd/ntp/dist/html/copyright.html   up to 1.1.1.6
+external/bsd/ntp/dist/include/Makefile.in   up to 1.1.1.11
+external/bsd/ntp/dist/include/isc/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/include/libssl_compat.h   up to 1.1.1.2
+external/bsd/ntp/dist/include/ntp_crypto.h  up to 1.5
+external/bsd/ntp/dist/include/ntp_fp.h  up to 1.9
+external/bsd/ntp/dist/include/ntp_md5.h up to 1.7
+external/bsd/ntp/dist/include/ntp_stdlib.h  up to 1.14
+external/bsd/ntp/dist/include/ntpd.hup to 1.10
+external/bsd/ntp/dist/include/ssl_applink.c up to 1.5
+external/bsd/ntp/dist/kernel/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/kernel/sys/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/lib/isc/inet_pton.c   up to 1.8
+external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.8
+external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.11
+external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.8
+external/bsd/ntp/dist/libntp/audio.cup to 1.12
+external/bsd/ntp/dist/libntp/authkeys.c up to 1.11
+external/bsd/ntp/dist/libntp/emalloc.c  up to 1.8
+external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.2
+external/bsd/ntp/dist/libntp/ntp_intres.c   up to 1.11
+external/bsd/ntp/dist/libntp/recvbuff.c up to 1.7
+external/bsd/ntp/dist/libntp/ssl_init.c up to 1.10
+external/bsd/ntp/dist/libntp/statestr.c up to 1.6
+external/bsd/ntp/dist/libntp/work_fork.cup to 1.11
+external/bsd/ntp/dist/libparse/Makefile.am  up to 1.1.1.5
+external/bsd/ntp/dist/libparse/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/libparse/clk_trimtsip.c   up to 1.6
+external/bsd/ntp/dist/libparse/gpstolfp.c   up to 1.6
+external/bsd/ntp/dist/ntpd/Makefile.am  up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc   up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.man.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc   up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.man.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.17
+external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.19
+external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.14
+external/bsd/ntp/dist/ntpd/ntp_io.c up to 1.25
+external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.11
+external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.16

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:46:16 UTC 2017

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

Log Message:
1405


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/doc/CHANGES-7.1.1

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

CVS commit: [netbsd-7-1] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:45:21 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: 3RDPARTY
src/external/bsd/ntp [netbsd-7-1]: importdate
src/external/bsd/ntp/bin/ntpd [netbsd-7-1]: ntp.keys.5
src/external/bsd/ntp/dist [netbsd-7-1]: COPYRIGHT ChangeLog CommitLog
Makefile.in NEWS aclocal.m4 config.h.in configure configure.ac
packageinfo.sh
src/external/bsd/ntp/dist/adjtimed [netbsd-7-1]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/clockstuff [netbsd-7-1]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/html [netbsd-7-1]: copyright.html
src/external/bsd/ntp/dist/include [netbsd-7-1]: Makefile.in
libssl_compat.h ntp_crypto.h ntp_fp.h ntp_md5.h ntp_stdlib.h ntpd.h
ssl_applink.c
src/external/bsd/ntp/dist/include/isc [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/kernel [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/kernel/sys [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/lib/isc [netbsd-7-1]: inet_pton.c
src/external/bsd/ntp/dist/libntp [netbsd-7-1]: Makefile.am Makefile.in
a_md5encrypt.c audio.c authkeys.c emalloc.c libssl_compat.c
ntp_intres.c recvbuff.c ssl_init.c statestr.c work_fork.c
src/external/bsd/ntp/dist/libparse [netbsd-7-1]: Makefile.am
Makefile.in clk_trimtsip.c gpstolfp.c
src/external/bsd/ntp/dist/ntpd [netbsd-7-1]: Makefile.am Makefile.in
invoke-ntp.conf.texi invoke-ntp.keys.texi invoke-ntpd.texi
ntp.conf.5man ntp.conf.5mdoc ntp.conf.html ntp.conf.man.in
ntp.conf.mdoc.in ntp.keys.5man ntp.keys.5mdoc ntp.keys.html
ntp.keys.man.in ntp.keys.mdoc.in ntp_config.c ntp_control.c
ntp_crypto.c ntp_io.c ntp_loopfilter.c ntp_parser.y ntp_peer.c
ntp_proto.c ntp_restrict.c ntp_scanner.c ntpd-opts.c ntpd-opts.h
ntpd.1ntpdman ntpd.1ntpdmdoc ntpd.c ntpd.html ntpd.man.in
ntpd.mdoc.in refclock_datum.c refclock_gpsdjson.c refclock_jjy.c
refclock_mx4200.c refclock_nmea.c refclock_oncore.c
refclock_parse.c
src/external/bsd/ntp/dist/ntpdate [netbsd-7-1]: Makefile.am Makefile.in
ntpdate.c
src/external/bsd/ntp/dist/ntpdc [netbsd-7-1]: Makefile.am Makefile.in
invoke-ntpdc.texi ntpdc-opts.c ntpdc-opts.h ntpdc.1ntpdcman
ntpdc.1ntpdcmdoc ntpdc.c ntpdc.html ntpdc.man.in ntpdc.mdoc.in
ntpdc_ops.c
src/external/bsd/ntp/dist/ntpq [netbsd-7-1]: Makefile.am Makefile.in
invoke-ntpq.texi libntpq.c ntpq-opts.c ntpq-opts.h ntpq-subs.c
ntpq.1ntpqman ntpq.1ntpqmdoc ntpq.c ntpq.html ntpq.man.in
ntpq.mdoc.in
src/external/bsd/ntp/dist/ntpsnmpd [netbsd-7-1]: Makefile.am
Makefile.in invoke-ntpsnmpd.texi ntpsnmpd-opts.c ntpsnmpd-opts.h
ntpsnmpd.1ntpsnmpdman ntpsnmpd.1ntpsnmpdmdoc ntpsnmpd.html
ntpsnmpd.man.in ntpsnmpd.mdoc.in
src/external/bsd/ntp/dist/parseutil [netbsd-7-1]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/scripts [netbsd-7-1]: Makefile.in
invoke-plot_summary.texi invoke-summary.texi plot_summary-opts
plot_summary.1plot_summaryman plot_summary.1plot_summarymdoc
plot_summary.html plot_summary.man.in plot_summary.mdoc.in
summary-opts summary.1summaryman summary.1summarymdoc summary.html
summary.man.in summary.mdoc.in
src/external/bsd/ntp/dist/scripts/build [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/scripts/calc_tickadj [netbsd-7-1]:
Makefile.in calc_tickadj.1calc_tickadjman
calc_tickadj.1calc_tickadjmdoc calc_tickadj.html
calc_tickadj.man.in calc_tickadj.mdoc.in invoke-calc_tickadj.texi
src/external/bsd/ntp/dist/scripts/lib [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/scripts/ntp-wait [netbsd-7-1]: Makefile.in
invoke-ntp-wait.texi ntp-wait-opts ntp-wait.1ntp-waitman
ntp-wait.1ntp-waitmdoc ntp-wait.html ntp-wait.man.in
ntp-wait.mdoc.in
src/external/bsd/ntp/dist/scripts/ntpsweep [netbsd-7-1]: Makefile.in
invoke-ntpsweep.texi ntpsweep-opts ntpsweep.1ntpsweepman
ntpsweep.1ntpsweepmdoc ntpsweep.html ntpsweep.man.in
ntpsweep.mdoc.in
src/external/bsd/ntp/dist/scripts/ntptrace [netbsd-7-1]: Makefile.in
invoke-ntptrace.texi ntptrace-opts ntptrace.1ntptraceman
ntptrace.1ntptracemdoc ntptrace.html ntptrace.man.in
ntptrace.mdoc.in
src/external/bsd/ntp/dist/scripts/update-leap [netbsd-7-1]: Makefile.in
invoke-update-leap.texi update-leap-opts
update-leap.1update-leapman update-leap.1update-leapmdoc
update-leap.html update-leap.man.in 

CVS commit: [netbsd-7-1] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:45:21 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: 3RDPARTY
src/external/bsd/ntp [netbsd-7-1]: importdate
src/external/bsd/ntp/bin/ntpd [netbsd-7-1]: ntp.keys.5
src/external/bsd/ntp/dist [netbsd-7-1]: COPYRIGHT ChangeLog CommitLog
Makefile.in NEWS aclocal.m4 config.h.in configure configure.ac
packageinfo.sh
src/external/bsd/ntp/dist/adjtimed [netbsd-7-1]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/clockstuff [netbsd-7-1]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/html [netbsd-7-1]: copyright.html
src/external/bsd/ntp/dist/include [netbsd-7-1]: Makefile.in
libssl_compat.h ntp_crypto.h ntp_fp.h ntp_md5.h ntp_stdlib.h ntpd.h
ssl_applink.c
src/external/bsd/ntp/dist/include/isc [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/kernel [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/kernel/sys [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/lib/isc [netbsd-7-1]: inet_pton.c
src/external/bsd/ntp/dist/libntp [netbsd-7-1]: Makefile.am Makefile.in
a_md5encrypt.c audio.c authkeys.c emalloc.c libssl_compat.c
ntp_intres.c recvbuff.c ssl_init.c statestr.c work_fork.c
src/external/bsd/ntp/dist/libparse [netbsd-7-1]: Makefile.am
Makefile.in clk_trimtsip.c gpstolfp.c
src/external/bsd/ntp/dist/ntpd [netbsd-7-1]: Makefile.am Makefile.in
invoke-ntp.conf.texi invoke-ntp.keys.texi invoke-ntpd.texi
ntp.conf.5man ntp.conf.5mdoc ntp.conf.html ntp.conf.man.in
ntp.conf.mdoc.in ntp.keys.5man ntp.keys.5mdoc ntp.keys.html
ntp.keys.man.in ntp.keys.mdoc.in ntp_config.c ntp_control.c
ntp_crypto.c ntp_io.c ntp_loopfilter.c ntp_parser.y ntp_peer.c
ntp_proto.c ntp_restrict.c ntp_scanner.c ntpd-opts.c ntpd-opts.h
ntpd.1ntpdman ntpd.1ntpdmdoc ntpd.c ntpd.html ntpd.man.in
ntpd.mdoc.in refclock_datum.c refclock_gpsdjson.c refclock_jjy.c
refclock_mx4200.c refclock_nmea.c refclock_oncore.c
refclock_parse.c
src/external/bsd/ntp/dist/ntpdate [netbsd-7-1]: Makefile.am Makefile.in
ntpdate.c
src/external/bsd/ntp/dist/ntpdc [netbsd-7-1]: Makefile.am Makefile.in
invoke-ntpdc.texi ntpdc-opts.c ntpdc-opts.h ntpdc.1ntpdcman
ntpdc.1ntpdcmdoc ntpdc.c ntpdc.html ntpdc.man.in ntpdc.mdoc.in
ntpdc_ops.c
src/external/bsd/ntp/dist/ntpq [netbsd-7-1]: Makefile.am Makefile.in
invoke-ntpq.texi libntpq.c ntpq-opts.c ntpq-opts.h ntpq-subs.c
ntpq.1ntpqman ntpq.1ntpqmdoc ntpq.c ntpq.html ntpq.man.in
ntpq.mdoc.in
src/external/bsd/ntp/dist/ntpsnmpd [netbsd-7-1]: Makefile.am
Makefile.in invoke-ntpsnmpd.texi ntpsnmpd-opts.c ntpsnmpd-opts.h
ntpsnmpd.1ntpsnmpdman ntpsnmpd.1ntpsnmpdmdoc ntpsnmpd.html
ntpsnmpd.man.in ntpsnmpd.mdoc.in
src/external/bsd/ntp/dist/parseutil [netbsd-7-1]: Makefile.am
Makefile.in
src/external/bsd/ntp/dist/scripts [netbsd-7-1]: Makefile.in
invoke-plot_summary.texi invoke-summary.texi plot_summary-opts
plot_summary.1plot_summaryman plot_summary.1plot_summarymdoc
plot_summary.html plot_summary.man.in plot_summary.mdoc.in
summary-opts summary.1summaryman summary.1summarymdoc summary.html
summary.man.in summary.mdoc.in
src/external/bsd/ntp/dist/scripts/build [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/scripts/calc_tickadj [netbsd-7-1]:
Makefile.in calc_tickadj.1calc_tickadjman
calc_tickadj.1calc_tickadjmdoc calc_tickadj.html
calc_tickadj.man.in calc_tickadj.mdoc.in invoke-calc_tickadj.texi
src/external/bsd/ntp/dist/scripts/lib [netbsd-7-1]: Makefile.in
src/external/bsd/ntp/dist/scripts/ntp-wait [netbsd-7-1]: Makefile.in
invoke-ntp-wait.texi ntp-wait-opts ntp-wait.1ntp-waitman
ntp-wait.1ntp-waitmdoc ntp-wait.html ntp-wait.man.in
ntp-wait.mdoc.in
src/external/bsd/ntp/dist/scripts/ntpsweep [netbsd-7-1]: Makefile.in
invoke-ntpsweep.texi ntpsweep-opts ntpsweep.1ntpsweepman
ntpsweep.1ntpsweepmdoc ntpsweep.html ntpsweep.man.in
ntpsweep.mdoc.in
src/external/bsd/ntp/dist/scripts/ntptrace [netbsd-7-1]: Makefile.in
invoke-ntptrace.texi ntptrace-opts ntptrace.1ntptraceman
ntptrace.1ntptracemdoc ntptrace.html ntptrace.man.in
ntptrace.mdoc.in
src/external/bsd/ntp/dist/scripts/update-leap [netbsd-7-1]: Makefile.in
invoke-update-leap.texi update-leap-opts
update-leap.1update-leapman update-leap.1update-leapmdoc
update-leap.html update-leap.man.in 

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:43:48 UTC 2017

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

Log Message:
1405


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-7.0.3

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

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

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Apr 20 06:43:48 UTC 2017

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

Log Message:
1405


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-7.0.3

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.37 src/doc/CHANGES-7.0.3:1.1.2.38
--- src/doc/CHANGES-7.0.3:1.1.2.37	Tue Apr 11 16:48:34 2017
+++ src/doc/CHANGES-7.0.3	Thu Apr 20 06:43:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.37 2017/04/11 16:48:34 martin Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.38 2017/04/20 06:43:48 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -1512,3 +1512,283 @@ etc/ssh/ssh_known_hosts1.10
 	Update ssh keys of various NetBSD.org machines.
  	[spz, ticket #1393]
 
+doc/3RDPARTY	1.1431
+external/bsd/ntp/bin/ntpd/ntp.keys.5up to 1.2
+external/bsd/ntp/dist/COPYRIGHT up to 1.1.1.8
+external/bsd/ntp/dist/ChangeLog up to 1.1.1.12
+external/bsd/ntp/dist/CommitLog up to 1.1.1.12
+external/bsd/ntp/dist/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/NEWS  up to 1.1.1.12
+external/bsd/ntp/dist/aclocal.m4up to 1.1.1.10
+external/bsd/ntp/dist/adjtimed/Makefile.am  up to 1.1.1.4
+external/bsd/ntp/dist/adjtimed/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/clockstuff/Makefile.amup to 1.1.1.3
+external/bsd/ntp/dist/clockstuff/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/config.h.in   up to 1.1.1.9
+external/bsd/ntp/dist/configure up to 1.1.1.12
+external/bsd/ntp/dist/configure.ac  up to 1.1.1.10
+external/bsd/ntp/dist/html/copyright.html   up to 1.1.1.6
+external/bsd/ntp/dist/include/Makefile.in   up to 1.1.1.11
+external/bsd/ntp/dist/include/isc/Makefile.in   up to 1.1.1.10
+external/bsd/ntp/dist/include/libssl_compat.h   up to 1.1.1.2
+external/bsd/ntp/dist/include/ntp_crypto.h  up to 1.5
+external/bsd/ntp/dist/include/ntp_fp.h  up to 1.9
+external/bsd/ntp/dist/include/ntp_md5.h up to 1.7
+external/bsd/ntp/dist/include/ntp_stdlib.h  up to 1.14
+external/bsd/ntp/dist/include/ntpd.hup to 1.10
+external/bsd/ntp/dist/include/ssl_applink.c up to 1.5
+external/bsd/ntp/dist/kernel/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/kernel/sys/Makefile.inup to 1.1.1.10
+external/bsd/ntp/dist/lib/isc/inet_pton.c   up to 1.8
+external/bsd/ntp/dist/libntp/Makefile.amup to 1.1.1.8
+external/bsd/ntp/dist/libntp/Makefile.inup to 1.1.1.11
+external/bsd/ntp/dist/libntp/a_md5encrypt.c up to 1.8
+external/bsd/ntp/dist/libntp/audio.cup to 1.12
+external/bsd/ntp/dist/libntp/authkeys.c up to 1.11
+external/bsd/ntp/dist/libntp/emalloc.c  up to 1.8
+external/bsd/ntp/dist/libntp/libssl_compat.cup to 1.1.1.2
+external/bsd/ntp/dist/libntp/ntp_intres.c   up to 1.11
+external/bsd/ntp/dist/libntp/recvbuff.c up to 1.7
+external/bsd/ntp/dist/libntp/ssl_init.c up to 1.10
+external/bsd/ntp/dist/libntp/statestr.c up to 1.6
+external/bsd/ntp/dist/libntp/work_fork.cup to 1.11
+external/bsd/ntp/dist/libparse/Makefile.am  up to 1.1.1.5
+external/bsd/ntp/dist/libparse/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/libparse/clk_trimtsip.c   up to 1.6
+external/bsd/ntp/dist/libparse/gpstolfp.c   up to 1.6
+external/bsd/ntp/dist/ntpd/Makefile.am  up to 1.1.1.8
+external/bsd/ntp/dist/ntpd/Makefile.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntp.conf.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntp.keys.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/invoke-ntpd.texi up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.5manup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.5mdoc   up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.htmlup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.man.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.conf.mdoc.in up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.5manup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.5mdoc   up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.htmlup to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.man.in  up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp.keys.mdoc.in up to 1.1.1.10
+external/bsd/ntp/dist/ntpd/ntp_config.c up to 1.17
+external/bsd/ntp/dist/ntpd/ntp_control.cup to 1.19
+external/bsd/ntp/dist/ntpd/ntp_crypto.c up to 1.14
+external/bsd/ntp/dist/ntpd/ntp_io.c up to 1.25
+external/bsd/ntp/dist/ntpd/ntp_loopfilter.c up to 1.11
+external/bsd/ntp/dist/ntpd/ntp_parser.y up to 1.16