subject:"CVS commit\: src\/external\/gpl2"

CVS commit: src/external/gpl2/gettext/dist/gettext-runtime

2021-08-03 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Tue Aug  3 20:22:15 UTC 2021

Modified Files:
src/external/gpl2/gettext/dist/gettext-runtime: Makefile.in

Log Message:
do not descend into the man or tests directory.
this avoids a problem where git sets the file timestamps differently
than CVS does and accidentally causes make to try to rebuild
various targets that don't work during the tools build.
this matches the change that was made to Makefile.am in our tree.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in

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

Modified files:

Index: src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in
diff -u src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.2 src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.3
--- src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in:1.2	Tue Jan 12 22:58:02 2016
+++ src/external/gpl2/gettext/dist/gettext-runtime/Makefile.in	Tue Aug  3 20:22:15 2021
@@ -347,7 +347,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../autoconf-l
 # The list of subdirectories depends on whether --disable-libasprintf was
 # specified.
 @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf
-SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
+SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po m4
 
 # Allow users to use "gnulib-tool --update".

CVS commit: src/external/gpl2/xcvs/dist/doc

2021-06-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Jun 21 02:48:01 UTC 2021

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo

Log Message:
PR/56256: Germain: cvs info doc incorrect for update -D


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.14 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.15
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.14	Fri Jul  5 20:10:25 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sun Jun 20 22:48:01 2021
@@ -11807,7 +11807,7 @@ them):
 @table @code
 @item -D date
 Use the most recent revision no later than @var{date}.
-This option is sticky, and implies @samp{-P}.
+This option is sticky.
 See @ref{Sticky tags}, for more information on sticky tags/dates.
 
 @item -f

CVS commit: src/external/gpl2/texinfo/dist/makeinfo

2021-06-07 Thread Chris Pinnock

Module Name:src
Committed By:   cjep
Date:   Mon Jun  7 20:27:59 UTC 2021

Modified Files:
src/external/gpl2/texinfo/dist/makeinfo: multi.c

Log Message:
Whilst debugging the nbmakeinfo tool on an OpenBSD box, I noticed
two changes in OpenBSD's makeinfo sources. One addresses an out of bounds
access issue and the other an off-by-one issue.

Fixes PR toolchain/56179. Reviewed by christos.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/multi.c

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

Modified files:

Index: src/external/gpl2/texinfo/dist/makeinfo/multi.c
diff -u src/external/gpl2/texinfo/dist/makeinfo/multi.c:1.1.1.1 src/external/gpl2/texinfo/dist/makeinfo/multi.c:1.2
--- src/external/gpl2/texinfo/dist/makeinfo/multi.c:1.1.1.1	Thu Jan 14 00:11:29 2016
+++ src/external/gpl2/texinfo/dist/makeinfo/multi.c	Mon Jun  7 20:27:59 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: multi.c,v 1.1.1.1 2016/01/14 00:11:29 christos Exp $	*/
+/*	$NetBSD: multi.c,v 1.2 2021/06/07 20:27:59 cjep Exp $	*/
 
 /* multi.c -- multiple-column tables (@multitable) for makeinfo.
Id: multi.c,v 1.8 2004/04/11 17:56:47 karl Exp 
@@ -209,7 +209,7 @@ setup_multitable_parameters (void)
   params++;
 
 if (*params == '@') {
-  sscanf (params, "%200s", command);
+  sscanf (params, "%199s", command);
   nchars = strlen (command);
   params += nchars;
   if (strcmp (command, "@hsep") == 0)
@@ -432,8 +432,8 @@ output_multitable_row (void)
 
   /* remove trailing whitespace from each column */
   for (i = 1; i <= last_column; i++) {
-if (envs[i].output_paragraph_offset)
-  while (cr_or_whitespace (CHAR_AT (envs[i].output_paragraph_offset - 1)))
+while (envs[i].output_paragraph_offset &&
+  cr_or_whitespace (CHAR_AT (envs[i].output_paragraph_offset - 1)))
 envs[i].output_paragraph_offset--;
 
 if (i == current_env_no)

CVS commit: src/external/gpl2/libmalloc/lib

2021-03-03 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Mar  3 21:46:43 UTC 2021

Modified Files:
src/external/gpl2/libmalloc/lib: combined.c

Log Message:
Add some jemalloc stubs so we can link as a jemalloc replacement


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/libmalloc/lib/combined.c

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

Modified files:

Index: src/external/gpl2/libmalloc/lib/combined.c
diff -u src/external/gpl2/libmalloc/lib/combined.c:1.1 src/external/gpl2/libmalloc/lib/combined.c:1.2
--- src/external/gpl2/libmalloc/lib/combined.c:1.1	Wed Jan 13 16:56:38 2016
+++ src/external/gpl2/libmalloc/lib/combined.c	Wed Mar  3 16:46:43 2021
@@ -4,9 +4,17 @@
  * and libc sometimes invokes realloc, which can greatly confuse things
  * in the linking process...
  *
- *	$Id: combined.c,v 1.1 2016/01/13 21:56:38 christos Exp $
+ *	$Id: combined.c,v 1.2 2021/03/03 21:46:43 christos Exp $
  */
 
 #include "malloc.c"
 #include "free.c"
 #include "realloc.c"
+
+/* jemalloc defines these */
+void _malloc_prefork(void);
+void _malloc_postfork(void); 
+void _malloc_postfork_child(void);
+void _malloc_prefork(void) {}
+void _malloc_postfork(void) {}
+void _malloc_postfork_child(void) {}

CVS commit: src/external/gpl2/send-pr/dist/send-pr

2021-02-03 Thread Ryo ONODERA

Module Name:src
Committed By:   ryoon
Date:   Wed Feb  3 15:42:53 UTC 2021

Modified Files:
src/external/gpl2/send-pr/dist/send-pr: send-pr-el.in

Log Message:
Do not use old-style backquotes and other old-style expressions.

Fix PR misc/55918.
Tested with pkgsrc/editors/emacs26 and emacs27.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/send-pr/dist/send-pr/send-pr-el.in

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

Modified files:

Index: src/external/gpl2/send-pr/dist/send-pr/send-pr-el.in
diff -u src/external/gpl2/send-pr/dist/send-pr/send-pr-el.in:1.2 src/external/gpl2/send-pr/dist/send-pr/send-pr-el.in:1.3
--- src/external/gpl2/send-pr/dist/send-pr/send-pr-el.in:1.2	Thu Jan 14 21:13:20 2016
+++ src/external/gpl2/send-pr/dist/send-pr/send-pr-el.in	Wed Feb  3 15:42:53 2021
@@ -151,23 +151,23 @@ at runtime.")
 ;;; during runtime instead of having them here in the code.
 ;;;
 (defconst send-pr::fields
-  (` (("Category" send-pr::set-categories
-   (, (or (gnats::get-config "DEFAULT_CATEGORY") nil)) enum)
+`(("Category" send-pr::set-categories
+   ,(or (gnats::get-config "DEFAULT_CATEGORY") nil) enum)
   ("Class" (("sw-bug") ("doc-bug") ("change-request") ("support"))
-   (, (or (gnats::get-config "DEFAULT_CLASS") 0)) enum)
+   ,(or (gnats::get-config "DEFAULT_CLASS") 0) enum)
   ("Confidential" (("yes") ("no"))
-   (, (or (gnats::get-config "DEFAULT_CONFIDENTIAL") 1)) enum)
+   ,(or (gnats::get-config "DEFAULT_CONFIDENTIAL") 1) enum)
   ("Severity" (("non-critical") ("serious") ("critical"))
-   (, (or (gnats::get-config "DEFAULT_SEVERITY") 1)) enum)
+   ,(or (gnats::get-config "DEFAULT_SEVERITY") 1) enum)
   ("Priority" (("low") ("medium") ("high"))
-   (, (or (gnats::get-config "DEFAULT_PRIORITY") 1)) enum)
+   ,(or (gnats::get-config "DEFAULT_PRIORITY") 1) enum)
   ("Release" nil
-   (, (or (gnats::get-config "DEFAULT_RELEASE") "xDEFAULT_RELEASEx"))
+   ,(or (gnats::get-config "DEFAULT_RELEASE") "`uname -s` `uname -r`")
text)
   ("Submitter-Id" nil
-   (, (or (gnats::get-config "SUBMITTER") "xSUBMITTERx")) text)
+   ,(or (gnats::get-config "SUBMITTER") "net") text)
   ("Synopsis" nil nil text
-   (lambda (a b c) (gnats::set-mail-field "Subject" c)
+   (lambda (a b c) (gnats::set-mail-field "Subject" c
   "AList, keyed on the name of the field, of:
 1) The field name.
 2) The list of completions.  This can be a list, a function to call, or nil.
@@ -178,7 +178,7 @@ at runtime.")
 (defvar gnats::fields nil)
 
 (defmacro gnats::push (i l)
-  (` (setq (, l) (cons (,@ (list i l))
+  `(setq ,l (cons ,@ (list i l
 
 (defun send-pr::set-categories ( arg)
   "Get the list of categories for the current site out of

CVS commit: src/external/gpl2/diffutils/dist/src

2020-12-12 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Sun Dec 13 00:04:40 UTC 2020

Modified Files:
src/external/gpl2/diffutils/dist/src: util.c

Log Message:
diffutils: execl requires a NULL sentinel


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/diffutils/dist/src/util.c

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

Modified files:

Index: src/external/gpl2/diffutils/dist/src/util.c
diff -u src/external/gpl2/diffutils/dist/src/util.c:1.1.1.1 src/external/gpl2/diffutils/dist/src/util.c:1.2
--- src/external/gpl2/diffutils/dist/src/util.c:1.1.1.1	Wed Jan 13 03:15:30 2016
+++ src/external/gpl2/diffutils/dist/src/util.c	Sun Dec 13 00:04:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.1.1.1 2016/01/13 03:15:30 christos Exp $	*/
+/*	$NetBSD: util.c,v 1.2 2020/12/13 00:04:40 roy Exp $	*/
 
 /* Support routines for GNU DIFF.
 
@@ -217,7 +217,7 @@ begin_output (void)
 		close (pipes[0]);
 	  }
 
-	execl (pr_program, pr_program, "-h", name, 0);
+	execl (pr_program, pr_program, "-h", name, NULL);
 	_exit (errno == ENOEXEC ? 126 : 127);
 	  }
 	else

CVS commit: src/external/gpl2/grep/dist/lib

2020-09-26 Thread Michael van Elst

Module Name:src
Committed By:   mlelstv
Date:   Sat Sep 26 11:39:17 UTC 2020

Modified Files:
src/external/gpl2/grep/dist/lib: regex.c

Log Message:
Moving pointers could fail if realloc() allocates a new memory region
where the difference between old and new address exceeds an int. Use
ptrdiff_t for calculations instead.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/grep/dist/lib/regex.c

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

Modified files:

Index: src/external/gpl2/grep/dist/lib/regex.c
diff -u src/external/gpl2/grep/dist/lib/regex.c:1.2 src/external/gpl2/grep/dist/lib/regex.c:1.3
--- src/external/gpl2/grep/dist/lib/regex.c:1.2	Sun Jan 10 22:16:40 2016
+++ src/external/gpl2/grep/dist/lib/regex.c	Sat Sep 26 11:39:17 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: regex.c,v 1.2 2016/01/10 22:16:40 christos Exp $	*/
+/*	$NetBSD: regex.c,v 1.3 2020/09/26 11:39:17 mlelstv Exp $	*/
 
 /* Extended regular expression matching and search library,
version 0.12.
@@ -2047,7 +2047,7 @@ static reg_errcode_t compile_range _RE_A
 /* If the buffer moved, move all the pointers into it.  */		\
 if (old_buffer != COMPILED_BUFFER_VAR)\
   {	\
-	int incr = COMPILED_BUFFER_VAR - old_buffer;			\
+	ptrdiff_t incr = COMPILED_BUFFER_VAR - old_buffer;			\
 	MOVE_BUFFER_POINTER (b);	\
 	MOVE_BUFFER_POINTER (begalt);	\
 	if (fixup_alt_jump)		\
@@ -2075,7 +2075,7 @@ static reg_errcode_t compile_range _RE_A
 /* If the buffer moved, move all the pointers into it.  */		\
 if (old_buffer != COMPILED_BUFFER_VAR)\
   {	\
-	int incr = COMPILED_BUFFER_VAR - old_buffer;			\
+	ptrdiff_t incr = COMPILED_BUFFER_VAR - old_buffer;			\
 	MOVE_BUFFER_POINTER (b);	\
 	MOVE_BUFFER_POINTER (begalt);	\
 	if (fixup_alt_jump)		\

CVS commit: src/external/gpl2/groff/tmac

2020-09-02 Thread Kimmo Suominen

Module Name:src
Committed By:   kim
Date:   Wed Sep  2 09:28:25 UTC 2020

Modified Files:
src/external/gpl2/groff/tmac: mdoc.local

Log Message:
Reflect that this is current by using ".99" in the Os version

This helps distinguising NetBSD-current pages from NetBSD-9.0 pages better
on man.netbsd.org, which is still using nroff. (Using mandoc needs more
tweaking to avoid all page footers reflecting the uname release of the
web server.)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/groff/tmac/mdoc.local

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

Modified files:

Index: src/external/gpl2/groff/tmac/mdoc.local
diff -u src/external/gpl2/groff/tmac/mdoc.local:1.6 src/external/gpl2/groff/tmac/mdoc.local:1.7
--- src/external/gpl2/groff/tmac/mdoc.local:1.6	Tue Jul 30 15:56:53 2019
+++ src/external/gpl2/groff/tmac/mdoc.local	Wed Sep  2 09:28:25 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.6 2019/07/30 15:56:53 martin Exp $
+.\" $NetBSD: mdoc.local,v 1.7 2020/09/02 09:28:25 kim Exp $
 .\"
 .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -44,9 +44,9 @@
 .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
 .
 .\" Default .Os value
-.ds doc-operating-system NetBSD\~9.0
+.ds doc-operating-system NetBSD\~9.99
 .\" Default footer operating system value
-.ds doc-default-operating-system NetBSD\~9.0
+.ds doc-default-operating-system NetBSD\~9.99
 .\" Other known versions, not yet in groff distribution
 .ds doc-operating-system-NetBSD-1.3.3  1.3.3
 .ds doc-operating-system-NetBSD-1.6.3  1.6.3

CVS commit: src/external/gpl2/rcs/dist/man

2020-07-18 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sat Jul 18 14:53:10 UTC 2020

Modified Files:
src/external/gpl2/rcs/dist/man: rlog.1

Log Message:
Add missing linebreak.

Reported by Anon.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/rcs/dist/man/rlog.1

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

Modified files:

Index: src/external/gpl2/rcs/dist/man/rlog.1
diff -u src/external/gpl2/rcs/dist/man/rlog.1:1.2 src/external/gpl2/rcs/dist/man/rlog.1:1.3
--- src/external/gpl2/rcs/dist/man/rlog.1:1.2	Thu Jan 14 04:22:39 2016
+++ src/external/gpl2/rcs/dist/man/rlog.1	Sat Jul 18 14:53:10 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rlog.1,v 1.2 2016/01/14 04:22:39 christos Exp $
+.\"	$NetBSD: rlog.1,v 1.3 2020/07/18 14:53:10 wiz Exp $
 .\"
 .de Id
 .ds Rv \\$3
@@ -50,6 +50,7 @@ The options below restrict this output.
 .TP \*n
 .B \-c
 Print the commitid if available.
+.TP
 .B \-L
 Ignore \*r files that have no locks set.
 This is convenient in combination with

CVS commit: src/external/gpl2/texinfo/dist

2020-06-26 Thread Jason R Thorpe

Module Name:src
Committed By:   thorpej
Date:   Fri Jun 26 06:08:37 UTC 2020

Modified Files:
src/external/gpl2/texinfo/dist: configure

Log Message:
Hack to get the "has ANSI C headers" check to pass on newer versions
of clang as bundled with Xcode.  If someone really cares about ensuring
NetBSD's host tools build on a system without , then I'm sure
that enterprising individual will also find a super #correct fix for this
specific problem.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/texinfo/dist/configure

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

Modified files:

Index: src/external/gpl2/texinfo/dist/configure
diff -u src/external/gpl2/texinfo/dist/configure:1.2 src/external/gpl2/texinfo/dist/configure:1.3
--- src/external/gpl2/texinfo/dist/configure:1.2	Thu Jan 14 00:34:52 2016
+++ src/external/gpl2/texinfo/dist/configure	Fri Jun 26 06:08:37 2020
@@ -3657,6 +3657,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include 
+#include 
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

CVS commit: src/external/gpl2/groff/dist/src/roff

2020-06-15 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Jun 16 00:47:21 UTC 2020

Modified Files:
src/external/gpl2/groff/dist/src/roff/groff: groff.cpp
src/external/gpl2/groff/dist/src/roff/troff: input.cpp

Log Message:
Add --timestamp for reproducible builds.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl2/groff/dist/src/roff/groff/groff.cpp
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl2/groff/dist/src/roff/troff/input.cpp

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

Modified files:

Index: src/external/gpl2/groff/dist/src/roff/groff/groff.cpp
diff -u src/external/gpl2/groff/dist/src/roff/groff/groff.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/roff/groff/groff.cpp:1.2
--- src/external/gpl2/groff/dist/src/roff/groff/groff.cpp:1.1.1.1	Wed Jan 13 13:41:48 2016
+++ src/external/gpl2/groff/dist/src/roff/groff/groff.cpp	Mon Jun 15 20:47:21 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: groff.cpp,v 1.1.1.1 2016/01/13 18:41:48 christos Exp $	*/
+/*	$NetBSD: groff.cpp,v 1.2 2020/06/16 00:47:21 christos Exp $	*/
 
 // -*- C++ -*-
 /* Copyright (C) 1989-2000, 2001, 2002, 2003, 2004
@@ -126,11 +126,12 @@ int main(int argc, char **argv)
   commands[TROFF_INDEX].set_name(command_prefix, "troff");
   static const struct option long_options[] = {
 { "help", no_argument, 0, 'h' },
+{ "timestamp", required_argument, 0, 'Y' },
 { "version", no_argument, 0, 'v' },
 { NULL, 0, 0, 0 }
   };
   while ((opt = getopt_long(argc, argv,
-			"abcCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
+			"abcCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XY:zZ",
 			long_options, NULL))
 	 != EOF) {
 char buf[3];
@@ -281,6 +282,9 @@ int main(int argc, char **argv)
   usage(stderr);
   exit(1);
   break;
+case 'Y':
+  commands[TROFF_INDEX].append_arg(buf, optarg);
+  break;
 default:
   assert(0);
   break;

Index: src/external/gpl2/groff/dist/src/roff/troff/input.cpp
diff -u src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.4 src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.5
--- src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.4	Sat Oct  8 19:40:52 2016
+++ src/external/gpl2/groff/dist/src/roff/troff/input.cpp	Mon Jun 15 20:47:21 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.cpp,v 1.4 2016/10/08 23:40:52 joerg Exp $	*/
+/*	$NetBSD: input.cpp,v 1.5 2020/06/16 00:47:21 christos Exp $	*/
 
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
@@ -7242,6 +7242,14 @@ void usage(FILE *stream, const char *pro
 "   -rcn -Tname -Fdir -Idir -Mdir [files...]\n",
 	  prog);
 }
+ 
+static
+#ifdef LONG_FOR_TIME_T
+long
+#else /* not LONG_FOR_TIME_T */
+time_t
+#endif /* not LONG_FOR_TIME_T */
+timestamp;
 
 int main(int argc, char **argv)
 {
@@ -7273,6 +7281,7 @@ int main(int argc, char **argv)
   }
   static const struct option long_options[] = {
 { "help", no_argument, 0, CHAR_MAX + 1 },
+{ "timestamp", required_argument, 0, 'Y' },
 { "version", no_argument, 0, 'v' },
 { 0, 0, 0, 0 }
   };
@@ -7280,7 +7289,7 @@ int main(int argc, char **argv)
 #define DEBUG_OPTION "D"
 #endif
   while ((c = getopt_long(argc, argv,
-			  "abciI:vw:W:zCEf:m:n:o:r:d:F:M:T:tqs:RU"
+			  "abciI:vw:W:zCEf:m:n:o:r:d:F:M:T:tqs:RUY:"
 			  DEBUG_OPTION, long_options, 0))
 	 != EOF)
 switch(c) {
@@ -7383,6 +7392,9 @@ int main(int argc, char **argv)
   usage(stdout, argv[0]);
   exit(0);
   break;
+case 'Y': // --timestamp
+  timestamp = strtoul(optarg, NULL, 0);
+  break;
 case '?':
   usage(stderr, argv[0]);
   exit(1);
@@ -7485,7 +7497,7 @@ static void init_registers()
 #else /* not LONG_FOR_TIME_T */
   time_t
 #endif /* not LONG_FOR_TIME_T */
-t = time(0);
+t = timestamp ? timestamp : time(0);
   // Use struct here to work around misfeature in old versions of g++.
   struct tm *tt = localtime();
   set_number_reg("seconds", int(tt->tm_sec));

CVS commit: src/external/gpl2/texinfo/dist/makeinfo

2020-06-05 Thread Rin Okuyama

Module Name:src
Committed By:   rin
Date:   Fri Jun  5 12:47:28 UTC 2020

Modified Files:
src/external/gpl2/texinfo/dist/makeinfo: html.c

Log Message:
Check x > 0 *before*, not after, using (x - 1) as index of array.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/texinfo/dist/makeinfo/html.c

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

Modified files:

Index: src/external/gpl2/texinfo/dist/makeinfo/html.c
diff -u src/external/gpl2/texinfo/dist/makeinfo/html.c:1.1.1.1 src/external/gpl2/texinfo/dist/makeinfo/html.c:1.2
--- src/external/gpl2/texinfo/dist/makeinfo/html.c:1.1.1.1	Thu Jan 14 00:11:29 2016
+++ src/external/gpl2/texinfo/dist/makeinfo/html.c	Fri Jun  5 12:47:28 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: html.c,v 1.1.1.1 2016/01/14 00:11:29 christos Exp $	*/
+/*	$NetBSD: html.c,v 1.2 2020/06/05 12:47:28 rin Exp $	*/
 
 /* html.c -- html-related utilities.
Id: html.c,v 1.28 2004/12/06 01:13:06 karl Exp 
@@ -447,7 +447,7 @@ rollback_empty_tag (char *tag)
 return 0;
 
   /* Find the end of the previous tag.  */
-  while (output_paragraph[check_position-1] != '>' && check_position > 0)
+  while (check_position > 0 && output_paragraph[check_position-1] != '>')
 check_position--;
 
   /* Save stuff between tag's end to output_paragraph's end.  */
@@ -464,7 +464,7 @@ rollback_empty_tag (char *tag)
 }
 
   /* Find the start of the previous tag.  */
-  while (output_paragraph[check_position-1] != '<' && check_position > 0)
+  while (check_position > 0 && output_paragraph[check_position-1] != '<')
 check_position--;
 
   /* Check to see if this is the tag.  */

CVS commit: src/external/gpl2/lvm2

2020-05-31 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Mon Jun  1 00:34:25 UTC 2020

Modified Files:
src/external/gpl2/lvm2: lvm2tools.mk
src/external/gpl2/lvm2/dist/include: lib.h
src/external/gpl2/lvm2/dist/lib/misc: lib.h

Log Message:
Avoid redefining _REENTRANT under sanitizers

Switch away from -Wno-macro-redefined which was Clang specific.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/lvm2/lvm2tools.mk
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/lvm2/dist/include/lib.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/lvm2/dist/lib/misc/lib.h

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

Modified files:

Index: src/external/gpl2/lvm2/lvm2tools.mk
diff -u src/external/gpl2/lvm2/lvm2tools.mk:1.6 src/external/gpl2/lvm2/lvm2tools.mk:1.7
--- src/external/gpl2/lvm2/lvm2tools.mk:1.6	Sat Feb  8 00:11:18 2020
+++ src/external/gpl2/lvm2/lvm2tools.mk	Mon Jun  1 00:34:25 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: lvm2tools.mk,v 1.6 2020/02/08 00:11:18 kamil Exp $
+#	$NetBSD: lvm2tools.mk,v 1.7 2020/06/01 00:34:25 kamil Exp $
 
 .include 
 
@@ -24,7 +24,3 @@ CPPFLAGS+=-DDM_DEVICE_UID=0 -DDM_DEVICE_
 #.endif
 #
 #LVM2.liblvm=	${LVM2OBJDIR.liblvm}/liblvm.a
-
-.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
-CFLAGS+=	-Wno-macro-redefined # _REENTRANT redefined in lib.h
-.endif

Index: src/external/gpl2/lvm2/dist/include/lib.h
diff -u src/external/gpl2/lvm2/dist/include/lib.h:1.1.1.1 src/external/gpl2/lvm2/dist/include/lib.h:1.2
--- src/external/gpl2/lvm2/dist/include/lib.h:1.1.1.1	Mon Dec 22 00:18:44 2008
+++ src/external/gpl2/lvm2/dist/include/lib.h	Mon Jun  1 00:34:25 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: lib.h,v 1.1.1.1 2008/12/22 00:18:44 haad Exp $	*/
+/*	$NetBSD: lib.h,v 1.2 2020/06/01 00:34:25 kamil Exp $	*/
 
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.  
@@ -23,7 +23,9 @@
 
 #include "configure.h"
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
 

Index: src/external/gpl2/lvm2/dist/lib/misc/lib.h
diff -u src/external/gpl2/lvm2/dist/lib/misc/lib.h:1.1.1.1 src/external/gpl2/lvm2/dist/lib/misc/lib.h:1.2
--- src/external/gpl2/lvm2/dist/lib/misc/lib.h:1.1.1.1	Mon Dec 22 00:18:12 2008
+++ src/external/gpl2/lvm2/dist/lib/misc/lib.h	Mon Jun  1 00:34:25 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: lib.h,v 1.1.1.1 2008/12/22 00:18:12 haad Exp $	*/
+/*	$NetBSD: lib.h,v 1.2 2020/06/01 00:34:25 kamil Exp $	*/
 
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.  
@@ -23,7 +23,9 @@
 
 #include "configure.h"
 
+#ifndef _REENTRANT
 #define _REENTRANT
+#endif
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64

CVS commit: src/external/gpl2/dtc/dist

2020-05-22 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri May 22 23:19:53 UTC 2020

Modified Files:
src/external/gpl2/dtc/dist: dtc-lexer.l

Log Message:
Satisfy -fno-common


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/dtc/dist/dtc-lexer.l

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

Modified files:

Index: src/external/gpl2/dtc/dist/dtc-lexer.l
diff -u src/external/gpl2/dtc/dist/dtc-lexer.l:1.4 src/external/gpl2/dtc/dist/dtc-lexer.l:1.5
--- src/external/gpl2/dtc/dist/dtc-lexer.l:1.4	Sun Dec 22 12:38:24 2019
+++ src/external/gpl2/dtc/dist/dtc-lexer.l	Fri May 22 23:19:53 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtc-lexer.l,v 1.4 2019/12/22 12:38:24 skrll Exp $	*/
+/*	$NetBSD: dtc-lexer.l,v 1.5 2020/05/22 23:19:53 jmcneill Exp $	*/
 
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
@@ -25,7 +25,7 @@ LINECOMMENT	"//".*\n
 #include "srcpos.h"
 #include "dtc-parser.h"
 
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
 extern bool treesource_error;
 
 /* CAUTION: this will stop working if we ever use yyless() or yyunput() */

CVS commit: src/external/gpl2/dtc

2019-12-22 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sun Dec 22 12:42:23 UTC 2019

Modified Files:
src/external/gpl2/dtc/dist: Makefile.dtc
src/external/gpl2/dtc/usr.bin/dtc: Makefile

Log Message:
Update for new DTC


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl2/dtc/dist/Makefile.dtc
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/dtc/usr.bin/dtc/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/gpl2/dtc/dist/Makefile.dtc
diff -u src/external/gpl2/dtc/dist/Makefile.dtc:1.1.1.2 src/external/gpl2/dtc/dist/Makefile.dtc:1.2
--- src/external/gpl2/dtc/dist/Makefile.dtc:1.1.1.2	Sun Dec 22 12:34:03 2019
+++ src/external/gpl2/dtc/dist/Makefile.dtc	Sun Dec 22 12:42:23 2019
@@ -15,9 +15,9 @@ DTC_SRCS = \
 	treesource.c \
 	util.c
 
-ifneq ($(NO_YAML),1)
-DTC_SRCS += yamltree.c
-endif
+#ifneq ($(NO_YAML),1)
+#DTC_SRCS += yamltree.c
+#endif
 
 DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c
 DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)

Index: src/external/gpl2/dtc/usr.bin/dtc/Makefile
diff -u src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.3 src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.4
--- src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.3	Thu May 31 09:08:25 2018
+++ src/external/gpl2/dtc/usr.bin/dtc/Makefile	Sun Dec 22 12:42:23 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2018/05/31 09:08:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2019/12/22 12:42:23 skrll Exp $
 
 NOMAN=	# defined
 
@@ -12,6 +12,7 @@ PROG=	dtc
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-I${DTCDIST}
 CPPFLAGS+=	-I${LIBFDTDIST}
+CPPFLAGS+=	-DNO_YAML
 
 SRCS+=	${DTC_SRCS} dtc-lexer.l dtc-parser.y
 YFLAGS+= -d -L

CVS commit: src/external/gpl2/dtc/usr.bin/dtc

2019-12-22 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sun Dec 22 12:41:52 UTC 2019

Modified Files:
src/external/gpl2/dtc/usr.bin/dtc: version_gen.h

Log Message:
Update version


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/dtc/usr.bin/dtc/version_gen.h

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

Modified files:

Index: src/external/gpl2/dtc/usr.bin/dtc/version_gen.h
diff -u src/external/gpl2/dtc/usr.bin/dtc/version_gen.h:1.2 src/external/gpl2/dtc/usr.bin/dtc/version_gen.h:1.3
--- src/external/gpl2/dtc/usr.bin/dtc/version_gen.h:1.2	Fri Jun 16 22:47:22 2017
+++ src/external/gpl2/dtc/usr.bin/dtc/version_gen.h	Sun Dec 22 12:41:52 2019
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.4"
+#define DTC_VERSION "DTC 1.5.1"

CVS commit: src/external/gpl2/dtc/dist

2019-12-22 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sun Dec 22 12:38:24 UTC 2019

Modified Files:
src/external/gpl2/dtc/dist: data.c dtc-lexer.l dtc-parser.y dtc.h
fdtdump.c fdtput.c flattree.c srcpos.c util.h
src/external/gpl2/dtc/dist/tests: mangle-layout.c move_and_save.c
tests.h
Removed Files:
src/external/gpl2/dtc/dist/tests: mangle-layout.supp open_pack.supp
sw_tree1.supp tests.sh

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/dtc/dist/data.c \
src/external/gpl2/dtc/dist/dtc-lexer.l \
src/external/gpl2/dtc/dist/dtc-parser.y src/external/gpl2/dtc/dist/dtc.h \
src/external/gpl2/dtc/dist/fdtdump.c src/external/gpl2/dtc/dist/fdtput.c \
src/external/gpl2/dtc/dist/srcpos.c src/external/gpl2/dtc/dist/util.h
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/dtc/dist/flattree.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/dtc/dist/tests/mangle-layout.c \
src/external/gpl2/dtc/dist/tests/move_and_save.c \
src/external/gpl2/dtc/dist/tests/tests.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/dtc/dist/tests/mangle-layout.supp \
src/external/gpl2/dtc/dist/tests/open_pack.supp \
src/external/gpl2/dtc/dist/tests/sw_tree1.supp \
src/external/gpl2/dtc/dist/tests/tests.sh

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

Modified files:

Index: src/external/gpl2/dtc/dist/data.c
diff -u src/external/gpl2/dtc/dist/data.c:1.3 src/external/gpl2/dtc/dist/data.c:1.4
--- src/external/gpl2/dtc/dist/data.c:1.3	Thu Jun  8 16:00:40 2017
+++ src/external/gpl2/dtc/dist/data.c	Sun Dec 22 12:38:24 2019
@@ -1,23 +1,8 @@
-/*	$NetBSD: data.c,v 1.3 2017/06/08 16:00:40 skrll Exp $	*/
+/*	$NetBSD: data.c,v 1.4 2019/12/22 12:38:24 skrll Exp $	*/
 
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * (C) Copyright David Gibson , IBM Corporation.  2005.
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- *   USA
  */
 
 #include "dtc.h"
@@ -76,7 +61,8 @@ struct data data_copy_escape_string(cons
 	struct data d;
 	char *q;
 
-	d = data_grow_for(empty_data, len + 1);
+	d = data_add_marker(empty_data, TYPE_STRING, NULL);
+	d = data_grow_for(d, len + 1);
 
 	q = d.val;
 	while (i < len) {
@@ -96,6 +82,7 @@ struct data data_copy_file(FILE *f, size
 {
 	struct data d = empty_data;
 
+	d = data_add_marker(d, TYPE_NONE, NULL);
 	while (!feof(f) && (d.len < maxlen)) {
 		size_t chunksize, ret;
 
Index: src/external/gpl2/dtc/dist/dtc-lexer.l
diff -u src/external/gpl2/dtc/dist/dtc-lexer.l:1.3 src/external/gpl2/dtc/dist/dtc-lexer.l:1.4
--- src/external/gpl2/dtc/dist/dtc-lexer.l:1.3	Thu Jun  8 16:00:40 2017
+++ src/external/gpl2/dtc/dist/dtc-lexer.l	Sun Dec 22 12:38:24 2019
@@ -1,23 +1,8 @@
-/*	$NetBSD: dtc-lexer.l,v 1.3 2017/06/08 16:00:40 skrll Exp $	*/
+/*	$NetBSD: dtc-lexer.l,v 1.4 2019/12/22 12:38:24 skrll Exp $	*/
 
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * (C) Copyright David Gibson , IBM Corporation.  2005.
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- *   USA
  */
 
 %option noyywrap nounput noinput never-interactive
@@ -155,6 +140,13 @@ static void PRINTF(1, 2) lexical_error(c
 			return DT_DEL_NODE;
 		}
 
+<*>"/omit-if-no-ref/"	{
+			DPRINT("Keyword: /omit-if-no-ref/\n");
+			DPRINT("\n");
+			BEGIN(PROPNODENAME);
+			return DT_OMIT_NO_REF;
+		}
+
 <*>{LABEL}:	{
 			DPRINT("Label: %s\n", yytext);
 			yylval.labelref =

CVS commit: src/external/gpl2/lvm2/dist/libdm/ioctl

2019-12-14 Thread Michael van Elst

Module Name:src
Committed By:   mlelstv
Date:   Sat Dec 14 09:05:30 UTC 2019

Modified Files:
src/external/gpl2/lvm2/dist/libdm/ioctl: libdm_netbsd.c

Log Message:
Handle NULL params, fix error paths.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c

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

Modified files:

Index: src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c
diff -u src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.7 src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.8
--- src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.7	Tue Feb  8 03:26:12 2011
+++ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c	Sat Dec 14 09:05:30 2019
@@ -1,4 +1,4 @@
-/*  $NetBSD: libdm_netbsd.c,v 1.7 2011/02/08 03:26:12 haad Exp $*/
+/*  $NetBSD: libdm_netbsd.c,v 1.8 2019/12/14 09:05:30 mlelstv Exp $*/
 
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -345,9 +345,10 @@ dm_table_status(libdm_task_t task, struc
 		type = libdm_table_get_target(table);
 		params = libdm_table_get_params(table);
 
-		if (params != NULL)
-			plen = strlen(params) + 1;
+		if (params == NULL)
+			params = "";
 
+		plen = strlen(params) + 1;
 		rec_size = sizeof(struct dm_target_spec) + plen;
 
 		/*
@@ -357,17 +358,17 @@ dm_table_status(libdm_task_t task, struc
 		 */
 		next += rec_size;
 
-		if (rec_size > dmi->data_size)
+		if (rec_size > dmi->data_size) {
+			libdm_table_destroy(table);
+			libdm_iter_destroy(iter);
 			return -ENOMEM;
+		}
 
 		dmts->next = next;
 		strlcpy(dmts->target_type, type, DM_MAX_TYPE_NAME);
 		params_start = (char *)dmts + sizeof(struct dm_target_spec);
 
-		if (params != NULL)
-			strlcpy(params_start, params, plen);
-		else
-			params_start = "\0";
+		strlcpy(params_start, params, plen);
 
 		odmts = dmts;
 		dmts = (struct dm_target_spec *)((uint8_t *)dmts + rec_size);

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-04-30 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Wed May  1 02:15:07 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add various small corrections

Add various corrections mostly sourced from upstream's cvs.texinfo,
e.g., note NetBSD's local change to log admin commands in history
(subsequently added on upstream's HEAD, since it was noted in
r. 1.689), add some references to rannotate and rlog (from r. 1.686),
some amendments concerning rdiff (from r. 1.687), and miscellaneous
typo fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.9 src/external/gpl2/xcvs/dist/doc/cvs.1:1.10
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.9	Sun Apr 28 07:13:16 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Wed May  1 02:15:07 2019
@@ -1098,7 +1098,7 @@ acceptable for \fIstate\fR.  A useful se
 stable), and \fBRel\fR (for released).  By default,
 the state of a new revision is set to \fBExp\fR when
 it is created.  The state is visible in the output from
-\fIcvs log\fR (see node `log\(aq in the CVS manual), and in the
+\fIcvs log\fR (see node `log & rlog\(aq in the CVS manual), and in the
 \fB$\fP\fPLog$\fR and \fB$\fP\fPState$\fR keywords
 (see node `Keyword substitution\(aq in the CVS manual).  Note that \fBcvs\fR
 uses the \fBdead\fR state for its own purposes (see node `Attic\(aq in the CVS manual); to
@@ -1113,7 +1113,7 @@ Useful with \fBcvs\fR.  Write descriptiv
 contents of the named \fIfile\fR into the RCS file,
 deleting the existing text.  The \fIfile\fR pathname
 may not begin with \fB-\fR.  The descriptive text can be seen in the
-output from \fBcvs log\fR (see node `log\(aq in the CVS manual).
+output from \fBcvs log\fR (see node `log & rlog\(aq in the CVS manual).
 There can be no space between \fB-t\fR and its argument.
 .SP
 If \fIfile\fR is omitted,
@@ -1171,9 +1171,10 @@ files.  However, \fBcvs\fR has always re
 this option has never done anything useful.
 .SP
 .SP
-.SH "annotate"
+.SH "annotate & rannotate"
 .SS "What revision modified each line of a file?"
 .IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: annotate [options] files\&...
@@ -1225,6 +1226,8 @@ existed on \fIdate\fR.  See see node `Co
 Annotate file as of specified date.
 .SP
 .SH "annotate example"
+.IX "annotate (subcommand)"
+.IX "rannotate (subcommand)"
 .SP
 For example:
 .SP
@@ -1511,6 +1514,7 @@ $ cvs checkout -D yesterday tc
 .SH "commit"
 .SS "Check files into the repository"
 .IX "commit (subcommand)"
+.IX "ci (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: commit [-lnRf] [-m \(aqlog_message\(aq |
@@ -1550,7 +1554,7 @@ enter a log message that will be written
 logging programs (see node `modules\(aq in the CVS manual, and see node `loginfo\(aq in the CVS manual)
 and placed in the \fBrcs\fR file inside the
 repository.  This log message can be retrieved with the
-\fBlog\fR command; see see node `log\(aq in the CVS manual.  You can specify the
+\fBlog\fR command (see node `log & rlog\(aq in the CVS manual).  You can specify the
 log message on the command line with the \fB-m
 \fImessage\fB\fR option, and thus avoid the editor invocation,
 or use the \fB-F \fIfile\fB\fR option to specify
@@ -1559,8 +1563,8 @@ that the argument file contains the log 
 At \fBcommit\fR, a unique commitid is placed in the \fBrcs\fR
 file inside the repository. All files committed at once
 get the same commitid. The commitid can be retrieved with
-the \fBlog\fR and \fBstatus\fR command; see see node `log\(aq in the CVS manual,
-see node `File status\(aq in the CVS manual.
+the \fBlog\fR and \fBstatus\fR command (see node `log & rlog\(aq in the CVS manual,
+see node `File status\(aq in the CVS manual).
 .SP
 .SH "commit options"
 .SP
@@ -2821,6 +2825,12 @@ A file was modified.
 .IP "" 4
 A file was removed.
 .SP
+One record type results from the admin command:
+.IP "" 2
+\fBX\fR
+.IP "" 4
+The admin command.
+.SP
 The options shown as \fB-flags\fR constrain or expand
 the report without requiring option arguments:
 .SP
@@ -3117,9 +3127,10 @@ $ cvs -d /usr/local/cvsroot init
 .PD
 .IP "" 0
 .SP
-.SH "log"
+.SH "log & rlog"
 .SS "Print out log information for files"
 .IX "log (subcommand)"
+.IX "rlog (subcommand)"
 .SP
 .IP "\(bu" 2
 Synopsis: log [options] [files\&...]
@@ -3488,7 +3499,7 @@ verifymsg
 .IX "rdiff (subcommand)"
 .SP
 .IP "\(bu" 2
-rdiff [-flags] [-V vn] (-r tag1[:date1] | -D date1) [-r tag2[:date2] | -D date2] modules\&...
+rdiff [options] {-r tag1[:date1] | -D date1} [-r tag2[:date2] | -D date2] modules\&...
 .IP "\(bu" 2
 Requires: repository.
 .IP "\(bu" 2
@@ -3499,10 +3510,7 @@

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-04-28 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Sun Apr 28 07:13:16 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add a missing section documenting the "tag" and
"rtag" commands. This is taken mostly from the upstream project's
cvs.texinfo revisions 1.686 and 1.687. Additionally, I've reflected
NetBSD's local changes to log "tag" as well as "rtag" in history, and
to require admin privileges for destructive tagging commands. This
addresses PR bin/33877.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.8 src/external/gpl2/xcvs/dist/doc/cvs.1:1.9
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.8	Sun Mar  3 21:11:54 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sun Apr 28 07:13:16 2019
@@ -2779,7 +2779,7 @@ export
 .IP "" 2
 \fBT\fR
 .IP "" 4
-rtag
+tag and rtag
 .SP
 One of five record types may result from an update:
 .SP
@@ -3925,6 +3925,154 @@ Load configuration from \fIpath\fR rathe
 \fB/etc/cvs.conf\fR or prefixed by \fB/etc/cvs/\fR.  This option is
 supported beginning with \fBcvs\fR release 1.12.13.
 .SP
+.SH "tag & rtag"
+.SS "Mark project snapshot for later retrieval."
+.IX "tag (subcommand)"
+.IX "freeze (subcommand)"
+.IX "rtag (subcommand)"
+.IX "rfreeze (subcommand)"
+.SP
+.IP "\(bu" 2
+tag [-bBcdFflR] [-r tag] [-D date] new_tag [files\&...]
+.IP "\(bu" 2
+Requires: working directory, repository.
+.IP "\(bu" 2
+Changes: repository.
+.IP "\(bu" 2
+Synonym: ta, freeze
+.SP
+and
+.SP
+.IP "\(bu" 2
+rtag [-abBdFflnR] [-r tag | -D date] new_tag module\&...
+.IP "\(bu" 2
+Requires: repository.
+.IP "\(bu" 2
+Changes: repository.
+.IP "\(bu" 2
+Synonym: rt, rfreeze
+.SP
+Use \fBtag\fR to assign symbolic tags to the revisions of files
+checked out into your sandbox.  The tags are applied immediately
+to the repository, with the revision numbers to attach the tag
+to supplied implicitly by the \fBcvs\fR records of your working files.
+.SP
+\fBrtag\fR works similarly, but does not need a sandbox to operate
+in, requiring an explicitly supplied tag or date instead (or assuming
+the tip of the trunk when one is not supplied explicitly).  \fBcvs\fR
+uses this preexisting tag or date to determine which revisions of
+files in the repository to attach the new symbolic tag to.
+.SP
+The symbolic tags are meant to permanently record which
+revisions of which files were used for some purpose.  The \fBcheckout\fR
+and \fBupdate\fR commands allow you to extract an exact
+copy of a tagged release at any time in the future,
+regardless of whether files have been changed, added,
+or removed on the trunk or other branches since the release was tagged.
+For more, see node `Branching and merging\(aq in the CVS manual.
+.SP
+These commands may also be used to delete a symbolic tag,
+or to create a branch.  See the options section below.
+.SP
+Note if you wish to run destructive commands such as tag deletion, you may
+need to be a member of the group \fBcvsadmin\fR to do this.
+.SP
+If you attempt to create a tag that already exists,
+CVS will complain and not overwrite that tag.  Use
+the \fB-F\fR option to move the tag to a new set of
+revisions.
+.SP
+These standard options are supported by \fBtag\fR or \fBrtag\fR
+(see node `Common options\(aq in the CVS manual, for a complete description of them):
+.SP
+.IP "" 0
+\fB-D \fIdate\fB\fR
+.IP "" 2
+Tag the most recent revision no later than \fIdate\fR.  This option is
+not valid when deleting tags (see \fB-d\fR option, below).
+.SP
+.IP "" 0
+\fB-l\fR
+.IP "" 2
+Local; run only in current working directory.  see node `Recursive behavior\(aq in the CVS manual.
+.SP
+.IP "" 0
+\fB-R\fR
+.IP "" 2
+Update directories recursively (default).  see node `Recursive behavior\(aq in the CVS manual.
+.SP
+.IP "" 0
+\fB-r \fItag\fB[:\fIdate\fB]\fR
+.IP "" 2
+Tag the revisions specified by \fItag\fR or, when \fIdate\fR is specified
+and \fItag\fR is a branch tag, the version from the branch \fItag\fR as it
+existed on \fIdate\fR.  This option is not valid when deleting tags
+(see \fB-d\fR option, below).
+.SP
+Several tag specific options are also available.  When an option is only
+available with one of \fBtag\fR or \fBrtag\fR, it is noted below:
+.SP
+.IP "" 0
+\fB-a\fR
+.IP "" 2
+Clear \fInew_tag\fR from removed files that would not otherwise be tagged
+(\fBrtag\fR only).
+.SP
+.IP "" 0
+\fB-B\fR
+.IP "" 2
+Allows \fB-d\fR or \fB-F\fR to delete or move branch tags.
+.SP
+\fBWARNING: Recovering the information stored by branch tags is
+a very hard problem, more so than regular tags.  Be absolutely sure you
+understand what you are doing before using this

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-03-03 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Sun Mar  3 21:26:18 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo

Log Message:
cvs.texinfo: add minor formatting fix for Texinfo >5.0

Pull over a tiny fix from pkgsrc's devel/scmcvs patch-ab to support
generating info files with newer versions of Texinfo than what's
shipped in base presently. (Should base be updated at some point, or
for those using an external toolchain here.)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.9
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8	Sun Mar  3 21:11:54 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sun Mar  3 21:26:18 2019
@@ -111,9 +111,9 @@ approved by the Free Software Foundation
 @sp 4
 @comment The title is printed in a large font.
 @center @titlefont{Version Management}
-@sp
+@sp 1
 @center @titlefont{with}
-@sp
+@sp 1
 @center @titlefont{CVS}
 @sp 2
 @center for @sc{cvs} @value{VERSION}

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-03-03 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Sun Mar  3 21:11:54 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: minor amendments and cvs.1 regen

Put a cross-reference to "init" back in "Creating a Repository" and
other minor formatting tweaks, and regenerate cvs.1 to reflect the
previous changes by christos@ in cvs.texinfo r. 1.7.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl2/xcvs/dist/doc/cvs.1 \
src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.7 src/external/gpl2/xcvs/dist/doc/cvs.1:1.8
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.7	Sat Mar  2 21:30:40 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sun Mar  3 21:11:54 2019
@@ -3086,7 +3086,7 @@ See see node `Tracking sources\(aq in th
 .IX "init (subcommand)"
 .SP
 .IP "\(bu" 2
-init
+Synopsis: init
 .IP "\(bu" 2
 Requires: working directory.
 .IP "\(bu" 2
@@ -3096,10 +3096,16 @@ The \fBinit\fR command initializes a rep
 \fBCVSROOT\fR subdirectory and some default control files. You must
 use this command or initialize the repository in some other way before
 you can use it. Specify the root of the repository with the general
-\fB-d\fR option.
+\fB-d\fR option.  This will set up an empty repository in the
+\fBcvs\fR root specified in the usual way (see node `Repository\(aq in the CVS manual).
+.SP
+\fBinit\fR is careful to never overwrite any existing files in the
+repository, so no harm is done if you run \fBinit\fR on an already
+set-up repository. Note you may need to be a member of the group
+\fBcvsadmin\fR to do this.
 .SP
 Note \fBinit\fR will enable history logging; if you don\(aqt want that,
-remove the history file after running \fBinit\fR.
+remove the history file after running \fBinit\fR (see node `history file\(aq in the CVS manual).
 .SP
 .SH "init examples"
 .SP
Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.8
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7	Sun Mar  3 02:21:07 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sun Mar  3 21:11:54 2019
@@ -1939,6 +1939,9 @@ possible to use @sc{cvs} to read from a 
 which one only has read access to; @sc{cvs} needs to be
 able to create lock files (@pxref{Concurrency}).
 
+To create a repository, run the @code{cvs init} 	 
+command (@pxref{init}).
+
 @node Backing up
 @section Backing up a repository
 @cindex Repository, backing up
@@ -10868,21 +10871,20 @@ use this command or initialize the repos
 you can use it. Specify the root of the repository with the general
 @code{-d} option.  This will set up an empty repository in the
 @sc{cvs} root specified in the usual way (@pxref{Repository}).
-For example,
 
-@code{cvs init} is careful to never overwrite any
-existing files in the repository, so no harm is done if
-you run @code{cvs init} on an already set-up
-repository. Note you may need to be a member of the
-group @code{cvsadmin} to do this.
+@code{init} is careful to never overwrite any existing files in the
+repository, so no harm is done if you run @code{init} on an already
+set-up repository. Note you may need to be a member of the group
+@code{cvsadmin} to do this.
 
 Note @code{init} will enable history logging; if you don't want that,
-remove the history file after running @code{init}.  @xref{history file}.
+remove the history file after running @code{init} (@pxref{history file}).
 
 @menu
 * init examples:  init examples
 @end menu
 
+@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 @node init examples
 @appendixsubsec init examples

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-03-02 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Mar  3 02:21:07 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.texinfo

Log Message:
Fix the build by merging duplicate "init" sections.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.6 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.7
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.6	Sat Mar  2 16:30:40 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sat Mar  2 21:21:07 2019
@@ -1939,26 +1939,6 @@ possible to use @sc{cvs} to read from a 
 which one only has read access to; @sc{cvs} needs to be
 able to create lock files (@pxref{Concurrency}).
 
-@cindex init (subcommand)
-To create a repository, run the @code{cvs init}
-command.  It will set up an empty repository in the
-@sc{cvs} root specified in the usual way
-(@pxref{Repository}).  For example,
-
-@example
-cvs -d /usr/local/cvsroot init
-@end example
-
-@code{cvs init} is careful to never overwrite any
-existing files in the repository, so no harm is done if
-you run @code{cvs init} on an already set-up
-repository. Note you may need to be a member of the
-group @code{cvsadmin} to do this.
-
-@code{cvs init} will enable history logging; if you
-don't want that, remove the history file after running
-@code{cvs init}.  @xref{history file}.
-
 @node Backing up
 @section Backing up a repository
 @cindex Repository, backing up
@@ -10875,7 +10855,7 @@ See @ref{Tracking sources}, and @ref{Fro
 
 @itemize @bullet
 @item
-init
+Synopsis: init
 @item
 Requires: working directory.
 @item
@@ -10886,12 +10866,23 @@ The @code{init} command initializes a re
 @file{CVSROOT} subdirectory and some default control files. You must
 use this command or initialize the repository in some other way before
 you can use it. Specify the root of the repository with the general
-@code{-d} option.
+@code{-d} option.  This will set up an empty repository in the
+@sc{cvs} root specified in the usual way (@pxref{Repository}).
+For example,
+
+@code{cvs init} is careful to never overwrite any
+existing files in the repository, so no harm is done if
+you run @code{cvs init} on an already set-up
+repository. Note you may need to be a member of the
+group @code{cvsadmin} to do this.
 
 Note @code{init} will enable history logging; if you don't want that,
-remove the history file after running @code{init}.
+remove the history file after running @code{init}.  @xref{history file}.
+
+@menu
+* init examples:  init examples
+@end menu
 
-@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 @node init examples
 @appendixsubsec init examples

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-03-02 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Sat Mar  2 21:30:40 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add details about "init"

Add a section about the "init" command that has been missing all this
time. Part of the basic description is resurrected from r. 1.20 of
cvs.1 (in its prior incarnation in the CVS project tree under /man
rather than /doc), contributed by Tom Lees back in 1999. The caveat
about the history file is copied from elsewhere in the current
cvs.texinfo file. Additional fragments written by me. Addresses the
PR bin/45446.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.6 src/external/gpl2/xcvs/dist/doc/cvs.1:1.7
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.6	Tue Feb 12 01:32:08 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sat Mar  2 21:30:40 2019
@@ -3081,6 +3081,36 @@ see node `modules\(aq in the CVS manual.
 .SP
 See see node `Tracking sources\(aq in the CVS manual, and see node `From files\(aq in the CVS manual.
 .SP
+.SH "init"
+.SS "Initialize a repository"
+.IX "init (subcommand)"
+.SP
+.IP "\(bu" 2
+init
+.IP "\(bu" 2
+Requires: working directory.
+.IP "\(bu" 2
+Changes: repository, working directory.
+.SP
+The \fBinit\fR command initializes a repository by adding the
+\fBCVSROOT\fR subdirectory and some default control files. You must
+use this command or initialize the repository in some other way before
+you can use it. Specify the root of the repository with the general
+\fB-d\fR option.
+.SP
+Note \fBinit\fR will enable history logging; if you don\(aqt want that,
+remove the history file after running \fBinit\fR.
+.SP
+.SH "init examples"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ cvs -d /usr/local/cvsroot init
+
+.PD
+.IP "" 0
+.SP
 .SH "log"
 .SS "Print out log information for files"
 .IX "log (subcommand)"

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.6
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5	Tue Feb 12 01:32:08 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Sat Mar  2 21:30:40 2019
@@ -1952,7 +1952,8 @@ cvs -d /usr/local/cvsroot init
 @code{cvs init} is careful to never overwrite any
 existing files in the repository, so no harm is done if
 you run @code{cvs init} on an already set-up
-repository.
+repository. Note you may need to be a member of the
+group @code{cvsadmin} to do this.
 
 @code{cvs init} will enable history logging; if you
 don't want that, remove the history file after running
@@ -8126,6 +8127,7 @@ reference to @sc{cvs} commands, @pxref{I
 * export::  Export sources from CVS, similar to checkout
 * history:: Show status of files and users
 * import::  Import sources into CVS, using vendor branches
+* init::Initialize a repository
 * log:: Show log messages for files
 * ls & rls::List files in the repository
 * rdiff::   'patch' format diffs between releases
@@ -10867,6 +10869,37 @@ to recreate symbolic links on checkout, 
 See @ref{Tracking sources}, and @ref{From files}.
 
 @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+@node init
+@appendixsec init---Initialize a repository
+@cindex init (subcommand)
+
+@itemize @bullet
+@item
+init
+@item
+Requires: working directory.
+@item
+Changes: repository, working directory.
+@end itemize
+
+The @code{init} command initializes a repository by adding the
+@file{CVSROOT} subdirectory and some default control files. You must
+use this command or initialize the repository in some other way before
+you can use it. Specify the root of the repository with the general
+@code{-d} option.
+
+Note @code{init} will enable history logging; if you don't want that,
+remove the history file after running @code{init}.
+
+@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
+@node init examples
+@appendixsubsec init examples
+
+@example
+$ cvs -d /usr/local/cvsroot init
+@end example
+
+@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 @node log
 @appendixsec log---Print out log information for files
 @cindex log (subcommand)

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-02-11 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Tue Feb 12 01:32:08 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add information about the "update" command's "-t"
flag to cvs.texinfo, so the installed man and info documentation match
here. This makes cvs.1 auto-generable from cvs.texinfo again, which I
plan to leverage with further additions later.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.5 src/external/gpl2/xcvs/dist/doc/cvs.1:1.6
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.5	Sun Feb 10 22:36:27 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Tue Feb 12 01:32:08 2019
@@ -3900,7 +3900,7 @@ Requires: repository, working directory.
 .IP "\(bu" 2
 Changes: working directory.
 .SP
-After you\(aqve run checkout to create your private copy
+After you\(aqve run \fBcheckout\fR to create your private copy
 of source from the common repository, other developers
 will continue changing the central source.  From time
 to time, when it is convenient in your development
@@ -3954,19 +3954,6 @@ Local; run only in current working direc
 Prune empty directories.  See see node `Moving directories\(aq in the CVS manual.
 .SP
 .IP "" 0
-\fB-t\fR
-.IP "" 2
-Preserve source timestamps.  Unlike \fBcheckout\fR where files are created
-using the original timestamp of the file in the repository, \fBupdate\fR
-updates files using the current time of the machine.  This is convenient
-because updated files appear newer than any other files on the system so
-.BR make ( 1 )
-knows that are their corresponding built artifacts are out of date and
-they will get rebuilt.  The \fB-t\fR flag instead preserves the timestamps
-of the original repository files, behaving exactly like \fBcheckout\fR.
-This is useful for maintaining a tree in the original checked-out state.
-.SP
-.IP "" 0
 \fB-p\fR
 .IP "" 2
 Pipe files to the standard output.
@@ -3986,6 +3973,18 @@ existed on \fIdate\fR.  This option is s
 See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates. Also
 see see node `Common options\(aq in the CVS manual.
 .SP
+.IP "" 0
+\fB-t\fR
+.IP "" 2
+Preserve source timestamps.  Unlike \fBcheckout\fR, where files are created
+using the original timestamp of the file in the repository, \fBupdate\fR
+updates files using the current time of the machine.  This is convenient
+because updated files appear newer than any other files on the system so
+\fBmake(1)\fR knows that their corresponding built artifacts are out of date
+and they will get rebuilt.  The \fB-t\fR flag instead preserves the timestamps
+of the original repository files, behaving exactly like \fBcheckout\fR.
+This is useful for maintaining a tree in the original checked-out state.
+.SP
 These special options are also available with
 \fBupdate\fR.
 .SP

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.4 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.5
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.4	Sun Feb 10 22:36:27 2019
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Tue Feb 12 01:32:08 2019
@@ -11595,14 +11595,14 @@ supported beginning with @sc{cvs} releas
 
 @itemize @bullet
 @item
-update [-ACdflPpR] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files@dots{}
+update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files@dots{}
 @item
 Requires: repository, working directory.
 @item
 Changes: working directory.
 @end itemize
 
-After you've run checkout to create your private copy
+After you've run @code{checkout} to create your private copy
 of source from the common repository, other developers
 will continue changing the central source.  From time
 to time, when it is convenient in your development
@@ -11666,6 +11666,16 @@ and @var{tag} is a branch tag, the versi
 existed on @var{date}.  This option is sticky, and implies @samp{-P}.
 See @ref{Sticky tags}, for more information on sticky tags/dates. Also
 see @ref{Common options}.
+
+@item -t
+Preserve source timestamps.  Unlike @code{checkout}, where files are created
+using the original timestamp of the file in the repository, @code{update}
+updates files using the current time of the machine.  This is convenient
+because updated files appear newer than any other files on the system so
+@code{make(1)} knows that their corresponding built artifacts are out of date
+and they will get rebuilt.  The @samp{-t} flag instead preserves the timestamps
+of the original repository files, behaving exactly like @code{checkout}.
+This is useful

CVS commit: src/external/gpl2/xcvs/dist/doc

2019-02-10 Thread David H. Gutteridge

Module Name:src
Committed By:   gutteridge
Date:   Sun Feb 10 22:36:27 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
cvs.1 & cvs.texinfo: add missing sections documenting the "add" and
"remove" commands. These were never present upstream on the branch
NetBSD imported, but were subsequently added on other branches (against
upstream's HEAD: cvs.1: r. 1.53 & cvs.texinfo: r. 1.697).

XXX While cvs.texinfo is supposed to be used to auto-generate cvs.1,
that isn't safe at present, because content has been added direct to
cvs.1 in NetBSD's tree.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.4 src/external/gpl2/xcvs/dist/doc/cvs.1:1.5
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.4	Fri Jan 20 16:54:11 2017
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Sun Feb 10 22:36:27 2019
@@ -674,6 +674,111 @@ Available with the following commands: \
 and \fBupdate\fR.
 .SP
 .SP
+.SH "add"
+.SS "Add files and directories to the repository"
+.IX "add (subcommand)"
+.SP
+.IP "\(bu" 2
+Synopsis: add [-k rcs-kflag] [-m message] files...
+.IP "\(bu" 2
+Requires: repository, working directory.
+.IP "\(bu" 2
+Changes: repository, working directory.
+.SP
+The \fBadd\fR command is used to present new files
+and directories for addition into the \fBcvs\fR
+repository.  When \fBadd\fR is used on a directory,
+a new directory is created in the repository
+immediately.  When used on a file, only the working
+directory is updated.  Changes to the repository are
+not made until the \fBcommit\fR command is used on
+the newly added file. 
+.SP
+The \fBadd\fR command also resurrects files that
+have been previously removed.  This can be done
+before or after the \fBcommit\fR command is used
+to finalize the removal of files.  Resurrected files
+are restored into the working directory at the time
+the \fBadd\fR command is executed.
+.SP
+.SH "add options"
+.SP
+These standard options are supported by \fBadd\fR
+(see node `Common options\(aq in the CVS manual, for a complete description of
+them):
+.SP
+.IP "" 0
+\fB-k \fIkflag\fB\fR
+.IP "" 2
+Process keywords according to \fIkflag\fR.  See
+see node `Keyword substitution\(aq in the CVS manual.
+This option is sticky; future updates of
+this file in this working directory will use the same
+\fIkflag\fR.  The \fBstatus\fR command can be viewed
+to see the sticky options.  For more information on
+the \fBstatus\fR command, see node `Invoking CVS\(aq in the CVS manual.
+.SP
+.IP "" 0
+\fB-m \fImessage\fB\fR
+.IP "" 2
+Use \fImessage\fR as the log message, instead of
+invoking an editor.
+.SP
+.SH "add examples"
+.SP
+.SS "Adding a directory"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ mkdir doc
+.IP "" 2
+$ cvs add doc
+.IP "" 2
+Directory /path/to/repository/doc added to the repository
+
+.PD
+.IP "" 0
+.SP
+.SS "Adding a file"
+.SP
+.PD 0
+.SP
+.SP
+.IP "" 2
+$ >TODO
+.IP "" 2
+$ cvs add TODO
+.IP "" 2
+cvs add: scheduling file \`TODO\(aq for addition
+.IP "" 2
+cvs add: use \(aqcvs commit\(aq to add this file permanently
+
+.PD
+.IP "" 0
+.SP
+.SS "Undoing a \fBremove\fR command"
+.SP
+.PD 0
+.SP
+.IP "" 2
+$ rm -f makefile
+.IP "" 2
+$ cvs remove makefile
+.IP "" 2
+cvs remove: scheduling \`makefile\(aq for removal
+.IP "" 2
+cvs remove: use \(aqcvs commit\(aq to remove this file permanently
+.IP "" 2
+$ cvs add makefile
+.IP "" 2
+U makefile
+.IP "" 2
+cvs add: makefile, version 1.2, resurrected
+
+.PD
+.IP "" 0
+.SP
 .SH "admin"
 .SS "Administration"
 .IX "Admin (subcommand)"
@@ -3624,6 +3729,131 @@ $
 .PD
 .IP "" 0
 .SP
+.SH "remove"
+.SS "Remove files from active use"
+.IX "remove (subcommand)"
+.SP
+.IP "\(bu" 2
+Synopsis: remove [-flR] [files...]
+.IP "\(bu" 2
+Requires: repository, working directory.
+.IP "\(bu" 2
+Changes: working directory.
+.SP
+The \fBremove\fR command is used to remove unwanted
+files from active use.  The user normally deletes the
+files from the working directory prior to invocation
+of the \fBremove\fR command.  Only the working
+directory is updated.  Changes to the repository are
+not made until the \fBcommit\fR command is run.
+.SP
+The \fBremove\fR command does not delete files from
+from the repository.  \fBcvs\fR keeps all historical
+data in the repository so that it is possible to
+reconstruct previous states of the projects under
+revision control.
+.SP
+To undo \fBcvs\fR \fBremove\fR or to resurrect files
+that were previously removed, see node `add\(aq in the CVS manual.
+.SP
+.SH "remove options"
+.SP
+These standard options are supported by \fBremove\fR
+(see node `Common options\(aq in the CVS manual for a complete description of
+them):
+.SP
+.IP "" 0
+\fB-l\fR

CVS commit: src/external/gpl2/xcvs/dist/src

2019-01-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Jan  5 00:27:58 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/src: tag.c

Log Message:
When we we fail to remove tags, print an error message since we are going
to be exiting with an error anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/src/tag.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/tag.c
diff -u src/external/gpl2/xcvs/dist/src/tag.c:1.4 src/external/gpl2/xcvs/dist/src/tag.c:1.5
--- src/external/gpl2/xcvs/dist/src/tag.c:1.4	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/tag.c	Fri Jan  4 19:27:58 2019
@@ -17,7 +17,7 @@
  * the modules database, if necessary.
  */
 #include 
-__RCSID("$NetBSD: tag.c,v 1.4 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: tag.c,v 1.5 2019/01/05 00:27:58 christos Exp $");
 
 #include "cvs.h"
 #include 
@@ -1189,7 +1189,7 @@ rtag_delete (RCSNode *rcsfile)
 if ((isbranch && !disturb_branch_tags) ||
 	(!isbranch && disturb_branch_tags))
 {
-	if (!quiet)
+	if (!really_quiet)
 	error (0, 0,
"Not removing %s tag `%s' from `%s'%s.",
isbranch ? "branch" : "non-branch",
@@ -1200,7 +1200,7 @@ rtag_delete (RCSNode *rcsfile)
 
 if ((retcode = RCS_deltag(rcsfile, symtag)) != 0)
 {
-	if (!quiet)
+	if (!really_quiet)
 	error (0, retcode == -1 ? errno : 0,
 		   "failed to remove tag `%s' from `%s'", symtag,
 		   rcsfile->path);
@@ -1275,7 +1275,7 @@ tag_fileproc (void *callerdat, struct fi
 	if ((isbranch && !disturb_branch_tags) ||
 	(!isbranch && disturb_branch_tags))
 	{
-	if (!quiet)
+	if (!really_quiet)
 		error(0, 0,
 		   "Not removing %s tag `%s' from `%s'%s.",
 			isbranch ? "branch" : "non-branch",
@@ -1287,7 +1287,7 @@ tag_fileproc (void *callerdat, struct fi
 
 	if ((retcode = RCS_deltag (vers->srcfile, symtag)) != 0)
 	{
-	if (!quiet)
+	if (!really_quiet)
 		error (0, retcode == -1 ? errno : 0,
 		   "failed to remove tag %s from %s", symtag,
 		   vers->srcfile->path);

CVS commit: src/external/gpl2/lvm2/dist/libdm/ioctl

2018-11-24 Thread Michael van Elst

Module Name:src
Committed By:   mlelstv
Date:   Sat Nov 24 11:27:37 UTC 2018

Modified Files:
src/external/gpl2/lvm2/dist/libdm/ioctl: libdm-nbsd-iface.c

Log Message:
Support device nodes that have no entry in /dev, identify them by major:minor
numbers like the original Linux code.

While here, fix a memory leak.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c

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

Modified files:

Index: src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c
diff -u src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.11 src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.12
--- src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c:1.11	Tue Feb  8 03:26:12 2011
+++ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm-nbsd-iface.c	Sat Nov 24 11:27:37 2018
@@ -1,4 +1,4 @@
-/*  $NetBSD: libdm-nbsd-iface.c,v 1.11 2011/02/08 03:26:12 haad Exp $*/
+/*  $NetBSD: libdm-nbsd-iface.c,v 1.12 2018/11/24 11:27:37 mlelstv Exp $*/
 
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
@@ -25,7 +25,9 @@
 #include 
 
 #include 
+#include 
 #include 
+#include 
 #include 
 
 #include 
@@ -367,40 +369,31 @@ static int _unmarshal_status(struct dm_t
 }
 
 static char *
-get_dev_name(char *d_name, uint32_t d_major, uint32_t d_minor)
+get_dev_name(dev_t dev)
 {
+	static char * const dirs[2] = { _PATH_DEV, NULL };
 	static char d_buf[MAXPATHLEN];
-	struct dirent *dire;
-	struct stat st;
-	DIR *dev_dir;
-
-	int err;
+	FTS *ftsp;
+	FTSENT *fe;
 	char *name;
 
-	dev_dir = opendir("/dev");
-
-	while ((dire = readdir(dev_dir)) != NULL) {
+	if ((ftsp = fts_open(dirs, FTS_NOCHDIR | FTS_PHYSICAL, NULL)) == NULL)
+		return NULL;
 
-		if (strstr(dire->d_name, d_name) == NULL)
+	name = NULL;
+	while ((fe = fts_read(ftsp)) != NULL) {
+		if (fe->fts_info != FTS_DEFAULT)
 			continue;
-
-		snprintf(d_buf, MAXPATHLEN, "/dev/%s", dire->d_name);
-
-		if ((err = stat(d_buf, )) < 0)
-			printf("stat failed with %d", err);
-
-		if (st.st_mode & S_IFBLK){
-			if ((major(st.st_rdev) == d_major) && (minor(st.st_rdev) == d_minor)) {
-strncpy(d_buf, dire->d_name, strlen(dire->d_name) + 1);
+		if (S_ISBLK(fe->fts_statp->st_mode)) {
+			if (fe->fts_statp->st_rdev == dev) {
+strlcpy(d_buf, fe->fts_path, sizeof(d_buf));
 name = d_buf;
 break;
 			}
 		}
-
-		memset(d_buf, '0', sizeof(d_buf));
 	}
 
-	(void)closedir(dev_dir);
+	fts_close(ftsp);
 
 	return name;
 }
@@ -417,13 +410,15 @@ int dm_format_dev(char *buf, int bufsize
 		  uint32_t dev_minor)
 {
 	int r;
-	uint32_t major, dm_major;
+	uint32_t dm_major;
+	int major;
 	char *name;
 	mode_t mode;
 	dev_t dev;
 	size_t val_len,i;
 	struct kinfo_drivers *kd;
 
+	major = -1;
 	mode = 0;
 
 	nbsd_get_dm_major(_major, DM_BLOCK_MAJOR);
@@ -432,7 +427,7 @@ int dm_format_dev(char *buf, int bufsize
 		return 0;
 
 	if (sysctlbyname("kern.drivers",NULL,_len,NULL,0) < 0) {
-		printf("sysctlbyname failed");
+		printf("sysctlbyname failed\n");
 		return 0;
 	}
 
@@ -442,7 +437,8 @@ int dm_format_dev(char *buf, int bufsize
 	}
 
 	if (sysctlbyname("kern.drivers", kd, _len, NULL, 0) < 0) {
-		printf("sysctlbyname failed kd");
+		free(kd);
+		printf("sysctlbyname failed kd\n");
 		return 0;
 	}
 
@@ -453,18 +449,22 @@ int dm_format_dev(char *buf, int bufsize
 		}
 	}
 
-	dev = MKDEV(major,dev_minor);
-
-	mode |= S_IFBLK;
-
-	if ((name = devname(dev,mode)) == NULL)
-		name = get_dev_name(kd[i].d_name, major, dev_minor);
-
-	r = snprintf(buf, (size_t) bufsize, "/dev/%s",name);
+	if (major != -1) {
+		dev = MKDEV(major,dev_minor);
+		mode |= S_IFBLK;
+		if ((name = devname(dev,mode)) == NULL)
+			name = get_dev_name(dev);
+	} else
+		name = NULL;
 
 	free(kd);
 
-	if (r < 0 || r > bufsize - 1 || name == NULL)
+	if (name == NULL)
+		r = snprintf(buf, (size_t) bufsize, "%d:%d", dev_major, dev_minor);
+	else
+		r = snprintf(buf, (size_t) bufsize, _PATH_DEV "%s", name);
+
+	if (r < 0 || r > bufsize - 1)
 		return 0;
 
 	return 1;

CVS commit: src/external/gpl2/groff/dist

2018-11-06 Thread Sevan Janiyan

Module Name:src
Committed By:   sevan
Date:   Tue Nov  6 22:01:16 UTC 2018

Modified Files:
src/external/gpl2/groff/dist: configure

Log Message:
Test for other exit cases.
It might be worth regenerating configure with modern autoconf.

Reviewed by 
Closes PR toolchain/53314


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/groff/dist/configure

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

Modified files:

Index: src/external/gpl2/groff/dist/configure
diff -u src/external/gpl2/groff/dist/configure:1.1.1.1 src/external/gpl2/groff/dist/configure:1.2
--- src/external/gpl2/groff/dist/configure:1.1.1.1	Wed Jan 13 18:41:45 2016
+++ src/external/gpl2/groff/dist/configure	Tue Nov  6 22:01:16 2018
@@ -2511,6 +2511,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
'extern "C" void exit (int);' \
+   'extern "C" [[noreturn]] void exit (int);' \
+   'extern "C" _Noreturn void exit (int);' \
'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
@@ -2977,6 +2979,8 @@ for ac_declaration in \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
'extern "C" void exit (int);' \
+   'extern "C" [[noreturn]] void exit (int);' \
+   'extern "C" _Noreturn void exit (int);' \
'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF

CVS commit: src/external/gpl2/xcvs/dist/src

2018-08-21 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Aug 21 15:37:34 UTC 2018

Modified Files:
src/external/gpl2/xcvs/dist/src: main.c run.c

Log Message:
support SIGINFO


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/src/main.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/run.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/main.c
diff -u src/external/gpl2/xcvs/dist/src/main.c:1.6 src/external/gpl2/xcvs/dist/src/main.c:1.7
--- src/external/gpl2/xcvs/dist/src/main.c:1.6	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/main.c	Tue Aug 21 11:37:33 2018
@@ -17,7 +17,7 @@
  *
  */
 #include 
-__RCSID("$NetBSD: main.c,v 1.6 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.7 2018/08/21 15:37:33 christos Exp $");
 
 #include "cvs.h"
 
@@ -498,6 +498,32 @@ divide_by (unsigned char buf[COMMITID_RA
 return carry;
 }
 
+#ifdef SIGINFO
+#include 
+
+static void
+show_status (int n)
+{
+	char wd[PATH_MAX];
+	char buf[2048];
+	static int ttyfd = -2;
+
+	if (ttyfd == -2)
+		ttyfd = open(_PATH_TTY, O_RDWR, O_CLOEXEC);
+
+	if (ttyfd == -1)
+		return;
+
+	if (getcwd(wd, sizeof(wd)) == NULL)
+		return;
+	n = snprintf(buf, sizeof(buf), "%s[%d]: working in %s\n", getprogname(),
+	(int)getpid(), wd);
+	if (n <= 0)
+		return;
+	write(ttyfd, buf, (size_t)n);
+}
+#endif
+
 static void
 convert (char const input[COMMITID_RAW_SIZE], char *output)
 {
@@ -967,6 +993,9 @@ cause intermittent sandbox corruption.")
 
 	/* make sure we clean up on error */
 	signals_register (main_cleanup);
+#ifdef SIGINFO
+	signal (SIGINFO, show_status);
+#endif
 
 #ifdef KLUDGE_FOR_WNT_TESTSUITE
 	/* Probably the need for this will go away at some point once

Index: src/external/gpl2/xcvs/dist/src/run.c
diff -u src/external/gpl2/xcvs/dist/src/run.c:1.3 src/external/gpl2/xcvs/dist/src/run.c:1.4
--- src/external/gpl2/xcvs/dist/src/run.c:1.3	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/run.c	Tue Aug 21 11:37:33 2018
@@ -12,7 +12,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.  */
 #include 
-__RCSID("$NetBSD: run.c,v 1.3 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: run.c,v 1.4 2018/08/21 15:37:33 christos Exp $");
 
 #include "cvs.h"
 
@@ -239,6 +239,9 @@ run_exec (const char *stin, const char *
 #endif
 if (pid == 0)
 {
+#ifdef SIGINFO
+   signal (SIGINFO, SIG_DFL);
+#endif
 #ifdef SETXID_SUPPORT
 	if (flags & RUN_UNSETXID) {
 	(void) setgid (getgid ());
@@ -570,6 +573,9 @@ piped_child (char *const *command, int *
 	error (1, errno, "cannot fork");
 if (pid == 0)
 {
+#ifdef SIGINFO
+	signal (SIGINFO, SIG_DFL);
+#endif
 	if (dup2 (to_child_pipe[0], STDIN_FILENO) < 0)
 	error (1, errno, "cannot dup2 pipe");
 	if (close (to_child_pipe[1]) < 0)

CVS commit: src/external/gpl2/groff/dist/tmac

2018-07-27 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Fri Jul 27 15:13:01 UTC 2018

Modified Files:
src/external/gpl2/groff/dist/tmac: doc-syms groff_mdoc.man

Log Message:
it's c18, not c17.
thanks ingo schwarze.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/groff/dist/tmac/doc-syms
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/groff/dist/tmac/groff_mdoc.man

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

Modified files:

Index: src/external/gpl2/groff/dist/tmac/doc-syms
diff -u src/external/gpl2/groff/dist/tmac/doc-syms:1.4 src/external/gpl2/groff/dist/tmac/doc-syms:1.5
--- src/external/gpl2/groff/dist/tmac/doc-syms:1.4	Fri Jul 27 14:30:22 2018
+++ src/external/gpl2/groff/dist/tmac/doc-syms	Fri Jul 27 15:13:01 2018
@@ -545,8 +545,8 @@
 .as doc-str-St--isoC-99" (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq])
 .ds doc-str-St--isoC-2011  \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2011
 .as doc-str-St--isoC-2011  " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^11\*[doc-str-St]\*[Rq])
-.ds doc-str-St--isoC-2017  \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2017
-.as doc-str-St--isoC-2017  " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^17\*[doc-str-St]\*[Rq])
+.ds doc-str-St--isoC-2018  \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2018
+.as doc-str-St--isoC-2018  " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^18\*[doc-str-St]\*[Rq])
 .
 .\" POSIX Part 1: System API
 .ds doc-str-St--p1003.1\*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1

Index: src/external/gpl2/groff/dist/tmac/groff_mdoc.man
diff -u src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.6 src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.7
--- src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.6	Fri Jul 27 14:30:22 2018
+++ src/external/gpl2/groff/dist/tmac/groff_mdoc.man	Fri Jul 27 15:13:01 2018
@@ -1948,8 +1948,8 @@ are:
 .St -isoC-99
 .It Li -isoC-2011
 .St -isoC-2011
-.It Li -isoC-2017
-.St -isoC-2017
+.It Li -isoC-2018
+.St -isoC-2018
 .El
 .Pp
 .

CVS commit: src/external/gpl2/groff/dist/tmac

2018-07-27 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Fri Jul 27 14:30:22 UTC 2018

Modified Files:
src/external/gpl2/groff/dist/tmac: doc-syms groff_mdoc.man

Log Message:
Support -isoC-2017


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/groff/dist/tmac/doc-syms
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/groff/dist/tmac/groff_mdoc.man

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

Modified files:

Index: src/external/gpl2/groff/dist/tmac/doc-syms
diff -u src/external/gpl2/groff/dist/tmac/doc-syms:1.3 src/external/gpl2/groff/dist/tmac/doc-syms:1.4
--- src/external/gpl2/groff/dist/tmac/doc-syms:1.3	Mon Nov 21 20:43:25 2016
+++ src/external/gpl2/groff/dist/tmac/doc-syms	Fri Jul 27 14:30:22 2018
@@ -545,6 +545,8 @@
 .as doc-str-St--isoC-99" (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq])
 .ds doc-str-St--isoC-2011  \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2011
 .as doc-str-St--isoC-2011  " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^11\*[doc-str-St]\*[Rq])
+.ds doc-str-St--isoC-2017  \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2017
+.as doc-str-St--isoC-2017  " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^17\*[doc-str-St]\*[Rq])
 .
 .\" POSIX Part 1: System API
 .ds doc-str-St--p1003.1\*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1

Index: src/external/gpl2/groff/dist/tmac/groff_mdoc.man
diff -u src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.5 src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.6
--- src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.5	Wed Jan 24 09:04:41 2018
+++ src/external/gpl2/groff/dist/tmac/groff_mdoc.man	Fri Jul 27 14:30:22 2018
@@ -44,7 +44,7 @@
 .\" for an already extremely slow package.
 .\"
 .
-.Dd June 9, 2013
+.Dd July 27, 2018
 .Os
 .Dt GROFF_MDOC 7
 .
@@ -1948,6 +1948,8 @@ are:
 .St -isoC-99
 .It Li -isoC-2011
 .St -isoC-2011
+.It Li -isoC-2017
+.St -isoC-2017
 .El
 .Pp
 .

CVS commit: src/external/gpl2/xcvs

2018-06-25 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Mon Jun 25 18:03:56 UTC 2018

Modified Files:
src/external/gpl2/xcvs: Makefile.inc

Log Message:
Specify SANITIZER_RENAME_SYMBOL in cvs

Rename local versions of regcomp regerror regexec regfree in order to
remove symbol clash with libc.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/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/gpl2/xcvs/Makefile.inc
diff -u src/external/gpl2/xcvs/Makefile.inc:1.4 src/external/gpl2/xcvs/Makefile.inc:1.5
--- src/external/gpl2/xcvs/Makefile.inc:1.4	Sat Jan 30 16:47:00 2016
+++ src/external/gpl2/xcvs/Makefile.inc	Mon Jun 25 18:03:56 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.4 2016/01/30 16:47:00 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.5 2018/06/25 18:03:56 kamil Exp $
 
 .include 
 
@@ -24,3 +24,5 @@ COBJDIR!=cd $(.CURDIR)/../../lib/libcvs 
 LIBDIFF=	${DOBJDIR}/libdiff.a
 LIBCVS=		${COBJDIR}/libcvs.a
 .endif
+
+SANITIZER_RENAME_SYMBOL+=	regcomp regerror regexec regfree

CVS commit: src/external/gpl2/grep

2018-06-25 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Mon Jun 25 18:02:49 UTC 2018

Modified Files:
src/external/gpl2/grep: Makefile.inc

Log Message:
Specify SANITIZER_RENAME_SYMBOL in grep

Rename local versions of regcomp regerror regexec regfree in order to
remove symbol clash with libc.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/grep/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/gpl2/grep/Makefile.inc
diff -u src/external/gpl2/grep/Makefile.inc:1.1 src/external/gpl2/grep/Makefile.inc:1.2
--- src/external/gpl2/grep/Makefile.inc:1.1	Sun Jan 10 22:16:40 2016
+++ src/external/gpl2/grep/Makefile.inc	Mon Jun 25 18:02:49 2018
@@ -1,7 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.1 2016/01/10 22:16:40 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2018/06/25 18:02:49 kamil Exp $
 
 .include 
 
+SANITIZER_RENAME_SYMBOL+=	regcomp regerror regexec regfree
+
 WARNS=	0
 
 IDIST=	${NETBSDSRCDIR}/external/gpl2/grep/dist

CVS commit: src/external/gpl2/diffutils

2018-06-25 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Mon Jun 25 18:01:13 UTC 2018

Modified Files:
src/external/gpl2/diffutils: Makefile.inc

Log Message:
Specify SANITIZER_RENAME_SYMBOL in diffutils

Rename local versions of regcomp regerror regexec regfree in order to
remove symbol clash with libc.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/diffutils/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/gpl2/diffutils/Makefile.inc
diff -u src/external/gpl2/diffutils/Makefile.inc:1.1 src/external/gpl2/diffutils/Makefile.inc:1.2
--- src/external/gpl2/diffutils/Makefile.inc:1.1	Wed Jan 13 03:39:28 2016
+++ src/external/gpl2/diffutils/Makefile.inc	Mon Jun 25 18:01:13 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1 2016/01/13 03:39:28 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2018/06/25 18:01:13 kamil Exp $
 
 WARNS=	0
 
@@ -6,3 +6,5 @@ IDIST=	${NETBSDSRCDIR}/external/gpl2/dif
 
 CPPFLAGS+=	-DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H \
 		-I${IDIST}/../include -I${IDIST}/lib
+
+SANITIZER_RENAME_SYMBOL+=	regcomp regerror regexec regfree

CVS commit: src/external/gpl2/gettext/lib/libnlspr

2018-06-24 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Sun Jun 24 19:27:26 UTC 2018

Modified Files:
src/external/gpl2/gettext/lib/libnlspr: Makefile

Log Message:
Fix typo in previous

The -Wno-format-extra-args argument to Clang/LLVM needs trailing 's'.

Noted by 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/gettext/lib/libnlspr/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/gpl2/gettext/lib/libnlspr/Makefile
diff -u src/external/gpl2/gettext/lib/libnlspr/Makefile:1.4 src/external/gpl2/gettext/lib/libnlspr/Makefile:1.5
--- src/external/gpl2/gettext/lib/libnlspr/Makefile:1.4	Sat Jun 23 20:15:23 2018
+++ src/external/gpl2/gettext/lib/libnlspr/Makefile	Sun Jun 24 19:27:26 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2018/06/23 20:15:23 kamil Exp $
+#	$NetBSD: Makefile,v 1.5 2018/06/24 19:27:26 kamil Exp $
 
 LIBISPRIVATE=	yes
 
@@ -102,7 +102,7 @@ COPTS.write-tcl.c = -Wno-stack-protector
 COPTS.msgl-fsearch.c = -Wno-variably-modified
 
 CWARNFLAGS.clang+=	-Wno-tautological-compare
-CWARNFLAGS.clang+=	-Wno-format-extra-arg
+CWARNFLAGS.clang+=	-Wno-format-extra-args
 
 .include

CVS commit: src/external/gpl2/gettext/lib/libnlspr

2018-06-23 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Sat Jun 23 20:15:23 UTC 2018

Modified Files:
src/external/gpl2/gettext/lib/libnlspr: Makefile

Log Message:
Specify -Wno-format-extra-args for Clang/LLVM in gpl2/gettext

This is needed with Clang v. 7svn (HEAD) 2018-06-23 snapshot.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/gettext/lib/libnlspr/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/gpl2/gettext/lib/libnlspr/Makefile
diff -u src/external/gpl2/gettext/lib/libnlspr/Makefile:1.3 src/external/gpl2/gettext/lib/libnlspr/Makefile:1.4
--- src/external/gpl2/gettext/lib/libnlspr/Makefile:1.3	Fri Jan 15 18:03:32 2016
+++ src/external/gpl2/gettext/lib/libnlspr/Makefile	Sat Jun 23 20:15:23 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2016/01/15 18:03:32 tron Exp $
+#	$NetBSD: Makefile,v 1.4 2018/06/23 20:15:23 kamil Exp $
 
 LIBISPRIVATE=	yes
 
@@ -102,6 +102,7 @@ COPTS.write-tcl.c = -Wno-stack-protector
 COPTS.msgl-fsearch.c = -Wno-variably-modified
 
 CWARNFLAGS.clang+=	-Wno-tautological-compare
+CWARNFLAGS.clang+=	-Wno-format-extra-arg
 
 .include

CVS commit: src/external/gpl2/groff/dist

2018-06-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Jun 22 17:28:27 UTC 2018

Modified Files:
src/external/gpl2/groff/dist: Makefile.in

Log Message:
Don't look in random (legacy) places for fonts. We want reproducible builds
to work.
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/dist/Makefile.in

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

Modified files:

Index: src/external/gpl2/groff/dist/Makefile.in
diff -u src/external/gpl2/groff/dist/Makefile.in:1.2 src/external/gpl2/groff/dist/Makefile.in:1.3
--- src/external/gpl2/groff/dist/Makefile.in:1.2	Wed Jan 13 14:01:58 2016
+++ src/external/gpl2/groff/dist/Makefile.in	Fri Jun 22 13:28:27 2018
@@ -156,7 +156,7 @@ localfontdir=$(dataprogramdir)/site-font
 legacyfontdir=/usr/lib/font
 
 # `fontpath' says where to look for dev*/*.
-fontpath=$(localfontdir)$(RT_SEP)$(fontdir)$(RT_SEP)$(legacyfontdir)
+fontpath=$(localfontdir)$(RT_SEP)$(fontdir)
 
 # `tmacdir' says where to install macros.
 tmacdir=$(datasubdir)/tmac

CVS commit: src/external/gpl2/grep/dist/lib

2018-06-14 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Thu Jun 14 10:14:39 UTC 2018

Modified Files:
src/external/gpl2/grep/dist/lib: obstack.c

Log Message:
Make the alignof() usage more portable in grep(1)

Remove NetBSD specific check and replace it with GCC extension __alignof__
that is available since GCC 2.x.

Requested by 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/grep/dist/lib/obstack.c

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

Modified files:

Index: src/external/gpl2/grep/dist/lib/obstack.c
diff -u src/external/gpl2/grep/dist/lib/obstack.c:1.2 src/external/gpl2/grep/dist/lib/obstack.c:1.3
--- src/external/gpl2/grep/dist/lib/obstack.c:1.2	Wed Jun 13 17:32:29 2018
+++ src/external/gpl2/grep/dist/lib/obstack.c	Thu Jun 14 10:14:39 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: obstack.c,v 1.2 2018/06/13 17:32:29 kamil Exp $	*/
+/*	$NetBSD: obstack.c,v 1.3 2018/06/14 10:14:39 kamil Exp $	*/
 
 /* obstack.c - subroutines used implicitly by object stack macros
Copyright (C) 1988-1994,96,97,98,99 Free Software Foundation, Inc.
@@ -61,23 +61,7 @@
 
 /* Determine default alignment.  */
 struct fooalign {char x; double d;};
-
-#if defined(__NetBSD__)
-#include 
-#endif
-
-#ifndef __NetBSD_Prereq__
-#define __NetBSD_Prereq__(a,b,c) 0
-#endif
-
-#if __NetBSD_Prereq__(8,0,0)
-#include 
-// Avoid Undefined Behavior
-#define DEFAULT_ALIGNMENT ((int)alignof(struct fooalign))
-#else
-#define DEFAULT_ALIGNMENT  \
-  ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
-#endif
+#define DEFAULT_ALIGNMENT ((int)__alignof__(struct fooalign))
 /* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
But in fact it might be less smart and round addresses to as much as
DEFAULT_ROUNDING.  So we prepare for it to do that.  */

CVS commit: src/external/gpl2/grep/dist/lib

2018-06-13 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Wed Jun 13 17:32:29 UTC 2018

Modified Files:
src/external/gpl2/grep/dist/lib: obstack.c

Log Message:
Avoid Undefind Behavior in DEFAULT_ALIGNMENT in GNU grep(1)

Replace homegrown logic of calculating alignment with alignof, a C11 header
feature.

Add a check for NetBSD >= 8.0 just in case that someone will want to build
it on older NetBSD.

Issue detected with UBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/grep/dist/lib/obstack.c

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

Modified files:

Index: src/external/gpl2/grep/dist/lib/obstack.c
diff -u src/external/gpl2/grep/dist/lib/obstack.c:1.1.1.1 src/external/gpl2/grep/dist/lib/obstack.c:1.2
--- src/external/gpl2/grep/dist/lib/obstack.c:1.1.1.1	Sun Jan 10 21:36:18 2016
+++ src/external/gpl2/grep/dist/lib/obstack.c	Wed Jun 13 17:32:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: obstack.c,v 1.1.1.1 2016/01/10 21:36:18 christos Exp $	*/
+/*	$NetBSD: obstack.c,v 1.2 2018/06/13 17:32:29 kamil Exp $	*/
 
 /* obstack.c - subroutines used implicitly by object stack macros
Copyright (C) 1988-1994,96,97,98,99 Free Software Foundation, Inc.
@@ -61,8 +61,23 @@
 
 /* Determine default alignment.  */
 struct fooalign {char x; double d;};
+
+#if defined(__NetBSD__)
+#include 
+#endif
+
+#ifndef __NetBSD_Prereq__
+#define __NetBSD_Prereq__(a,b,c) 0
+#endif
+
+#if __NetBSD_Prereq__(8,0,0)
+#include 
+// Avoid Undefined Behavior
+#define DEFAULT_ALIGNMENT ((int)alignof(struct fooalign))
+#else
 #define DEFAULT_ALIGNMENT  \
   ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
+#endif
 /* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
But in fact it might be less smart and round addresses to as much as
DEFAULT_ROUNDING.  So we prepare for it to do that.  */

CVS commit: src/external/gpl2/grep/dist/src

2018-06-12 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Tue Jun 12 21:22:47 UTC 2018

Modified Files:
src/external/gpl2/grep/dist/src: dfa.c

Log Message:
Prevent Undefined Behavior in shift of signed integer in grep(1)

There is an interface in grep: dfa.c with functions to test bit, set bit,
clear bit etc. They operate over the INT-wide mask (INTBITS). Use unsigned
shift in these interfaces to prevent UB.

Detected with MKSANITIZER with the undefined behavior sanitizer option.

Sponsored by 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/grep/dist/src/dfa.c

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

Modified files:

Index: src/external/gpl2/grep/dist/src/dfa.c
diff -u src/external/gpl2/grep/dist/src/dfa.c:1.2 src/external/gpl2/grep/dist/src/dfa.c:1.3
--- src/external/gpl2/grep/dist/src/dfa.c:1.2	Sun Jan 10 22:16:40 2016
+++ src/external/gpl2/grep/dist/src/dfa.c	Tue Jun 12 21:22:47 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: dfa.c,v 1.2 2016/01/10 22:16:40 christos Exp $	*/
+/*	$NetBSD: dfa.c,v 1.3 2018/06/12 21:22:47 kamil Exp $	*/
 
 /* dfa.c - deterministic extended regexp routines for GNU
Copyright 1988, 1998, 2000 Free Software Foundation, Inc.
@@ -223,19 +223,19 @@ prtok (token t)
 static int
 tstbit (unsigned b, charclass c)
 {
-  return c[b / INTBITS] & 1 << b % INTBITS;
+  return c[b / INTBITS] & 1U << b % INTBITS;
 }
 
 static void
 setbit (unsigned b, charclass c)
 {
-  c[b / INTBITS] |= 1 << b % INTBITS;
+  c[b / INTBITS] |= 1U << b % INTBITS;
 }
 
 static void
 clrbit (unsigned b, charclass c)
 {
-  c[b / INTBITS] &= ~(1 << b % INTBITS);
+  c[b / INTBITS] &= ~(1U << b % INTBITS);
 }
 
 static void
@@ -2203,7 +2203,7 @@ dfastate (int s, struct dfa *d, int tran
   /* Set the transitions for each character in the current label. */
   for (j = 0; j < CHARCLASS_INTS; ++j)
 	for (k = 0; k < INTBITS; ++k)
-	  if (labels[i][j] & 1 << k)
+	  if (labels[i][j] & 1U << k)
 	{
 	  int c = j * INTBITS + k;

CVS commit: src/external/gpl2/gmake/dist/glob

2018-05-23 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Wed May 23 09:52:27 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist/glob: glob.c

Log Message:
gmake: __alloca and __stat are provided only when building with GLIBC.

Fix a build failure on Ubuntu 18.04.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/gmake/dist/glob/glob.c

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

Modified files:

Index: src/external/gpl2/gmake/dist/glob/glob.c
diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.4 src/external/gpl2/gmake/dist/glob/glob.c:1.5
--- src/external/gpl2/gmake/dist/glob/glob.c:1.4	Mon Apr 16 16:11:40 2018
+++ src/external/gpl2/gmake/dist/glob/glob.c	Wed May 23 09:52:27 2018
@@ -207,7 +207,7 @@ my_realloc (p, n)
 #endif /* __GNU_LIBRARY__ */
 
 
-#if !defined __alloca && !(defined __GNU_LIBRARY__ || defined __GLIBC__)
+#if !defined __alloca
 
 # ifdef	__GNUC__
 #  undef alloca
@@ -230,7 +230,7 @@ extern char *alloca ();
 
 #endif
 
-#ifndef __GNU_LIBRARY__
+#if !defined __stat
 # define __stat stat
 # ifdef STAT_MACROS_BROKEN
 #  undef S_ISDIR

CVS commit: src/external/gpl2/groff/dist/src/preproc/grn

2018-05-16 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Wed May 16 13:53:29 UTC 2018

Modified Files:
src/external/gpl2/groff/dist/src/preproc/grn: hdb.cpp hgraph.cpp
hpoint.cpp main.cpp

Log Message:
Remove obsolete register keywords from C++ code.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp \
src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp \
src/external/gpl2/groff/dist/src/preproc/grn/hpoint.cpp \
src/external/gpl2/groff/dist/src/preproc/grn/main.cpp

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

Modified files:

Index: src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp
diff -u src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp:1.2
--- src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp:1.1.1.1	Wed Jan 13 18:41:49 2016
+++ src/external/gpl2/groff/dist/src/preproc/grn/hdb.cpp	Wed May 16 13:53:28 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdb.cpp,v 1.1.1.1 2016/01/13 18:41:49 christos Exp $	*/
+/*	$NetBSD: hdb.cpp,v 1.2 2018/05/16 13:53:28 joerg Exp $	*/
 
  /* Last non-groff version: hdb.c  1.8 (Berkeley) 84/10/20
  *
@@ -33,7 +33,7 @@ extern POINT *PTInit();
 extern POINT *PTMakePoint(double x, double y, POINT ** pplist);
 
 
-int DBGetType(register char *s);
+int DBGetType(char *s);
 
 
 /*
@@ -59,7 +59,7 @@ DBCreateElt(int type,
 	char *text,
 	ELT **db)
 {
-  register ELT *temp;
+  ELT *temp;
 
   temp = (ELT *) malloc(sizeof(ELT));
   temp->nextelt = *db;
@@ -78,11 +78,11 @@ DBCreateElt(int type,
  * pointer to that database.
  */
 ELT *
-DBRead(register FILE *file)
+DBRead(FILE *file)
 {
-  register int i;
-  register int done;		/* flag for input exhausted */
-  register double nx;		/* x holder so x is not set before orienting */
+  int i;
+  int done;			/* flag for input exhausted */
+  double nx;			/* x holder so x is not set before orienting */
   int type;			/* element type */
   ELT *elist;			/* pointer to the file's elements */
   POINT *plist;			/* pointer for reading in points */
@@ -207,7 +207,7 @@ DBRead(register FILE *file)
  * New file format has literal names for element types.
  */
 int
-DBGetType(register char *s)
+DBGetType(char *s)
 {
   if (isdigit(s[0]) || (s[0] == '-'))	/* old element format or EOF */
 return (atoi(s));
@@ -293,7 +293,7 @@ xscanf(FILE *f,
double *xp,
double *yp)
 {
-  register int c, i, j, m, frac;
+  int c, i, j, m, frac;
   int iscale = 1, jscale = 1;	/* x = i/scale, y=j/jscale */
 
   while ((c = getc(f)) == ' ');
Index: src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp
diff -u src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp:1.1.1.1 src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp:1.2
--- src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp:1.1.1.1	Wed Jan 13 18:41:49 2016
+++ src/external/gpl2/groff/dist/src/preproc/grn/hgraph.cpp	Wed May 16 13:53:28 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: hgraph.cpp,v 1.1.1.1 2016/01/13 18:41:49 christos Exp $	*/
+/*	$NetBSD: hgraph.cpp,v 1.2 2018/05/16 13:53:28 joerg Exp $	*/
 
 /* Last non-groff version: hgraph.c  1.14 (Berkeley) 84/11/27
  *
@@ -50,7 +50,7 @@ extern double adj4;
 extern int res;
 
 void HGSetFont(int font, int size);
-void HGPutText(int justify, POINT pnt, register char *string);
+void HGPutText(int justify, POINT pnt, char *string);
 void HGSetBrush(int mode);
 void tmove2(int px, int py);
 void doarc(POINT cp, POINT sp, int angle);
@@ -60,8 +60,8 @@ void drawwig(POINT * ptr, int type);
 void HGtline(int x1, int y1);
 void deltax(double x);
 void deltay(double y);
-void HGArc(register int cx, register int cy, int px, int py, int angle);
-void picurve(register int *x, register int *y, int npts);
+void HGArc(int cx, int cy, int px, int py, int angle);
+void picurve(int *x, int *y, int npts);
 void HGCurve(int *x, int *y, int numpoints);
 void Paramaterize(int x[], int y[], double h[], int n);
 void PeriodicSpline(double h[], int z[],
@@ -85,10 +85,10 @@ void
 HGPrintElt(ELT *element,
 	   int /* baseline */)
 {
-  register POINT *p1;
-  register POINT *p2;
-  register int length;
-  register int graylevel;
+  POINT *p1;
+  POINT *p2;
+  int length;
+  int graylevel;
 
   if (!DBNullelt(element) && !Nullpoint((p1 = element->ptlist))) {
 /* p1 always has first point */
@@ -280,7 +280,7 @@ HGPrintElt(ELT *element,
 void
 HGPutText(int justify,
 	  POINT pnt,
-	  register char *string)
+	  char *string)
 {
   int savelasty = lasty;	/* vertical motion for text is to be */
 /* ignored.  Save current y here */
@@ -389,7 +389,7 @@ HGSetFont(int font,
 void
 HGSetBrush(int mode)
 {
-  register int printed = 0;
+  int printed = 0;
 
   if (linmod != style[--mode]) {
 /* Groff doesn't understand \Ds, so we take it out */
@@ -419,7 +419,7 @@ HGSetBrush(int mode)
 void
 deltax(double x)
 {
-  register int ix =

CVS commit: src/external/gpl2/texinfo/makedoc

2018-05-02 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Thu May  3 01:12:26 UTC 2018

Modified Files:
src/external/gpl2/texinfo/makedoc: Makefile

Log Message:
Restore MAKEDOC. Fix a build failure on non NetBSD host.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/texinfo/makedoc/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/gpl2/texinfo/makedoc/Makefile
diff -u src/external/gpl2/texinfo/makedoc/Makefile:1.2 src/external/gpl2/texinfo/makedoc/Makefile:1.3
--- src/external/gpl2/texinfo/makedoc/Makefile:1.2	Tue May  1 19:59:43 2018
+++ src/external/gpl2/texinfo/makedoc/Makefile	Thu May  3 01:12:26 2018
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2018/05/01 19:59:43 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2018/05/03 01:12:26 nonaka Exp $
 
+MAKEDOC=
 .include 
 
 HOSTPROG=	makedoc

CVS commit: src/external/gpl2/gmake/dist

2018-04-30 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Tue May  1 00:39:58 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist: configure configure.in

Log Message:
gmake: Revert configure r1.2 and configure.in r1.2.

> gmake: Apply patch to support GLIBC glob interface v2
>
> http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116
>
> Fix a build failure on Ubuntu 18.04.

Don't apply an imcompatible license patch.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/configure \
src/external/gpl2/gmake/dist/configure.in

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

Modified files:

Index: src/external/gpl2/gmake/dist/configure
diff -u src/external/gpl2/gmake/dist/configure:1.2 src/external/gpl2/gmake/dist/configure:1.3
--- src/external/gpl2/gmake/dist/configure:1.2	Sat Apr 28 12:20:40 2018
+++ src/external/gpl2/gmake/dist/configure	Tue May  1 00:39:58 2018
@@ -13619,9 +13619,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include 
 #include 
 
+#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include 
-# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
gnu glob
 # endif
 #endif
Index: src/external/gpl2/gmake/dist/configure.in
diff -u src/external/gpl2/gmake/dist/configure.in:1.2 src/external/gpl2/gmake/dist/configure.in:1.3
--- src/external/gpl2/gmake/dist/configure.in:1.2	Sat Apr 28 12:20:40 2018
+++ src/external/gpl2/gmake/dist/configure.in	Tue May  1 00:39:58 2018
@@ -19,7 +19,7 @@
 AC_INIT([GNU make],[3.81],[bug-m...@gnu.org])
 
 AC_PREREQ(2.59)
-AC_REVISION([[$Id: configure.in,v 1.2 2018/04/28 12:20:40 nonaka Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.3 2018/05/01 00:39:58 nonaka Exp $]])
 
 # Autoconf setup
 AC_CONFIG_AUX_DIR(config)
@@ -351,9 +351,10 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
 #include 
 #include 
 
+#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include 
-# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
gnu glob
 # endif
 #endif

CVS commit: src/external/gpl2/gmake/dist

2018-04-30 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Tue May  1 00:36:58 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist: dir.c

Log Message:
gmake: Revert dir.c r.1.2.

> gmake: Make this work with glibc glob interface v2
>
> http://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81

Don't apply an imcompatible license patch.

Reported by kamil@n.o.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/dir.c

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

Modified files:

Index: src/external/gpl2/gmake/dist/dir.c
diff -u src/external/gpl2/gmake/dist/dir.c:1.2 src/external/gpl2/gmake/dist/dir.c:1.3
--- src/external/gpl2/gmake/dist/dir.c:1.2	Mon Apr 30 04:17:27 2018
+++ src/external/gpl2/gmake/dist/dir.c	Tue May  1 00:36:57 2018
@@ -1194,32 +1194,6 @@ local_stat (const char *path, struct sta
 }
 #endif
 
-/* Similarly for lstat.  */
-#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-# ifndef VMS
-#  ifndef HAVE_SYS_STAT_H
-int lstat (const char *path, struct stat *sbuf);
-#  endif
-# else
-/* We are done with the fake lstat.  Go back to the real lstat */
-#   ifdef lstat
-# undef lstat
-#   endif
-# endif
-# define local_lstat lstat
-#elif defined(WINDOWS32)
-/* Windows doesn't support lstat().  */
-# define local_lstat local_stat
-#else
-static int
-local_lstat (const char *path, struct stat *buf)
-{
-  int e;
-  EINTRLOOP (e, lstat (path, buf));
-  return e;
-}
-#endif
-
 void
 dir_setup_glob (glob_t *gl)
 {
@@ -1227,8 +1201,9 @@ dir_setup_glob (glob_t *gl)
   gl->gl_opendir = open_dirstream;
   gl->gl_readdir = read_dirstream;
   gl->gl_closedir = ansi_free;
-  gl->gl_lstat = local_lstat;
   gl->gl_stat = local_stat;
+  /* We don't bother setting gl_lstat, since glob never calls it.
+ The slot is only there for compatibility with 4.4 BSD.  */
 }
 
 void

CVS commit: src/external/gpl2/gmake/dist

2018-04-29 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Mon Apr 30 04:17:27 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist: dir.c

Log Message:
gmake: Make this work with glibc glob interface v2

http://git.savannah.gnu.org/cgit/make.git/commit/?id=193f1e81


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/dir.c

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

Modified files:

Index: src/external/gpl2/gmake/dist/dir.c
diff -u src/external/gpl2/gmake/dist/dir.c:1.1.1.1 src/external/gpl2/gmake/dist/dir.c:1.2
--- src/external/gpl2/gmake/dist/dir.c:1.1.1.1	Mon Aug 18 06:46:58 2014
+++ src/external/gpl2/gmake/dist/dir.c	Mon Apr 30 04:17:27 2018
@@ -1194,6 +1194,32 @@ local_stat (const char *path, struct sta
 }
 #endif
 
+/* Similarly for lstat.  */
+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
+# ifndef VMS
+#  ifndef HAVE_SYS_STAT_H
+int lstat (const char *path, struct stat *sbuf);
+#  endif
+# else
+/* We are done with the fake lstat.  Go back to the real lstat */
+#   ifdef lstat
+# undef lstat
+#   endif
+# endif
+# define local_lstat lstat
+#elif defined(WINDOWS32)
+/* Windows doesn't support lstat().  */
+# define local_lstat local_stat
+#else
+static int
+local_lstat (const char *path, struct stat *buf)
+{
+  int e;
+  EINTRLOOP (e, lstat (path, buf));
+  return e;
+}
+#endif
+
 void
 dir_setup_glob (glob_t *gl)
 {
@@ -1201,9 +1227,8 @@ dir_setup_glob (glob_t *gl)
   gl->gl_opendir = open_dirstream;
   gl->gl_readdir = read_dirstream;
   gl->gl_closedir = ansi_free;
+  gl->gl_lstat = local_lstat;
   gl->gl_stat = local_stat;
-  /* We don't bother setting gl_lstat, since glob never calls it.
- The slot is only there for compatibility with 4.4 BSD.  */
 }
 
 void

CVS commit: src/external/gpl2/xcvs/dist/src

2018-04-29 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Apr 29 15:47:01 UTC 2018

Modified Files:
src/external/gpl2/xcvs/dist/src: create_adm.c

Log Message:
keep going if there is a CVS directory already, but warn


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/create_adm.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/create_adm.c
diff -u src/external/gpl2/xcvs/dist/src/create_adm.c:1.2 src/external/gpl2/xcvs/dist/src/create_adm.c:1.3
--- src/external/gpl2/xcvs/dist/src/create_adm.c:1.2	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/create_adm.c	Sun Apr 29 11:47:01 2018
@@ -16,7 +16,7 @@
  * "Entries" file is prefilled from the "initrecord" argument.
  */
 #include 
-__RCSID("$NetBSD: create_adm.c,v 1.2 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: create_adm.c,v 1.3 2018/04/29 15:47:01 christos Exp $");
 
 #include "cvs.h"
 
@@ -49,7 +49,9 @@ Create_Admin (const char *dir, const cha
 
 tmp = Xasprintf ("%s/%s", dir, CVSADM);
 if (isfile (tmp))
-	error (1, 0, "there is a version in %s already", update_dir);
+{
+	error (0, 0, "there is a version in %s already", update_dir);
+}
 
 if (CVS_MKDIR (tmp, 0777) < 0)
 {

CVS commit: src/external/gpl2/gmake/dist

2018-04-28 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Sat Apr 28 12:20:41 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist: configure configure.in

Log Message:
gmake: Apply patch to support GLIBC glob interface v2

http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116

Fix a build failure on Ubuntu 18.04.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/configure \
src/external/gpl2/gmake/dist/configure.in

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

Modified files:

Index: src/external/gpl2/gmake/dist/configure
diff -u src/external/gpl2/gmake/dist/configure:1.1.1.1 src/external/gpl2/gmake/dist/configure:1.2
--- src/external/gpl2/gmake/dist/configure:1.1.1.1	Mon Aug 18 06:46:54 2014
+++ src/external/gpl2/gmake/dist/configure	Sat Apr 28 12:20:40 2018
@@ -13619,10 +13619,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include 
 #include 
 
-#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include 
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
gnu glob
 # endif
 #endif
Index: src/external/gpl2/gmake/dist/configure.in
diff -u src/external/gpl2/gmake/dist/configure.in:1.1.1.1 src/external/gpl2/gmake/dist/configure.in:1.2
--- src/external/gpl2/gmake/dist/configure.in:1.1.1.1	Mon Aug 18 06:46:47 2014
+++ src/external/gpl2/gmake/dist/configure.in	Sat Apr 28 12:20:40 2018
@@ -19,7 +19,7 @@
 AC_INIT([GNU make],[3.81],[bug-m...@gnu.org])
 
 AC_PREREQ(2.59)
-AC_REVISION([[$Id: configure.in,v 1.1.1.1 2014/08/18 06:46:47 christos Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.2 2018/04/28 12:20:40 nonaka Exp $]])
 
 # Autoconf setup
 AC_CONFIG_AUX_DIR(config)
@@ -351,10 +351,9 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
 #include 
 #include 
 
-#define GLOB_INTERFACE_VERSION 1
 #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
 # include 
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
gnu glob
 # endif
 #endif

CVS commit: src/external/gpl2/gmake/dist/glob

2018-04-16 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Apr 16 16:11:40 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist/glob: glob.c

Log Message:
According to:
https://sourceforge.net/p/predef/wiki/Libraries/
The macro used for old glibc is __GNU_LIBRARY__ and the new one is __GLIBC__.
Try to fix linux compilation by detecting both.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/gmake/dist/glob/glob.c

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

Modified files:

Index: src/external/gpl2/gmake/dist/glob/glob.c
diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.3 src/external/gpl2/gmake/dist/glob/glob.c:1.4
--- src/external/gpl2/gmake/dist/glob/glob.c:1.3	Mon Apr 16 12:02:57 2018
+++ src/external/gpl2/gmake/dist/glob/glob.c	Mon Apr 16 12:11:40 2018
@@ -207,7 +207,7 @@ my_realloc (p, n)
 #endif /* __GNU_LIBRARY__ */
 
 
-#if !defined __alloca && !defined __GNU_LIBRARY__
+#if !defined __alloca && !(defined __GNU_LIBRARY__ || defined __GLIBC__)
 
 # ifdef	__GNUC__
 #  undef alloca

CVS commit: src/external/gpl2/gmake/dist/glob

2018-04-16 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Mon Apr 16 16:02:57 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist/glob: glob.c

Log Message:
Revert previous glob.c change

It broke on !GLIBC.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/glob/glob.c

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

Modified files:

Index: src/external/gpl2/gmake/dist/glob/glob.c
diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.2 src/external/gpl2/gmake/dist/glob/glob.c:1.3
--- src/external/gpl2/gmake/dist/glob/glob.c:1.2	Mon Apr 16 14:39:19 2018
+++ src/external/gpl2/gmake/dist/glob/glob.c	Mon Apr 16 16:02:57 2018
@@ -207,7 +207,7 @@ my_realloc (p, n)
 #endif /* __GNU_LIBRARY__ */
 
 
-#if !defined __alloca && defined __GNU_LIBRARY__
+#if !defined __alloca && !defined __GNU_LIBRARY__
 
 # ifdef	__GNUC__
 #  undef alloca

CVS commit: src/external/gpl2/gmake/dist/glob

2018-04-16 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Mon Apr 16 14:39:19 UTC 2018

Modified Files:
src/external/gpl2/gmake/dist/glob: glob.c

Log Message:
Fix build of gmake (in tools) on new GLIBC systems

Reported on Debian and Fedora.

Reference for similar fix:
https://lists.nongnu.org/archive/html/bug-make/2017-11/msg00020.html

Tested by  on Fedora.
Tested by  on Debian.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/glob/glob.c

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

Modified files:

Index: src/external/gpl2/gmake/dist/glob/glob.c
diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.1.1.1 src/external/gpl2/gmake/dist/glob/glob.c:1.2
--- src/external/gpl2/gmake/dist/glob/glob.c:1.1.1.1	Mon Aug 18 06:47:54 2014
+++ src/external/gpl2/gmake/dist/glob/glob.c	Mon Apr 16 14:39:19 2018
@@ -207,7 +207,7 @@ my_realloc (p, n)
 #endif /* __GNU_LIBRARY__ */
 
 
-#if !defined __alloca && !defined __GNU_LIBRARY__
+#if !defined __alloca && defined __GNU_LIBRARY__
 
 # ifdef	__GNUC__
 #  undef alloca

CVS commit: src/external/gpl2/groff/bin

2018-03-12 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Mar 13 03:03:33 UTC 2018

Modified Files:
src/external/gpl2/groff/bin/eqn: Makefile
src/external/gpl2/groff/bin/pic: Makefile
src/external/gpl2/groff/bin/refer: Makefile

Log Message:
use CLEANFILES+= not CLEANFILES= to avoid overriding what was already
setup before now.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/eqn/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/pic/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/refer/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/gpl2/groff/bin/eqn/Makefile
diff -u src/external/gpl2/groff/bin/eqn/Makefile:1.2 src/external/gpl2/groff/bin/eqn/Makefile:1.3
--- src/external/gpl2/groff/bin/eqn/Makefile:1.2	Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/bin/eqn/Makefile	Tue Mar 13 03:03:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/13 03:03:33 mrg Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/eqn/Makefile,v 1.4 2003/05/01 13:22:19 ru Exp $
 
@@ -15,6 +15,6 @@ SRCS=		main.cpp lex.cpp eqn.cpp \
 CPPFLAGS+=	-I${DIST_DIR} -I.
 SCRIPTS=	neqn
 MAN=		eqn.1 neqn.1
-CLEANFILES=	${SCRIPTS} ${MAN}
+CLEANFILES+=	${SCRIPTS} ${MAN}
 
 .include 

Index: src/external/gpl2/groff/bin/pic/Makefile
diff -u src/external/gpl2/groff/bin/pic/Makefile:1.2 src/external/gpl2/groff/bin/pic/Makefile:1.3
--- src/external/gpl2/groff/bin/pic/Makefile:1.2	Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/bin/pic/Makefile	Tue Mar 13 03:03:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/13 03:03:33 mrg Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/pic/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
@@ -12,6 +12,6 @@ PROG_CXX=	pic
 SRCS=		lex.cpp main.cpp object.cpp pic.cpp \
 		common.cpp troff.cpp tex.cpp
 CPPFLAGS+=	-I${DIST_DIR} -I.
-CLEANFILES=	${MAN}
+CLEANFILES+=	${MAN}
 
 .include 

Index: src/external/gpl2/groff/bin/refer/Makefile
diff -u src/external/gpl2/groff/bin/refer/Makefile:1.2 src/external/gpl2/groff/bin/refer/Makefile:1.3
--- src/external/gpl2/groff/bin/refer/Makefile:1.2	Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/bin/refer/Makefile	Tue Mar 13 03:03:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/13 03:03:33 mrg Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/src/preproc/refer/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
 
@@ -13,6 +13,6 @@ SRCS=		label.cpp command.cpp ref.cpp ref
 CFLAGS+=	-I${DIST_DIR}
 DPADD+=		${LIBBIB}
 LDADD+=		${LIBBIB}
-CLEANFILES=	${MAN}
+CLEANFILES+=	${MAN}
 
 .include

CVS commit: src/external/gpl2/groff/tmac

2018-02-25 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Sun Feb 25 12:46:49 UTC 2018

Modified Files:
src/external/gpl2/groff/tmac: mdoc.local

Log Message:
Add FreeBSD 11.0 and 12.0


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/groff/tmac/mdoc.local

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

Modified files:

Index: src/external/gpl2/groff/tmac/mdoc.local
diff -u src/external/gpl2/groff/tmac/mdoc.local:1.4 src/external/gpl2/groff/tmac/mdoc.local:1.5
--- src/external/gpl2/groff/tmac/mdoc.local:1.4	Sun Jan 14 03:33:10 2018
+++ src/external/gpl2/groff/tmac/mdoc.local	Sun Feb 25 12:46:49 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.4 2018/01/14 03:33:10 uwe Exp $
+.\" $NetBSD: mdoc.local,v 1.5 2018/02/25 12:46:49 uwe Exp $
 .\"
 .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -78,6 +78,8 @@
 .ds doc-operating-system-FreeBSD-9.0   9.0
 .ds doc-operating-system-FreeBSD-10.0   10.0
 .ds doc-operating-system-FreeBSD-10.1   10.1
+.ds doc-operating-system-FreeBSD-11.0   11.0
+.ds doc-operating-system-FreeBSD-12.0   12.0
 .
 .
 .nr Dx 1

CVS commit: src/external/gpl2/groff/tmac

2018-01-13 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Sun Jan 14 03:33:10 UTC 2018

Modified Files:
src/external/gpl2/groff/tmac: mdoc.local

Log Message:
Copy-paste a .Dx macro for DragonFly (from .Ox) and add a couple of
FreeBSD versions to make autofs(5) man pages cleanly format with groff.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/groff/tmac/mdoc.local

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

Modified files:

Index: src/external/gpl2/groff/tmac/mdoc.local
diff -u src/external/gpl2/groff/tmac/mdoc.local:1.3 src/external/gpl2/groff/tmac/mdoc.local:1.4
--- src/external/gpl2/groff/tmac/mdoc.local:1.3	Sun Jun  4 07:16:34 2017
+++ src/external/gpl2/groff/tmac/mdoc.local	Sun Jan 14 03:33:10 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.3 2017/06/04 07:16:34 snj Exp $
+.\" $NetBSD: mdoc.local,v 1.4 2018/01/14 03:33:10 uwe Exp $
 .\"
 .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -76,6 +76,66 @@
 .ds doc-operating-system-FreeBSD-7.2   7.2
 .ds doc-operating-system-FreeBSD-8.0   8.0
 .ds doc-operating-system-FreeBSD-9.0   9.0
+.ds doc-operating-system-FreeBSD-10.0   10.0
+.ds doc-operating-system-FreeBSD-10.1   10.1
+.
+.
+.nr Dx 1
+.\" NS Dx user macro
+.\" NS   print DragonFly
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Dx
+.\" NS   doc-str-Dx1
+.\" NS
+.\" NS width register `Dx' defined above
+.
+.eo
+.de Dx
+.\"backtrace
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx]
+.
+.  if !\n[doc-arg-limit] \
+.if \n[.$] \{\
+.  ds doc-macro-name Dx
+.  doc-parse-args \$@
+.\}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.nr doc-arg-ptr +1
+.ie (\n[doc-type\n[doc-arg-ptr]] == 2) \
+.  as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.el \
+.  nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.doc-parse-space-vector
+.
+.  doc-print-recursive
+..
+.ec
+.
+.
 .\" Platforms not yet in groff distribution
 .ds doc-volume-as-amigappc  amigappc
 .ds doc-volume-as-ews4800mips   ews4800mips

CVS commit: src/external/gpl2/groff/tmac/man

2018-01-13 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Sat Jan 13 14:00:51 UTC 2018

Modified Files:
src/external/gpl2/groff/tmac/man: Makefile

Log Message:
Fix trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/tmac/man/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/gpl2/groff/tmac/man/Makefile
diff -u src/external/gpl2/groff/tmac/man/Makefile:1.1 src/external/gpl2/groff/tmac/man/Makefile:1.2
--- src/external/gpl2/groff/tmac/man/Makefile:1.1	Wed Jan 13 19:02:01 2016
+++ src/external/gpl2/groff/tmac/man/Makefile	Sat Jan 13 14:00:50 2018
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2016/01/13 19:02:01 christos Exp $
-  
+# $NetBSD: Makefile,v 1.2 2018/01/13 14:00:50 uwe Exp $
+
 DIST_SUBDIR=tmac
-
+
 .include "${.CURDIR}/../../Makefile.inc"
 
 # For ms.7
-USETBL=   
+USETBL=
 
 MAN=groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7
 MAN+=   groff_trace.7 groff_www.7
-MLINKS= groff_ms.7 ms.7  
-MLINKS+=groff_man.7 man.7
-MLINKS+=groff_me.7 me.7  
+MLINKS= groff_ms.7 ms.7
+MLINKS+=groff_man.7 man.7
+MLINKS+=groff_me.7 me.7
 MLINKS+=groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7
 
 cleandir: tmac_manclean

CVS commit: src/external/gpl2/groff/dist/src/preproc

2017-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sun Oct  8 11:06:48 UTC 2017

Removed Files:
src/external/gpl2/groff/dist/src/preproc/eqn: eqn.cpp eqn_tab.h
src/external/gpl2/groff/dist/src/preproc/pic: pic_tab.h

Log Message:
Remove pre-generated files as they can confuse make when using hg or git.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/groff/dist/src/preproc/eqn/eqn.cpp \
src/external/gpl2/groff/dist/src/preproc/eqn/eqn_tab.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/groff/dist/src/preproc/pic/pic_tab.h

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

CVS commit: src/external/gpl2/xcvs/dist/src

2017-09-15 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Sep 15 21:03:26 UTC 2017

Modified Files:
src/external/gpl2/xcvs/dist/src: cvs.h filesubr.c find_names.c import.c
rcs.c subr.c update.c vers_ts.c

Log Message:
1/2 the number of {l,s}stat(2) calls by exposing the stat data found
when calling islink()!


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/src/cvs.h \
src/external/gpl2/xcvs/dist/src/subr.c
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/src/filesubr.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/find_names.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl2/xcvs/dist/src/import.c
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/src/rcs.c
cvs rdiff -u -r1.11 -r1.12 src/external/gpl2/xcvs/dist/src/update.c
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/vers_ts.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/cvs.h
diff -u src/external/gpl2/xcvs/dist/src/cvs.h:1.4 src/external/gpl2/xcvs/dist/src/cvs.h:1.5
--- src/external/gpl2/xcvs/dist/src/cvs.h:1.4	Thu Mar  8 15:50:26 2012
+++ src/external/gpl2/xcvs/dist/src/cvs.h	Fri Sep 15 17:03:26 2017
@@ -516,7 +516,7 @@ typedef	RETSIGTYPE (*SIGCLEANUPPROC)	(in
 int SIG_register (int sig, SIGCLEANUPPROC sigcleanup);
 bool isdir (const char *file);
 bool isfile (const char *file);
-ssize_t islink (const char *file);
+ssize_t islink (const char *file, struct stat *stp);
 bool isdevice (const char *file);
 bool isreadable (const char *file);
 bool iswritable (const char *file);
Index: src/external/gpl2/xcvs/dist/src/subr.c
diff -u src/external/gpl2/xcvs/dist/src/subr.c:1.4 src/external/gpl2/xcvs/dist/src/subr.c:1.5
--- src/external/gpl2/xcvs/dist/src/subr.c:1.4	Mon May 30 13:49:51 2016
+++ src/external/gpl2/xcvs/dist/src/subr.c	Fri Sep 15 17:03:26 2017
@@ -13,7 +13,7 @@
  * Various useful functions for the CVS support code.
  */
 #include 
-__RCSID("$NetBSD: subr.c,v 1.4 2016/05/30 17:49:51 christos Exp $");
+__RCSID("$NetBSD: subr.c,v 1.5 2017/09/15 21:03:26 christos Exp $");
 
 #include "cvs.h"
 
@@ -719,7 +719,7 @@ resolve_symlink (char **filename)
 if (filename == NULL || *filename == NULL)
 	return;
 
-while ((rsize = islink (*filename)) > 0)
+while ((rsize = islink (*filename, NULL)) > 0)
 {
 #ifdef HAVE_READLINK
 	/* The clean thing to do is probably to have each filesubr.c

Index: src/external/gpl2/xcvs/dist/src/filesubr.c
diff -u src/external/gpl2/xcvs/dist/src/filesubr.c:1.5 src/external/gpl2/xcvs/dist/src/filesubr.c:1.6
--- src/external/gpl2/xcvs/dist/src/filesubr.c:1.5	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/filesubr.c	Fri Sep 15 17:03:26 2017
@@ -13,7 +13,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.  */
 #include 
-__RCSID("$NetBSD: filesubr.c,v 1.5 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: filesubr.c,v 1.6 2017/09/15 21:03:26 christos Exp $");
 
 /* These functions were moved out of subr.c because they need different
definitions under operating systems (like, say, Windows NT) with different
@@ -25,6 +25,13 @@ __RCSID("$NetBSD: filesubr.c,v 1.5 2016/
 #include "xsize.h"
 
 static int deep_remove_dir (const char *path);
+#ifndef S_ISBLK
+#define S_ISBLK(a) 0
+#endif
+#ifndef S_ISCHR
+#define S_ISCHR(a) 0
+#endif
+#define IS_DEVICE(sbp) (S_ISBLK((sbp)->st_mode) || S_ISCHR((sbp)->st_mode))
 
 /*
  * Copies "from" to "to".
@@ -44,7 +51,7 @@ copy_file (const char *from, const char 
 
 /* If the file to be copied is a link or a device, then just create
the new link or device appropriately. */
-if ((rsize = islink (from)) > 0)
+if ((rsize = islink (from, )) > 0)
 {
 	char *source = Xreadlink (from, rsize);
 	if (symlink (source, to) == -1)
@@ -53,11 +60,9 @@ copy_file (const char *from, const char 
 	return;
 }
 
-if (isdevice (from))
+if (sb.st_ino != -1 && IS_DEVICE ())
 {
 #if defined(HAVE_MKNOD) && defined(HAVE_STRUCT_STAT_ST_RDEV)
-	if (stat (from, ) < 0)
-	error (1, errno, "cannot stat %s", from);
 	mknod (to, sb.st_mode, sb.st_rdev);
 #else
 	error (1, 0, "cannot copy device files on this system (%s)", from);
@@ -136,14 +141,22 @@ isdir (const char *file)
  * Returns size of the link if it is a symbolic link.
  */
 ssize_t
-islink (const char *file)
+islink (const char *file, struct stat *sbp)
 {
 ssize_t retsize = 0;
 #ifdef S_ISLNK
 struct stat sb;
+if (sbp == NULL)
+	sbp = 
 
-if ((lstat (file, ) >= 0) && S_ISLNK (sb.st_mode))
-	retsize = sb.st_size;
+if (lstat (file, sbp) < 0) {
+	sbp->st_ino = -1;
+	return 0;
+}
+if (S_ISLNK (sbp->st_mode))
+	retsize = sbp->st_size;
+#else
+sbp->st_ino = -1;
 #endif
 return retsize;
 }
@@ -161,15 +174,7 @@ isdevice (const char *file)
 
 if (lstat (file, ) < 0)
 	return false;

CVS commit: src/external/gpl2/xcvs/dist/src

2017-08-22 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Aug 22 10:06:57 UTC 2017

Modified Files:
src/external/gpl2/xcvs/dist/src: rsh-client.c

Log Message:
Fix for CVE-2017-12836; (cvs command injection) from MirBSD.
XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/rsh-client.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/rsh-client.c
diff -u src/external/gpl2/xcvs/dist/src/rsh-client.c:1.2 src/external/gpl2/xcvs/dist/src/rsh-client.c:1.3
--- src/external/gpl2/xcvs/dist/src/rsh-client.c:1.2	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/rsh-client.c	Tue Aug 22 06:06:57 2017
@@ -10,7 +10,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.  */
 #include 
-__RCSID("$NetBSD: rsh-client.c,v 1.2 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: rsh-client.c,v 1.3 2017/08/22 10:06:57 christos Exp $");
 
 #include 
 
@@ -55,11 +55,11 @@ start_rsh_server (cvsroot_t *root, struc
 char *cvs_server = (root->cvs_server != NULL
 			? root->cvs_server : getenv ("CVS_SERVER"));
 int i = 0;
-/* This needs to fit "rsh", "-b", "-l", "USER", "host",
+/* This needs to fit "rsh", "-b", "-l", "USER", "--", "host",
"cmd (w/ args)", and NULL.  We leave some room to grow. */
-char *rsh_argv[10];
+char *rsh_argv[16];
 
-if (!cvs_rsh)
+if (!cvs_rsh || !*cvs_rsh)
 	/* People sometimes suggest or assume that this should default
 	   to "remsh" on systems like HPUX in which that is the
 	   system-supplied name for the rsh program.  However, that
@@ -99,6 +99,9 @@ start_rsh_server (cvsroot_t *root, struc
 	rsh_argv[i++] = root->username;
 }
 
+/* Only non-option arguments from here. (CVE-2017-12836) */
+rsh_argv[i++] = "--";
+
 rsh_argv[i++] = root->hostname;
 rsh_argv[i++] = cvs_server;
 rsh_argv[i++] = "server";
@@ -159,7 +162,7 @@ start_rsh_server (cvsroot_t *root, struc
 command = Xasprintf ("%s server", cvs_server);
 
 {
-char *argv[10];
+char *argv[16];
 	char **p = argv;
 
 	*p++ = cvs_rsh;
@@ -173,6 +176,8 @@ start_rsh_server (cvsroot_t *root, struc
 	*p++ = root->username;
 	}
 
+	*p++ = "--";
+
 	*p++ = root->hostname;
 	*p++ = command;
 	*p++ = NULL;

CVS commit: src/external/gpl2/dtc

2017-06-16 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Jun 16 22:47:22 UTC 2017

Modified Files:
src/external/gpl2/dtc: dtc2netbsd
src/external/gpl2/dtc/usr.bin/dtc: version_gen.h

Log Message:
Update the dtc version string to match the imported version and note that
version_gen.h should be updated when importing a new version.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/dtc/dtc2netbsd
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/dtc/usr.bin/dtc/version_gen.h

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

Modified files:

Index: src/external/gpl2/dtc/dtc2netbsd
diff -u src/external/gpl2/dtc/dtc2netbsd:1.1 src/external/gpl2/dtc/dtc2netbsd:1.2
--- src/external/gpl2/dtc/dtc2netbsd:1.1	Thu Jun  8 15:51:12 2017
+++ src/external/gpl2/dtc/dtc2netbsd	Fri Jun 16 22:47:22 2017
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#	$NetBSD: dtc2netbsd,v 1.1 2017/06/08 15:51:12 skrll Exp $
+#	$NetBSD: dtc2netbsd,v 1.2 2017/06/16 22:47:22 jmcneill Exp $
 #
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -52,6 +52,9 @@
 #	$ cvs import -m "Import dtc -MM-DD" src/external/gpl2/dtc/dist DTC dtc-
 # merge dtc sources using, e.g.
 # 	$ cvs -d cvs.netbsd.org:/cvsroot checkout -jdtc-1-4-1 -jdtc-1-4-4 src/external/gpl2/dtc/dist
+#
+# Update the version string in the version_gen.h header to match the imported version:
+#	$ echo '#define DTC_VERSION "DTC 1.4.4"' > src/external/gpl2/dtc/usr.bin/dtc/version_gen.h
 
 if [ $# -ne 2 ]; then echo "dtc2netbsd dtcsrc tmpdir"; exit 1; fi
 

Index: src/external/gpl2/dtc/usr.bin/dtc/version_gen.h
diff -u src/external/gpl2/dtc/usr.bin/dtc/version_gen.h:1.1 src/external/gpl2/dtc/usr.bin/dtc/version_gen.h:1.2
--- src/external/gpl2/dtc/usr.bin/dtc/version_gen.h:1.1	Mon Jun  5 18:59:43 2017
+++ src/external/gpl2/dtc/usr.bin/dtc/version_gen.h	Fri Jun 16 22:47:22 2017
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.1"
+#define DTC_VERSION "DTC 1.4.4"

CVS commit: src/external/gpl2/dtc

2017-06-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Jun  8 18:57:21 UTC 2017

Modified Files:
src/external/gpl2/dtc: Makefile.inc
src/external/gpl2/dtc/lib/libfdt: Makefile
src/external/gpl2/dtc/usr.bin/dtc: Makefile

Log Message:
Adjust build for new source location for real.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/dtc/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/dtc/lib/libfdt/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/dtc/usr.bin/dtc/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/gpl2/dtc/Makefile.inc
diff -u src/external/gpl2/dtc/Makefile.inc:1.1 src/external/gpl2/dtc/Makefile.inc:1.2
--- src/external/gpl2/dtc/Makefile.inc:1.1	Mon Jun  5 18:59:43 2017
+++ src/external/gpl2/dtc/Makefile.inc	Thu Jun  8 18:57:21 2017
@@ -1,4 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.1 2017/06/05 18:59:43 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2017/06/08 18:57:21 skrll Exp $
 
 BINDIR=		/usr/bin
-DIST=		${NETBSDSRCDIR}/external/gpl2/dtc/dist
+DTCDIST=	${NETBSDSRCDIR}/external/gpl2/dtc/dist
+LIBFDTDIST=	${NETBSDSRCDIR}/sys/external/bsd/libfdt/dist

Index: src/external/gpl2/dtc/lib/libfdt/Makefile
diff -u src/external/gpl2/dtc/lib/libfdt/Makefile:1.2 src/external/gpl2/dtc/lib/libfdt/Makefile:1.3
--- src/external/gpl2/dtc/lib/libfdt/Makefile:1.2	Thu Jun  8 17:24:31 2017
+++ src/external/gpl2/dtc/lib/libfdt/Makefile	Thu Jun  8 18:57:21 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2017/06/08 17:24:31 skrll Exp $
+#	$NetBSD: Makefile,v 1.3 2017/06/08 18:57:21 skrll Exp $
 
 LIBISPRIVATE=	yes
 
@@ -7,13 +7,13 @@ LIBISPRIVATE=	yes
 LIB=	fdt
 
 .include "${.CURDIR}/../../Makefile.inc"
-.include "${.CURDIR}/../../../../../sys/external/bsd/libfdt/dist/Makefile.libfdt"
+.include "${LIBFDTDIST}/Makefile.libfdt"
 
 SRCS=	${LIBFDT_SRCS}
 
-CPPFLAGS+=	-I ${DIST}/libfdt
+CPPFLAGS+=	-I ${LIBFDTDIST}
 
-.PATH:	${DIST}/libfdt
+.PATH:	${LIBFDTDIST}
 
 .include 
 

Index: src/external/gpl2/dtc/usr.bin/dtc/Makefile
diff -u src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.1 src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.2
--- src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.1	Mon Jun  5 18:59:43 2017
+++ src/external/gpl2/dtc/usr.bin/dtc/Makefile	Thu Jun  8 18:57:21 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2017/06/08 18:57:21 skrll Exp $
 
 NOMAN=	# defined
 
@@ -7,15 +7,15 @@ NOMAN=	# defined
 PROG=	dtc
 
 .include "${.CURDIR}/../../Makefile.inc"
-.include "${DIST}/Makefile.dtc"
+.include "${DTCDIST}/Makefile.dtc"
 
 CPPFLAGS+=	-I${.CURDIR}
-CPPFLAGS+=	-I${DIST}
-CPPFLAGS+=	-I${DIST}/libfdt
+CPPFLAGS+=	-I${DTCDIST}
+CPPFLAGS+=	-I${LIBFDTDIST}
 
 SRCS+=	${DTC_SRCS} dtc-lexer.l dtc-parser.y
 YFLAGS+= -d -L
 
-.PATH:	${DIST}
+.PATH:	${DTCDIST}
 
 .include

CVS commit: src/external/gpl2/dtc/lib/libfdt

2017-06-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Jun  8 17:24:31 UTC 2017

Modified Files:
src/external/gpl2/dtc/lib/libfdt: Makefile

Log Message:
Update for new libfdt location


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/dtc/lib/libfdt/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/gpl2/dtc/lib/libfdt/Makefile
diff -u src/external/gpl2/dtc/lib/libfdt/Makefile:1.1 src/external/gpl2/dtc/lib/libfdt/Makefile:1.2
--- src/external/gpl2/dtc/lib/libfdt/Makefile:1.1	Mon Jun  5 18:59:43 2017
+++ src/external/gpl2/dtc/lib/libfdt/Makefile	Thu Jun  8 17:24:31 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2017/06/08 17:24:31 skrll Exp $
 
 LIBISPRIVATE=	yes
 
@@ -7,7 +7,7 @@ LIBISPRIVATE=	yes
 LIB=	fdt
 
 .include "${.CURDIR}/../../Makefile.inc"
-.include "${.CURDIR}/../../dist/libfdt/Makefile.libfdt"
+.include "${.CURDIR}/../../../../../sys/external/bsd/libfdt/dist/Makefile.libfdt"
 
 SRCS=	${LIBFDT_SRCS}

CVS commit: src/external/gpl2/dtc/dist

2017-06-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Jun  8 17:24:10 UTC 2017

Modified Files:
src/external/gpl2/dtc/dist: flattree.c

Log Message:
s/ALIGN/FDTALIGN2/


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/dtc/dist/flattree.c

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

Modified files:

Index: src/external/gpl2/dtc/dist/flattree.c
diff -u src/external/gpl2/dtc/dist/flattree.c:1.3 src/external/gpl2/dtc/dist/flattree.c:1.4
--- src/external/gpl2/dtc/dist/flattree.c:1.3	Thu Jun  8 16:00:40 2017
+++ src/external/gpl2/dtc/dist/flattree.c	Thu Jun  8 17:24:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: flattree.c,v 1.3 2017/06/08 16:00:40 skrll Exp $	*/
+/*	$NetBSD: flattree.c,v 1.4 2017/06/08 17:24:10 skrll Exp $	*/
 
 /*
  * (C) Copyright David Gibson , IBM Corporation.  2005.
@@ -404,7 +404,7 @@ void dt_to_blob(FILE *f, struct dt_info 
 		padlen = padsize;
 
 	if (alignsize > 0)
-		padlen = ALIGN(fdt32_to_cpu(fdt.totalsize) + padlen, alignsize)
+		padlen = FDTALIGN2(fdt32_to_cpu(fdt.totalsize) + padlen, alignsize)
 			- fdt32_to_cpu(fdt.totalsize);
 
 	if (padlen > 0) {

CVS commit: src/external/gpl2/dtc/dist

2017-06-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Jun  8 16:00:40 UTC 2017

Modified Files:
src/external/gpl2/dtc/dist: data.c dtc-lexer.l dtc-parser.y dtc.h
fdtdump.c fdtput.c flattree.c srcpos.c util.h
src/external/gpl2/dtc/dist/tests: mangle-layout.c move_and_save.c
tests.h
Removed Files:
src/external/gpl2/dtc/dist: .gitignore .travis.yml
src/external/gpl2/dtc/dist/libfdt: Makefile.libfdt TODO fdt.c fdt.h
fdt_addresses.c fdt_empty_tree.c fdt_ro.c fdt_rw.c fdt_strerror.c
fdt_sw.c fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h
version.lds
src/external/gpl2/dtc/dist/tests: test_tree1_body.dtsi

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/dtc/dist/.gitignore \
src/external/gpl2/dtc/dist/.travis.yml
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/dtc/dist/data.c \
src/external/gpl2/dtc/dist/dtc-lexer.l \
src/external/gpl2/dtc/dist/dtc-parser.y src/external/gpl2/dtc/dist/dtc.h \
src/external/gpl2/dtc/dist/fdtdump.c src/external/gpl2/dtc/dist/fdtput.c \
src/external/gpl2/dtc/dist/flattree.c src/external/gpl2/dtc/dist/srcpos.c \
src/external/gpl2/dtc/dist/util.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/dtc/dist/libfdt/Makefile.libfdt \
src/external/gpl2/dtc/dist/libfdt/TODO \
src/external/gpl2/dtc/dist/libfdt/fdt.c \
src/external/gpl2/dtc/dist/libfdt/fdt.h \
src/external/gpl2/dtc/dist/libfdt/fdt_addresses.c \
src/external/gpl2/dtc/dist/libfdt/fdt_empty_tree.c \
src/external/gpl2/dtc/dist/libfdt/fdt_ro.c \
src/external/gpl2/dtc/dist/libfdt/fdt_rw.c \
src/external/gpl2/dtc/dist/libfdt/fdt_strerror.c \
src/external/gpl2/dtc/dist/libfdt/fdt_sw.c \
src/external/gpl2/dtc/dist/libfdt/fdt_wip.c \
src/external/gpl2/dtc/dist/libfdt/libfdt.h \
src/external/gpl2/dtc/dist/libfdt/libfdt_env.h \
src/external/gpl2/dtc/dist/libfdt/libfdt_internal.h \
src/external/gpl2/dtc/dist/libfdt/version.lds
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/dtc/dist/tests/mangle-layout.c \
src/external/gpl2/dtc/dist/tests/move_and_save.c \
src/external/gpl2/dtc/dist/tests/tests.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/dtc/dist/tests/test_tree1_body.dtsi

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

Modified files:

Index: src/external/gpl2/dtc/dist/data.c
diff -u src/external/gpl2/dtc/dist/data.c:1.2 src/external/gpl2/dtc/dist/data.c:1.3
--- src/external/gpl2/dtc/dist/data.c:1.2	Tue Jun  6 20:19:04 2017
+++ src/external/gpl2/dtc/dist/data.c	Thu Jun  8 16:00:40 2017
@@ -1,3 +1,5 @@
+/*	$NetBSD: data.c,v 1.3 2017/06/08 16:00:40 skrll Exp $	*/
+
 /*
  * (C) Copyright David Gibson , IBM Corporation.  2005.
  *
@@ -171,9 +173,9 @@ struct data data_merge(struct data d1, s
 struct data data_append_integer(struct data d, uint64_t value, int bits)
 {
 	uint8_t value_8;
-	uint16_t value_16;
-	uint32_t value_32;
-	uint64_t value_64;
+	fdt16_t value_16;
+	fdt32_t value_32;
+	fdt64_t value_64;
 
 	switch (bits) {
 	case 8:
@@ -197,14 +199,14 @@ struct data data_append_integer(struct d
 	}
 }
 
-struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
+struct data data_append_re(struct data d, uint64_t address, uint64_t size)
 {
-	struct fdt_reserve_entry bere;
+	struct fdt_reserve_entry re;
 
-	bere.address = cpu_to_fdt64(re->address);
-	bere.size = cpu_to_fdt64(re->size);
+	re.address = cpu_to_fdt64(address);
+	re.size = cpu_to_fdt64(size);
 
-	return data_append_data(d, , sizeof(bere));
+	return data_append_data(d, , sizeof(re));
 }
 
 struct data data_append_cell(struct data d, cell_t word)
Index: src/external/gpl2/dtc/dist/dtc-lexer.l
diff -u src/external/gpl2/dtc/dist/dtc-lexer.l:1.2 src/external/gpl2/dtc/dist/dtc-lexer.l:1.3
--- src/external/gpl2/dtc/dist/dtc-lexer.l:1.2	Mon Jun  5 18:59:10 2017
+++ src/external/gpl2/dtc/dist/dtc-lexer.l	Thu Jun  8 16:00:40 2017
@@ -1,3 +1,5 @@
+/*	$NetBSD: dtc-lexer.l,v 1.3 2017/06/08 16:00:40 skrll Exp $	*/
+
 /*
  * (C) Copyright David Gibson , IBM Corporation.  2005.
  *
@@ -62,7 +64,8 @@ static int dts_version = 1;
 
 static void push_input_file(const char *filename);
 static bool pop_input_file(void);
-static void lexical_error(const char *fmt, ...);
+static void PRINTF(1, 2) lexical_error(const char *fmt, ...);
+
 %}
 
 %%
@@ -73,24 +76,32 @@ static void lexical_error(const char *fm
 		}
 
 <*>^"#"(line)?[ \t]+[0-9]+[ \t]+{STRING}([ \t]+[0-9]+)? {
-			char *line, *tmp, *fn;
+			char *line, *fnstart, *fnend;
+			struct data fn;
 			/* skip text before line # */
 			line = yytext;
 			while (!isdigit((unsigned char)*line))
 line++;
-			/* skip digits in line # */
-			tmp = line;
-			while (!isspace((unsigned char)*tmp))
-tmp++;
-			/* "NULL"-terminate line # */
-			*tmp = '\0';
-			/* start of filename */
-

CVS commit: src/external/gpl2/dtc

2017-06-08 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Jun  8 15:51:12 UTC 2017

Added Files:
src/external/gpl2/dtc: dtc2netbsd

Log Message:
Add a dtc2netbsd script


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl2/dtc/dtc2netbsd

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

Added files:

Index: src/external/gpl2/dtc/dtc2netbsd
diff -u /dev/null src/external/gpl2/dtc/dtc2netbsd:1.1
--- /dev/null	Thu Jun  8 15:51:12 2017
+++ src/external/gpl2/dtc/dtc2netbsd	Thu Jun  8 15:51:12 2017
@@ -0,0 +1,124 @@
+#! /bin/sh
+#
+#	$NetBSD: dtc2netbsd,v 1.1 2017/06/08 15:51:12 skrll Exp $
+#
+#
+# Copyright (c) 2017 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Nick Hudson
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# dtc2netbsd:  convert a dtc source tree into netbsd dtc/libfdt source trees
+#
+# Rough instructions for importing new dtc release:
+#
+#	$ cd /some/where/temporary
+#	$ tar xpfz /dtc/release/tar/file
+#	$ DTCSRCS=$(pwd)
+#	$ WRKDIR=/an/other/temporary
+#	$ sh /usr/src/external/gpl2/dtc/dtc2netbsd $DTCSRCS $WRKDIR
+#
+# Import libfdt using
+#	$ cd $WRKDIR/libfdt
+#	$ cvs import -m "Import libfdt " src/sys/external/bsd/libfdt/dist DTC dtc-
+#
+# merge libfdt sources using, e.g.
+#	$ cvs -d cvs.netbsd.org:/cvsroot checkout -jdtc-1-4-1 -jdtc-1-4-4 src/sys/external/bsd/libfdt/dist
+#
+# Import dtc using
+#	$ cd $WRKDIR/dtc
+#	$ cvs import -m "Import dtc -MM-DD" src/external/gpl2/dtc/dist DTC dtc-
+# merge dtc sources using, e.g.
+# 	$ cvs -d cvs.netbsd.org:/cvsroot checkout -jdtc-1-4-1 -jdtc-1-4-4 src/external/gpl2/dtc/dist
+
+if [ $# -ne 2 ]; then echo "dtc2netbsd dtcsrc tmpdir"; exit 1; fi
+
+r=$1
+d=$2
+
+case "$d" in
+	/*)
+		;;
+	*)
+		d=`/bin/pwd`/$d
+		;;
+esac
+
+case "$r" in
+	/*)
+		;;
+	*)
+		r=`/bin/pwd`/$r
+		;;
+esac
+
+echo preparing directory $d
+rm -rf $d
+mkdir -p $d/dtc
+
+### Copy the files and directories
+echo copying $r to $d
+cd $r
+pax -rw * $d/dtc
+mv $d/dtc/libfdt $d/libfdt
+
+# cd to import directory
+cd $d
+
+#
+
+### Remove the $'s around RCS tags
+cleantags $d
+
+### Add our NetBSD RCS Id
+find $d -type f -name '*.[chly]' -print | while read c; do
+	sed 1q < $c | grep -q '\$NetBSD' || (
+echo "/*	\$NetBSD\$	*/" >/tmp/dtc$$
+echo "" >>/tmp/dtc$$
+cat $c  >> /tmp/dtc$$
+mv /tmp/dtc$$ $c && echo added NetBSD RCS tag to $c
+	)
+done
+
+echo done
+
+### Clean up any CVS directories that might be around.
+echo "cleaning up CVS residue."
+(
+	cd $d
+	find . -type d -name "CVS" -print | xargs rm -r
+)
+echo done
+
+### Fixing file and directory permissions.
+echo "Fixing file/directory permissions."
+(
+	cd $d
+	find . -type f -print | xargs chmod u+rw,go+r
+	find . -type d -print | xargs chmod u+rwx,go+rx
+)
+echo done
+
+exit 0

CVS commit: src/external/gpl2/dtc/dist

2017-06-06 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun  6 20:19:04 UTC 2017

Modified Files:
src/external/gpl2/dtc/dist: data.c dtc.h fdtdump.c fdtput.c flattree.c
srcpos.c util.h
src/external/gpl2/dtc/dist/tests: mangle-layout.c move_and_save.c
tests.h

Log Message:
Reduce number of ALIGN macros defines and rename to avoid namespace clash


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/dtc/dist/data.c \
src/external/gpl2/dtc/dist/dtc.h src/external/gpl2/dtc/dist/fdtdump.c \
src/external/gpl2/dtc/dist/fdtput.c src/external/gpl2/dtc/dist/flattree.c \
src/external/gpl2/dtc/dist/srcpos.c src/external/gpl2/dtc/dist/util.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/dtc/dist/tests/mangle-layout.c \
src/external/gpl2/dtc/dist/tests/move_and_save.c \
src/external/gpl2/dtc/dist/tests/tests.h

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

Modified files:

Index: src/external/gpl2/dtc/dist/data.c
diff -u src/external/gpl2/dtc/dist/data.c:1.1.1.1 src/external/gpl2/dtc/dist/data.c:1.2
--- src/external/gpl2/dtc/dist/data.c:1.1.1.1	Fri Dec  4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/data.c	Tue Jun  6 20:19:04 2017
@@ -233,7 +233,7 @@ struct data data_append_zeroes(struct da
 
 struct data data_append_align(struct data d, int align)
 {
-	int newlen = ALIGN(d.len, align);
+	int newlen = FDTALIGN2(d.len, align);
 	return data_append_zeroes(d, newlen - d.len);
 }
 
Index: src/external/gpl2/dtc/dist/dtc.h
diff -u src/external/gpl2/dtc/dist/dtc.h:1.1.1.1 src/external/gpl2/dtc/dist/dtc.h:1.2
--- src/external/gpl2/dtc/dist/dtc.h:1.1.1.1	Fri Dec  4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/dtc.h	Tue Jun  6 20:19:04 2017
@@ -65,8 +65,6 @@ typedef uint32_t cell_t;
 #define streq(a, b)	(strcmp((a), (b)) == 0)
 #define strneq(a, b, n)	(strncmp((a), (b), (n)) == 0)
 
-#define ALIGN(x, a)	(((x) + (a) - 1) & ~((a) - 1))
-
 /* Data blobs */
 enum markertype {
 	REF_PHANDLE,
Index: src/external/gpl2/dtc/dist/fdtdump.c
diff -u src/external/gpl2/dtc/dist/fdtdump.c:1.1.1.1 src/external/gpl2/dtc/dist/fdtdump.c:1.2
--- src/external/gpl2/dtc/dist/fdtdump.c:1.1.1.1	Fri Dec  4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/fdtdump.c	Tue Jun  6 20:19:04 2017
@@ -15,8 +15,6 @@
 
 #include "util.h"
 
-#define ALIGN(x, a)	(((x) + ((a) - 1)) & ~((a) - 1))
-#define PALIGN(p, a)	((void *)(ALIGN((unsigned long)(p), (a
 #define GET_CELL(p)	(p += 4, *((const uint32_t *)(p-4)))
 
 static const char *tagname(uint32_t tag)
Index: src/external/gpl2/dtc/dist/fdtput.c
diff -u src/external/gpl2/dtc/dist/fdtput.c:1.1.1.1 src/external/gpl2/dtc/dist/fdtput.c:1.2
--- src/external/gpl2/dtc/dist/fdtput.c:1.1.1.1	Fri Dec  4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/fdtput.c	Tue Jun  6 20:19:04 2017
@@ -128,7 +128,7 @@ static int encode_value(struct display_i
 	return 0;
 }
 
-#define ALIGN(x)		(((x) + (FDT_TAGSIZE) - 1) & ~((FDT_TAGSIZE) - 1))
+#define FDTALIGN(x)		(((x) + (FDT_TAGSIZE) - 1) & ~((FDT_TAGSIZE) - 1))
 
 static char *_realloc_fdt(char *fdt, int delta)
 {
@@ -142,7 +142,7 @@ static char *realloc_node(char *fdt, con
 {
 	int delta;
 	/* FDT_BEGIN_NODE, node name in off_struct and FDT_END_NODE */
-	delta = sizeof(struct fdt_node_header) + ALIGN(strlen(name) + 1)
+	delta = sizeof(struct fdt_node_header) + FDTALIGN(strlen(name) + 1)
 			+ FDT_TAGSIZE;
 	return _realloc_fdt(fdt, delta);
 }
@@ -159,7 +159,7 @@ static char *realloc_property(char *fdt,
 
 	if (newlen > oldlen)
 		/* actual value in off_struct */
-		delta += ALIGN(newlen) - ALIGN(oldlen);
+		delta += FDTALIGN(newlen) - FDTALIGN(oldlen);
 
 	return _realloc_fdt(fdt, delta);
 }
Index: src/external/gpl2/dtc/dist/flattree.c
diff -u src/external/gpl2/dtc/dist/flattree.c:1.1.1.1 src/external/gpl2/dtc/dist/flattree.c:1.2
--- src/external/gpl2/dtc/dist/flattree.c:1.1.1.1	Fri Dec  4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/flattree.c	Tue Jun  6 20:19:04 2017
@@ -350,7 +350,7 @@ static void make_fdt_header(struct fdt_h
 	fdt->last_comp_version = cpu_to_fdt32(vi->last_comp_version);
 
 	/* Reserve map should be doubleword aligned */
-	reserve_off = ALIGN(vi->hdr_size, 8);
+	reserve_off = FDTALIGN2(vi->hdr_size, 8);
 
 	fdt->off_mem_rsvmap = cpu_to_fdt32(reserve_off);
 	fdt->off_dt_struct = cpu_to_fdt32(reserve_off + reservesize);
@@ -613,7 +613,7 @@ static void flat_realign(struct inbuf *i
 {
 	int off = inb->ptr - inb->base;
 
-	inb->ptr = inb->base + ALIGN(off, align);
+	inb->ptr = inb->base + FDTALIGN2(off, align);
 	if (inb->ptr > inb->limit)
 		die("Premature end of data parsing flat device tree\n");
 }
Index: src/external/gpl2/dtc/dist/srcpos.c
diff -u src/external/gpl2/dtc/dist/srcpos.c:1.1.1.1 src/external/gpl2/dtc/dist/srcpos.c:1.2
--- src/external/gpl2/dtc/dist/srcpos.c:1.1.1.1	Fri Dec  4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/srcpos.c	Tue Jun  6 20:19:04 2017
@@ -226,7 +226,7 @@ void

CVS commit: src/external/gpl2

2017-06-05 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Jun  5 23:45:23 UTC 2017

Modified Files:
src/external/gpl2: Makefile

Log Message:
add DTC


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/gpl2/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/gpl2/Makefile
diff -u src/external/gpl2/Makefile:1.13 src/external/gpl2/Makefile:1.14
--- src/external/gpl2/Makefile:1.13	Thu Jan 14 16:13:54 2016
+++ src/external/gpl2/Makefile	Mon Jun  5 19:45:23 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2016/01/14 21:13:54 christos Exp $
+#	$NetBSD: Makefile,v 1.14 2017/06/05 23:45:23 christos Exp $
 
 .include 
 
@@ -17,6 +17,10 @@ SUBDIR+= grep
 SUBDIR+=groff
 .endif
 
+.if ${MKDTC} != "no"
+SUBDIR+=	dtc
+.endif
+
 SUBDIR+= gettext diffutils texinfo rcs send-pr
 
 .include

CVS commit: src/external/gpl2/dtc

2017-06-05 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Jun  5 18:59:43 UTC 2017

Added Files:
src/external/gpl2/dtc: Makefile Makefile.inc
src/external/gpl2/dtc/lib: Makefile
src/external/gpl2/dtc/lib/libfdt: Makefile
src/external/gpl2/dtc/usr.bin: Makefile Makefile.inc
src/external/gpl2/dtc/usr.bin/dtc: Makefile version_gen.h

Log Message:
Add build glue (from skrll)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl2/dtc/Makefile \
src/external/gpl2/dtc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl2/dtc/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/dtc/lib/libfdt/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl2/dtc/usr.bin/Makefile \
src/external/gpl2/dtc/usr.bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl2/dtc/usr.bin/dtc/Makefile \
src/external/gpl2/dtc/usr.bin/dtc/version_gen.h

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

Added files:

Index: src/external/gpl2/dtc/Makefile
diff -u /dev/null src/external/gpl2/dtc/Makefile:1.1
--- /dev/null	Mon Jun  5 14:59:43 2017
+++ src/external/gpl2/dtc/Makefile	Mon Jun  5 14:59:43 2017
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+
+SUBDIR = lib .WAIT usr.bin
+
+.include 
Index: src/external/gpl2/dtc/Makefile.inc
diff -u /dev/null src/external/gpl2/dtc/Makefile.inc:1.1
--- /dev/null	Mon Jun  5 14:59:43 2017
+++ src/external/gpl2/dtc/Makefile.inc	Mon Jun  5 14:59:43 2017
@@ -0,0 +1,4 @@
+#	$NetBSD: Makefile.inc,v 1.1 2017/06/05 18:59:43 christos Exp $
+
+BINDIR=		/usr/bin
+DIST=		${NETBSDSRCDIR}/external/gpl2/dtc/dist

Index: src/external/gpl2/dtc/lib/Makefile
diff -u /dev/null src/external/gpl2/dtc/lib/Makefile:1.1
--- /dev/null	Mon Jun  5 14:59:43 2017
+++ src/external/gpl2/dtc/lib/Makefile	Mon Jun  5 14:59:43 2017
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+
+SUBDIR+=	libfdt
+
+.include 

Index: src/external/gpl2/dtc/lib/libfdt/Makefile
diff -u /dev/null src/external/gpl2/dtc/lib/libfdt/Makefile:1.1
--- /dev/null	Mon Jun  5 14:59:43 2017
+++ src/external/gpl2/dtc/lib/libfdt/Makefile	Mon Jun  5 14:59:43 2017
@@ -0,0 +1,19 @@
+#	$NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+
+LIBISPRIVATE=	yes
+
+.include 
+
+LIB=	fdt
+
+.include "${.CURDIR}/../../Makefile.inc"
+.include "${.CURDIR}/../../dist/libfdt/Makefile.libfdt"
+
+SRCS=	${LIBFDT_SRCS}
+
+CPPFLAGS+=	-I ${DIST}/libfdt
+
+.PATH:	${DIST}/libfdt
+
+.include 
+

Index: src/external/gpl2/dtc/usr.bin/Makefile
diff -u /dev/null src/external/gpl2/dtc/usr.bin/Makefile:1.1
--- /dev/null	Mon Jun  5 14:59:43 2017
+++ src/external/gpl2/dtc/usr.bin/Makefile	Mon Jun  5 14:59:43 2017
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+
+SUBDIR+=	dtc
+
+.include 

Index: src/external/gpl2/dtc/usr.bin/dtc/Makefile
diff -u /dev/null src/external/gpl2/dtc/usr.bin/dtc/Makefile:1.1
--- /dev/null	Mon Jun  5 14:59:43 2017
+++ src/external/gpl2/dtc/usr.bin/dtc/Makefile	Mon Jun  5 14:59:43 2017
@@ -0,0 +1,21 @@
+#	$NetBSD: Makefile,v 1.1 2017/06/05 18:59:43 christos Exp $
+
+NOMAN=	# defined
+
+.include 
+
+PROG=	dtc
+
+.include "${.CURDIR}/../../Makefile.inc"
+.include "${DIST}/Makefile.dtc"
+
+CPPFLAGS+=	-I${.CURDIR}
+CPPFLAGS+=	-I${DIST}
+CPPFLAGS+=	-I${DIST}/libfdt
+
+SRCS+=	${DTC_SRCS} dtc-lexer.l dtc-parser.y
+YFLAGS+= -d -L
+
+.PATH:	${DIST}
+
+.include 
Index: src/external/gpl2/dtc/usr.bin/dtc/version_gen.h
diff -u /dev/null src/external/gpl2/dtc/usr.bin/dtc/version_gen.h:1.1
--- /dev/null	Mon Jun  5 14:59:43 2017
+++ src/external/gpl2/dtc/usr.bin/dtc/version_gen.h	Mon Jun  5 14:59:43 2017
@@ -0,0 +1 @@
+#define DTC_VERSION "DTC 1.4.1"

CVS commit: src/external/gpl2/dtc/dist

2017-06-05 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Jun  5 18:59:10 UTC 2017

Modified Files:
src/external/gpl2/dtc/dist: dtc-lexer.l

Log Message:
rename include file per our convention.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/dtc/dist/dtc-lexer.l

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

Modified files:

Index: src/external/gpl2/dtc/dist/dtc-lexer.l
diff -u src/external/gpl2/dtc/dist/dtc-lexer.l:1.1.1.1 src/external/gpl2/dtc/dist/dtc-lexer.l:1.2
--- src/external/gpl2/dtc/dist/dtc-lexer.l:1.1.1.1	Fri Dec  4 07:30:05 2015
+++ src/external/gpl2/dtc/dist/dtc-lexer.l	Mon Jun  5 14:59:10 2017
@@ -36,7 +36,7 @@ LINECOMMENT	"//".*\n
 %{
 #include "dtc.h"
 #include "srcpos.h"
-#include "dtc-parser.tab.h"
+#include "dtc-parser.h"
 
 YYLTYPE yylloc;
 extern bool treesource_error;

CVS commit: src/external/gpl2/dtc/dist

2017-06-05 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Jun  5 18:59:21 UTC 2017

Modified Files:
src/external/gpl2/dtc/dist: dtc-parser.y

Log Message:
Make this compatible with byacc


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/dtc/dist/dtc-parser.y

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

Modified files:

Index: src/external/gpl2/dtc/dist/dtc-parser.y
diff -u src/external/gpl2/dtc/dist/dtc-parser.y:1.1.1.1 src/external/gpl2/dtc/dist/dtc-parser.y:1.2
--- src/external/gpl2/dtc/dist/dtc-parser.y:1.1.1.1	Fri Dec  4 07:30:05 2015
+++ src/external/gpl2/dtc/dist/dtc-parser.y	Mon Jun  5 14:59:21 2017
@@ -24,7 +24,11 @@
 #include "srcpos.h"
 
 extern int yylex(void);
+#ifndef YYBYACC
 extern void yyerror(char const *s);
+#else
+#include "dtc-parser.h"
+#endif
 #define ERROR(loc, ...) \
 	do { \
 		srcpos_error((loc), "Error", __VA_ARGS__); \
@@ -471,7 +475,14 @@ subnode:
 
 %%
 
+#ifndef YYBYACC
 void yyerror(char const *s)
 {
 	ERROR(, "%s", s);
 }
+#else
+void yyerror(YYLTYPE *loc, char const *s)
+{
+	ERROR(loc, "%s", s);
+}
+#endif

CVS commit: src/external/gpl2/groff/tmac

2017-06-04 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jun  4 07:16:34 UTC 2017

Modified Files:
src/external/gpl2/groff/tmac: mdoc.local

Log Message:
8.0 update, and add 9.0 for THE FUTURE


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/tmac/mdoc.local

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

Modified files:

Index: src/external/gpl2/groff/tmac/mdoc.local
diff -u src/external/gpl2/groff/tmac/mdoc.local:1.2 src/external/gpl2/groff/tmac/mdoc.local:1.3
--- src/external/gpl2/groff/tmac/mdoc.local:1.2	Sun Jan 29 05:12:17 2017
+++ src/external/gpl2/groff/tmac/mdoc.local	Sun Jun  4 07:16:34 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.2 2017/01/29 05:12:17 snj Exp $
+.\" $NetBSD: mdoc.local,v 1.3 2017/06/04 07:16:34 snj Exp $
 .\"
 .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -44,9 +44,9 @@
 .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
 .
 .\" Default .Os value
-.ds doc-operating-system NetBSD\~7.0
+.ds doc-operating-system NetBSD\~8.0
 .\" Default footer operating system value
-.ds doc-default-operating-system NetBSD\~7.0
+.ds doc-default-operating-system NetBSD\~8.0
 .\" Other known versions, not yet in groff distribution
 .ds doc-operating-system-NetBSD-1.3.3  1.3.3
 .ds doc-operating-system-NetBSD-1.6.3  1.6.3
@@ -63,6 +63,7 @@
 .ds doc-operating-system-NetBSD-7.07.0
 .ds doc-operating-system-NetBSD-7.17.1
 .ds doc-operating-system-NetBSD-8.08.0
+.ds doc-operating-system-NetBSD-9.09.0
 .ds doc-operating-system-FreeBSD-4.11  4.11
 .ds doc-operating-system-FreeBSD-5.4   5.4
 .ds doc-operating-system-FreeBSD-5.5   5.5

CVS commit: src/external/gpl2/groff/tmac

2017-01-28 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 29 05:12:17 UTC 2017

Modified Files:
src/external/gpl2/groff/tmac: mdoc.local

Log Message:
add 7.1


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl2/groff/tmac/mdoc.local

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

Modified files:

Index: src/external/gpl2/groff/tmac/mdoc.local
diff -u src/external/gpl2/groff/tmac/mdoc.local:1.1 src/external/gpl2/groff/tmac/mdoc.local:1.2
--- src/external/gpl2/groff/tmac/mdoc.local:1.1	Wed Jan 13 19:02:01 2016
+++ src/external/gpl2/groff/tmac/mdoc.local	Sun Jan 29 05:12:17 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: mdoc.local,v 1.1 2016/01/13 19:02:01 christos Exp $
+.\" $NetBSD: mdoc.local,v 1.2 2017/01/29 05:12:17 snj Exp $
 .\"
 .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -61,6 +61,7 @@
 .ds doc-operating-system-NetBSD-6.06.0
 .ds doc-operating-system-NetBSD-6.16.1
 .ds doc-operating-system-NetBSD-7.07.0
+.ds doc-operating-system-NetBSD-7.17.1
 .ds doc-operating-system-NetBSD-8.08.0
 .ds doc-operating-system-FreeBSD-4.11  4.11
 .ds doc-operating-system-FreeBSD-5.4   5.4

CVS commit: src/external/gpl2/xcvs/bin/xcvs

2017-01-28 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Jan 29 00:01:48 UTC 2017

Modified Files:
src/external/gpl2/xcvs/bin/xcvs: Makefile

Log Message:
add sqlite3


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/bin/xcvs/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/gpl2/xcvs/bin/xcvs/Makefile
diff -u src/external/gpl2/xcvs/bin/xcvs/Makefile:1.4 src/external/gpl2/xcvs/bin/xcvs/Makefile:1.5
--- src/external/gpl2/xcvs/bin/xcvs/Makefile:1.4	Thu Mar  8 19:14:16 2012
+++ src/external/gpl2/xcvs/bin/xcvs/Makefile	Sat Jan 28 19:01:48 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2012/03/09 00:14:16 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2017/01/29 00:01:48 christos Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
 PROG=	xcvs
@@ -47,8 +47,8 @@ LDADD+= -lasn1
 # libcrypto is required by libgssapi, libkrb5, and libhx509
 # libwind is required by libhx509
 CPPFLAGS+= -DENCRYPTION
-DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBCRYPTO}
-LDADD+= -lcom_err -lroken -lwind -lcrypto
+DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBCRYPTO} ${LIBSQLITE3}
+LDADD+= -lcom_err -lroken -lwind -lcrypto -lsqlite3
 
 
 # libutil is required by libroken

CVS commit: src/external/gpl2/xcvs/dist/doc

2017-01-20 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Fri Jan 20 16:54:11 UTC 2017

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1 cvs.texinfo

Log Message:
Fix a spelling: s/regestring/registering


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/doc/cvs.1
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/doc/cvs.texinfo

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.3 src/external/gpl2/xcvs/dist/doc/cvs.1:1.4
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.3	Wed Dec 21 21:26:28 2016
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Fri Jan 20 16:54:11 2017
@@ -1490,7 +1490,7 @@ cannot commit to a specific revision on 
 Refuse to commit files unless the user has registered a valid edit on the
 file via \fBcvs edit\fR.  This is most useful when \fBcommit -c\fR
 and \fBedit -c\fR have been placed in all \fB.cvsrc\fR files.
-A commit can be forced anyways by either regestering an edit retroactively
+A commit can be forced anyways by either registering an edit retroactively
 via \fBcvs edit\fR (no changes to the file will be lost) or using the
 \fB-f\fR option to commit.  Support for \fBcommit -c\fR requires both
 client and a server versions 1.12.10 or greater.

Index: src/external/gpl2/xcvs/dist/doc/cvs.texinfo
diff -u src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.2 src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.3
--- src/external/gpl2/xcvs/dist/doc/cvs.texinfo:1.2	Sat Sep 24 12:02:58 2011
+++ src/external/gpl2/xcvs/dist/doc/cvs.texinfo	Fri Jan 20 16:54:11 2017
@@ -9541,7 +9541,7 @@ cannot commit to a specific revision on 
 Refuse to commit files unless the user has registered a valid edit on the
 file via @code{cvs edit}.  This is most useful when @samp{commit -c}
 and @samp{edit -c} have been placed in all @file{.cvsrc} files.
-A commit can be forced anyways by either regestering an edit retroactively
+A commit can be forced anyways by either registering an edit retroactively
 via @code{cvs edit} (no changes to the file will be lost) or using the
 @code{-f} option to commit.  Support for @code{commit -c} requires both
 client and a server versions 1.12.10 or greater.

CVS commit: src/external/gpl2/xcvs/include

2017-01-12 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Jan 12 23:15:49 UTC 2017

Modified Files:
src/external/gpl2/xcvs/include: config.h

Log Message:
Don't re-define MAP_ANONYMOUS


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/include/config.h

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

Modified files:

Index: src/external/gpl2/xcvs/include/config.h
diff -u src/external/gpl2/xcvs/include/config.h:1.6 src/external/gpl2/xcvs/include/config.h:1.7
--- src/external/gpl2/xcvs/include/config.h:1.6	Fri May 22 14:44:16 2009
+++ src/external/gpl2/xcvs/include/config.h	Thu Jan 12 18:15:49 2017
@@ -857,7 +857,7 @@
 #define MALLOC_0_IS_NONNULL 1
 
 /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-#define MAP_ANONYMOUS MAP_ANON
+/* #define MAP_ANONYMOUS MAP_ANON */
 
 /* By default, CVS stores its modules and other such items in flat text files
(MY_NDBM enables this). Turning off MY_NDBM causes CVS to look for a

CVS commit: src/external/gpl2/xcvs/dist/src

2017-01-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jan  4 16:11:20 UTC 2017

Modified Files:
src/external/gpl2/xcvs/dist/src: update.c

Log Message:
only preserve timestamps on specific revisions if we've been asked to.
found by martin@


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl2/xcvs/dist/src/update.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/update.c
diff -u src/external/gpl2/xcvs/dist/src/update.c:1.10 src/external/gpl2/xcvs/dist/src/update.c:1.11
--- src/external/gpl2/xcvs/dist/src/update.c:1.10	Mon Dec 19 12:31:47 2016
+++ src/external/gpl2/xcvs/dist/src/update.c	Wed Jan  4 11:11:20 2017
@@ -38,7 +38,7 @@
  * as well.
  */
 #include 
-__RCSID("$NetBSD: update.c,v 1.10 2016/12/19 17:31:47 christos Exp $");
+__RCSID("$NetBSD: update.c,v 1.11 2017/01/04 16:11:20 christos Exp $");
 
 #include "cvs.h"
 #include 
@@ -1382,7 +1382,6 @@ VERS: ", 0);
 
 	xvers_ts = Version_TS (finfo, options, tag, date, 
    force_tag_match, set_time);
-
 	if (strcmp (xvers_ts->options, "-V4") == 0)
 		xvers_ts->options[0] = '\0';
 
@@ -1777,7 +1776,7 @@ patch_file (struct file_info *finfo, Ver
 /* This stuff is just copied blindly from checkout_file.  I
 	   don't really know what it does.  */
 xvers_ts = Version_TS (finfo, options, tag, date,
-			   force_tag_match, 1);
+			   force_tag_match, preserve_timestamps_on_update);
 	if (strcmp (xvers_ts->options, "-V4") == 0)
 	xvers_ts->options[0] = '\0';

CVS commit: src/external/gpl2/xcvs/dist/doc

2016-12-21 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Dec 21 21:26:28 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/doc: cvs.1

Log Message:
document -t for update


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/doc/cvs.1

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

Modified files:

Index: src/external/gpl2/xcvs/dist/doc/cvs.1
diff -u src/external/gpl2/xcvs/dist/doc/cvs.1:1.2 src/external/gpl2/xcvs/dist/doc/cvs.1:1.3
--- src/external/gpl2/xcvs/dist/doc/cvs.1:1.2	Sat Sep 24 08:02:58 2011
+++ src/external/gpl2/xcvs/dist/doc/cvs.1	Wed Dec 21 16:26:28 2016
@@ -3664,7 +3664,7 @@ supported beginning with \fBcvs\fR relea
 .IX "update (subcommand)"
 .SP
 .IP "\(bu" 2
-update [-ACdflPpR] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files\&...
+update [-ACdflPpRt] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag[:date] | -D date] [-W spec] files\&...
 .IP "\(bu" 2
 Requires: repository, working directory.
 .IP "\(bu" 2
@@ -3724,6 +3724,19 @@ Local; run only in current working direc
 Prune empty directories.  See see node `Moving directories\(aq in the CVS manual.
 .SP
 .IP "" 0
+\fB-t\fR
+.IP "" 2
+Preserve source timestamps.  Unlike \fBcheckout\fR where files are created
+using the original timestamp of the file in the repository, \fBupdate\fR
+updates files using the current time of the machine.  This is convenient
+because updated files appear newer than any other files on the system so
+.BR make ( 1 )
+knows that are their corresponding built artifacts are out of date and
+they will get rebuilt.  The \fB-t\fR flag instead preserves the timestamps
+of the original repository files, behaving exactly like \fBcheckout\fR.
+This is useful for maintaining a tree in the original checked-out state.
+.SP
+.IP "" 0
 \fB-p\fR
 .IP "" 2
 Pipe files to the standard output.

CVS commit: src/external/gpl2/xcvs/dist/src

2016-12-19 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 19 17:31:47 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: update.c

Log Message:
fix the usage message


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/xcvs/dist/src/update.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/update.c
diff -u src/external/gpl2/xcvs/dist/src/update.c:1.9 src/external/gpl2/xcvs/dist/src/update.c:1.10
--- src/external/gpl2/xcvs/dist/src/update.c:1.9	Sun Dec 18 23:54:49 2016
+++ src/external/gpl2/xcvs/dist/src/update.c	Mon Dec 19 12:31:47 2016
@@ -38,7 +38,7 @@
  * as well.
  */
 #include 
-__RCSID("$NetBSD: update.c,v 1.9 2016/12/19 04:54:49 christos Exp $");
+__RCSID("$NetBSD: update.c,v 1.10 2016/12/19 17:31:47 christos Exp $");
 
 #include "cvs.h"
 #include 
@@ -127,12 +127,12 @@ static const char *const update_usage[] 
 "\t-l\tLocal directory only, no recursion.\n",
 "\t-R\tProcess directories recursively.\n",
 "\t-p\tSend updates to standard output (avoids stickiness).\n",
+"\t-t\tPreserve timestamps on update.\n",
 "\t-k kopt\tUse RCS kopt -k option on checkout. (is sticky)\n",
 "\t-r rev\tUpdate using specified revision/tag (is sticky).\n",
 "\t-D date\tSet date to update from (is sticky).\n",
 "\t-j rev\tMerge in changes made between current revision and rev.\n",
 "\t-I ign\tMore files to ignore (! to reset).\n",
-"\t-t Preserve timestamps on update.\n",
 "\t-W spec\tWrappers specification line.\n",
 "(Specify the --help global option for a list of other help options)\n",
 NULL

CVS commit: src/external/gpl2/xcvs/dist/src

2016-12-18 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 19 04:54:49 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: update.c

Log Message:
remove obsolete comment, flip polarity.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl2/xcvs/dist/src/update.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/update.c
diff -u src/external/gpl2/xcvs/dist/src/update.c:1.8 src/external/gpl2/xcvs/dist/src/update.c:1.9
--- src/external/gpl2/xcvs/dist/src/update.c:1.8	Sun Dec 18 23:44:35 2016
+++ src/external/gpl2/xcvs/dist/src/update.c	Sun Dec 18 23:54:49 2016
@@ -38,7 +38,7 @@
  * as well.
  */
 #include 
-__RCSID("$NetBSD: update.c,v 1.8 2016/12/19 04:44:35 christos Exp $");
+__RCSID("$NetBSD: update.c,v 1.9 2016/12/19 04:54:49 christos Exp $");
 
 #include "cvs.h"
 #include 
@@ -1373,11 +1373,7 @@ VERS: ", 0);
 	/* set the time from the RCS file iff it was unknown before */
 	set_time =
 		(!noexec
-		/*
-		 * always pass the time to the client, and let it decide
-		 * if it is going to set the time
-		 */
-		 && (!preserve_timestamps_on_update ||
+		 && (preserve_timestamps_on_update ||
 		 vers_ts->vn_user == NULL ||
 		 strncmp (vers_ts->ts_rcs, "Initial", 7) == 0)
 		 && !file_is_dead);

CVS commit: src/external/gpl2/xcvs/dist/src

2016-12-18 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 19 04:44:35 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: update.c

Log Message:
fix reversed logic


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl2/xcvs/dist/src/update.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/update.c
diff -u src/external/gpl2/xcvs/dist/src/update.c:1.7 src/external/gpl2/xcvs/dist/src/update.c:1.8
--- src/external/gpl2/xcvs/dist/src/update.c:1.7	Sun Dec 18 23:37:13 2016
+++ src/external/gpl2/xcvs/dist/src/update.c	Sun Dec 18 23:44:35 2016
@@ -38,7 +38,7 @@
  * as well.
  */
 #include 
-__RCSID("$NetBSD: update.c,v 1.7 2016/12/19 04:37:13 christos Exp $");
+__RCSID("$NetBSD: update.c,v 1.8 2016/12/19 04:44:35 christos Exp $");
 
 #include "cvs.h"
 #include 
@@ -1377,7 +1377,7 @@ VERS: ", 0);
 		 * always pass the time to the client, and let it decide
 		 * if it is going to set the time
 		 */
-		 && (preserve_timestamps_on_update ||
+		 && (!preserve_timestamps_on_update ||
 		 vers_ts->vn_user == NULL ||
 		 strncmp (vers_ts->ts_rcs, "Initial", 7) == 0)
 		 && !file_is_dead);

CVS commit: src/external/gpl2/xcvs/dist/src

2016-12-18 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 19 04:37:13 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: update.c

Log Message:
add -t to preserve timestamps.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/src/update.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/update.c
diff -u src/external/gpl2/xcvs/dist/src/update.c:1.6 src/external/gpl2/xcvs/dist/src/update.c:1.7
--- src/external/gpl2/xcvs/dist/src/update.c:1.6	Sun Dec 18 22:15:31 2016
+++ src/external/gpl2/xcvs/dist/src/update.c	Sun Dec 18 23:37:13 2016
@@ -38,7 +38,7 @@
  * as well.
  */
 #include 
-__RCSID("$NetBSD: update.c,v 1.6 2016/12/19 03:15:31 christos Exp $");
+__RCSID("$NetBSD: update.c,v 1.7 2016/12/19 04:37:13 christos Exp $");
 
 #include "cvs.h"
 #include 
@@ -106,6 +106,7 @@ static int toss_local_changes = 0;
 static int force_tag_match = 1;
 static int update_build_dirs = 0;
 static int update_prune_dirs = 0;
+static int preserve_timestamps_on_update = 0;
 static int pipeout = 0;
 static int dotemplate = 0;
 #ifdef SERVER_SUPPORT
@@ -131,6 +132,7 @@ static const char *const update_usage[] 
 "\t-D date\tSet date to update from (is sticky).\n",
 "\t-j rev\tMerge in changes made between current revision and rev.\n",
 "\t-I ign\tMore files to ignore (! to reset).\n",
+"\t-t Preserve timestamps on update.\n",
 "\t-W spec\tWrappers specification line.\n",
 "(Specify the --help global option for a list of other help options)\n",
 NULL
@@ -162,7 +164,7 @@ update (int argc, char **argv)
 
 /* parse the args */
 getoptreset ();
-while ((c = getopt (argc, argv, "+ApCPflRQqduk:r:D:j:I:W:")) != -1)
+while ((c = getopt (argc, argv, "+ApCPflRQqduk:r:tD:j:I:W:")) != -1)
 {
 	switch (c)
 	{
@@ -218,6 +220,9 @@ update (int argc, char **argv)
 		pipeout = 1;
 		noexec = 1;		/* so no locks will be created */
 		break;
+	case 't':
+		preserve_timestamps_on_update = 1;
+		break;
 	case 'j':
 		if (join_orig2)
 		error (1, 0, "only two -j options can be specified");
@@ -281,6 +286,8 @@ update (int argc, char **argv)
 		send_arg("-C");
 	if (update_prune_dirs)
 		send_arg("-P");
+	if (preserve_timestamps_on_update)
+		send_arg("-t");
 	client_prune_dirs = update_prune_dirs;
 	option_with_arg ("-r", tag);
 	if (options && options[0] != '\0')
@@ -1366,18 +1373,20 @@ VERS: ", 0);
 	/* set the time from the RCS file iff it was unknown before */
 	set_time =
 		(!noexec
-#if 0
 		/*
 		 * always pass the time to the client, and let it decide
 		 * if it is going to set the time
 		 */
-		 && (vers_ts->vn_user == NULL ||
+		 && (preserve_timestamps_on_update ||
+		 vers_ts->vn_user == NULL ||
 		 strncmp (vers_ts->ts_rcs, "Initial", 7) == 0)
-#endif
 		 && !file_is_dead);
+
 	wrap_fromcvs_process_file (finfo->file);
+
 	xvers_ts = Version_TS (finfo, options, tag, date, 
    force_tag_match, set_time);
+
 	if (strcmp (xvers_ts->options, "-V4") == 0)
 		xvers_ts->options[0] = '\0';

CVS commit: src/external/gpl2/xcvs/dist/src

2016-12-18 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 19 03:15:31 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: update.c

Log Message:
Always pass the modification time of the file to the client and let it decide
if it is going to use it to set the time. This makes update work like checkout
with respect to time setting. The time of the updated file is set to the
repository modification time of the file as opposed to the the time that the
file was checked out.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/src/update.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/update.c
diff -u src/external/gpl2/xcvs/dist/src/update.c:1.5 src/external/gpl2/xcvs/dist/src/update.c:1.6
--- src/external/gpl2/xcvs/dist/src/update.c:1.5	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/update.c	Sun Dec 18 22:15:31 2016
@@ -38,7 +38,7 @@
  * as well.
  */
 #include 
-__RCSID("$NetBSD: update.c,v 1.5 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: update.c,v 1.6 2016/12/19 03:15:31 christos Exp $");
 
 #include "cvs.h"
 #include 
@@ -1366,12 +1366,16 @@ VERS: ", 0);
 	/* set the time from the RCS file iff it was unknown before */
 	set_time =
 		(!noexec
+#if 0
+		/*
+		 * always pass the time to the client, and let it decide
+		 * if it is going to set the time
+		 */
 		 && (vers_ts->vn_user == NULL ||
 		 strncmp (vers_ts->ts_rcs, "Initial", 7) == 0)
+#endif
 		 && !file_is_dead);
-
 	wrap_fromcvs_process_file (finfo->file);
-
 	xvers_ts = Version_TS (finfo, options, tag, date, 
    force_tag_match, set_time);
 	if (strcmp (xvers_ts->options, "-V4") == 0)
@@ -1768,7 +1772,7 @@ patch_file (struct file_info *finfo, Ver
 /* This stuff is just copied blindly from checkout_file.  I
 	   don't really know what it does.  */
 xvers_ts = Version_TS (finfo, options, tag, date,
-			   force_tag_match, 0);
+			   force_tag_match, 1);
 	if (strcmp (xvers_ts->options, "-V4") == 0)
 	xvers_ts->options[0] = '\0';

CVS commit: src/external/gpl2/groff/dist/src/roff/troff

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 23:40:52 UTC 2016

Modified Files:
src/external/gpl2/groff/dist/src/roff/troff: input.cpp

Log Message:
Revert half of the last commit. Turns out that in some contexts,
BEGIN_QUOTE/END_QUOTE is used intentionally as non-char marker.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl2/groff/dist/src/roff/troff/input.cpp

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

Modified files:

Index: src/external/gpl2/groff/dist/src/roff/troff/input.cpp
diff -u src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.3 src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.4
--- src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.3	Sat Oct  8 20:44:59 2016
+++ src/external/gpl2/groff/dist/src/roff/troff/input.cpp	Sat Oct  8 23:40:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.cpp,v 1.3 2016/10/08 20:44:59 joerg Exp $	*/
+/*	$NetBSD: input.cpp,v 1.4 2016/10/08 23:40:52 joerg Exp $	*/
 
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
@@ -941,11 +941,11 @@ static int get_copy(node **nd, int defin
   compatible_flag = input_stack::get_compatible_flag();
   continue;
 }
-if (c == (char)BEGIN_QUOTE) {
+if (c == BEGIN_QUOTE) {
   input_stack::increase_level();
   continue;
 }
-if (c == (char)END_QUOTE) {
+if (c == END_QUOTE) {
   input_stack::decrease_level();
   continue;
 }

CVS commit: src/external/gpl2/groff/dist/src/roff/troff

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 20:44:59 UTC 2016

Modified Files:
src/external/gpl2/groff/dist/src/roff/troff: input.cpp

Log Message:
BEGIN_QUOTE and END_QUOTE have values outside the range of a signed char
for non-EBCDIC host. Explicitly cast them to char to avoid the implicit
cast.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl2/groff/dist/src/roff/troff/input.cpp

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

Modified files:

Index: src/external/gpl2/groff/dist/src/roff/troff/input.cpp
diff -u src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.2 src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.3
--- src/external/gpl2/groff/dist/src/roff/troff/input.cpp:1.2	Wed Jan 13 19:01:59 2016
+++ src/external/gpl2/groff/dist/src/roff/troff/input.cpp	Sat Oct  8 20:44:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: input.cpp,v 1.2 2016/01/13 19:01:59 christos Exp $	*/
+/*	$NetBSD: input.cpp,v 1.3 2016/10/08 20:44:59 joerg Exp $	*/
 
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
@@ -941,11 +941,11 @@ static int get_copy(node **nd, int defin
   compatible_flag = input_stack::get_compatible_flag();
   continue;
 }
-if (c == BEGIN_QUOTE) {
+if (c == (char)BEGIN_QUOTE) {
   input_stack::increase_level();
   continue;
 }
-if (c == END_QUOTE) {
+if (c == (char)END_QUOTE) {
   input_stack::decrease_level();
   continue;
 }
@@ -4238,12 +4238,12 @@ static void interpolate_arg(symbol nm)
 string args;
 for (int i = 1; i <= limit; i++) {
   args += '"';
-  args += BEGIN_QUOTE;
+  args += (char)BEGIN_QUOTE;
   input_iterator *p = input_stack::get_arg(i);
   int c;
   while ((c = p->get(0)) != EOF)
 	args += c;
-  args += END_QUOTE;
+  args += (char)END_QUOTE;
   args += '"';
   if (i != limit)
 	args += ' ';

CVS commit: src/external/gpl2/texinfo/dist/info

2016-10-08 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sat Oct  8 20:35:00 UTC 2016

Modified Files:
src/external/gpl2/texinfo/dist/info: infokey.c

Log Message:
Explicitly cast Meta(c) to char as the intermediate value can be too
large for a signed character.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/texinfo/dist/info/infokey.c

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

Modified files:

Index: src/external/gpl2/texinfo/dist/info/infokey.c
diff -u src/external/gpl2/texinfo/dist/info/infokey.c:1.2 src/external/gpl2/texinfo/dist/info/infokey.c:1.3
--- src/external/gpl2/texinfo/dist/info/infokey.c:1.2	Thu Jan 14 00:34:52 2016
+++ src/external/gpl2/texinfo/dist/info/infokey.c	Sat Oct  8 20:34:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: infokey.c,v 1.2 2016/01/14 00:34:52 christos Exp $	*/
+/*	$NetBSD: infokey.c,v 1.3 2016/10/08 20:34:59 joerg Exp $	*/
 
 /* infokey.c -- compile ~/.infokey to ~/.info.
Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp 
@@ -446,7 +446,7 @@ compile (FILE *fp, const char *filename,
 #define	To_seq(c) \
 		  do { \
 		if (slen < sizeof seq) \
-		  seq[slen++] = meta ? Meta(c) : (c); \
+		  seq[slen++] = meta ? (char)Meta(c) : (c); \
 		else \
 		  { \
 			syntax_error(filename, lnum, _("key sequence too long"), \

CVS commit: src/external/gpl2/lvm2/lib/libdevmapper

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 14:33:16 UTC 2016

Modified Files:
src/external/gpl2/lvm2/lib/libdevmapper: Makefile

Log Message:
Hack for powerpc64


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl2/lvm2/lib/libdevmapper/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/gpl2/lvm2/lib/libdevmapper/Makefile
diff -u src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.9 src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.10
--- src/external/gpl2/lvm2/lib/libdevmapper/Makefile:1.9	Wed Sep 11 19:04:10 2013
+++ src/external/gpl2/lvm2/lib/libdevmapper/Makefile	Tue Oct  4 10:33:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2013/09/11 23:04:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.10 2016/10/04 14:33:16 christos Exp $
 
 USE_SHLIBDIR=	yes
 USE_FORT?=	no
@@ -35,6 +35,11 @@ LDADD+= -lrumpvfs -lrump -lrumpu
 DBG=-g
 .endif
 
+# call to `dm_lib_release' lacks nop, can't restore toc; recompile with -fPIC
+.if ${MACHINE_ARCH} == "powerpc64"
+COPTS.libdm-nbsd-iface.c+= -O0
+.endif
+
 .PATH: ${LIBDEVMAPPER_DISTDIR}/
 .PATH: ${LIBDEVMAPPER_DISTDIR}/datastruct
 .PATH: ${LIBDEVMAPPER_DISTDIR}/mm

CVS commit: src/external/gpl2/lvm2/dist/man

2016-06-09 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Thu Jun  9 09:01:21 UTC 2016

Modified Files:
src/external/gpl2/lvm2/dist/man: dmsetup.8

Log Message:
Fix typo: processess -> processes


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/lvm2/dist/man/dmsetup.8

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

Modified files:

Index: src/external/gpl2/lvm2/dist/man/dmsetup.8
diff -u src/external/gpl2/lvm2/dist/man/dmsetup.8:1.2 src/external/gpl2/lvm2/dist/man/dmsetup.8:1.3
--- src/external/gpl2/lvm2/dist/man/dmsetup.8:1.2	Wed Feb 18 12:16:13 2009
+++ src/external/gpl2/lvm2/dist/man/dmsetup.8	Thu Jun  9 09:01:21 2016
@@ -1,4 +1,4 @@
-.\"$NetBSD: dmsetup.8,v 1.2 2009/02/18 12:16:13 haad Exp $
+.\"$NetBSD: dmsetup.8,v 1.3 2016/06/09 09:01:21 abhinav Exp $
 .\"
 .TH DMSETUP 8 "Apr 06 2006" "Linux" "MAINTENANCE COMMANDS"
 .SH NAME
@@ -234,7 +234,7 @@ process to be killed.
 .br
 Attempts to remove all device definitions i.e. reset the driver.
 Use with care!  From version 4.8.0 onwards, if devices can't
-be removed because uninterruptible processess are waiting for
+be removed because uninterruptible processes are waiting for
 I/O to return from them, adding --force will replace the table 
 with one that fails all I/O, which might allow the 
 process to be killed.  This also runs \fBmknodes\fP afterwards.

CVS commit: src/external/gpl2/groff/dist/tmac

2016-06-06 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Mon Jun  6 16:09:47 UTC 2016

Modified Files:
src/external/gpl2/groff/dist/tmac: groff_mdoc.man

Log Message:
Fix .Xr references to troff(1), ok from wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/dist/tmac/groff_mdoc.man

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

Modified files:

Index: src/external/gpl2/groff/dist/tmac/groff_mdoc.man
diff -u src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.2 src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.3
--- src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.2	Wed Jan 13 19:01:59 2016
+++ src/external/gpl2/groff/dist/tmac/groff_mdoc.man	Mon Jun  6 16:09:47 2016
@@ -391,7 +391,7 @@ that is, a blank space preceded by the e
 .Ql \e .
 This method may be used with any macro but has the side effect of
 interfering with the adjustment of text over the length of a line.
-.Xr Troff
+.Xr troff 1
 sees the hard space as if it were any other printable character and cannot
 split the string into blank or newline separated pieces as one would expect.
 This method is useful for strings which are not expected to overlap a line
@@ -433,7 +433,7 @@ would see three arguments, and the resul
 .
 .Ss "Trailing Blank Space Characters"
 .
-.Xr Troff
+.Xr troff 1
 can be confused by blank space characters at the end of a line.
 It is a wise preventive measure to globally remove all blank spaces
 from
@@ -1123,7 +1123,7 @@ The following punctuation characters are
 .El
 .Pp
 .
-.Xr Troff
+.Xr troff 1
 is limited as a macro language, and has difficulty when presented with a
 string containing a member of the mathematical, logical or quotation set:
 .
@@ -1133,7 +1133,7 @@ string containing a member of the mathem
 .Pp
 .
 The problem is that
-.Xr troff
+.Xr troff 1
 may assume it is supposed to actually perform the operation or evaluation
 suggested by the characters.
 To prevent the accidental evaluation of these characters, escape them with
@@ -3230,7 +3230,7 @@ This
 .Em left
 aligns the block about two inches from the right side of the page.
 This macro needs work and perhaps may never do the right thing within
-.Xr troff .
+.Xr troff 1 .
 .El
 .Pp
 .

CVS commit: src/external/gpl2/xcvs/dist/src

2016-05-30 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon May 30 17:49:51 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: import.c subr.c

Log Message:
Make sure that all messages end in '\n' in make_message_rcsvalid() and
compensate for it in add_rcs_file().


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/dist/src/import.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/subr.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/import.c
diff -u src/external/gpl2/xcvs/dist/src/import.c:1.6 src/external/gpl2/xcvs/dist/src/import.c:1.7
--- src/external/gpl2/xcvs/dist/src/import.c:1.6	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/import.c	Mon May 30 13:49:51 2016
@@ -21,7 +21,7 @@
  * Additional arguments specify more Vendor Release Tags.
  */
 #include 
-__RCSID("$NetBSD: import.c,v 1.6 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: import.c,v 1.7 2016/05/30 17:49:51 christos Exp $");
 
 #include "cvs.h"
 #include "lstat.h"
@@ -1409,7 +1409,7 @@ add_rcs_file (const char *message, const
 	/* We are going to put the log message in the revision on the
 	   branch.  So putting it here too seems kind of redundant, I
 	   guess (and that is what CVS has always done, anyway).  */
-	if (fprintf (fprcs, "Initial revision") < 0)
+	if (fprintf (fprcs, "Initial revision\n") < 0)
 		goto write_error;
 	}
 	else
@@ -1417,7 +1417,7 @@ add_rcs_file (const char *message, const
 	if (expand_at_signs (message, (off_t) strlen (message), fprcs) < 0)
 		goto write_error;
 	}
-	if (fprintf (fprcs, "\012@\012") < 0 ||
+	if (fprintf (fprcs, "@\012") < 0 ||
 	fprintf (fprcs, "text\012@") < 0)
 	{
 	goto write_error;
@@ -1443,7 +1443,7 @@ add_rcs_file (const char *message, const
 		fprintf (fprcs, "log\012@") < 0 ||
 		expand_at_signs (message,
  (off_t) strlen (message), fprcs) < 0 ||
-		fprintf (fprcs, "\012@\012text\012") < 0 ||
+		fprintf (fprcs, "@\012text\012") < 0 ||
 		fprintf (fprcs, "@@\012") < 0)
 		goto write_error;
 	}

Index: src/external/gpl2/xcvs/dist/src/subr.c
diff -u src/external/gpl2/xcvs/dist/src/subr.c:1.3 src/external/gpl2/xcvs/dist/src/subr.c:1.4
--- src/external/gpl2/xcvs/dist/src/subr.c:1.3	Tue May 17 10:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/subr.c	Mon May 30 13:49:51 2016
@@ -13,7 +13,7 @@
  * Various useful functions for the CVS support code.
  */
 #include 
-__RCSID("$NetBSD: subr.c,v 1.3 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: subr.c,v 1.4 2016/05/30 17:49:51 christos Exp $");
 
 #include "cvs.h"
 
@@ -542,7 +542,8 @@ make_message_rcsvalid (const char *messa
 if (message == NULL) message = "";
 
 /* Strip whitespace from end of lines and end of string. */
-dp = dst = (char *) xmalloc (strlen (message) + 1);
+/* One for NUL, one for \n */
+dp = dst = xmalloc (strlen (message) + 2);
 for (mp = message; *mp != '\0'; ++mp)
 {
 	if (*mp == '\n')
@@ -564,7 +565,12 @@ make_message_rcsvalid (const char *messa
 if (*dst == '\0')
 {
 	free (dst);
-	dst = xstrdup ("*** empty log message ***");
+	dst = xstrdup ("*** empty log message ***\n");
+}
+else if (dp > dst && dp[-1] != '\n')
+{
+	*dp++ = '\n';
+	*dp++ = '\0';
 }
 
 return dst;

CVS commit: src/external/gpl2/xcvs/dist

2016-05-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue May 17 14:00:09 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/lib: __fpending.c alloca.c allocsa.c
asnprintf.c asprintf.c atexit.c basename.c canon-host.c
canonicalize.c chdir-long.c closeout.c cycle-check.c dirname.c
dup-safer.c dup2.c error.c exitfail.c fd-safer.c filenamecat.c
fncase.c fnmatch.c fnmatch_loop.c fseeko.c ftello.c ftruncate.c
gai_strerror.c getaddrinfo.c getcwd.c getdate.c getdelim.c
gethostname.c getline.c getlogin_r.c getndelim2.c getnline.c
getopt.c getopt1.c getpass.c gettime.c gettimeofday.c glob.c
lstat.c malloc.c mbchar.c md5.c memchr.c memmove.c mempcpy.c
memrchr.c mkdir.c mkstemp.c mktime.c nanosleep.c openat.c
pagealign_alloc.c pipe-safer.c printf-args.c printf-parse.c
progname.c quotearg.c readlink.c realloc.c regcomp.c regex.c
regex_internal.c regexec.c rename.c rpmatch.c save-cwd.c setenv.c
sighandle.c strcasecmp.c strdup.c strerror.c strftime.c
stripslash.c strncasecmp.c strnlen1.c strstr.c strtol.c strtoul.c
sunos57-select.c tempname.c time_r.c unsetenv.c vasnprintf.c
vasprintf.c waitpid.c xalloc-die.c xgetcwd.c xgethostname.c
xmalloc.c xreadlink.c yesno.c
src/external/gpl2/xcvs/dist/src: acl.c add.c admin.c annotate.c
buffer.c checkin.c checkout.c classify.c client.c commit.c
create_adm.c cvsrc.c diff.c edit.c entries.c error.c exithandle.c
expand_path.c fileattr.c filesubr.c find_names.c gssapi-client.c
hardlink.c hash.c history.c ignore.c import.c kerberos4-client.c
lock.c log-buffer.c log.c login.c logmsg.c ls.c main.c mkmodules.c
modules.c ms-buffer.c myndbm.c no_diff.c parseinfo.c patch.c rcs.c
rcscmds.c recurse.c release.c remove.c repos.c root.c rsh-client.c
run.c scramble.c server.c socket-client.c stack.c status.c subr.c
tag.c update.c vers_ts.c version.c watch.c wrapper.c zlib.c

Log Message:
Add RCSID's


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/xcvs/dist/lib/__fpending.c \
src/external/gpl2/xcvs/dist/lib/alloca.c \
src/external/gpl2/xcvs/dist/lib/allocsa.c \
src/external/gpl2/xcvs/dist/lib/asnprintf.c \
src/external/gpl2/xcvs/dist/lib/asprintf.c \
src/external/gpl2/xcvs/dist/lib/atexit.c \
src/external/gpl2/xcvs/dist/lib/basename.c \
src/external/gpl2/xcvs/dist/lib/canon-host.c \
src/external/gpl2/xcvs/dist/lib/canonicalize.c \
src/external/gpl2/xcvs/dist/lib/chdir-long.c \
src/external/gpl2/xcvs/dist/lib/closeout.c \
src/external/gpl2/xcvs/dist/lib/cycle-check.c \
src/external/gpl2/xcvs/dist/lib/dirname.c \
src/external/gpl2/xcvs/dist/lib/dup-safer.c \
src/external/gpl2/xcvs/dist/lib/dup2.c \
src/external/gpl2/xcvs/dist/lib/error.c \
src/external/gpl2/xcvs/dist/lib/exitfail.c \
src/external/gpl2/xcvs/dist/lib/fd-safer.c \
src/external/gpl2/xcvs/dist/lib/filenamecat.c \
src/external/gpl2/xcvs/dist/lib/fncase.c \
src/external/gpl2/xcvs/dist/lib/fnmatch.c \
src/external/gpl2/xcvs/dist/lib/fnmatch_loop.c \
src/external/gpl2/xcvs/dist/lib/fseeko.c \
src/external/gpl2/xcvs/dist/lib/ftello.c \
src/external/gpl2/xcvs/dist/lib/ftruncate.c \
src/external/gpl2/xcvs/dist/lib/gai_strerror.c \
src/external/gpl2/xcvs/dist/lib/getaddrinfo.c \
src/external/gpl2/xcvs/dist/lib/getcwd.c \
src/external/gpl2/xcvs/dist/lib/getdelim.c \
src/external/gpl2/xcvs/dist/lib/gethostname.c \
src/external/gpl2/xcvs/dist/lib/getline.c \
src/external/gpl2/xcvs/dist/lib/getlogin_r.c \
src/external/gpl2/xcvs/dist/lib/getndelim2.c \
src/external/gpl2/xcvs/dist/lib/getnline.c \
src/external/gpl2/xcvs/dist/lib/getopt.c \
src/external/gpl2/xcvs/dist/lib/getopt1.c \
src/external/gpl2/xcvs/dist/lib/getpass.c \
src/external/gpl2/xcvs/dist/lib/gettime.c \
src/external/gpl2/xcvs/dist/lib/gettimeofday.c \
src/external/gpl2/xcvs/dist/lib/glob.c \
src/external/gpl2/xcvs/dist/lib/lstat.c \
src/external/gpl2/xcvs/dist/lib/malloc.c \
src/external/gpl2/xcvs/dist/lib/mbchar.c \
src/external/gpl2/xcvs/dist/lib/md5.c \
src/external/gpl2/xcvs/dist/lib/memchr.c \
src/external/gpl2/xcvs/dist/lib/memmove.c \
src/external/gpl2/xcvs/dist/lib/mempcpy.c \
src/external/gpl2/xcvs/dist/lib/memrchr.c \
src/external/gpl2/xcvs/dist/lib/mkdir.c \
src/external/gpl2/xcvs/dist/lib/mkstemp.c \
src/external/gpl2/xcvs/dist/lib/mktime.c \
src/external/gpl2/xcvs/dist/lib/nanosleep.c \
src/external/gpl2/xcvs/dist/lib/openat.c \
src/external/gpl2/xcvs/dist/lib/pagealign_alloc.c \
src/external/gpl2/xcvs/dist/lib/pipe-safer.c \
src/external/gpl2/xcvs/dist/lib/printf-args.c \

CVS commit: src/external/gpl2/libmalloc/lib

2016-05-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed May  4 17:17:00 UTC 2016

Modified Files:
src/external/gpl2/libmalloc/lib: Makefile

Log Message:
limit to gcc, requested by joerg.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/libmalloc/lib/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/gpl2/libmalloc/lib/Makefile
diff -u src/external/gpl2/libmalloc/lib/Makefile:1.4 src/external/gpl2/libmalloc/lib/Makefile:1.5
--- src/external/gpl2/libmalloc/lib/Makefile:1.4	Wed May  4 10:39:49 2016
+++ src/external/gpl2/libmalloc/lib/Makefile	Wed May  4 13:17:00 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2016/05/04 14:39:49 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2016/05/04 17:17:00 christos Exp $
 
 NOMAN=	# defined
 .include 
@@ -12,7 +12,10 @@ SRCS+=  ralloc.c
 
 
 CPPFLAGS+= -I${DIST} -I${.CURDIR} -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_UNISTD_H
+
+.if ${HAVE_GCC:U0} >= 53
 COPTS+=-fno-builtin-malloc
+.endif
 
 .PATH: ${DIST}

CVS commit: src/external/gpl2/libmalloc/lib

2016-05-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed May  4 14:39:49 UTC 2016

Modified Files:
src/external/gpl2/libmalloc/lib: Makefile

Log Message:
prevent gcc from combining memset+malloc -> calloc inside calloc so that
we end up calling ourselves recursively.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/libmalloc/lib/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/gpl2/libmalloc/lib/Makefile
diff -u src/external/gpl2/libmalloc/lib/Makefile:1.3 src/external/gpl2/libmalloc/lib/Makefile:1.4
--- src/external/gpl2/libmalloc/lib/Makefile:1.3	Fri Jan 15 10:14:02 2016
+++ src/external/gpl2/libmalloc/lib/Makefile	Wed May  4 10:39:49 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2016/01/15 15:14:02 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2016/05/04 14:39:49 christos Exp $
 
 NOMAN=	# defined
 .include 
@@ -12,6 +12,7 @@ SRCS+=  ralloc.c
 
 
 CPPFLAGS+= -I${DIST} -I${.CURDIR} -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_UNISTD_H
+COPTS+=-fno-builtin-malloc
 
 .PATH: ${DIST}

CVS commit: src/external/gpl2/groff

2016-03-18 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Wed Mar 16 23:52:04 UTC 2016

Modified Files:
src/external/gpl2/groff: Makefile.inc

Log Message:
Hardcode man page dates to date of groff release (September 4, 2005
for 1.19.2 in this case).

We can not use mdate.sh since after checkout/update from version
control, it might be today's date and MKREPRO won't work.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/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/gpl2/groff/Makefile.inc
diff -u src/external/gpl2/groff/Makefile.inc:1.2 src/external/gpl2/groff/Makefile.inc:1.3
--- src/external/gpl2/groff/Makefile.inc:1.2	Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/Makefile.inc	Wed Mar 16 23:52:04 2016
@@ -1,9 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2016/03/16 23:52:04 wiz Exp $
 
 # $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
 
 BINDIR?=	/usr/bin
 ECHO=		echo
+# date of groff tarball; embedded as last-change date into man pages
+# we can not use mdate.sh since after checkout from some of the used
+# version control systems, it might be today's date and MKREPRO won't
+# work.
+MDATE=		September 4, 2005
 
 # Define `page' to be letter if your PostScript printer uses 8.5x11
 # paper (USA) and define it to be A4, if it uses A4 paper (rest of the
@@ -137,7 +142,7 @@ revision != ${TOOL_SED} -e 's/^0$$//' -e
 	-e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
 	-e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
 	-e "s;@VERSION@;$(version)$(revision);g" \
-	-e "s;@MDATE@;`${HOST_SH} ${GROFF_DIST}/mdate.sh $<`;g" \
+	-e "s;@MDATE@;${MDATE};g" \
 	-e "s;@g@;$(g);g" \
 	-e "s;@G@;`echo $(g) | LC_ALL=C tr [a-z] [A-Z]`;g" \
 	$< >$@

CVS commit: src/external/gpl2/xcvs/dist/src

2016-02-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Feb 21 00:56:44 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: import.c

Log Message:
Handle the last newline in the "special" import for new file like RCS does.
I.e. make_message_rcsvalid() removes it, and we put it back.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/src/import.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/import.c
diff -u src/external/gpl2/xcvs/dist/src/import.c:1.4 src/external/gpl2/xcvs/dist/src/import.c:1.5
--- src/external/gpl2/xcvs/dist/src/import.c:1.4	Sat Jan 30 11:21:47 2016
+++ src/external/gpl2/xcvs/dist/src/import.c	Sat Feb 20 19:56:44 2016
@@ -1407,7 +1407,7 @@ add_rcs_file (const char *message, const
 	/* We are going to put the log message in the revision on the
 	   branch.  So putting it here too seems kind of redundant, I
 	   guess (and that is what CVS has always done, anyway).  */
-	if (fprintf (fprcs, "Initial revision\012") < 0)
+	if (fprintf (fprcs, "Initial revision") < 0)
 		goto write_error;
 	}
 	else
@@ -1415,7 +1415,7 @@ add_rcs_file (const char *message, const
 	if (expand_at_signs (message, (off_t) strlen (message), fprcs) < 0)
 		goto write_error;
 	}
-	if (fprintf (fprcs, "@\012") < 0 ||
+	if (fprintf (fprcs, "\012@\012") < 0 ||
 	fprintf (fprcs, "text\012@") < 0)
 	{
 	goto write_error;
@@ -1441,7 +1441,7 @@ add_rcs_file (const char *message, const
 		fprintf (fprcs, "log\012@") < 0 ||
 		expand_at_signs (message,
  (off_t) strlen (message), fprcs) < 0 ||
-		fprintf (fprcs, "@\012text\012") < 0 ||
+		fprintf (fprcs, "\012@\012text\012") < 0 ||
 		fprintf (fprcs, "@@\012") < 0)
 		goto write_error;
 	}

CVS commit: src/external/gpl2/xcvs

2016-01-30 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Jan 30 16:47:00 UTC 2016

Modified Files:
src/external/gpl2/xcvs: Makefile.inc

Log Message:
Use .PARSEDIR to set the TOP. It makes things more portable since they
can work outside the tree.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/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/gpl2/xcvs/Makefile.inc
diff -u src/external/gpl2/xcvs/Makefile.inc:1.3 src/external/gpl2/xcvs/Makefile.inc:1.4
--- src/external/gpl2/xcvs/Makefile.inc:1.3	Sun Sep 23 13:22:25 2012
+++ src/external/gpl2/xcvs/Makefile.inc	Sat Jan 30 11:47:00 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.3 2012/09/23 17:22:25 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2016/01/30 16:47:00 christos Exp $
 
 .include 
 
@@ -11,7 +11,7 @@ CWARNFLAGS.clang+=	-Wno-tautological-com
 			-Wno-tautological-constant-out-of-range-compare
 
 BINDIR?= /usr/bin
-IDIST=	${NETBSDSRCDIR}/external/gpl2/xcvs/dist
+IDIST:=	${.PARSEDIR}/dist
 
 .if !defined(SUBDIR)
 CPPFLAGS+= -DSETXID_SUPPORT -DHAVE_CONFIG_H \

CVS commit: src/external/gpl2/xcvs/dist/src

2016-01-30 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Jan 30 16:21:47 UTC 2016

Modified Files:
src/external/gpl2/xcvs/dist/src: import.c

Log Message:
Remove trailing whitespace from imported messages when adding now files.
This is done in RCS_checkin() but we have a "fast path" for new files here
that does not do it. Hooray for specialized code.

XXX: pullup 6, 7


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/import.c

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

Modified files:

Index: src/external/gpl2/xcvs/dist/src/import.c
diff -u src/external/gpl2/xcvs/dist/src/import.c:1.3 src/external/gpl2/xcvs/dist/src/import.c:1.4
--- src/external/gpl2/xcvs/dist/src/import.c:1.3	Thu Mar  8 15:47:45 2012
+++ src/external/gpl2/xcvs/dist/src/import.c	Sat Jan 30 11:21:47 2016
@@ -579,7 +579,7 @@ static int
 process_import_file (char *message, char *vfile, char *vtag, int targc,
 		 char **targv)
 {
-char *rcs;
+char *rcs, *cleanmessage;
 int inattic = 0;
 
 rcs = Xasprintf ("%s/%s%s", repository, vfile, RCSEXT);
@@ -654,13 +654,14 @@ process_import_file (char *message, char
 		Entries_Close (entries);
 	}
 #endif
-
-	retval = add_rcs_file (message, rcs, vfile, vhead, our_opt,
+	cleanmessage = make_message_rcsvalid (message);
+	retval = add_rcs_file (cleanmessage, rcs, vfile, vhead, our_opt,
    vbranch, vtag, targc, targv,
    NULL, 0, logfp, killnew);
 	if (free_opt != NULL)
 		free (free_opt);
 	free (rcs);
+	free (cleanmessage);
 	return retval;
 	}
 	free (attic_name);

CVS commit: src/external/gpl2/libmalloc/dist

2016-01-17 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Jan 17 22:51:32 UTC 2016

Modified Files:
src/external/gpl2/libmalloc/dist: getpagesize.h

Log Message:
include unistd.h for getpagesize()


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/libmalloc/dist/getpagesize.h

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

Modified files:

Index: src/external/gpl2/libmalloc/dist/getpagesize.h
diff -u src/external/gpl2/libmalloc/dist/getpagesize.h:1.3 src/external/gpl2/libmalloc/dist/getpagesize.h:1.4
--- src/external/gpl2/libmalloc/dist/getpagesize.h:1.3	Fri Jan 15 10:13:28 2016
+++ src/external/gpl2/libmalloc/dist/getpagesize.h	Sun Jan 17 17:51:32 2016
@@ -1,16 +1,17 @@
-/*	$NetBSD: getpagesize.h,v 1.3 2016/01/15 15:13:28 christos Exp $	*/
+/*	$NetBSD: getpagesize.h,v 1.4 2016/01/17 22:51:32 christos Exp $	*/
 
 /* Emulate getpagesize on systems that lack it.  */
 
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+
 #ifndef HAVE_GETPAGESIZE
 
 #ifdef VMS
 #define getpagesize() 512
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include 
-#endif
 
 #ifdef _SC_PAGESIZE
 #define getpagesize() sysconf(_SC_PAGESIZE)
@@ -22,7 +23,7 @@
 #define getpagesize() EXEC_PAGESIZE
 #else
 #ifdef NBPG
-#define getpagesize() NBPG * CLSIZE
+#define getpagesize() (NBPG * CLSIZE)
 #ifndef CLSIZE
 #define CLSIZE 1
 #endif /* no CLSIZE */

CVS commit: src/external/gpl2/libmalloc/lib

2016-01-15 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Jan 15 15:14:02 UTC 2016

Modified Files:
src/external/gpl2/libmalloc/lib: Makefile

Log Message:
we have unistd.h


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/libmalloc/lib/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/gpl2/libmalloc/lib/Makefile
diff -u src/external/gpl2/libmalloc/lib/Makefile:1.2 src/external/gpl2/libmalloc/lib/Makefile:1.3
--- src/external/gpl2/libmalloc/lib/Makefile:1.2	Wed Jan 13 21:43:50 2016
+++ src/external/gpl2/libmalloc/lib/Makefile	Fri Jan 15 10:14:02 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/01/14 02:43:50 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2016/01/15 15:14:02 christos Exp $
 
 NOMAN=	# defined
 .include 
@@ -11,7 +11,7 @@ SRCS+=  memalign.c valloc.c mcheck.c mtr
 SRCS+=  ralloc.c
 
 
-CPPFLAGS+= -I${DIST} -I${.CURDIR} -DSTDC_HEADERS -DHAVE_STDLIB_H
+CPPFLAGS+= -I${DIST} -I${.CURDIR} -DSTDC_HEADERS -DHAVE_STDLIB_H -DHAVE_UNISTD_H
 
 .PATH: ${DIST}

CVS commit: src/external/gpl2/libmalloc/dist

2016-01-15 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Jan 15 15:13:29 UTC 2016

Modified Files:
src/external/gpl2/libmalloc/dist: getpagesize.h

Log Message:
remove param.h


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/libmalloc/dist/getpagesize.h

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

Modified files:

Index: src/external/gpl2/libmalloc/dist/getpagesize.h
diff -u src/external/gpl2/libmalloc/dist/getpagesize.h:1.2 src/external/gpl2/libmalloc/dist/getpagesize.h:1.3
--- src/external/gpl2/libmalloc/dist/getpagesize.h:1.2	Wed Jan 13 16:56:38 2016
+++ src/external/gpl2/libmalloc/dist/getpagesize.h	Fri Jan 15 10:13:28 2016
@@ -1,5 +1,4 @@
-#include 
-/*	$NetBSD: getpagesize.h,v 1.2 2016/01/13 21:56:38 christos Exp $	*/
+/*	$NetBSD: getpagesize.h,v 1.3 2016/01/15 15:13:28 christos Exp $	*/
 
 /* Emulate getpagesize on systems that lack it.  */

CVS commit: src/external/gpl2/gettext

2016-01-15 Thread Matthias Scheler

Module Name:src
Committed By:   tron
Date:   Fri Jan 15 18:03:32 UTC 2016

Modified Files:
src/external/gpl2/gettext/bin/msgmerge: Makefile
src/external/gpl2/gettext/lib/libnlspr: Makefile

Log Message:
Fix build with "USE_SSP" set to "yes"


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gettext/bin/msgmerge/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gettext/lib/libnlspr/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/gpl2/gettext/bin/msgmerge/Makefile
diff -u src/external/gpl2/gettext/bin/msgmerge/Makefile:1.2 src/external/gpl2/gettext/bin/msgmerge/Makefile:1.3
--- src/external/gpl2/gettext/bin/msgmerge/Makefile:1.2	Wed Jan 13 12:48:51 2016
+++ src/external/gpl2/gettext/bin/msgmerge/Makefile	Fri Jan 15 18:03:32 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/01/13 12:48:51 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2016/01/15 18:03:32 tron Exp $
 
 PROG=	msgmerge
 SRCS=msgmerge.c msgl-fsearch.c
@@ -6,4 +6,6 @@ SRCS=msgmerge.c msgl-fsearch.c
 LDADD+=	-lm
 DPADD+= ${LIBM}
 
+COPTS.msgmerge.c = -Wno-stack-protector
+
 .include "${.CURDIR}/../Makefile.inc.prog"

Index: src/external/gpl2/gettext/lib/libnlspr/Makefile
diff -u src/external/gpl2/gettext/lib/libnlspr/Makefile:1.2 src/external/gpl2/gettext/lib/libnlspr/Makefile:1.3
--- src/external/gpl2/gettext/lib/libnlspr/Makefile:1.2	Wed Jan 13 12:48:51 2016
+++ src/external/gpl2/gettext/lib/libnlspr/Makefile	Fri Jan 15 18:03:32 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2016/01/13 12:48:51 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2016/01/15 18:03:32 tron Exp $
 
 LIBISPRIVATE=	yes
 
@@ -83,10 +83,13 @@ CPPFLAGS+=-DLIBDIR=\"/usr/share\"
 CPPFLAGS+=-DGETTEXTJAR=\"/usr/share/gettext/gettext.jar\"
 CPPFLAGS+=-DGETTEXTDATADIR=\"/usr/share/gettext\"
 
+COPTS.clean-temp.c = -Wno-stack-protector
 COPTS.format-java.c = -Wno-stack-protector
+COPTS.message.c = -Wno-stack-protector
 COPTS.msgl-cat.c = -Wno-stack-protector
 COPTS.msgl-charset.c = -Wno-stack-protector
 COPTS.msgl-iconv.c = -Wno-stack-protector
+COPTS.plural-exp.c = -Wno-stack-protector
 COPTS.plural.c = -Wno-stack-protector
 COPTS.po-charset.c = -Wno-stack-protector
 COPTS.po-gram-gen.c = -Wno-stack-protector

1 2 3 >

1 - 100 of 238 matches

Mail list logo