CVS commit: src/usr.bin/uuencode
Module Name:src
Committed By: rin
Date: Mon Mar 4 05:37:08 UTC 2019
Modified Files:
src/usr.bin/uuencode: uuencode.5 uuencode.c
Log Message:
When input is not a multiple of three bytes in size, pad null
characters instead of garbage. This makes output reproducible.
Taken from FreeBSD:
https://svnweb.freebsd.org/base?view=revision=84715
Even though this is not demanded by POSIX, uuencode(1) in
FreeBSD, OpenBSD, macOS, and GNU, behaves that way.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/uuencode/uuencode.5
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/uuencode/uuencode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/uuencode/uuencode.5
diff -u src/usr.bin/uuencode/uuencode.5:1.12 src/usr.bin/uuencode/uuencode.5:1.13
--- src/usr.bin/uuencode/uuencode.5:1.12 Mon Jun 6 15:09:33 2016
+++ src/usr.bin/uuencode/uuencode.5 Mon Mar 4 05:37:08 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: uuencode.5,v 1.12 2016/06/06 15:09:33 abhinav Exp $
+.\" $NetBSD: uuencode.5,v 1.13 2019/03/04 05:37:08 rin Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)uuencode.format.5 8.2 (Berkeley) 1/12/94
.\"
-.Dd June 2, 2016
+.Dd March 4, 2019
.Dt UUENCODE 5
.Os
.Sh NAME
@@ -118,11 +118,11 @@ backquote character \`).
Obviously, not every input file will be a multiple of three bytes in size.
In these cases,
.Xr uuencode 1
-will pad the remaining one or two bytes of data with garbage bytes until
+will pad the remaining one or two bytes of data with null characters until
a three byte group is created.
The byte count in a line containing
-garbage padding will reflect the actual number of bytes encoded, making
-it possible to convey how many bytes are garbage.
+null padding will reflect the actual number of bytes encoded, making
+it possible to convey how many bytes are null.
.Pp
The trailer line consists of
.Dq end
Index: src/usr.bin/uuencode/uuencode.c
diff -u src/usr.bin/uuencode/uuencode.c:1.16 src/usr.bin/uuencode/uuencode.c:1.17
--- src/usr.bin/uuencode/uuencode.c:1.16 Sat Sep 6 18:58:35 2014
+++ src/usr.bin/uuencode/uuencode.c Mon Mar 4 05:37:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uuencode.c,v 1.16 2014/09/06 18:58:35 dholland Exp $ */
+/* $NetBSD: uuencode.c,v 1.17 2019/03/04 05:37:08 rin Exp $ */
/*-
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: uuencode.c,v 1.16 2014/09/06 18:58:35 dholland Exp $");
+__RCSID("$NetBSD: uuencode.c,v 1.17 2019/03/04 05:37:08 rin Exp $");
#endif
#endif /* not lint */
@@ -165,6 +165,12 @@ encode(void)
if (putchar(ch) == EOF)
break;
for (p = buf; n > 0; n -= 3, p += 3) {
+ /* Pad with nulls if not a multiple of 3. */
+ if (n < 3) {
+p[2] = '\0';
+if (n < 2)
+ p[1] = '\0';
+ }
ch = *p >> 2;
ch = ENC(ch);
if (putchar(ch) == EOF)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Mar 4 05:28:48 UTC 2019
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Use do { ... } whille (0) for DPRINTF(x, y).
To generate a diff of this commit:
cvs rdiff -u -r1.629 -r1.630 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.629 src/sys/dev/pci/if_wm.c:1.630
--- src/sys/dev/pci/if_wm.c:1.629 Thu Feb 28 16:56:35 2019
+++ src/sys/dev/pci/if_wm.c Mon Mar 4 05:28:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.629 2019/02/28 16:56:35 khorben Exp $ */
+/* $NetBSD: if_wm.c,v 1.630 2019/03/04 05:28:48 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.629 2019/02/28 16:56:35 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.630 2019/03/04 05:28:48 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -157,7 +157,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.
int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX | WM_DEBUG_LINK | WM_DEBUG_GMII
| WM_DEBUG_MANAGE | WM_DEBUG_NVM | WM_DEBUG_INIT | WM_DEBUG_LOCK;
-#define DPRINTF(x, y) if (wm_debug & (x)) printf y
+#define DPRINTF(x, y) do { if (wm_debug & (x)) printf y; } while (0)
#else
#define DPRINTF(x, y) __nothing
#endif /* WM_DEBUG */
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Mon Mar 4 01:16:33 UTC 2019 Modified Files: src/external/gpl3/gcc: README.gcc7 Log Message: update reality on switched ports and commited fixes. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/README.gcc7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/README.gcc7 diff -u src/external/gpl3/gcc/README.gcc7:1.12 src/external/gpl3/gcc/README.gcc7:1.13 --- src/external/gpl3/gcc/README.gcc7:1.12 Sun Feb 17 06:22:58 2019 +++ src/external/gpl3/gcc/README.gcc7 Mon Mar 4 01:16:33 2019 @@ -1,4 +1,4 @@ -$NetBSD: README.gcc7,v 1.12 2019/02/17 06:22:58 mrg Exp $ +$NetBSD: README.gcc7,v 1.13 2019/03/04 01:16:33 mrg Exp $ new stuff (from gcc 5): cc1objcplus @@ -23,35 +23,35 @@ architecture tools kernels libgcc native - --- -- -- --- aarch64 y y y y y y y y alpha y y y y y y ? y -arm y y y y y y ? n -armeb y y y y y ? ? n -earmv4 y y y y y y ??? n -earmv4eb y ? y y ? ? ? n -earm y ? y y ? ? ? n -earmeb y ? y y ? ? ? n -earmhf y ? y y ? ? ? n -earmhfeb y ? y y ? ? ? n -earmv6 y ? y y ? ? ? n -earmv6eb y ? y y ? ? ? n -earmv6hf y ? y y ? ? ? n -earmv6hfeb y ? y y ? ? ? n -earmv7 y ? y y ? ? ? n -earmv7eb y ? y y ? ? ? n -earmv7hf y ? y y ? ? ? n -earmv7hfeb y ? y y ? ? ? n -hppa y y y y y ? ? n +arm y y y y y y ? y +armeb y y y y y ? ? y +earmv4 y y y y y y ??? y +earmv4eb y ? y y ? ? ? y +earm y ? y y ? ? ? y +earmeb y ? y y ? ? ? y +earmhf y ? y y ? ? ? y +earmhfeb y ? y y ? ? ? y +earmv6 y ? y y ? ? ? y +earmv6eb y ? y y ? ? ? y +earmv6hf y ? y y ? ? ? y +earmv6hfeb y ? y y ? ? ? y +earmv7 y ? y y ? ? ? y +earmv7eb y ? y y ? ? ? y +earmv7hf y ? y y ? ? ? y +earmv7hfeb y ? y y ? ? ? y +hppa y y y y y ? ? y i386 y y y y y y y y ia64 y ? ? y n[2] ? ? ? -m68000 y y y y y ? ? ? -m68k y y y y y[1] y ? ? +m68000 y y y y y ? ? y +m68k y y y y y y ? y mipseb y y y y y ? ? y mipsel y y y y y ? ? y mips64eb y y y y y y y y mips64el y y y y y ? ? y powerpc y y y y y y ? y powerpc64 y ? y y n[9] ? ? ? -sh3eb y y y y y ? ? n -sh3el y y y y y y ? n +sh3eb y y y y y ? ? y +sh3el y y y y y y ? y sparc y y y y y y ? y sparc64 y y y y y y ? y vax y y y y y n[3] ? ? @@ -64,7 +64,6 @@ coldfire ? N/A ? ? ? N/A N/A - --- -- -- --- architecture tools kernels libgcc native-gcc make release runs atf -[1] - mac68k/intr.c has uncommited change. [2] - libgcc_s.so: undefined reference to `__netf2' [3] - vax dynamic seems busted, but /rescue works [9] - /usr/src6/external/gpl3/gcc/dist/libgcc/libgcc2.c:2036:1: error: unrecognizable insn:
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Mar 4 01:14:31 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch 32 bit arm, m68* and sh3 to GCC 7.
reverse the polarity now that few ports remain: hppa, vax, ia64 and ppc64
To generate a diff of this commit:
cvs rdiff -u -r1.1104 -r1.1105 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1104 src/share/mk/bsd.own.mk:1.1105
--- src/share/mk/bsd.own.mk:1.1104 Sat Feb 9 21:05:48 2019
+++ src/share/mk/bsd.own.mk Mon Mar 4 01:14:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1104 2019/02/09 21:05:48 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1105 2019/03/04 01:14:31 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -59,19 +59,13 @@ TOOLCHAIN_MISSING?= no
# What GCC is used?
#
.if \
-${MACHINE_CPU} == "alpha" || \
-${MACHINE_CPU} == "aarch64" || \
-${MACHINE_CPU} == "i386" || \
-${MACHINE_CPU} == "mips" || \
-${MACHINE_ARCH} == "powerpc" || \
-${MACHINE_CPU} == "riscv" || \
-${MACHINE_CPU} == "sparc" || \
-${MACHINE_CPU} == "sparc64" || \
-${MACHINE_CPU} == "x86_64"
-HAVE_GCC?= 7
-.else
+${MACHINE_CPU} == "hppa" || \
+${MACHINE_CPU} == "ia64" || \
+${MACHINE_ARCH} == "powerpc64" || \
+${MACHINE_CPU} == "vax"
HAVE_GCC?= 6
.endif
+HAVE_GCC?= 7
#
# Platforms that can't run a modern GCC natively
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Sun Mar 3 23:06:08 UTC 2019
Modified Files:
src/usr.bin/xlint/lint1: cgram.y scan.l
Log Message:
Add more gnu attributes
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/xlint/lint1/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.100 src/usr.bin/xlint/lint1/cgram.y:1.101
--- src/usr.bin/xlint/lint1/cgram.y:1.100 Fri Jan 4 13:51:23 2019
+++ src/usr.bin/xlint/lint1/cgram.y Sun Mar 3 18:06:08 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.100 2019/01/04 18:51:23 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.101 2019/03/03 23:06:08 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.100 2019/01/04 18:51:23 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.101 2019/03/03 23:06:08 christos Exp $");
#endif
#include
@@ -201,6 +201,7 @@ anonymize(sym_t *s)
/* Type Attributes */
%token T_ATTRIBUTE
%token T_AT_ALIAS
+%token T_AT_ALLOC_SIZE
%token T_AT_ALIGNED
%token T_AT_ALWAYS_INLINE
%token T_AT_BOUNDED
@@ -217,12 +218,14 @@ anonymize(sym_t *s)
%token T_AT_FORMAT_STRFTIME
%token T_AT_FORMAT_SYSLOG
%token T_AT_GNU_INLINE
+%token T_AT_MALLOC
%token T_AT_MAY_ALIAS
%token T_AT_MINBYTES
%token T_AT_MODE
%token T_AT_NOINLINE
%token T_AT_NONNULL
%token T_AT_NORETURN
+%token T_AT_NOTHROW
%token T_AT_NO_INSTRUMENT_FUNCTION
%token T_AT_PACKED
%token T_AT_PCS
@@ -531,6 +534,7 @@ type_attribute_spec:
| T_AT_DEPRECATED T_LPARN string T_RPARN
| T_AT_DEPRECATED
| T_AT_ALIGNED T_LPARN constant T_RPARN
+ | T_AT_ALLOC_SIZE T_LPARN constant T_RPARN
| T_AT_BOUNDED T_LPARN type_attribute_bounded_type
T_COMMA constant T_COMMA constant T_RPARN
| T_AT_SENTINEL T_LPARN constant T_RPARN
@@ -543,10 +547,12 @@ type_attribute_spec:
| T_AT_ALIGNED
| T_AT_CONSTRUCTOR
| T_AT_DESTRUCTOR
+ | T_AT_MALLOC
| T_AT_MAY_ALIAS
| T_AT_NO_INSTRUMENT_FUNCTION
| T_AT_NOINLINE
| T_AT_NORETURN
+ | T_AT_NOTHROW
| T_AT_COLD
| T_AT_RETURNS_TWICE
| T_AT_PACKED {
Index: src/usr.bin/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.86 src/usr.bin/xlint/lint1/scan.l:1.87
--- src/usr.bin/xlint/lint1/scan.l:1.86 Fri Jan 4 13:51:23 2019
+++ src/usr.bin/xlint/lint1/scan.l Sun Mar 3 18:06:08 2019
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.86 2019/01/04 18:51:23 christos Exp $ */
+/* $NetBSD: scan.l,v 1.87 2019/03/03 23:06:08 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.86 2019/01/04 18:51:23 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.87 2019/03/03 23:06:08 christos Exp $");
#endif
#include
@@ -216,6 +216,7 @@ static struct kwtab {
{ "alias", T_AT_ALIAS, 0, 0, 0, 0,0,1,1,5 },
{ "aligned", T_AT_ALIGNED, 0, 0, 0, 0,0,1,1,5 },
{ "alignof", T_ALIGNOF, 0, 0, 0, 0,0,0,0,4 },
+ { "alloc_size", T_AT_ALLOC_SIZE,0, 0, 0, 0,0,1,1,5 },
{ "always_inline", T_AT_ALWAYS_INLINE, 0,0, 0, 0,0,1,1,5 },
{ "asm", T_ASM, 0, 0, 0, 0,0,1,0,7 },
{ "attribute", T_ATTRIBUTE, 0, 0, 0, 0,0,1,0,6 },
@@ -250,6 +251,7 @@ static struct kwtab {
{ "inline", T_SCLASS, INLINE, 0, 0, 0,1,0,0,7 },
{ "int", T_TYPE, 0, INT, 0, 0,0,0,0,1 },
{ "long", T_TYPE, 0, LONG, 0, 0,0,0,0,1 },
+ { "malloc", T_AT_MALLOC, 0, 0, 0, 0,0,1,1,5 },
{ "may_alias", T_AT_MAY_ALIAS, 0, 0, 0, 0,0,1,1,5 },
{ "minbytes", T_AT_MINBYTES, 0, 0, 0, 0,0,1,1,5 },
{ "mode", T_AT_MODE, 0, 0, 0, 0,0,1,1,5 },
@@ -258,6 +260,7 @@ static struct kwtab {
{ "nonnull", T_AT_NONNULL, 0, 0, 0, 0,0,1,1,5 },
{ "noinline", T_AT_NOINLINE, 0, 0, 0, 0,0,1,1,5 },
{ "noreturn", T_AT_NORETURN, 0, 0, 0, 0,0,1,1,5 },
+ { "nothrow", T_AT_NOTHROW, 0, 0, 0, 0,0,1,1,5 },
{ "packed", T_AT_PACKED, 0, 0, 0, 0,0,1,1,5 },
{ "packed", T_PACKED, 0, 0, 0, 0,0,0,0,2 },
{ "pcs", T_AT_PCS, 0, 0, 0, 0,0,0,0,5 },
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 22:43:54 UTC 2019 Modified Files: xsrc/external/mit/xorg-server/include: xf86Build.h Log Message: make BUILD_TIME be something that can have existed :-) To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/include/xf86Build.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.9 xsrc/external/mit/xorg-server/include/xf86Build.h:1.10 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.9 Sun Mar 3 22:01:09 2019 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Sun Mar 3 22:43:54 2019 @@ -1,2 +1,2 @@ #define BUILD_DATE 20190303 -#define BUILD_TIME 01010101 +#define BUILD_TIME 71123
CVS commit: src/external/mit/xorg/include/xorgproto
Module Name:src Committed By: mrg Date: Sun Mar 3 22:32:28 UTC 2019 Modified Files: src/external/mit/xorg/include/xorgproto: Makefile Log Message: don't install marked obsolete fontcacheproto.pc. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/include/xorgproto/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/include/xorgproto/Makefile diff -u src/external/mit/xorg/include/xorgproto/Makefile:1.1 src/external/mit/xorg/include/xorgproto/Makefile:1.2 --- src/external/mit/xorg/include/xorgproto/Makefile:1.1 Wed Mar 14 08:55:35 2018 +++ src/external/mit/xorg/include/xorgproto/Makefile Sun Mar 3 22:32:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/03/14 08:55:35 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2019/03/03 22:32:27 mrg Exp $ .include @@ -11,7 +11,6 @@ PKGCONFIG= bigreqsproto \ dri3proto \ evieproto \ fixesproto \ - fontcacheproto \ fontsproto \ glproto \ inputproto \
CVS commit: src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sun Mar 3 22:26:58 UTC 2019
Modified Files:
src/sys/compat/ultrix: ultrix_syscall.h ultrix_syscallargs.h
ultrix_syscalls.c ultrix_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/ultrix/ultrix_syscall.h
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/ultrix/ultrix_syscallargs.h
cvs rdiff -u -r1.73 -r1.74 src/sys/compat/ultrix/ultrix_syscalls.c
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/ultrix/ultrix_sysent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ultrix/ultrix_syscall.h
diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.74 src/sys/compat/ultrix/ultrix_syscall.h:1.75
--- src/sys/compat/ultrix/ultrix_syscall.h:1.74 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/ultrix_syscall.h Sun Mar 3 22:26:58 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscall.h,v 1.74 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscall.h,v 1.75 2019/03/03 22:26:58 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALL_H_
@@ -387,15 +387,12 @@
/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
#define ULTRIX_SYS_getfh 164
-#if defined(COMPAT_09)
/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_getdomainname 165
/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_setdomainname 166
-#else
-#endif
/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "void *" */
#define ULTRIX_SYS_quotactl 168
Index: src/sys/compat/ultrix/ultrix_syscallargs.h
diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.69 src/sys/compat/ultrix/ultrix_syscallargs.h:1.70
--- src/sys/compat/ultrix/ultrix_syscallargs.h:1.69 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/ultrix_syscallargs.h Sun Mar 3 22:26:58 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscallargs.h,v 1.69 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscallargs.h,v 1.70 2019/03/03 22:26:58 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALLARGS_H_
@@ -357,13 +357,10 @@ struct ultrix_sys_fstatfs_args {
check_syscall_args(ultrix_sys_fstatfs)
struct compat_30_sys_getfh_args;
-#if defined(COMPAT_09)
struct compat_09_sys_getdomainname_args;
struct compat_09_sys_setdomainname_args;
-#else
-#endif
struct ultrix_sys_quotactl_args {
syscallarg(int) cmd;
@@ -678,13 +675,10 @@ int ultrix_sys_fstatfs(struct lwp *, con
int compat_30_sys_getfh(struct lwp *, const struct compat_30_sys_getfh_args *, register_t *);
-#if defined(COMPAT_09)
int compat_09_sys_getdomainname(struct lwp *, const struct compat_09_sys_getdomainname_args *, register_t *);
int compat_09_sys_setdomainname(struct lwp *, const struct compat_09_sys_setdomainname_args *, register_t *);
-#else
-#endif
int ultrix_sys_quotactl(struct lwp *, const struct ultrix_sys_quotactl_args *, register_t *);
int ultrix_sys_exportfs(struct lwp *, const struct ultrix_sys_exportfs_args *, register_t *);
Index: src/sys/compat/ultrix/ultrix_syscalls.c
diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.73 src/sys/compat/ultrix/ultrix_syscalls.c:1.74
--- src/sys/compat/ultrix/ultrix_syscalls.c:1.73 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/ultrix_syscalls.c Sun Mar 3 22:26:58 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: ultrix_syscalls.c,v 1.73 2019/01/27 02:08:41 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscalls.c,v 1.74 2019/03/03 22:26:58 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.73 2019/01/27 02:08:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.74 2019/03/03 22:26:58 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -193,13 +193,8 @@ const char *const ultrix_syscallnames[]
/* 162 */ "#162 (unimplemented umount)",
/* 163 */ "#163 (unimplemented async_daemon)",
/* 164 */ "getfh",
-#if defined(COMPAT_09)
/* 165 */ "getdomainname",
/* 166 */ "setdomainname",
-#else
- /* 165 */ "#165 (unimplemented compat_09_sys_getdomainname)",
- /* 166 */ "#166 (unimplemented compat_09_sys_setdomainname)",
-#endif
/* 167 */ "#167
CVS commit: src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sun Mar 3 22:26:30 UTC 2019
Modified Files:
src/sys/compat/ultrix: syscalls.master
Log Message:
The compat_09_{get,set}domainname() syscalls should not be defined
based on existence of COMPAT_09. Make them modular instead, and
reference the compat_09 module.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/compat/ultrix/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ultrix/syscalls.master
diff -u src/sys/compat/ultrix/syscalls.master:1.57 src/sys/compat/ultrix/syscalls.master:1.58
--- src/sys/compat/ultrix/syscalls.master:1.57 Sun Jan 27 02:08:41 2019
+++ src/sys/compat/ultrix/syscalls.master Sun Mar 3 22:26:30 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.57 2019/01/27 02:08:41 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.58 2019/03/03 22:26:30 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -255,15 +255,12 @@
162 UNIMPL umount
163 UNIMPL async_daemon
164 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
-#if defined(COMPAT_09)
-165 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
+165 NOARGS MODULAR compat_09 \
+ { int|compat_09_sys||getdomainname(char *domainname, \
int len); }
-166 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
+166 NOARGS MODULAR compat_09 \
+ { int|compat_09_sys||setdomainname(char *domainname, \
int len); }
-#else
-165 UNIMPL compat_09_sys_getdomainname
-166 UNIMPL compat_09_sys_setdomainname
-#endif
167 UNIMPL
168 STD { int|ultrix_sys||quotactl(int cmd, char *special, \
int uid, void *addr); }
CVS commit: src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sun Mar 3 22:25:00 UTC 2019
Modified Files:
src/sys/compat/ultrix: ultrix_mod.c
Log Message:
Fix the required-list for compat_ultrix. With the merge of the
[pgoyette-compat] branch there is no longer a "compat" module;
instead we have lots of version-specific compat_xx modules.
Code inspection shows compat_ultrix uses compat_13 (and newer)
stuff, so set the requirements list accordingly.
Should fix PR port-pmax/54037
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/ultrix/ultrix_mod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ultrix/ultrix_mod.c
diff -u src/sys/compat/ultrix/ultrix_mod.c:1.5 src/sys/compat/ultrix/ultrix_mod.c:1.6
--- src/sys/compat/ultrix/ultrix_mod.c:1.5 Fri Mar 7 01:33:44 2014
+++ src/sys/compat/ultrix/ultrix_mod.c Sun Mar 3 22:25:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_mod.c,v 1.5 2014/03/07 01:33:44 christos Exp $ */
+/* $NetBSD: ultrix_mod.c,v 1.6 2019/03/03 22:25:00 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.5 2014/03/07 01:33:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c,v 1.6 2019/03/03 22:25:00 pgoyette Exp $");
#include
#include
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: ultrix_mod.c
#define MD1 ""
#endif
-MODULE(MODULE_CLASS_EXEC, compat_ultrix, "compat" MD1);
+MODULE(MODULE_CLASS_EXEC, compat_ultrix, "compat_13" MD1);
static struct execsw ultrix_execsw[] = {
#ifdef EXEC_ECOFF
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sun Mar 3 22:02:49 UTC 2019 Modified Files: src/share/mk: bsd.x11.mk Log Message: xorg-server 1.20.4 is now current. To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.129 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.128 src/share/mk/bsd.x11.mk:1.129 --- src/share/mk/bsd.x11.mk:1.128 Mon Jan 21 21:11:54 2019 +++ src/share/mk/bsd.x11.mk Sun Mar 3 22:02:49 2019 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.128 2019/01/21 21:11:54 christos Exp $ +# $NetBSD: bsd.x11.mk,v 1.129 2019/03/03 22:02:49 mrg Exp $ .include @@ -134,7 +134,7 @@ XORG_SERVER_MINOR= 10 XORG_SERVER_TEENY= 6 .else XORG_SERVER_MINOR= 20 -XORG_SERVER_TEENY= 3 +XORG_SERVER_TEENY= 4 .endif XVENDORNAMESHORT= '"X.Org"'
CVS commit: xsrc/external/mit/xorg-server
r 3 22:01:09 2019
@@ -190,7 +190,7 @@ EnableDisableExtension(const char *name,
for (i = 0; i < ARRAY_SIZE(staticExtensions); i++) {
ext = [i];
-if (strcmp(name, ext->name) == 0) {
+if (strcasecmp(name, ext->name) == 0) {
if (ext->disablePtr != NULL) {
*ext->disablePtr = !enable;
return TRUE;
Index: xsrc/external/mit/xorg-server/dist/os/auth.c
diff -u xsrc/external/mit/xorg-server/dist/os/auth.c:1.4 xsrc/external/mit/xorg-server/dist/os/auth.c:1.5
--- xsrc/external/mit/xorg-server/dist/os/auth.c:1.4 Mon Dec 31 09:50:02 2018
+++ xsrc/external/mit/xorg-server/dist/os/auth.c Sun Mar 3 22:01:09 2019
@@ -42,6 +42,7 @@ from The Open Group.
#include "dixstruct.h"
#include
#include
+#include
#ifdef WIN32
#include
#endif
@@ -119,9 +120,15 @@ LoadAuthorization(void)
if (!authorization_file)
return 0;
+errno = 0;
f = Fopen(authorization_file, "r");
-if (!f)
+if (!f) {
+LogMessageVerb(X_ERROR, 0,
+ "Failed to open authorization file \"%s\": %s\n",
+ authorization_file,
+ errno != 0 ? strerror(errno) : "Unknown error");
return -1;
+}
while ((auth = XauReadAuth(f)) != 0) {
for (i = 0; i < NUM_AUTHORIZATION; i++) {
Index: xsrc/external/mit/xorg-server/dist/os/utils.c
diff -u xsrc/external/mit/xorg-server/dist/os/utils.c:1.9 xsrc/external/mit/xorg-server/dist/os/utils.c:1.10
--- xsrc/external/mit/xorg-server/dist/os/utils.c:1.9 Mon Dec 31 09:50:02 2018
+++ xsrc/external/mit/xorg-server/dist/os/utils.c Sun Mar 3 22:01:09 2019
@@ -485,14 +485,15 @@ GetTimeInMicros(void)
struct timeval tv;
#ifdef MONOTONIC_CLOCK
struct timespec tp;
+static clockid_t uclockid;
-if (!clockid) {
+if (!uclockid) {
if (clock_gettime(CLOCK_MONOTONIC, ) == 0)
-clockid = CLOCK_MONOTONIC;
+ uclockid = CLOCK_MONOTONIC;
else
-clockid = ~0L;
+uclockid = ~0L;
}
-if (clockid != ~0L && clock_gettime(clockid, ) == 0)
+if (uclockid != ~0L && clock_gettime(uclockid, ) == 0)
return (CARD64) tp.tv_sec * (CARD64)100 + tp.tv_nsec / 1000;
#endif
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.32 xsrc/external/mit/xorg-server/include/dix-config.h:1.33
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.32 Fri Jan 18 23:06:21 2019
+++ xsrc/external/mit/xorg-server/include/dix-config.h Sun Mar 3 22:01:09 2019
@@ -355,7 +355,7 @@
#define XINERAMA 1
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((3) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((4) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.7 xsrc/external/mit/xorg-server/include/version-config.h:1.8
--- xsrc/external/mit/xorg-server/include/version-config.h:1.7 Mon Dec 31 10:21:50 2018
+++ xsrc/external/mit/xorg-server/include/version-config.h Sun Mar 3 22:01:09 2019
@@ -5,13 +5,13 @@
#define VERSION_CONFIG_H
/* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.20.3"
+#define VENDOR_MAN_VERSION "Version 1.20.4"
/* Vendor name */
/* #define VENDOR_NAME "The X.Org Foundation" */
/* Vendor release */
-#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((3) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((4) * 1000) + 0)
#endif /* VERSION_CONFIG_H */
Index: xsrc/external/mit/xorg-server/include/xf86Build.h
diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.8 xsrc/external/mit/xorg-server/include/xf86Build.h:1.9
--- xsrc/external/mit/xorg-server/include/xf86Build.h:1.8 Mon Dec 31 09:53:40 2018
+++ xsrc/external/mit/xorg-server/include/xf86Build.h Sun Mar 3 22:01:09 2019
@@ -1,2 +1,2 @@
-#define BUILD_DATE 20181225
-#define BUILD_TIME 1131031
+#define BUILD_DATE 20190303
+#define BUILD_TIME 01010101
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.17 xsrc/external/mit/xorg-server/include/xorg-config.h:1.18
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.17 Fri Jan 18 23:06:21 2019
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Sun Mar 3 22:01:09 2019
@@ -17,7 +17,7 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((3) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((4) * 1000) + 0)
/* Name of X server. */
#define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.17 xsrc/external/mit/xorg-server/include/xorg-server.h:1.18
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.17 Thu Jan 3 23:24:49 2019
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Sun Mar 3 22:01:09 2019
@@ -140,7 +140,7 @@
#define XORGSERVER 1
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((3) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 1000) + ((20) * 10) + ((4) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
CVS import: xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 21:58:02 UTC 2019 Update of /cvsroot/xsrc/external/mit/xorg-server/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12917 Log Message: initial import of xorg-server-1.20.4 Status: Vendor Tag: xorg Release Tags: xorg-server-1-20-4 U xsrc/external/mit/xorg-server/dist/Makefile.am C xsrc/external/mit/xorg-server/dist/configure C xsrc/external/mit/xorg-server/dist/configure.ac U xsrc/external/mit/xorg-server/dist/aclocal.m4 U xsrc/external/mit/xorg-server/dist/Makefile.in U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in U xsrc/external/mit/xorg-server/dist/xserver.ent.in U xsrc/external/mit/xorg-server/dist/COPYING U xsrc/external/mit/xorg-server/dist/ChangeLog U xsrc/external/mit/xorg-server/dist/INSTALL U xsrc/external/mit/xorg-server/dist/compile U xsrc/external/mit/xorg-server/dist/config.guess U xsrc/external/mit/xorg-server/dist/config.sub U xsrc/external/mit/xorg-server/dist/install-sh U xsrc/external/mit/xorg-server/dist/ltmain.sh U xsrc/external/mit/xorg-server/dist/missing U xsrc/external/mit/xorg-server/dist/xorg-server.m4 U xsrc/external/mit/xorg-server/dist/autogen.sh N xsrc/external/mit/xorg-server/dist/README.md U xsrc/external/mit/xorg-server/dist/meson_options.txt U xsrc/external/mit/xorg-server/dist/meson.build U xsrc/external/mit/xorg-server/dist/devbook.am U xsrc/external/mit/xorg-server/dist/docbook.am U xsrc/external/mit/xorg-server/dist/manpages.am U xsrc/external/mit/xorg-server/dist/depcomp U xsrc/external/mit/xorg-server/dist/ylwrap U xsrc/external/mit/xorg-server/dist/test-driver U xsrc/external/mit/xorg-server/dist/Xext/meson.build U xsrc/external/mit/xorg-server/dist/Xext/Makefile.am U xsrc/external/mit/xorg-server/dist/Xext/xvdix.h U xsrc/external/mit/xorg-server/dist/Xext/xvmcext.h U xsrc/external/mit/xorg-server/dist/Xext/geext.h U xsrc/external/mit/xorg-server/dist/Xext/geint.h U xsrc/external/mit/xorg-server/dist/Xext/shmint.h U xsrc/external/mit/xorg-server/dist/Xext/syncsdk.h U xsrc/external/mit/xorg-server/dist/Xext/panoramiXsrv.h U xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h U xsrc/external/mit/xorg-server/dist/Xext/xace.h U xsrc/external/mit/xorg-server/dist/Xext/xacestr.h U xsrc/external/mit/xorg-server/dist/Xext/Makefile.in U xsrc/external/mit/xorg-server/dist/Xext/bigreq.c U xsrc/external/mit/xorg-server/dist/Xext/geext.c U xsrc/external/mit/xorg-server/dist/Xext/shape.c U xsrc/external/mit/xorg-server/dist/Xext/sleepuntil.c U xsrc/external/mit/xorg-server/dist/Xext/sleepuntil.h U xsrc/external/mit/xorg-server/dist/Xext/sync.c U xsrc/external/mit/xorg-server/dist/Xext/syncsrv.h U xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c U xsrc/external/mit/xorg-server/dist/Xext/xtest.c U xsrc/external/mit/xorg-server/dist/Xext/shm.c U xsrc/external/mit/xorg-server/dist/Xext/xvmain.c U xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c U xsrc/external/mit/xorg-server/dist/Xext/xvmc.c U xsrc/external/mit/xorg-server/dist/Xext/xvdisp.h U xsrc/external/mit/xorg-server/dist/Xext/hashtable.c U xsrc/external/mit/xorg-server/dist/Xext/hashtable.h U xsrc/external/mit/xorg-server/dist/Xext/xres.c U xsrc/external/mit/xorg-server/dist/Xext/saver.c U xsrc/external/mit/xorg-server/dist/Xext/panoramiX.c U xsrc/external/mit/xorg-server/dist/Xext/panoramiXh.h U xsrc/external/mit/xorg-server/dist/Xext/panoramiXprocs.c U xsrc/external/mit/xorg-server/dist/Xext/panoramiXSwap.c U xsrc/external/mit/xorg-server/dist/Xext/xace.c U xsrc/external/mit/xorg-server/dist/Xext/xselinux_ext.c U xsrc/external/mit/xorg-server/dist/Xext/xselinux_hooks.c U xsrc/external/mit/xorg-server/dist/Xext/xselinux_label.c U xsrc/external/mit/xorg-server/dist/Xext/xselinux.h U xsrc/external/mit/xorg-server/dist/Xext/xselinuxint.h U xsrc/external/mit/xorg-server/dist/Xext/security.c U xsrc/external/mit/xorg-server/dist/Xext/securitysrv.h U xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.c U xsrc/external/mit/xorg-server/dist/Xext/xf86bigfontsrv.h U xsrc/external/mit/xorg-server/dist/Xext/dpms.c U xsrc/external/mit/xorg-server/dist/Xext/dpmsproc.h U xsrc/external/mit/xorg-server/dist/Xext/vidmode.c U xsrc/external/mit/xorg-server/dist/Xi/meson.build U xsrc/external/mit/xorg-server/dist/Xi/Makefile.am U xsrc/external/mit/xorg-server/dist/Xi/Makefile.in U xsrc/external/mit/xorg-server/dist/Xi/allowev.c U xsrc/external/mit/xorg-server/dist/Xi/allowev.h U xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c U xsrc/external/mit/xorg-server/dist/Xi/chgdctl.h U xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c U xsrc/external/mit/xorg-server/dist/Xi/chgfctl.h U xsrc/external/mit/xorg-server/dist/Xi/chgkbd.c U xsrc/external/mit/xorg-server/dist/Xi/chgkbd.h U xsrc/external/mit/xorg-server/dist/Xi/chgkmap.c U xsrc/external/mit/xorg-server/dist/Xi/chgkmap.h U xsrc/external/mit/xorg-server/dist/Xi/chgprop.c U xsrc/external/mit/xorg-server/dist/Xi/chgprop.h U xsrc/external/mit/xorg-server/dist/Xi/chgptr.c U
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 3 21:38:01 UTC 2019
Modified Files:
xsrc/external/mit/xinit/dist: xinit.c
Added Files:
xsrc/external/mit/xlogo/dist: compile
xsrc/external/mit/xmore/dist: compile
Removed Files:
xsrc/external/mit/xditview/dist: README
xsrc/external/mit/xinit/dist: README
xsrc/external/mit/xlogo/dist: README
xsrc/external/mit/xmore/dist: README xmore.man xmore.sgml
Log Message:
merge xditview 1.0.5, xinit 1.4.1, xlogo 1.0.5, and xmore 1.0.3.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xditview/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xinit/dist/README
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xinit/dist/xinit.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xlogo/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xlogo/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xmore/dist/README \
xsrc/external/mit/xmore/dist/xmore.man \
xsrc/external/mit/xmore/dist/xmore.sgml
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xmore/dist/compile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinit/dist/xinit.c
diff -u xsrc/external/mit/xinit/dist/xinit.c:1.7 xsrc/external/mit/xinit/dist/xinit.c:1.8
--- xsrc/external/mit/xinit/dist/xinit.c:1.7 Sun Mar 11 10:46:02 2018
+++ xsrc/external/mit/xinit/dist/xinit.c Sun Mar 3 21:38:01 2019
@@ -151,7 +151,6 @@ main(int argc, char *argv[])
register char **ptr;
pid_t pid;
int client_given = 0, server_given = 0;
-int client_args_given = 0, server_args_given = 0;
int start_of_client_args, start_of_server_args;
struct sigaction sa, si;
#ifdef __APPLE__
@@ -174,7 +173,8 @@ main(int argc, char *argv[])
}
start_of_client_args = (cptr - client);
while (argc && strcmp(*argv, "--")) {
-client_args_given++;
+if (cptr > clientargv + sizeof(clientargv) / sizeof(*clientargv) - 2)
+Fatalx("too many client arguments");
*cptr++ = *argv++;
argc--;
}
@@ -202,7 +202,8 @@ main(int argc, char *argv[])
start_of_server_args = (sptr - server);
while (--argc >= 0) {
-server_args_given++;
+if (sptr > serverargv + sizeof(serverargv) / sizeof(*serverargv) - 2)
+Fatalx("too many server arguments");
*sptr++ = *argv++;
}
*sptr = NULL;
Added files:
Index: xsrc/external/mit/xlogo/dist/compile
diff -u /dev/null xsrc/external/mit/xlogo/dist/compile:1.3
--- /dev/null Sun Mar 3 21:38:01 2019
+++ xsrc/external/mit/xlogo/dist/compile Sun Mar 3 21:38:01 2019
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# 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, 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, see
CVS import: xsrc/external/mit/xinit/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 21:36:27 UTC 2019 Update of /cvsroot/xsrc/external/mit/xinit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19812 Log Message: initial import of xinit-1.4.1 Status: Vendor Tag: xorg Release Tags: xinit-1-4-1 U xsrc/external/mit/xinit/dist/missing U xsrc/external/mit/xinit/dist/depcomp U xsrc/external/mit/xinit/dist/config.sub U xsrc/external/mit/xinit/dist/Makefile.am U xsrc/external/mit/xinit/dist/compile N xsrc/external/mit/xinit/dist/README.md U xsrc/external/mit/xinit/dist/configure U xsrc/external/mit/xinit/dist/xinitrc.cpp U xsrc/external/mit/xinit/dist/autogen.sh U xsrc/external/mit/xinit/dist/configure.ac U xsrc/external/mit/xinit/dist/ChangeLog C xsrc/external/mit/xinit/dist/xinit.c U xsrc/external/mit/xinit/dist/Makefile.in U xsrc/external/mit/xinit/dist/COPYING U xsrc/external/mit/xinit/dist/install-sh U xsrc/external/mit/xinit/dist/cpprules.in U xsrc/external/mit/xinit/dist/config.guess U xsrc/external/mit/xinit/dist/aclocal.m4 U xsrc/external/mit/xinit/dist/startx.cpp U xsrc/external/mit/xinit/dist/INSTALL U xsrc/external/mit/xinit/dist/config.h.in U xsrc/external/mit/xinit/dist/man/startx.man U xsrc/external/mit/xinit/dist/man/xinit.man U xsrc/external/mit/xinit/dist/man/Makefile.in U xsrc/external/mit/xinit/dist/man/Makefile.am U xsrc/external/mit/xinit/dist/launchd/console_redirect.c U xsrc/external/mit/xinit/dist/launchd/Makefile.am U xsrc/external/mit/xinit/dist/launchd/Makefile.in U xsrc/external/mit/xinit/dist/launchd/console_redirect.h U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx_types.h U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/privileged_startx/client.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.plist.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/privileged_startx/20-font_cache.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/10-tmpdirs.cpp U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.c U xsrc/external/mit/xinit/dist/launchd/privileged_startx/privileged_startx.defs U xsrc/external/mit/xinit/dist/launchd/privileged_startx/server.c U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.in U xsrc/external/mit/xinit/dist/launchd/user_startx/Makefile.am U xsrc/external/mit/xinit/dist/launchd/user_startx/startx.plist.cpp U xsrc/external/mit/xinit/dist/launchd/user_startx/launchd_startx.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xinit/dist
CVS import: xsrc/external/mit/xlogo/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 21:36:28 UTC 2019 Update of /cvsroot/xsrc/external/mit/xlogo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17741 Log Message: initial import of xlogo-1.0.5 Status: Vendor Tag: xorg Release Tags: xlogo-1-0-5 U xsrc/external/mit/xlogo/dist/missing U xsrc/external/mit/xlogo/dist/Makefile.in U xsrc/external/mit/xlogo/dist/config.sub U xsrc/external/mit/xlogo/dist/depcomp U xsrc/external/mit/xlogo/dist/RenderLogo.h U xsrc/external/mit/xlogo/dist/xlogo.c U xsrc/external/mit/xlogo/dist/LogoP.h C xsrc/external/mit/xlogo/dist/compile U xsrc/external/mit/xlogo/dist/Logo.h U xsrc/external/mit/xlogo/dist/config.guess U xsrc/external/mit/xlogo/dist/ChangeLog U xsrc/external/mit/xlogo/dist/Makefile.am U xsrc/external/mit/xlogo/dist/configure N xsrc/external/mit/xlogo/dist/README.md U xsrc/external/mit/xlogo/dist/COPYING U xsrc/external/mit/xlogo/dist/configure.ac U xsrc/external/mit/xlogo/dist/RenderLogo.c U xsrc/external/mit/xlogo/dist/aclocal.m4 U xsrc/external/mit/xlogo/dist/xlogo.h U xsrc/external/mit/xlogo/dist/config.h.in U xsrc/external/mit/xlogo/dist/install-sh U xsrc/external/mit/xlogo/dist/INSTALL U xsrc/external/mit/xlogo/dist/Logo.c U xsrc/external/mit/xlogo/dist/man/Makefile.am U xsrc/external/mit/xlogo/dist/man/Makefile.in U xsrc/external/mit/xlogo/dist/man/xlogo.man U xsrc/external/mit/xlogo/dist/app-defaults/XLogo U xsrc/external/mit/xlogo/dist/app-defaults/XLogo-color 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xlogo/dist
CVS import: xsrc/external/mit/xmore/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 21:36:30 UTC 2019 Update of /cvsroot/xsrc/external/mit/xmore/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16194 Log Message: initial import of xmore-1.0.3 Status: Vendor Tag: xorg Release Tags: xmore-1-0-3 U xsrc/external/mit/xmore/dist/install-sh U xsrc/external/mit/xmore/dist/INSTALL U xsrc/external/mit/xmore/dist/aclocal.m4 U xsrc/external/mit/xmore/dist/config.guess U xsrc/external/mit/xmore/dist/ChangeLog U xsrc/external/mit/xmore/dist/xmore.h U xsrc/external/mit/xmore/dist/configure U xsrc/external/mit/xmore/dist/config.h.in N xsrc/external/mit/xmore/dist/README.md N xsrc/external/mit/xmore/dist/xmore.xml U xsrc/external/mit/xmore/dist/depcomp U xsrc/external/mit/xmore/dist/Makefile.am U xsrc/external/mit/xmore/dist/missing U xsrc/external/mit/xmore/dist/configure.ac U xsrc/external/mit/xmore/dist/Makefile.in U xsrc/external/mit/xmore/dist/xmore.c C xsrc/external/mit/xmore/dist/compile U xsrc/external/mit/xmore/dist/COPYING U xsrc/external/mit/xmore/dist/config.sub N xsrc/external/mit/xmore/dist/man/xmore.man N xsrc/external/mit/xmore/dist/man/Makefile.in N xsrc/external/mit/xmore/dist/man/Makefile.am U xsrc/external/mit/xmore/dist/app-defaults/XMore 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xmore/dist
CVS import: xsrc/external/mit/xditview/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 21:36:24 UTC 2019 Update of /cvsroot/xsrc/external/mit/xditview/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10016 Log Message: initial import of xditview-1.0.5 Status: Vendor Tag: xorg Release Tags: xditview-1-0-5 U xsrc/external/mit/xditview/dist/xdit_mask.bm U xsrc/external/mit/xditview/dist/Menu.h U xsrc/external/mit/xditview/dist/parse.c U xsrc/external/mit/xditview/dist/config.sub U xsrc/external/mit/xditview/dist/Makefile.am U xsrc/external/mit/xditview/dist/draw.c U xsrc/external/mit/xditview/dist/DviChar.h U xsrc/external/mit/xditview/dist/XFontName.c U xsrc/external/mit/xditview/dist/config.guess U xsrc/external/mit/xditview/dist/font.c U xsrc/external/mit/xditview/dist/INSTALL U xsrc/external/mit/xditview/dist/Makefile.in U xsrc/external/mit/xditview/dist/ldblarrow U xsrc/external/mit/xditview/dist/Dvi.h U xsrc/external/mit/xditview/dist/DviChar.c U xsrc/external/mit/xditview/dist/XFontName.h U xsrc/external/mit/xditview/dist/ChangeLog N xsrc/external/mit/xditview/dist/README.md U xsrc/external/mit/xditview/dist/install-sh U xsrc/external/mit/xditview/dist/DviP.h U xsrc/external/mit/xditview/dist/configure.ac U xsrc/external/mit/xditview/dist/depcomp U xsrc/external/mit/xditview/dist/rdblarrow U xsrc/external/mit/xditview/dist/missing U xsrc/external/mit/xditview/dist/configure U xsrc/external/mit/xditview/dist/aclocal.m4 U xsrc/external/mit/xditview/dist/COPYING U xsrc/external/mit/xditview/dist/Dvi.c U xsrc/external/mit/xditview/dist/config.h.in U xsrc/external/mit/xditview/dist/lex.c U xsrc/external/mit/xditview/dist/xdit.bm U xsrc/external/mit/xditview/dist/page.c U xsrc/external/mit/xditview/dist/xditview.c U xsrc/external/mit/xditview/dist/compile U xsrc/external/mit/xditview/dist/man/xditview.man U xsrc/external/mit/xditview/dist/man/Makefile.am U xsrc/external/mit/xditview/dist/man/Makefile.in U xsrc/external/mit/xditview/dist/app-defaults/Xditview-chrtr U xsrc/external/mit/xditview/dist/app-defaults/Xditview No conflicts created by this import
CVS commit: src/external/gpl2/xcvs/dist/doc
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
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/lib/libc/compat-43
Module Name:src Committed By: maya Date: Sun Mar 3 20:34:43 UTC 2019 Modified Files: src/lib/libc/compat-43: gethostid.3 Log Message: s/a DARPA Internet address/an Internet address/ >From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/compat-43/gethostid.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/compat-43/gethostid.3 diff -u src/lib/libc/compat-43/gethostid.3:1.12 src/lib/libc/compat-43/gethostid.3:1.13 --- src/lib/libc/compat-43/gethostid.3:1.12 Thu Aug 7 16:42:39 2003 +++ src/lib/libc/compat-43/gethostid.3 Sun Mar 3 20:34:43 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: gethostid.3,v 1.12 2003/08/07 16:42:39 agc Exp $ +.\" $NetBSD: gethostid.3,v 1.13 2019/03/03 20:34:43 maya Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)gethostid.3 8.1 (Berkeley) 6/2/93 .\" -.Dd June 2, 1993 +.Dd March 3, 2019 .Dt GETHOSTID 3 .Os .Sh NAME @@ -50,7 +50,7 @@ establishes a 32-bit identifier for the intended to be unique among all .Ux systems in existence. -This is normally a DARPA Internet address for the local machine. +This is normally an Internet address for the local machine. This call is allowed only to the super-user and is normally performed at boot time. .Pp
CVS commit: src/lib
Module Name:src
Committed By: maya
Date: Sun Mar 3 17:55:04 UTC 2019
Modified Files:
src/lib: Makefile
Log Message:
Traverse into external/bsd/llvm/lib when building libraries.
This allows things that occur after lib (like do-x11) to depend on llvm
libraries already existing.
We need libexecinfo, so adding llvm after the 2nd library barrier.
To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 src/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/lib/Makefile
diff -u src/lib/Makefile:1.266 src/lib/Makefile:1.267
--- src/lib/Makefile:1.266 Mon Dec 24 22:02:32 2018
+++ src/lib/Makefile Sun Mar 3 17:55:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.266 2018/12/24 22:02:32 mrg Exp $
+# $NetBSD: Makefile,v 1.267 2019/03/03 17:55:04 maya Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include
@@ -171,6 +171,10 @@ SUBDIR+= ../external/gpl3/${EXTERNAL_GCC
# 2nd library dependency barrier
SUBDIR+= .WAIT
+.if (${MKLLVM} != "no")
+SUBDIR+= ../external/bsd/llvm/lib # depends on libexecinfo
+.endif
+
.for sanitizer in asan lsan ubsan
.if exists(../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer})
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer}
CVS commit: src
Module Name:src Committed By: maya Date: Sun Mar 3 17:52:32 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: mi src/distrib/sets/lists/xcomp: md.amd64 md.evbarm md.i386 src/etc/mtree: NetBSD.dist.Xorg src/external/mit/xorg/lib/libdrm_nouveau: Makefile Log Message: Install more libdrm nouveau headers. These will be used by mesa 18. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xcomp/md.amd64 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xcomp/md.evbarm cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xcomp/md.i386 cvs rdiff -u -r1.22 -r1.23 src/etc/mtree/NetBSD.dist.Xorg cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libdrm_nouveau/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.146 src/distrib/sets/lists/xbase/mi:1.147 --- src/distrib/sets/lists/xbase/mi:1.146 Sun Dec 30 09:19:04 2018 +++ src/distrib/sets/lists/xbase/mi Sun Mar 3 17:52:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.146 2018/12/30 09:19:04 mrg Exp $ +# $NetBSD: mi,v 1.147 2019/03/03 17:52:32 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -267,6 +267,8 @@ ./usr/X11R7/include/freetype2/internal base-obsolete obsolete ./usr/X11R7/include/freetype2/internal/services base-obsolete obsolete ./usr/X11R7/include/libdrmbase-x11-root xorg +./usr/X11R7/include/libdrm/nouveau base-x11-root xorg +./usr/X11R7/include/libdrm/nouveau/nvif base-x11-root xorg ./usr/X11R7/include/libkmsbase-x11-root xorg ./usr/X11R7/include/pixman-1base-x11-root xorg ./usr/X11R7/include/xcb base-x11-root xorg Index: src/distrib/sets/lists/xcomp/md.amd64 diff -u src/distrib/sets/lists/xcomp/md.amd64:1.49 src/distrib/sets/lists/xcomp/md.amd64:1.50 --- src/distrib/sets/lists/xcomp/md.amd64:1.49 Fri Aug 19 22:37:03 2016 +++ src/distrib/sets/lists/xcomp/md.amd64 Sun Mar 3 17:52:32 2019 @@ -1,5 +1,12 @@ -# $NetBSD: md.amd64,v 1.49 2016/08/19 22:37:03 mrg Exp $ +# $NetBSD: md.amd64,v 1.50 2019/03/03 17:52:32 maya Exp $ ./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete +./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/class.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/if0002.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h -unknown- xorg ./usr/X11R7/lib/libI810XvMC.a-unknown- xorg,compatx11file ./usr/X11R7/lib/libI810XvMC_p.a-unknown- profile,xorg,compatx11file ./usr/X11R7/lib/libI810XvMC_pic.a -unknown- xorg,picinstall,compatx11file Index: src/distrib/sets/lists/xcomp/md.evbarm diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.7 src/distrib/sets/lists/xcomp/md.evbarm:1.8 --- src/distrib/sets/lists/xcomp/md.evbarm:1.7 Sun Jan 31 18:40:23 2016 +++ src/distrib/sets/lists/xcomp/md.evbarm Sun Mar 3 17:52:32 2019 @@ -1,4 +1,11 @@ -# $NetBSD: md.evbarm,v 1.7 2016/01/31 18:40:23 christos Exp $ +# $NetBSD: md.evbarm,v 1.8 2019/03/03 17:52:32 maya Exp $ +./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/class.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/if0002.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/unpack.h -unknown- xorg ./usr/X11R7/lib/libdrm_nouveau.a -unknown- xorg ./usr/X11R7/lib/libdrm_nouveau_p.a -unknown- profile,xorg ./usr/X11R7/lib/libdrm_nouveau_pic.a -unknown- xorg,picinstall Index: src/distrib/sets/lists/xcomp/md.i386 diff -u src/distrib/sets/lists/xcomp/md.i386:1.54 src/distrib/sets/lists/xcomp/md.i386:1.55 --- src/distrib/sets/lists/xcomp/md.i386:1.54 Fri Aug 19 22:37:03 2016 +++ src/distrib/sets/lists/xcomp/md.i386 Sun Mar 3 17:52:32 2019 @@ -1,6 +1,13 @@ -# $NetBSD: md.i386,v 1.54 2016/08/19 22:37:03 mrg Exp $ +# $NetBSD: md.i386,v 1.55 2019/03/03 17:52:32 maya Exp $ #./usr/libdata/lint/llib-lIntelXvMC.ln -unknown- lint,xorg ./usr/X11R7/include/intel_bufmgr.h -unknown- obsolete +./usr/X11R7/include/libdrm/nouveau/nvif/cl0080.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/cl9097.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/class.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/if0002.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/if0003.h -unknown- xorg +./usr/X11R7/include/libdrm/nouveau/nvif/ioctl.h -unknown- xorg
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: maya
Date: Sun Mar 3 17:46:01 UTC 2019
Modified Files:
src/external/bsd/llvm: Makefile
src/external/bsd/llvm/include: Makefile
Log Message:
Make the includes target run the custom include targets.
This avoids the need for a .WAIT here, and later makes it possible
for non-llvm things to not worry about llvm includes not being created
yet (as includes runs before a lot of other things)
suggested by mrg, build-tested by agc, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/llvm/Makefile
cvs rdiff -u -r1.45 -r1.46 src/external/bsd/llvm/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/Makefile
diff -u src/external/bsd/llvm/Makefile:1.10 src/external/bsd/llvm/Makefile:1.11
--- src/external/bsd/llvm/Makefile:1.10 Sun Dec 17 21:16:57 2017
+++ src/external/bsd/llvm/Makefile Sun Mar 3 17:46:01 2019
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2017/12/17 21:16:57 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2019/03/03 17:46:01 maya Exp $
.include
SUBDIR= include \
- .WAIT \
lib \
.WAIT \
bin
Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.45 src/external/bsd/llvm/include/Makefile:1.46
--- src/external/bsd/llvm/include/Makefile:1.45 Tue Jan 1 18:46:04 2019
+++ src/external/bsd/llvm/include/Makefile Sun Mar 3 17:46:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2019/01/01 18:46:04 maya Exp $
+# $NetBSD: Makefile,v 1.46 2019/03/03 17:46:01 maya Exp $
.include
@@ -296,6 +296,6 @@ run-configure:
${LLVM_INCLUDE_CONFIG}/llvm/Config/config.h.in
.endif
-depend dependall all: ${DPSRCS}
+includes depend dependall all: ${DPSRCS}
.include
CVS commit: src/sys/uvm
Module Name:src
Committed By: maxv
Date: Sun Mar 3 17:37:36 UTC 2019
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
Fix bug, the entry we're iterating on is 'current', not 'entry'. Here only
the first entry gets wired in.
To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/sys/uvm/uvm_map.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.357 src/sys/uvm/uvm_map.c:1.358
--- src/sys/uvm/uvm_map.c:1.357 Mon Dec 17 06:53:01 2018
+++ src/sys/uvm/uvm_map.c Sun Mar 3 17:37:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.357 2018/12/17 06:53:01 kamil Exp $ */
+/* $NetBSD: uvm_map.c,v 1.358 2019/03/03 17:37:36 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.357 2018/12/17 06:53:01 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.358 2019/03/03 17:37:36 maxv Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -3098,7 +3098,7 @@ uvm_map_protect(struct vm_map *map, vadd
/* update pmap! */
uvm_map_lock_entry(current);
pmap_protect(map->pmap, current->start, current->end,
- current->protection & MASK(entry));
+ current->protection & MASK(current));
uvm_map_unlock_entry(current);
/*
@@ -3124,11 +3124,11 @@ uvm_map_protect(struct vm_map *map, vadd
*/
if ((map->flags & VM_MAP_WIREFUTURE) != 0 &&
- VM_MAPENT_ISWIRED(entry) == 0 &&
+ VM_MAPENT_ISWIRED(current) == 0 &&
old_prot == VM_PROT_NONE &&
new_prot != VM_PROT_NONE) {
- if (uvm_map_pageable(map, entry->start,
- entry->end, false,
+ if (uvm_map_pageable(map, current->start,
+ current->end, false,
UVM_LK_ENTER|UVM_LK_EXIT) != 0) {
/*
CVS commit: src/sys/arch/x86/acpi
Module Name:src
Committed By: maxv
Date: Sun Mar 3 17:33:33 UTC 2019
Modified Files:
src/sys/arch/x86/acpi: acpi_machdep.c
Log Message:
Fix bug, PG_W is 'wired', not 'writable'.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/acpi/acpi_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.22 src/sys/arch/x86/acpi/acpi_machdep.c:1.23
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.22 Mon Feb 11 14:59:32 2019
+++ src/sys/arch/x86/acpi/acpi_machdep.c Sun Mar 3 17:33:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.22 2019/02/11 14:59:32 cherry Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.23 2019/03/03 17:33:33 maxv Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.22 2019/02/11 14:59:32 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.23 2019/03/03 17:33:33 maxv Exp $");
#include
#include
@@ -350,7 +350,7 @@ acpi_md_OsWritable(void *Pointer, uint32
for (; sva < eva; sva += PAGE_SIZE) {
pte = kvtopte(sva);
- if ((*pte & (PG_V|PG_W)) != (PG_V|PG_W)) {
+ if ((*pte & (PG_V|PG_RW)) != (PG_V|PG_RW)) {
rv = FALSE;
break;
}
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: jmcneill
Date: Sun Mar 3 17:09:24 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sun8i_a83t_gpio.c
Log Message:
"s_cir" function is now named "s_cir_rx"
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c
diff -u src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c:1.4 src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c:1.5
--- src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c:1.4 Mon Dec 31 19:07:21 2018
+++ src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c Sun Mar 3 17:09:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_a83t_gpio.c,v 1.4 2018/12/31 19:07:21 jmcneill Exp $ */
+/* $NetBSD: sun8i_a83t_gpio.c,v 1.5 2019/03/03 17:09:24 jmcneill Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sun8i_a83t_gpio.c,v 1.4 2018/12/31 19:07:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun8i_a83t_gpio.c,v 1.5 2019/03/03 17:09:24 jmcneill Exp $");
#include
#include
@@ -167,7 +167,7 @@ static const struct sunxi_gpio_pins a83t
{ "PL9", 0, 9, { "gpio_in", "gpio_out", "s_i2c", NULL, NULL, NULL, "irq" } },
{ "PL10", 0, 10, { "gpio_in", "gpio_out", "s_pwm", NULL, NULL, NULL, "irq" } },
{ "PL11", 0, 11, { "gpio_in", "gpio_out", NULL, NULL, NULL, "irq" } },
- { "PL12", 0, 12, { "gpio_in", "gpio_out", "s_cir", NULL, NULL, NULL, "irq" } },
+ { "PL12", 0, 12, { "gpio_in", "gpio_out", "s_cir_rx", NULL, NULL, NULL, "irq" } },
};
const struct sunxi_gpio_padconf sun8i_a83t_padconf = {
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: jmcneill
Date: Sun Mar 3 17:00:22 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_mc_smp.c
Log Message:
Fix A83T AP startup
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sunxi_mc_smp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_mc_smp.c
diff -u src/sys/arch/arm/sunxi/sunxi_mc_smp.c:1.3 src/sys/arch/arm/sunxi/sunxi_mc_smp.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_mc_smp.c:1.3 Thu Jan 3 14:44:21 2019
+++ src/sys/arch/arm/sunxi/sunxi_mc_smp.c Sun Mar 3 17:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mc_smp.c,v 1.3 2019/01/03 14:44:21 jmcneill Exp $ */
+/* $NetBSD: sunxi_mc_smp.c,v 1.4 2019/03/03 17:00:22 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mc_smp.c,v 1.3 2019/01/03 14:44:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mc_smp.c,v 1.4 2019/03/03 17:00:22 jmcneill Exp $");
#include
#include
@@ -156,6 +156,8 @@ sunxi_mc_smp_start(bus_space_tag_t bst,
if (soc == MC_SOC_A83T) {
if (cpu == 0)
val &= ~__BIT(4);
+ else
+ val &= ~__BIT(cpu);
val &= ~__BIT(0); /* cluster power gate */
} else {
val &= ~__BIT(cpu);
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: skrll Date: Sun Mar 3 16:29:00 UTC 2019 Modified Files: src/sys/arch/arm/broadcom: bcm2835_gpio.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/broadcom/bcm2835_gpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/broadcom/bcm2835_gpio.c diff -u src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.10 src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.11 --- src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.10 Thu Feb 7 21:16:35 2019 +++ src/sys/arch/arm/broadcom/bcm2835_gpio.c Sun Mar 3 16:29:00 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_gpio.c,v 1.10 2019/02/07 21:16:35 mlelstv Exp $ */ +/* $NetBSD: bcm2835_gpio.c,v 1.11 2019/03/03 16:29:00 skrll Exp $ */ /*- * Copyright (c) 2013, 2014, 2017 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.10 2019/02/07 21:16:35 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.11 2019/03/03 16:29:00 skrll Exp $"); /* * Driver for BCM2835 GPIO @@ -414,7 +414,7 @@ bcmgpio_intr(void *arg) if (!mpsafe) KERNEL_UNLOCK_ONE(curlwp); } - + /* * Now that all of the handlers have been called, * we can clear the indicators for any level-triggered @@ -450,7 +450,7 @@ bmcgpio_intr_enable(struct bcmgpio_softc /* Can't have HIGH and LOW together. */ if (has_level == (BCMGPIO_INTR_HIGH_LEVEL|BCMGPIO_INTR_LOW_LEVEL)) return (NULL); - + /* Can't have EDGE and LEVEL together. */ if (has_edge && has_level) return (NULL);
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Sun Mar 3 14:05:41 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Retroactively add some missing changes: arm: Add support for Allwinner A64 SoC. arm: Add support for Allwinner A13 and R8 SoCs. arm: Add support for Allwinner H5 SoC. arm: Add support for NextThing GR8 SoC. arm: Add SMP support for Allwinner multi-cluster SoCs (A83T, A80) arm: Update Amlogic S805 SoC support to use FDT based configuration. To generate a diff of this commit: cvs rdiff -u -r1.2505 -r1.2506 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2505 src/doc/CHANGES:1.2506 --- src/doc/CHANGES:1.2505 Sun Mar 3 13:46:39 2019 +++ src/doc/CHANGES Sun Mar 3 14:05:41 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2505 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2506 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -48,6 +48,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: lm(4): Add support for NCT5174D, NCT6775F, NCT6779D and NCT679[1235]D. [msaitoh 20170711] arm: Add support for NVIDIA Tegra X1 SoC. [jmcneill 20170720] + arm: Add support for Allwinner A64 SoC. [jmcneill 20170723] gzip(1): Add SIGINFO support. [mrg 20170804] i386: Remove vm86. [maxv 20170812] itesio(4): Add support IT8628E. [hauke 20170814] @@ -61,6 +62,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: tcpdump(8): Import 4.9.2. [christos 20170908] veriexecgen(8): Drop support for MD5, SHA1, RMD160. [sevan 20170909] itesio(4): Add support IT8728GF and IT877[12]E [hauke 20170814] + arm: Add support for Allwinner A13 and R8 SoCs. [jmcneill 20170825] veriexec(4): Drop support for VERIFIED_EXEC_FP_MD5, VERIFIED_EXEC_FP_SHA1, and VERIFIED_EXEC_FP_RMD160 options. [sevan 20170913] @@ -73,6 +75,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: [jdolecek 20171007] OpenSSH: Imported 7.6. [christos 20171007] amd64: Add support for Kernel ASLR [maxv 20171010] + arm: Add support for Allwinner H5 SoC. [jmcneill 20171011] tmux(1): Imported 2.6. [christos 20171012] amd64: Add support for SMAP. [maxv 20171017] amd64: Add support for USER_LDT. [maxv 20171021] @@ -83,6 +86,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: kernhist(9): Reworked the export-via-sysctl code to use uintptr_t arguments, PR kern/52639. Requires contemporaneous update of vmstat(1). [pgoyette 20171028] + arm: Add support for NextThing GR8 SoC. [jmcneill 20171106] acpi(4): Updated ACPICA to 20171110. [christos 2017] sunxinand(4): Add driver for Allwinner NAND Flash Controller. [jmcneill 20171113] @@ -298,6 +302,8 @@ Changes from NetBSD 8.0 to NetBSD 9.0: binutils: Updated to FSF binutils 2.31.1. [christos 20181231] services(5), protocols(5): Pull iana-generated services and protocols [christos 20190103] + arm: Add SMP support for Allwinner multi-cluster SoCs (A83T, A80) + [jmcneill 20190103] wpa: Import wpa_supplicant and hostapd 2.7. [christos 20190104] acpi(4): Updated ACPICA to 20181213. [christos 20190104] tmux(1): Imported 2.8. [christos 20190104] @@ -314,6 +320,8 @@ Changes from NetBSD 8.0 to NetBSD 9.0: tables, lock-free state lookup, incremental state G/C, etc). [rmind 20190119] gcc: Import GCC 7.4. [mrg 20190119] + arm: Update Amlogic S805 SoC support to use FDT based configuration. + [jmcneill 20190119] dhcpcd: Import dhcpcd-7.1.0. [roy 20190122] kernel: Remove the satlink driver. [maxv 20190127] kernel: Merged [pgoyette-compat] branch - for details, see
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Sun Mar 3 13:46:40 UTC 2019 Modified Files: src/doc: CHANGES Log Message: arm: Add support for Amlogic S905 SoC. To generate a diff of this commit: cvs rdiff -u -r1.2504 -r1.2505 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2504 src/doc/CHANGES:1.2505 --- src/doc/CHANGES:1.2504 Sun Feb 24 20:04:01 2019 +++ src/doc/CHANGES Sun Mar 3 13:46:39 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2504 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2505 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -333,3 +333,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: bge(4): Add support for BCM5762, BCM5725, BCM5727, BCM57764, BCM57767 and BCM57787 [msaitoh 20190220] bind: Import version 9.13.7. [christos 20190224] + arm: Add support for Amlogic S905 SoC. [jmcneill 20190225]
CVS commit: src/sys/arch/arm/amlogic
Module Name:src
Committed By: jmcneill
Date: Sun Mar 3 12:54:58 UTC 2019
Modified Files:
src/sys/arch/arm/amlogic: mesongx_mmc.c
Log Message:
Reset device at attach and fix eMMC 1.8V flags
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/mesongx_mmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/amlogic/mesongx_mmc.c
diff -u src/sys/arch/arm/amlogic/mesongx_mmc.c:1.1 src/sys/arch/arm/amlogic/mesongx_mmc.c:1.2
--- src/sys/arch/arm/amlogic/mesongx_mmc.c:1.1 Mon Feb 25 19:30:17 2019
+++ src/sys/arch/arm/amlogic/mesongx_mmc.c Sun Mar 3 12:54:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mesongx_mmc.c,v 1.1 2019/02/25 19:30:17 jmcneill Exp $ */
+/* $NetBSD: mesongx_mmc.c,v 1.2 2019/03/03 12:54:58 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.1 2019/02/25 19:30:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.2 2019/03/03 12:54:58 jmcneill Exp $");
#include
#include
@@ -370,6 +370,9 @@ mesongx_mmc_attach(device_t parent, devi
}
aprint_normal_dev(self, "interrupting on %s\n", intrstr);
+ if (sc->sc_pwrseq)
+ fdtbus_mmc_pwrseq_reset(sc->sc_pwrseq);
+
config_interrupts(self, mesongx_mmc_attach_i);
}
@@ -535,15 +538,13 @@ mesongx_mmc_attach_i(device_t self)
if (of_getprop_bool(sc->sc_phandle, "cap-mmc-highspeed"))
saa.saa_caps |= SMC_CAPS_MMC_HIGHSPEED;
- if (sc->sc_reg_vqmmc != NULL) {
- if (of_getprop_bool(sc->sc_phandle, "mmc-ddr-1_8v")) {
- saa.saa_caps |= SMC_CAPS_MMC_DDR52;
- sc->sc_host_ocr |= MMC_OCR_S18A;
- }
- if (of_getprop_bool(sc->sc_phandle, "mmc-hs200-1_8v")) {
- saa.saa_caps |= SMC_CAPS_MMC_HS200;
- sc->sc_host_ocr |= MMC_OCR_S18A;
- }
+ if (of_getprop_bool(sc->sc_phandle, "mmc-ddr-1_8v")) {
+ saa.saa_caps |= SMC_CAPS_MMC_DDR52;
+ sc->sc_host_ocr |= MMC_OCR_1_65V_1_95V;
+ }
+ if (of_getprop_bool(sc->sc_phandle, "mmc-hs200-1_8v")) {
+ saa.saa_caps |= SMC_CAPS_MMC_HS200;
+ sc->sc_host_ocr |= MMC_OCR_1_65V_1_95V;
}
if (width == 4)
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jmcneill
Date: Sun Mar 3 12:54:07 UTC 2019
Modified Files:
src/sys/dev/fdt: files.fdt mmc_pwrseq_simple.c
Added Files:
src/sys/dev/fdt: mmc_pwrseq_emmc.c
Log Message:
Add eMMC reset sequence provider
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/fdt/files.fdt
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/mmc_pwrseq_emmc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/mmc_pwrseq_simple.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.42 src/sys/dev/fdt/files.fdt:1.43
--- src/sys/dev/fdt/files.fdt:1.42 Wed Jan 30 01:24:00 2019
+++ src/sys/dev/fdt/files.fdt Sun Mar 3 12:54:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.42 2019/01/30 01:24:00 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.43 2019/03/03 12:54:07 jmcneill Exp $
include "external/bsd/libfdt/conf/files.libfdt"
@@ -72,8 +72,10 @@ attach cpus at fdt
file dev/fdt/cpus.ccpus
device mmcpwrseq
-attach mmcpwrseq at fdt
-file dev/fdt/mmc_pwrseq_simple.c mmcpwrseq
+attach mmcpwrseq at fdt with mmcpwrseq_simple
+file dev/fdt/mmc_pwrseq_simple.c mmcpwrseq_simple
+attach mmcpwrseq at fdt with mmcpwrseq_emmc
+file dev/fdt/mmc_pwrseq_emmc.c mmcpwrseq_emmc
device syscon { } : fdt
attach syscon at fdt
Index: src/sys/dev/fdt/mmc_pwrseq_simple.c
diff -u src/sys/dev/fdt/mmc_pwrseq_simple.c:1.1 src/sys/dev/fdt/mmc_pwrseq_simple.c:1.2
--- src/sys/dev/fdt/mmc_pwrseq_simple.c:1.1 Sun Oct 22 13:56:49 2017
+++ src/sys/dev/fdt/mmc_pwrseq_simple.c Sun Mar 3 12:54:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mmc_pwrseq_simple.c,v 1.1 2017/10/22 13:56:49 jmcneill Exp $ */
+/* $NetBSD: mmc_pwrseq_simple.c,v 1.2 2019/03/03 12:54:07 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mmc_pwrseq_simple.c,v 1.1 2017/10/22 13:56:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmc_pwrseq_simple.c,v 1.2 2019/03/03 12:54:07 jmcneill Exp $");
#include
#include
@@ -45,7 +45,7 @@ static const char * const compatible[] =
NULL
};
-struct mmcpwrseq_softc {
+struct mmcpwrseq_simple_softc {
device_t sc_dev;
int sc_phandle;
struct clk *sc_clk;
@@ -56,9 +56,9 @@ struct mmcpwrseq_softc {
};
static void
-mmcpwrseq_pre_power_on(device_t dev)
+mmcpwrseq_simple_pre_power_on(device_t dev)
{
- struct mmcpwrseq_softc * const sc = device_private(dev);
+ struct mmcpwrseq_simple_softc * const sc = device_private(dev);
int error;
if (sc->sc_clk) {
@@ -74,9 +74,9 @@ mmcpwrseq_pre_power_on(device_t dev)
}
static void
-mmcpwrseq_post_power_on(device_t dev)
+mmcpwrseq_simple_post_power_on(device_t dev)
{
- struct mmcpwrseq_softc * const sc = device_private(dev);
+ struct mmcpwrseq_simple_softc * const sc = device_private(dev);
for (u_int n = 0; n < sc->sc_npins; n++)
fdtbus_gpio_write(sc->sc_pins[n], 0);
@@ -87,9 +87,9 @@ mmcpwrseq_post_power_on(device_t dev)
}
static void
-mmcpwrseq_power_off(device_t dev)
+mmcpwrseq_simple_power_off(device_t dev)
{
- struct mmcpwrseq_softc * const sc = device_private(dev);
+ struct mmcpwrseq_simple_softc * const sc = device_private(dev);
for (u_int n = 0; n < sc->sc_npins; n++)
fdtbus_gpio_write(sc->sc_pins[n], 1);
@@ -98,14 +98,14 @@ mmcpwrseq_power_off(device_t dev)
delay(sc->sc_power_off_delay_us);
}
-static const struct fdtbus_mmc_pwrseq_func mmcpwrseq_funcs = {
- .pre_power_on = mmcpwrseq_pre_power_on,
- .post_power_on = mmcpwrseq_post_power_on,
- .power_off = mmcpwrseq_power_off,
+static const struct fdtbus_mmc_pwrseq_func mmcpwrseq_simple_funcs = {
+ .pre_power_on = mmcpwrseq_simple_pre_power_on,
+ .post_power_on = mmcpwrseq_simple_post_power_on,
+ .power_off = mmcpwrseq_simple_power_off,
};
static int
-mmcpwrseq_match(device_t parent, cfdata_t cf, void *aux)
+mmcpwrseq_simple_match(device_t parent, cfdata_t cf, void *aux)
{
struct fdt_attach_args * const faa = aux;
@@ -113,9 +113,9 @@ mmcpwrseq_match(device_t parent, cfdata_
}
static void
-mmcpwrseq_attach(device_t parent, device_t self, void *aux)
+mmcpwrseq_simple_attach(device_t parent, device_t self, void *aux)
{
- struct mmcpwrseq_softc * const sc = device_private(self);
+ struct mmcpwrseq_simple_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
@@ -156,10 +156,10 @@ mmcpwrseq_attach(device_t parent, device
>sc_power_off_delay_us);
aprint_naive("\n");
- aprint_normal("\n");
+ aprint_normal(": Simple MMC power sequence provider\n");
- fdtbus_register_mmc_pwrseq(self, phandle, _funcs);
+ fdtbus_register_mmc_pwrseq(self, phandle, _simple_funcs);
}
-CFATTACH_DECL_NEW(mmcpwrseq, sizeof(struct mmcpwrseq_softc),
- mmcpwrseq_match, mmcpwrseq_attach, NULL, NULL);
+CFATTACH_DECL_NEW(mmcpwrseq_simple, sizeof(struct mmcpwrseq_simple_softc),
+
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Sun Mar 3 11:44:18 UTC 2019
Modified Files:
src/distrib/utils/embedded/conf: arm64.conf
Log Message:
Add Amlogic dtb files to arm64.img
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/arm64.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/arm64.conf
diff -u src/distrib/utils/embedded/conf/arm64.conf:1.5 src/distrib/utils/embedded/conf/arm64.conf:1.6
--- src/distrib/utils/embedded/conf/arm64.conf:1.5 Fri Nov 30 20:53:02 2018
+++ src/distrib/utils/embedded/conf/arm64.conf Sun Mar 3 11:44:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: arm64.conf,v 1.5 2018/11/30 20:53:02 jmcneill Exp $
+# $NetBSD: arm64.conf,v 1.6 2019/03/03 11:44:18 jmcneill Exp $
# ARM64 customization script used by mkimage
#
board=arm64
@@ -52,6 +52,12 @@ populate_allwinner() {
mv "${mnt}"/boot/sun50i-*.dtb "${mnt}/boot/dtb/allwinner/"
}
+populate_amlogic() {
+ # U-Boot expects 64-bit DTB files to live in an amlogic/ subdirectory
+ mkdir -p "${mnt}/boot/dtb/amlogic"
+ mv "${mnt}"/boot/meson-*.dtb "${mnt}/boot/dtb/amlogic/"
+}
+
populate_rockchip() {
# U-Boot expects 64-bit DTB files to live in a rockchip/ subdirectory
mkdir -p "${mnt}/boot/dtb/rockchip"
@@ -125,6 +131,7 @@ populate() {
# SoC specific configuration
populate_allwinner
+ populate_amlogic
populate_nvidia
populate_rockchip
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Mar 3 11:11:19 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1198 and #1202 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.112 src/doc/CHANGES-8.1:1.1.2.113 --- src/doc/CHANGES-8.1:1.1.2.112 Fri Mar 1 19:02:43 2019 +++ src/doc/CHANGES-8.1 Sun Mar 3 11:11:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.112 2019/03/01 19:02:43 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.113 2019/03/03 11:11:18 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2557,3 +2557,16 @@ tests/kernel/kqueue/read/t_ttypty.c 1.3 Fix reporting of EOF via kevent and add a test case. [kamil, ticket #1201] +usr.sbin/arp/arp.c1.64,1.65 +usr.sbin/arp/arp_hostops.c 1.2 +usr.sbin/arp/arp_rumpops.c 1.2 +usr.sbin/arp/prog_ops.h1.2 + + Fix socket file descriptor leaks. + [dholland, ticket #1198] + +sys/sys/cdefs.h 1.138 + + Stop mangling __func__ for C++11 and newer. + [kamil, ticket #1202] +
CVS commit: [netbsd-8] src/sys/sys
Module Name:src Committed By: martin Date: Sun Mar 3 11:10:16 UTC 2019 Modified Files: src/sys/sys [netbsd-8]: cdefs.h Log Message: Pull up following revision(s) (requested by kamil in ticket #1202): sys/sys/cdefs.h: revision 1.138 Stop mangling __func__ for C++11 and newer Drop local logic between GCC 2.4 and GCC 2.6 that used __PRETTY_FUNCTION__. This caused __func__ to be redefined for all C++ programs and use a different behavior than intended by the compiler (Clang and GCC). __PRETTY_FUNCTION__ prints all the prototype not just function name, contrary to __FUNCTION__ and __func__. __func__ is now an integral part of C99 and C++11, shipped by a compiler. This change aligns the behavior of C++ programs using __func__ to other Operating Systems. The difference caused unnecessary fallout in regression test suites in projects (LLVM, fish, ...). To generate a diff of this commit: cvs rdiff -u -r1.132.6.1 -r1.132.6.2 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/cdefs.h diff -u src/sys/sys/cdefs.h:1.132.6.1 src/sys/sys/cdefs.h:1.132.6.2 --- src/sys/sys/cdefs.h:1.132.6.1 Sat Jan 13 21:33:14 2018 +++ src/sys/sys/cdefs.h Sun Mar 3 11:10:16 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.132.6.1 2018/01/13 21:33:14 snj Exp $ */ +/* $NetBSD: cdefs.h,v 1.132.6.2 2019/03/03 11:10:16 martin Exp $ */ /* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -405,18 +405,16 @@ #endif /* - * C99 defines __func__ predefined identifier, which was made available - * in GCC 2.95. + * C99 and C++11 define __func__ predefined identifier, which was made + * available in GCC 2.95. */ -#if !(__STDC_VERSION__ >= 199901L) -#if __GNUC_PREREQ__(2, 6) -#define __func__ __PRETTY_FUNCTION__ -#elif __GNUC_PREREQ__(2, 4) +#if !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L) +#if __GNUC_PREREQ__(2, 4) #define __func__ __FUNCTION__ #else #define __func__ "" #endif -#endif /* !(__STDC_VERSION__ >= 199901L) */ +#endif /* !(__STDC_VERSION__ >= 199901L) && !(__cplusplus - 0 >= 201103L) */ #if defined(_KERNEL) #if defined(NO_KERNEL_RCSIDS)
CVS commit: xsrc/external/mit/xf86-video-nouveau/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 3 11:09:04 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
Log Message:
put drmmode_udev_notify() under HAVE_LIBUDEV.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.10 xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.11
--- xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.10 Sun Mar 3 09:44:37 2019
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Sun Mar 3 11:09:04 2019
@@ -1843,6 +1843,7 @@ out:
#endif
+#ifdef HAVE_LIBUDEV
#if HAVE_NOTIFY_FD
static void
drmmode_udev_notify(int fd, int notify, void *data)
@@ -1851,6 +1852,7 @@ drmmode_udev_notify(int fd, int notify,
drmmode_handle_uevents(scrn);
}
#endif
+#endif
static bool has_randr(void)
{
CVS commit: [netbsd-8] src/usr.sbin/arp
Module Name:src
Committed By: martin
Date: Sun Mar 3 11:01:48 UTC 2019
Modified Files:
src/usr.sbin/arp [netbsd-8]: arp.c arp_hostops.c arp_rumpops.c
prog_ops.h
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1198):
usr.sbin/arp/arp_rumpops.c: revision 1.2
usr.sbin/arp/arp_hostops.c: revision 1.2
usr.sbin/arp/arp.c: revision 1.64
usr.sbin/arp/arp.c: revision 1.65
usr.sbin/arp/prog_ops.h: revision 1.2
Teach arp that it's okay to close sockets after using them.
(this requires adding a close op to the rump turds)
Fixes PR 53974 reporting too many open files.
-
arp(8): one more to close socket.
To generate a diff of this commit:
cvs rdiff -u -r1.55.8.4 -r1.55.8.5 src/usr.sbin/arp/arp.c
cvs rdiff -u -r1.1 -r1.1.8.1 src/usr.sbin/arp/arp_hostops.c \
src/usr.sbin/arp/arp_rumpops.c src/usr.sbin/arp/prog_ops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/arp/arp.c
diff -u src/usr.sbin/arp/arp.c:1.55.8.4 src/usr.sbin/arp/arp.c:1.55.8.5
--- src/usr.sbin/arp/arp.c:1.55.8.4 Tue Jul 31 17:08:00 2018
+++ src/usr.sbin/arp/arp.c Sun Mar 3 11:01:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.c,v 1.55.8.4 2018/07/31 17:08:00 martin Exp $ */
+/* $NetBSD: arp.c,v 1.55.8.5 2019/03/03 11:01:48 martin Exp $ */
/*
* Copyright (c) 1984, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1984, 19
#if 0
static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: arp.c,v 1.55.8.4 2018/07/31 17:08:00 martin Exp $");
+__RCSID("$NetBSD: arp.c,v 1.55.8.5 2019/03/03 11:01:48 martin Exp $");
#endif
#endif /* not lint */
@@ -276,8 +276,10 @@ set(int argc, char **argv)
argc -= 2;
argv += 2;
- if (getinetaddr(host, _m.sin_addr) == -1)
+ if (getinetaddr(host, _m.sin_addr) == -1) {
+ prog_close(s);
return (1);
+ }
if (atosdl(eaddr, _m))
warnx("invalid link-level address '%s'", eaddr);
doing_proxy = flags = export_only = expire_time = 0;
@@ -313,6 +315,7 @@ tryagain:
rtm = rtmsg(s, RTM_GET, NULL, _m, _m);
if (rtm == NULL) {
warn("%s", host);
+ prog_close(s);
return (1);
}
sina = (struct sockaddr_inarp *)(void *)(rtm + 1);
@@ -323,10 +326,12 @@ tryagain:
goto overwrite;
if (doing_proxy == 0) {
warnx("set: can only proxy for %s", host);
+ prog_close(s);
return (1);
}
if (sin_m.sin_other & SIN_PROXY) {
warnx("set: proxy entry exists for non 802 device");
+ prog_close(s);
return (1);
}
sin_m.sin_other = SIN_PROXY;
@@ -337,6 +342,7 @@ overwrite:
if (sdl->sdl_family != AF_LINK) {
warnx("cannot intuit interface index and type for %s",
host);
+ prog_close(s);
return (1);
}
sdl_m.sdl_type = sdl->sdl_type;
@@ -347,6 +353,7 @@ overwrite:
rtm = rtmsg(s, RTM_ADD, NULL, _m, _m);
if (vflag)
(void)printf("%s (%s) added\n", host, eaddr);
+ prog_close(s);
return (rtm == NULL) ? 1 : 0;
}
@@ -400,9 +407,12 @@ delete_one(struct rt_msghdr *rtm)
sina = (struct sockaddr_inarp *)(void *)(rtm + 1);
sdl = (struct sockaddr_dl *)(void *)(RT_ROUNDUP(sina->sin_len) +
(char *)(void *)sina);
- if (sdl->sdl_family != AF_LINK)
+ if (sdl->sdl_family != AF_LINK) {
+ prog_close(s);
return (1);
+ }
rtm = rtmsg(s, RTM_DELETE, rtm, sina, sdl);
+ prog_close(s);
if (rtm == NULL)
return (1);
return (0);
Index: src/usr.sbin/arp/arp_hostops.c
diff -u src/usr.sbin/arp/arp_hostops.c:1.1 src/usr.sbin/arp/arp_hostops.c:1.1.8.1
--- src/usr.sbin/arp/arp_hostops.c:1.1 Wed Jul 29 06:07:35 2015
+++ src/usr.sbin/arp/arp_hostops.c Sun Mar 3 11:01:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arp_hostops.c,v 1.1 2015/07/29 06:07:35 ozaki-r Exp $ */
+/* $NetBSD: arp_hostops.c,v 1.1.8.1 2019/03/03 11:01:48 martin Exp $ */
/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: arp_hostops.c,v 1.1 2015/07/29 06:07:35 ozaki-r Exp $");
+__RCSID("$NetBSD: arp_hostops.c,v 1.1.8.1 2019/03/03 11:01:48 martin Exp $");
#endif /* !lint */
#include
@@ -47,6 +47,7 @@ const struct prog_ops prog_ops = {
.op_read = read,
.op_write = write,
+ .op_close = close,
.op_sysctl = sysctl,
};
Index: src/usr.sbin/arp/arp_rumpops.c
diff -u src/usr.sbin/arp/arp_rumpops.c:1.1 src/usr.sbin/arp/arp_rumpops.c:1.1.8.1
--- src/usr.sbin/arp/arp_rumpops.c:1.1 Wed Jul 29 06:07:35 2015
+++ src/usr.sbin/arp/arp_rumpops.c Sun Mar 3 11:01:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arp_rumpops.c,v 1.1 2015/07/29 06:07:35 ozaki-r Exp $ */
+/* $NetBSD: arp_rumpops.c,v 1.1.8.1 2019/03/03 11:01:48 martin Exp $ */
/*
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: arp_rumpops.c,v 1.1 2015/07/29 06:07:35 ozaki-r Exp $");
+__RCSID("$NetBSD: arp_rumpops.c,v 1.1.8.1 2019/03/03 11:01:48 martin Exp $");
#endif /* !lint */
#include
@@
CVS commit: xsrc/external/mit/xf86-video-nouveau/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 3 09:44:37 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c
nouveau_xv.c nv30_xv_tex.c nv40_xv_tex.c nv50_xv.c nv_driver.c
nv_proto.h nvc0_xv.c
Log Message:
merge xf86-video-nouveau 1.0.16.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.9 xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.10
--- xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c:1.9 Tue Jan 1 00:34:53 2019
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c Sun Mar 3 09:44:37 2019
@@ -49,7 +49,6 @@ static Bool drmmode_xf86crtc_resize(Scrn
typedef struct {
int fd;
uint32_t fb_id;
-drmModeResPtr mode_res;
int cpp;
drmEventContext event_context;
#ifdef HAVE_LIBUDEV
@@ -86,6 +85,7 @@ typedef struct {
drmModeConnectorPtr mode_output;
drmModeEncoderPtr mode_encoder;
drmModePropertyBlobPtr edid_blob;
+drmModePropertyBlobPtr tile_blob;
int num_props;
drmmode_prop_ptr props;
} drmmode_output_private_rec, *drmmode_output_private_ptr;
@@ -480,6 +480,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
continue;
drmmode_output = output->driver_private;
+ if (drmmode_output->output_id == -1)
+ continue;
output_ids[output_count] =
drmmode_output->mode_output->connector_id;
output_count++;
@@ -525,7 +527,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
#ifdef HAVE_XF86_CURSOR_RESET_CURSOR
xf86CursorResetCursor(crtc->scrn->pScreen);
-#else
+#else
xf86_reload_cursors(crtc->scrn->pScreen);
#endif
@@ -685,7 +687,8 @@ drmmode_gamma_set(xf86CrtcPtr crtc, CARD
size, red, green, blue);
if (ret != 0) {
xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
- "failed to set gamma: %s\n", strerror(-ret));
+ "failed to set gamma with %d entries: %s\n",
+ size, strerror(-ret));
}
}
@@ -701,7 +704,11 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
int c, total_width = 0, max_height = 0, this_x = 0;
if (!ppix) {
if (crtc->randr_crtc->scanout_pixmap) {
- PixmapStopDirtyTracking((DrawablePtr)crtc->randr_crtc->scanout_pixmap, screenpix);
+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
+ PixmapStopDirtyTracking(>randr_crtc->scanout_pixmap->drawable, screenpix);
+#else
+ PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
+#endif
if (drmmode && drmmode->fb_id) {
drmModeRmFB(drmmode->fd, drmmode->fb_id);
drmmode->fb_id = 0;
@@ -747,8 +754,11 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
screen->height = screenpix->drawable.height = max_height;
}
drmmode_crtc->scanout_pixmap_x = this_x;
-#ifdef HAS_DIRTYTRACKING_ROTATION
- PixmapStartDirtyTracking((DrawablePtr)ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
+
+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
+ PixmapStartDirtyTracking(>drawable, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
+#elif defined(HAS_DIRTYTRACKING_ROTATION)
+ PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
#elif defined(HAS_DIRTYTRACKING2)
PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
#else
@@ -777,7 +787,7 @@ static const xf86CrtcFuncsRec drmmode_cr
static unsigned int
-drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res, int num)
{
NVPtr pNv = NVPTR(pScrn);
NVEntPtr pNVEnt = NVEntPriv(pScrn);
@@ -791,7 +801,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drm
drmmode_crtc = xnfcalloc(sizeof(drmmode_crtc_private_rec), 1);
drmmode_crtc->mode_crtc = drmModeGetCrtc(drmmode->fd,
- drmmode->mode_res->crtcs[num]);
+ mode_res->crtcs[num]);
drmmode_crtc->drmmode = drmmode;
drmmode_crtc->hw_crtc_index = num;
@@ -816,13 +826,19 @@ drmmode_output_detect(xf86OutputPtr outp
drmmode_output_private_ptr drmmode_output = output->driver_private;
drmmode_ptr drmmode = drmmode_output->drmmode;
xf86OutputStatus status;
+
+ if (drmmode_output->output_id == -1)
+ return XF86OutputStatusDisconnected;
+
CVS import: xsrc/external/mit/xf86-video-nouveau/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:40:17 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-nouveau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12956 Log Message: initial import of xf86-video-nouveau-1.0.16 Status: Vendor Tag: xorg Release Tags: xf86-video-nouveau-1-0-16 U xsrc/external/mit/xf86-video-nouveau/dist/depcomp U xsrc/external/mit/xf86-video-nouveau/dist/missing U xsrc/external/mit/xf86-video-nouveau/dist/configure.ac U xsrc/external/mit/xf86-video-nouveau/dist/config.sub U xsrc/external/mit/xf86-video-nouveau/dist/configure U xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4 U xsrc/external/mit/xf86-video-nouveau/dist/config.h.in U xsrc/external/mit/xf86-video-nouveau/dist/install-sh U xsrc/external/mit/xf86-video-nouveau/dist/config.guess U xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh U xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am U xsrc/external/mit/xf86-video-nouveau/dist/INSTALL U xsrc/external/mit/xf86-video-nouveau/dist/COPYING U xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in U xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog U xsrc/external/mit/xf86-video-nouveau/dist/compile U xsrc/external/mit/xf86-video-nouveau/dist/man/nouveau.man U xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.am U xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.in N xsrc/external/mit/xf86-video-nouveau/dist/m4/ltversion.m4 N xsrc/external/mit/xf86-video-nouveau/dist/m4/lt~obsolete.m4 N xsrc/external/mit/xf86-video-nouveau/dist/m4/ltoptions.m4 N xsrc/external/mit/xf86-video-nouveau/dist/m4/libtool.m4 N xsrc/external/mit/xf86-video-nouveau/dist/m4/ltsugar.m4 U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c C xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_xv.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy85b5.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_local.h U xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_type.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_accel.h C xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_xv_tex.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_accel.h C xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copya0b5.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_blit.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c C xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_xv.c C xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_include.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_rop.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_sync.h C xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_xv_tex.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c U xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_dma.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_xv_ovl.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c U xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_exa.c C xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_xv.c U xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in U xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_xv_ovl.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nvc0_exa.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy90b5.c U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c C xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c U xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h U xsrc/external/mit/xf86-video-nouveau/dist/src/nv_shadow.c U xsrc/external/mit/xf86-video-nouveau/dist/src/shader/videonvc0.fpc U xsrc/external/mit/xf86-video-nouveau/dist/src/shader/exacmnve0.fp U xsrc/external/mit/xf86-video-nouveau/dist/src/shader/exasanvc0.fp U xsrc/external/mit/xf86-video-nouveau/dist/src/shader/exacanvf0.fpc U xsrc/external/mit/xf86-video-nouveau/dist/src/shader/exascnvf0.fpc U xsrc/external/mit/xf86-video-nouveau/dist/src/shader/exascnvf0.fp U
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 3 09:31:52 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-apm/dist/src: apm_driver.c
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_accel.c s3v_driver.c
Log Message:
merge xf86-video-apm 1.3.0, xf86-video-chips 1.4.0, and
xf86-video-s3virge 1.11.0.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c
cvs rdiff -u -r1.28 -r1.29 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c
diff -u xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c:1.2 xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c:1.3
--- xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c:1.2 Tue Aug 16 01:27:46 2016
+++ xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c Sun Mar 3 09:31:52 2019
@@ -355,7 +355,8 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
EntityInfoPtr pEnt;
vgaHWPtr hwp;
MessageType from;
-char *mod = NULL, *req = NULL, *s;
+char *mod = NULL;
+const char *s;
ClockRangePtr clockRanges;
int i;
xf86MonPtr MonInfo = NULL;
@@ -751,7 +752,11 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
LinMap[0xFFECDB] = db;
LinMap[0xFFECD9] = d9;
/*pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);*/
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)LinMap, pApm->LinMapSize);
+#else
+ pci_device_unmap_range(pApm->PciInfo, (pointer)LinMap, pApm->LinMapSize);
+#endif
from = X_PROBED;
}
else {
@@ -1134,11 +1139,19 @@ ApmUnmapMem(ScrnInfoPtr pScrn)
WRXB(0xDB, pApm->db);
}
WRXB(0xC9, pApm->c9);
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, pApm->LinMapSize);
+#else
+ pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, pApm->LinMapSize);
+#endif
pApm->LinMap = NULL;
}
else if (pApm->FbBase)
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, 0x1);
+#else
+ pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, 0x1);
+#endif
return TRUE;
}
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.28 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.29
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.28 Thu Jan 19 23:50:31 2017
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Sun Mar 3 09:31:52 2019
@@ -2414,6 +2414,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, i
return FALSE;
hwp = VGAHWPTR(pScrn);
+vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
/*
@@ -2880,6 +2881,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int
return FALSE;
hwp = VGAHWPTR(pScrn);
+vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
/*
Index: xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c
diff -u xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c:1.4 xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c:1.5
--- xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c:1.4 Mon Sep 28 20:48:46 2015
+++ xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c Sun Mar 3 09:31:52 2019
@@ -465,7 +465,7 @@ S3VAccelSync(ScrnInfoPtr pScrn)
WAITIDLE();
}
-
+#ifdef HAVE_XAA_H
static void
S3VEngineReset(ScrnInfoPtr pScrn)
{
@@ -540,7 +540,6 @@ S3VWriteMask(
return;
}
-#ifdef HAVE_XAA_H
/\
| Solid Filled Rects|
Index: xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
diff -u xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.7 xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.8
--- xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c:1.7 Mon Dec 31 22:17:21 2018
+++ xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c Sun Mar 3 09:31:52 2019
@@ -478,8 +478,6 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
int i;
double real;
ClockRangePtr clockRanges;
-char *mod = NULL;
-const char *reqSym = NULL;
const char *s;
unsigned char config1, config2, m, n, n1, n2, cr66 = 0;
CVS import: xsrc/external/mit/xf86-video-s3virge/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:29:09 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-s3virge/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21782 Log Message: initial import of xf86-video-s3virge-1.11.0 Status: Vendor Tag: xorg Release Tags: xf86-video-s3virge-1-11-0 U xsrc/external/mit/xf86-video-s3virge/dist/aclocal.m4 U xsrc/external/mit/xf86-video-s3virge/dist/config.h.in U xsrc/external/mit/xf86-video-s3virge/dist/missing U xsrc/external/mit/xf86-video-s3virge/dist/config.sub U xsrc/external/mit/xf86-video-s3virge/dist/Makefile.in U xsrc/external/mit/xf86-video-s3virge/dist/INSTALL U xsrc/external/mit/xf86-video-s3virge/dist/Makefile.am U xsrc/external/mit/xf86-video-s3virge/dist/ltmain.sh U xsrc/external/mit/xf86-video-s3virge/dist/depcomp U xsrc/external/mit/xf86-video-s3virge/dist/compile U xsrc/external/mit/xf86-video-s3virge/dist/ChangeLog U xsrc/external/mit/xf86-video-s3virge/dist/configure.ac U xsrc/external/mit/xf86-video-s3virge/dist/configure U xsrc/external/mit/xf86-video-s3virge/dist/install-sh U xsrc/external/mit/xf86-video-s3virge/dist/TODO U xsrc/external/mit/xf86-video-s3virge/dist/README U xsrc/external/mit/xf86-video-s3virge/dist/COPYING U xsrc/external/mit/xf86-video-s3virge/dist/config.guess U xsrc/external/mit/xf86-video-s3virge/dist/CALLMAP U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_pcirename.h C xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dga.c U xsrc/external/mit/xf86-video-s3virge/dist/src/compat-api.h U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_xv.c U xsrc/external/mit/xf86-video-s3virge/dist/src/Makefile.in U xsrc/external/mit/xf86-video-s3virge/dist/src/newmmio.h U xsrc/external/mit/xf86-video-s3virge/dist/src/Makefile.am U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_pciids.h C xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_macros.h U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_shadow.c U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_dac.c U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_hwcurs.c U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_rop.h U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v.h U xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_i2c.c U xsrc/external/mit/xf86-video-s3virge/dist/src/regs3v.h C xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_accel.c U xsrc/external/mit/xf86-video-s3virge/dist/man/Makefile.in U xsrc/external/mit/xf86-video-s3virge/dist/man/Makefile.am U xsrc/external/mit/xf86-video-s3virge/dist/man/s3virge.man 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-s3virge/dist
CVS import: xsrc/external/mit/xf86-video-chips/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:29:05 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-chips/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15724 Log Message: initial import of xf86-video-chips-1.4.0 Status: Vendor Tag: xorg Release Tags: xf86-video-chips-1-4-0 U xsrc/external/mit/xf86-video-chips/dist/aclocal.m4 U xsrc/external/mit/xf86-video-chips/dist/config.h.in U xsrc/external/mit/xf86-video-chips/dist/missing U xsrc/external/mit/xf86-video-chips/dist/config.sub U xsrc/external/mit/xf86-video-chips/dist/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/INSTALL U xsrc/external/mit/xf86-video-chips/dist/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/ltmain.sh U xsrc/external/mit/xf86-video-chips/dist/depcomp U xsrc/external/mit/xf86-video-chips/dist/compile U xsrc/external/mit/xf86-video-chips/dist/ChangeLog U xsrc/external/mit/xf86-video-chips/dist/configure.ac U xsrc/external/mit/xf86-video-chips/dist/configure U xsrc/external/mit/xf86-video-chips/dist/install-sh U xsrc/external/mit/xf86-video-chips/dist/README U xsrc/external/mit/xf86-video-chips/dist/COPYING U xsrc/external/mit/xf86-video-chips/dist/config.guess U xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/util/dRegs.c U xsrc/external/mit/xf86-video-chips/dist/util/iopl.h U xsrc/external/mit/xf86-video-chips/dist/util/modClock.c U xsrc/external/mit/xf86-video-chips/dist/util/mRegs.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_Blitter.h U xsrc/external/mit/xf86-video-chips/dist/src/compat-api.h U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/src/ct_shadow.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_video.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_BlitMM.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_cursor.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_dga.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_ddc.c C xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_bank.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_regs.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_pcirename.h U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/man/chips.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-chips/dist
CVS import: xsrc/external/mit/xf86-video-apm/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:29:02 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-apm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7184 Log Message: initial import of xf86-video-apm-1.3.0 Status: Vendor Tag: xorg Release Tags: xf86-video-apm-1-3-0 U xsrc/external/mit/xf86-video-apm/dist/aclocal.m4 U xsrc/external/mit/xf86-video-apm/dist/config.h.in U xsrc/external/mit/xf86-video-apm/dist/missing U xsrc/external/mit/xf86-video-apm/dist/config.sub U xsrc/external/mit/xf86-video-apm/dist/Makefile.in U xsrc/external/mit/xf86-video-apm/dist/INSTALL U xsrc/external/mit/xf86-video-apm/dist/Makefile.am U xsrc/external/mit/xf86-video-apm/dist/ltmain.sh U xsrc/external/mit/xf86-video-apm/dist/depcomp N xsrc/external/mit/xf86-video-apm/dist/compile U xsrc/external/mit/xf86-video-apm/dist/ChangeLog U xsrc/external/mit/xf86-video-apm/dist/configure.ac U xsrc/external/mit/xf86-video-apm/dist/configure U xsrc/external/mit/xf86-video-apm/dist/install-sh U xsrc/external/mit/xf86-video-apm/dist/README U xsrc/external/mit/xf86-video-apm/dist/COPYING U xsrc/external/mit/xf86-video-apm/dist/config.guess U xsrc/external/mit/xf86-video-apm/dist/src/compat-api.h U xsrc/external/mit/xf86-video-apm/dist/src/apm_funcs.c U xsrc/external/mit/xf86-video-apm/dist/src/Makefile.in U xsrc/external/mit/xf86-video-apm/dist/src/apm_regs.h C xsrc/external/mit/xf86-video-apm/dist/src/apm.h U xsrc/external/mit/xf86-video-apm/dist/src/Makefile.am U xsrc/external/mit/xf86-video-apm/dist/src/apm_i2c.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_dga.c C xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_pcirename.h U xsrc/external/mit/xf86-video-apm/dist/src/apm_accel.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_cursor.c U xsrc/external/mit/xf86-video-apm/dist/man/Makefile.in U xsrc/external/mit/xf86-video-apm/dist/man/Makefile.am U xsrc/external/mit/xf86-video-apm/dist/man/apm.man 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-apm/dist
CVS commit: xsrc/external/mit/mkfontscale/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 3 09:27:12 UTC 2019
Modified Files:
xsrc/external/mit/mkfontscale/dist: list.c mkfontscale.c
Log Message:
protect config.h include with HAVE_CONFIG_H.
pass const char * to things wanting const not non-const.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/mkfontscale/dist/list.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/mkfontscale/dist/mkfontscale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/mkfontscale/dist/list.c
diff -u xsrc/external/mit/mkfontscale/dist/list.c:1.1.1.6 xsrc/external/mit/mkfontscale/dist/list.c:1.2
--- xsrc/external/mit/mkfontscale/dist/list.c:1.1.1.6 Sun Mar 3 09:16:10 2019
+++ xsrc/external/mit/mkfontscale/dist/list.c Sun Mar 3 09:27:12 2019
@@ -20,7 +20,9 @@
THE SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include
#include
Index: xsrc/external/mit/mkfontscale/dist/mkfontscale.c
diff -u xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.7 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.8
--- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.7 Sun Mar 3 09:18:36 2019
+++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c Sun Mar 3 09:27:12 2019
@@ -67,7 +67,7 @@
#define QUOTE(x) #x
#define STRINGIFY(x) QUOTE(x)
-static char *encodings_array[] =
+static const char *encodings_array[] =
{ "ascii-0",
"iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5",
"iso8859-6", "iso8859-6.8", "iso8859-6.8x", "iso8859-6.16",
@@ -86,7 +86,7 @@ static char *encodings_array[] =
"gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",
"ksc5601.1987-0", "ksc5601.1992-3"};
-static char *extra_encodings_array[] =
+static const char *extra_encodings_array[] =
{ "iso10646-1", "adobe-fontspecific", "microsoft-symbol" };
static ConstListPtr encodings, extra_encodings;
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Sun Mar 3 09:26:04 UTC 2019
Modified Files:
src/external/mit/xorg/bin/mkfontscale: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
build constlist.c for new mkfontscale.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/mkfontscale/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/tools/mkfontscale/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/mkfontscale/Makefile
diff -u src/external/mit/xorg/bin/mkfontscale/Makefile:1.6 src/external/mit/xorg/bin/mkfontscale/Makefile:1.7
--- src/external/mit/xorg/bin/mkfontscale/Makefile:1.6 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/mkfontscale/Makefile Sun Mar 3 09:26:04 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/03 09:26:04 mrg Exp $
.include
PROG= mkfontscale
-SRCS= mkfontscale.c list.c hash.c ident.c
+SRCS= mkfontscale.c constlist.c hash.c ident.c list.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.13 src/external/mit/xorg/tools/mkfontscale/Makefile:1.14
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.13 Tue Jul 3 21:12:10 2018
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Sun Mar 3 09:26:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/07/03 21:12:10 christos Exp $
+# $NetBSD: Makefile,v 1.14 2019/03/03 09:26:04 mrg Exp $
.include
@@ -7,7 +7,7 @@ HOSTPROG= mkfontscale
FREETYPE= ${X11SRCDIR.freetype}
.PATH: ${X11SRCDIR.${HOSTPROG}}
-SRCS.mkfontscale= mkfontscale.c list.c hash.c ident.c
+SRCS.mkfontscale= mkfontscale.c hash.c ident.c list.c constlist.c
.PATH: ${FREETYPE}/src/base
SRCS.freetype+= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
CVS commit: src/external/mit/xorg/bin/xhost
Module Name:src
Committed By: mrg
Date: Sun Mar 3 09:19:02 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xhost: Makefile
Log Message:
define HAVE_INET_ATON for new xhost.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xhost/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xhost/Makefile
diff -u src/external/mit/xorg/bin/xhost/Makefile:1.3 src/external/mit/xorg/bin/xhost/Makefile:1.4
--- src/external/mit/xorg/bin/xhost/Makefile:1.3 Thu Jan 3 23:39:47 2019
+++ src/external/mit/xorg/bin/xhost/Makefile Sun Mar 3 09:19:02 2019
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/03/03 09:19:02 mrg Exp $
.include
PROG= xhost
CPPFLAGS+=${X11FLAGS.CONNECTION} -DBSD44SOCKETS
+CPPFLAGS+=-DHAVE_INET_ATON
.if (${USE_INET6} != "no")
CPPFLAGS+= -DIPv6
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 3 09:18:36 UTC 2019
Modified Files:
xsrc/external/mit/mkfontscale/dist: ident.c mkfontscale.c
Removed Files:
xsrc/external/mit/bitmap/dist: README
xsrc/external/mit/mkfontscale/dist: README
Log Message:
merge bitmap 1.0.9 and mkfontscale 1.2.0.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/bitmap/dist/README
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/mkfontscale/dist/README
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/mkfontscale/dist/ident.c \
xsrc/external/mit/mkfontscale/dist/mkfontscale.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/mkfontscale/dist/ident.c
diff -u xsrc/external/mit/mkfontscale/dist/ident.c:1.6 xsrc/external/mit/mkfontscale/dist/ident.c:1.7
--- xsrc/external/mit/mkfontscale/dist/ident.c:1.6 Sun Mar 11 08:02:46 2018
+++ xsrc/external/mit/mkfontscale/dist/ident.c Sun Mar 3 09:18:36 2019
@@ -76,12 +76,12 @@ typedef struct {
gzFile gz;
BZFILE *bz2;
} f;
-unsigned pos;
+unsigned long pos;
} fontFile;
static inline void *
fontFileOpen(fontFile *ff, const char *filename) {
-int n = strlen(filename);
+size_t n = strlen(filename);
if (n > 4 && strcmp(filename + n - 4, ".bz2") == 0) {
ff->type = bz2FontFile;
@@ -123,7 +123,7 @@ fontFileGetc(fontFile *ff)
}
}
-static int
+static long
fontFileSeek(fontFile *ff, z_off_t offset, int whence)
{
if (ff->type == gzFontFile) {
@@ -132,7 +132,7 @@ fontFileSeek(fontFile *ff, z_off_t offse
/* bzlib has no easy equivalent so we have to fake it,
* fortunately, we only have to handle a couple of cases
*/
- int n;
+ z_off_t n;
char buf[BUFSIZ];
switch (whence) {
@@ -151,7 +151,7 @@ fontFileSeek(fontFile *ff, z_off_t offse
return -1;
n -= BUFSIZ;
}
- if (BZ2_bzread(ff->f.bz2, buf, n) != n)
+ if (BZ2_bzread(ff->f.bz2, buf, (int) n) != n)
return -1;
ff->pos = offset;
return offset;
@@ -247,7 +247,8 @@ pcfIdentify(fontFile *f, char **name)
{
int prop_position;
PropPtr props = NULL;
-int format, count, nprops, i, string_size, rc;
+int format, count, nprops, i, string_size;
+long rc;
char *strings = NULL, *s;
count = getLSB32(f);
Index: xsrc/external/mit/mkfontscale/dist/mkfontscale.c
diff -u xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.6 xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.7
--- xsrc/external/mit/mkfontscale/dist/mkfontscale.c:1.6 Sun Mar 11 08:02:46 2018
+++ xsrc/external/mit/mkfontscale/dist/mkfontscale.c Sun Mar 3 09:18:36 2019
@@ -48,6 +48,7 @@
#include FT_XFREE86_H
#include "list.h"
+#include "constlist.h"
#include "hash.h"
#include "data.h"
#include "ident.h"
@@ -88,14 +89,14 @@ static char *encodings_array[] =
static char *extra_encodings_array[] =
{ "iso10646-1", "adobe-fontspecific", "microsoft-symbol" };
-static ListPtr encodings, extra_encodings;
+static ConstListPtr encodings, extra_encodings;
static const char *outfilename;
#define countof(_a) (sizeof(_a)/sizeof((_a)[0]))
static int doDirectory(const char*, int, ListPtr);
-static int checkEncoding(FT_Face face, char *encoding_name);
-static int checkExtraEncoding(FT_Face face, char *encoding_name, int found);
+static int checkEncoding(FT_Face face, const char *encoding_name);
+static int checkExtraEncoding(FT_Face face, const char *encoding_name, int found);
static int find_cmap(int type, int pid, int eid, FT_Face face);
static const char* notice_foundry(const char *notice);
static const char* vendor_foundry(const signed char *vendor);
@@ -152,16 +153,17 @@ main(int argc, char **argv)
exit(1);
}
if(prefix[strlen(prefix) - 1] != '/')
-strcat(prefix, "/");
-encodingPrefix = dsprintf("%s", prefix);
+encodingPrefix = dsprintf("%s/", prefix);
+else
+encodingPrefix = strdup(prefix);
outfilename = NULL;
-encodings = makeList(encodings_array, countof(encodings_array), NULL, 0);
+encodings = makeConstList(encodings_array, countof(encodings_array), NULL, 0);
-extra_encodings = makeList(extra_encodings_array,
- countof(extra_encodings_array),
- NULL, 0);
+extra_encodings = makeConstList(extra_encodings_array,
+countof(extra_encodings_array),
+NULL, 0);
doBitmaps = 0;
doISO10646_1_encoding = 1;
doScalable = 1;
@@ -187,7 +189,7 @@ main(int argc, char **argv)
if(argn >= argc - 1) {
missing_arg("-a");
}
-makeList([argn + 1], 1, encodings, 0);
+makeConstList((const char **)[argn + 1], 1, encodings, 0);
argn += 2;
} else if(strcmp(argv[argn], "-p") == 0) {
if(argn >= argc - 1) {
@@ -199,7 +201,7 @@ main(int argc, char **argv)
CVS import: xsrc/external/mit/bitmap/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:16:09 UTC 2019 Update of /cvsroot/xsrc/external/mit/bitmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11178 Log Message: initial import of bitmap-1.0.9 Status: Vendor Tag: xorg Release Tags: bitmap-1-0-9 U xsrc/external/mit/bitmap/dist/Up U xsrc/external/mit/bitmap/dist/bmtoa.c U xsrc/external/mit/bitmap/dist/ReqMach.c U xsrc/external/mit/bitmap/dist/RotateLeft U xsrc/external/mit/bitmap/dist/Bitmap.h U xsrc/external/mit/bitmap/dist/config.guess U xsrc/external/mit/bitmap/dist/config.h.in U xsrc/external/mit/bitmap/dist/Handlers.c U xsrc/external/mit/bitmap/dist/Excl U xsrc/external/mit/bitmap/dist/install-sh U xsrc/external/mit/bitmap/dist/depcomp U xsrc/external/mit/bitmap/dist/missing U xsrc/external/mit/bitmap/dist/aclocal.m4 U xsrc/external/mit/bitmap/dist/COPYING U xsrc/external/mit/bitmap/dist/Dashes U xsrc/external/mit/bitmap/dist/Graphics.c U xsrc/external/mit/bitmap/dist/Down U xsrc/external/mit/bitmap/dist/Right U xsrc/external/mit/bitmap/dist/atobm.c U xsrc/external/mit/bitmap/dist/AUTHORS U xsrc/external/mit/bitmap/dist/Dialog.c U xsrc/external/mit/bitmap/dist/compile U xsrc/external/mit/bitmap/dist/BitEdit.c U xsrc/external/mit/bitmap/dist/BitmapP.h U xsrc/external/mit/bitmap/dist/ChangeLog U xsrc/external/mit/bitmap/dist/Requests.h U xsrc/external/mit/bitmap/dist/config.sub U xsrc/external/mit/bitmap/dist/Bitmap.c U xsrc/external/mit/bitmap/dist/Makefile.in U xsrc/external/mit/bitmap/dist/FlipVert N xsrc/external/mit/bitmap/dist/README.md U xsrc/external/mit/bitmap/dist/Left U xsrc/external/mit/bitmap/dist/configure U xsrc/external/mit/bitmap/dist/Fold U xsrc/external/mit/bitmap/dist/Term U xsrc/external/mit/bitmap/dist/Dialog.h U xsrc/external/mit/bitmap/dist/autogen.sh U xsrc/external/mit/bitmap/dist/configure.ac U xsrc/external/mit/bitmap/dist/RotateRight U xsrc/external/mit/bitmap/dist/FlipHoriz U xsrc/external/mit/bitmap/dist/CutPaste.c U xsrc/external/mit/bitmap/dist/Makefile.am U xsrc/external/mit/bitmap/dist/INSTALL U xsrc/external/mit/bitmap/dist/Stipple U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-nocase U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap U xsrc/external/mit/bitmap/dist/app-defaults/Bitmap-color U xsrc/external/mit/bitmap/dist/man/bmtoa.man U xsrc/external/mit/bitmap/dist/man/bitmap.man U xsrc/external/mit/bitmap/dist/man/atobm.man U xsrc/external/mit/bitmap/dist/man/Makefile.am U xsrc/external/mit/bitmap/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/mkfontscale/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:16:12 UTC 2019 Update of /cvsroot/xsrc/external/mit/mkfontscale/dist In directory ivanova.netbsd.org:/tmp/cvs-serv146 Log Message: initial import of mkfontscale-1.2.0 Status: Vendor Tag: xorg Release Tags: mkfontscale-1-2-0 N xsrc/external/mit/mkfontscale/dist/constlist.h U xsrc/external/mit/mkfontscale/dist/config.h.in C xsrc/external/mit/mkfontscale/dist/ident.c C xsrc/external/mit/mkfontscale/dist/mkfontscale.c U xsrc/external/mit/mkfontscale/dist/COPYING U xsrc/external/mit/mkfontscale/dist/compile U xsrc/external/mit/mkfontscale/dist/configure.ac U xsrc/external/mit/mkfontscale/dist/missing U xsrc/external/mit/mkfontscale/dist/depcomp U xsrc/external/mit/mkfontscale/dist/hash.c U xsrc/external/mit/mkfontscale/dist/list.c U xsrc/external/mit/mkfontscale/dist/config.sub N xsrc/external/mit/mkfontscale/dist/mkfontdir.in U xsrc/external/mit/mkfontscale/dist/configure N xsrc/external/mit/mkfontscale/dist/README.md U xsrc/external/mit/mkfontscale/dist/INSTALL U xsrc/external/mit/mkfontscale/dist/Makefile.in U xsrc/external/mit/mkfontscale/dist/ChangeLog N xsrc/external/mit/mkfontscale/dist/constlist.c U xsrc/external/mit/mkfontscale/dist/ident.h U xsrc/external/mit/mkfontscale/dist/install-sh U xsrc/external/mit/mkfontscale/dist/hash.h U xsrc/external/mit/mkfontscale/dist/list.h U xsrc/external/mit/mkfontscale/dist/aclocal.m4 U xsrc/external/mit/mkfontscale/dist/config.guess U xsrc/external/mit/mkfontscale/dist/Makefile.am U xsrc/external/mit/mkfontscale/dist/data.h N xsrc/external/mit/mkfontscale/dist/man/mkfontdir.man U xsrc/external/mit/mkfontscale/dist/man/Makefile.am U xsrc/external/mit/mkfontscale/dist/man/Makefile.in U xsrc/external/mit/mkfontscale/dist/man/mkfontscale.man 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/mkfontscale/dist
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:12:40 UTC 2019 Removed Files: xsrc/external/mit/xhost/dist: README xsrc/external/mit/xvinfo/dist: README Log Message: merge xhost 1.0.8 and xvinfo 1.1.4. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xhost/dist/README cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xvinfo/dist/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xvinfo/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:11:43 UTC 2019 Update of /cvsroot/xsrc/external/mit/xvinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6983 Log Message: initial import of xvinfo-1.1.4 Status: Vendor Tag: xorg Release Tags: xvinfo-1-1-4 U xsrc/external/mit/xvinfo/dist/install-sh U xsrc/external/mit/xvinfo/dist/depcomp U xsrc/external/mit/xvinfo/dist/missing U xsrc/external/mit/xvinfo/dist/aclocal.m4 U xsrc/external/mit/xvinfo/dist/config.h.in U xsrc/external/mit/xvinfo/dist/COPYING U xsrc/external/mit/xvinfo/dist/configure.ac U xsrc/external/mit/xvinfo/dist/compile U xsrc/external/mit/xvinfo/dist/config.sub U xsrc/external/mit/xvinfo/dist/config.guess U xsrc/external/mit/xvinfo/dist/xvinfo.c U xsrc/external/mit/xvinfo/dist/ChangeLog U xsrc/external/mit/xvinfo/dist/configure U xsrc/external/mit/xvinfo/dist/Makefile.am N xsrc/external/mit/xvinfo/dist/README.md U xsrc/external/mit/xvinfo/dist/INSTALL U xsrc/external/mit/xvinfo/dist/Makefile.in U xsrc/external/mit/xvinfo/dist/man/xvinfo.man U xsrc/external/mit/xvinfo/dist/man/Makefile.am U xsrc/external/mit/xvinfo/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xhost/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 09:11:42 UTC 2019 Update of /cvsroot/xsrc/external/mit/xhost/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15477 Log Message: initial import of xhost-1.0.8 Status: Vendor Tag: xorg Release Tags: xhost-1-0-8 U xsrc/external/mit/xhost/dist/ChangeLog U xsrc/external/mit/xhost/dist/config.guess N xsrc/external/mit/xhost/dist/README.md U xsrc/external/mit/xhost/dist/missing U xsrc/external/mit/xhost/dist/configure U xsrc/external/mit/xhost/dist/depcomp U xsrc/external/mit/xhost/dist/COPYING U xsrc/external/mit/xhost/dist/config.h.in U xsrc/external/mit/xhost/dist/install-sh U xsrc/external/mit/xhost/dist/aclocal.m4 U xsrc/external/mit/xhost/dist/AUTHORS U xsrc/external/mit/xhost/dist/compile U xsrc/external/mit/xhost/dist/Makefile.am U xsrc/external/mit/xhost/dist/config.sub U xsrc/external/mit/xhost/dist/Makefile.in U xsrc/external/mit/xhost/dist/INSTALL U xsrc/external/mit/xhost/dist/xhost.c U xsrc/external/mit/xhost/dist/configure.ac U xsrc/external/mit/xhost/dist/man/Makefile.am U xsrc/external/mit/xhost/dist/man/xhost.man U xsrc/external/mit/xhost/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Mar 3 08:36:22 UTC 2019
Modified Files:
xsrc/external/mit/xrdb/dist: xrdb.c
Added Files:
xsrc/external/mit/xstdcmap/dist: compile
Removed Files:
xsrc/external/mit/xmodmap/dist: README
xsrc/external/mit/xrdb/dist: README
xsrc/external/mit/xstdcmap/dist: README
Log Message:
merge xmodmap 1.0.10, xrdb 1.2.0, and xstdcmap 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xmodmap/dist/README
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xrdb/dist/README
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xstdcmap/dist/README
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xstdcmap/dist/compile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.9 xsrc/external/mit/xrdb/dist/xrdb.c:1.10
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.9 Sun Mar 11 08:35:14 2018
+++ xsrc/external/mit/xrdb/dist/xrdb.c Sun Mar 3 08:36:21 2019
@@ -127,6 +127,7 @@ static const char *cpp_program = NULL;
static const char * const cpp_locations[] = { CPP };
static const char *backup_suffix = BACKUP_SUFFIX;
static Bool dont_execute = False;
+static Bool show_cpp = False;
static String defines;
static size_t defines_base;
#define MAX_CMD_DEFINES 512
@@ -428,6 +429,8 @@ ReadFile(Buffer *b, FILE *input)
}
#endif
AppendToBuffer(b, buf, bytes);
+if (show_cpp)
+fwrite(buf, 1, bytes, stdout);
}
AppendToBuffer(b, "", 1);
}
@@ -779,6 +782,7 @@ Syntax(const char *errmsg)
" -n show but don't do changes\n"
" -cpp filename preprocessor to use [%s]\n"
" -nocpp do not use a preprocessor\n"
+" -E show preprocessor command & processed input file\n"
" -query query resources\n"
" -load load resources from file [default]\n"
" -override add in resources from file\n"
@@ -962,6 +966,10 @@ main(int argc, char *argv[])
cpp_program = argv[i];
continue;
}
+else if (!strcmp("-E", arg)) {
+show_cpp = True;
+continue;
+}
else if (!strcmp("-n", arg)) {
dont_execute = True;
continue;
@@ -1349,6 +1357,8 @@ Process(int scrno, Bool doScreen, Bool e
if (asprintf(, "%s %s %s %s > %s", cpp_program, cpp_addflags,
includes.val, tmpname2, tmpname3) == -1)
fatal("%s: Out of memory\n", ProgramName);
+if (show_cpp)
+puts(cmd);
if (system(cmd) < 0)
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
@@ -1364,6 +1374,8 @@ Process(int scrno, Bool doScreen, Bool e
if (asprintf(, "%s %s %s", cpp_program, cpp_addflags,
includes.val) == -1)
fatal("%s: Out of memory\n", ProgramName);
+if (show_cpp)
+puts(cmd);
if (!(input = popen(cmd, "r")))
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
@@ -1382,6 +1394,8 @@ Process(int scrno, Bool doScreen, Bool e
cpp_addflags, includes.val, defines.val,
filename ? filename : "", tmpname3) == -1)
fatal("%s: Out of memory\n", ProgramName);
+if (show_cpp)
+puts(cmd);
if (system(cmd) < 0)
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
@@ -1392,6 +1406,8 @@ Process(int scrno, Bool doScreen, Bool e
cpp_addflags, includes.val, defines.val,
filename ? filename : "") == -1)
fatal("%s: Out of memory\n", ProgramName);
+if (show_cpp)
+puts(cmd);
if (!(input = popen(cmd, "r")))
fatal("%s: cannot run '%s'\n", ProgramName, cmd);
free(cmd);
Added files:
Index: xsrc/external/mit/xstdcmap/dist/compile
diff -u /dev/null xsrc/external/mit/xstdcmap/dist/compile:1.3
--- /dev/null Sun Mar 3 08:36:22 2019
+++ xsrc/external/mit/xstdcmap/dist/compile Sun Mar 3 08:36:22 2019
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# 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
+#
CVS import: xsrc/external/mit/xstdcmap/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:35:11 UTC 2019 Update of /cvsroot/xsrc/external/mit/xstdcmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12164 Log Message: initial import of xstdcmap-1.0.4 Status: Vendor Tag: xorg Release Tags: xstdcmap-1-0-4 U xsrc/external/mit/xstdcmap/dist/install-sh U xsrc/external/mit/xstdcmap/dist/config.h.in U xsrc/external/mit/xstdcmap/dist/ChangeLog U xsrc/external/mit/xstdcmap/dist/aclocal.m4 U xsrc/external/mit/xstdcmap/dist/configure.ac U xsrc/external/mit/xstdcmap/dist/configure U xsrc/external/mit/xstdcmap/dist/INSTALL N xsrc/external/mit/xstdcmap/dist/README.md U xsrc/external/mit/xstdcmap/dist/xstdcmap.c U xsrc/external/mit/xstdcmap/dist/Makefile.am U xsrc/external/mit/xstdcmap/dist/missing U xsrc/external/mit/xstdcmap/dist/depcomp U xsrc/external/mit/xstdcmap/dist/config.guess U xsrc/external/mit/xstdcmap/dist/COPYING C xsrc/external/mit/xstdcmap/dist/compile U xsrc/external/mit/xstdcmap/dist/config.sub U xsrc/external/mit/xstdcmap/dist/Makefile.in U xsrc/external/mit/xstdcmap/dist/man/Makefile.in U xsrc/external/mit/xstdcmap/dist/man/xstdcmap.man U xsrc/external/mit/xstdcmap/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xstdcmap/dist
CVS import: xsrc/external/mit/xrdb/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:35:09 UTC 2019 Update of /cvsroot/xsrc/external/mit/xrdb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6591 Log Message: initial import of xrdb-1.2.0 Status: Vendor Tag: xorg Release Tags: xrdb-1-2-0 U xsrc/external/mit/xrdb/dist/configure.ac U xsrc/external/mit/xrdb/dist/config.h.in U xsrc/external/mit/xrdb/dist/AUTHORS U xsrc/external/mit/xrdb/dist/compile U xsrc/external/mit/xrdb/dist/COPYING U xsrc/external/mit/xrdb/dist/depcomp U xsrc/external/mit/xrdb/dist/missing U xsrc/external/mit/xrdb/dist/config.sub N xsrc/external/mit/xrdb/dist/README.md U xsrc/external/mit/xrdb/dist/INSTALL U xsrc/external/mit/xrdb/dist/configure C xsrc/external/mit/xrdb/dist/xrdb.c U xsrc/external/mit/xrdb/dist/ChangeLog U xsrc/external/mit/xrdb/dist/Makefile.in U xsrc/external/mit/xrdb/dist/install-sh U xsrc/external/mit/xrdb/dist/aclocal.m4 U xsrc/external/mit/xrdb/dist/config.guess U xsrc/external/mit/xrdb/dist/Makefile.am U xsrc/external/mit/xrdb/dist/man/Makefile.in U xsrc/external/mit/xrdb/dist/man/xrdb.man U xsrc/external/mit/xrdb/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrdb/dist
CVS import: xsrc/external/mit/xmodmap/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:35:07 UTC 2019 Update of /cvsroot/xsrc/external/mit/xmodmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4462 Log Message: initial import of xmodmap-1.0.10 Status: Vendor Tag: xorg Release Tags: xmodmap-1-0-10 U xsrc/external/mit/xmodmap/dist/config.sub U xsrc/external/mit/xmodmap/dist/config.h.in U xsrc/external/mit/xmodmap/dist/xmodmap.h U xsrc/external/mit/xmodmap/dist/pf.c U xsrc/external/mit/xmodmap/dist/ChangeLog U xsrc/external/mit/xmodmap/dist/INSTALL U xsrc/external/mit/xmodmap/dist/autogen.sh N xsrc/external/mit/xmodmap/dist/README.md U xsrc/external/mit/xmodmap/dist/configure.ac U xsrc/external/mit/xmodmap/dist/configure U xsrc/external/mit/xmodmap/dist/xmodmap.c U xsrc/external/mit/xmodmap/dist/swap.km U xsrc/external/mit/xmodmap/dist/Makefile.in U xsrc/external/mit/xmodmap/dist/depcomp U xsrc/external/mit/xmodmap/dist/missing U xsrc/external/mit/xmodmap/dist/exec.c C xsrc/external/mit/xmodmap/dist/handle.c U xsrc/external/mit/xmodmap/dist/config.guess U xsrc/external/mit/xmodmap/dist/aclocal.m4 U xsrc/external/mit/xmodmap/dist/install-sh U xsrc/external/mit/xmodmap/dist/wq.h U xsrc/external/mit/xmodmap/dist/Makefile.am U xsrc/external/mit/xmodmap/dist/AUTHORS U xsrc/external/mit/xmodmap/dist/compile U xsrc/external/mit/xmodmap/dist/COPYING U xsrc/external/mit/xmodmap/dist/man/xmodmap.man U xsrc/external/mit/xmodmap/dist/man/Makefile.am U xsrc/external/mit/xmodmap/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xmodmap/dist
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:17:43 UTC 2019 Modified Files: xsrc/external/mit/xfsinfo/dist: compile Removed Files: xsrc/external/mit/xcalc/dist: README xsrc/external/mit/xclock/dist: README xsrc/external/mit/xev/dist: README xsrc/external/mit/xfsinfo/dist: README xsrc/external/mit/xlsatoms/dist: README Log Message: merge xfsinfo 1.0.6, xcalc 1.0.7, xclock 1.0.8, xev 1.2.3 and xlsatoms 1.1.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xcalc/dist/README cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xclock/dist/README cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xev/dist/README cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xfsinfo/dist/README cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfsinfo/dist/compile cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xlsatoms/dist/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xfsinfo/dist/compile diff -u xsrc/external/mit/xfsinfo/dist/compile:1.3 xsrc/external/mit/xfsinfo/dist/compile:1.4 --- xsrc/external/mit/xfsinfo/dist/compile:1.3 Wed Jul 22 08:36:10 2015 +++ xsrc/external/mit/xfsinfo/dist/compile Sun Mar 3 08:17:43 2019 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify
CVS import: xsrc/external/mit/xfsinfo/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:16:18 UTC 2019 Update of /cvsroot/xsrc/external/mit/xfsinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17685 Log Message: initial import of xfsinfo-1.0.6 Status: Vendor Tag: xorg Release Tags: xfsinfo-1-0-6 U xsrc/external/mit/xfsinfo/dist/configure.ac U xsrc/external/mit/xfsinfo/dist/xfsinfo.c U xsrc/external/mit/xfsinfo/dist/Makefile.am U xsrc/external/mit/xfsinfo/dist/INSTALL U xsrc/external/mit/xfsinfo/dist/config.sub U xsrc/external/mit/xfsinfo/dist/Makefile.in U xsrc/external/mit/xfsinfo/dist/COPYING C xsrc/external/mit/xfsinfo/dist/compile U xsrc/external/mit/xfsinfo/dist/aclocal.m4 U xsrc/external/mit/xfsinfo/dist/config.h.in U xsrc/external/mit/xfsinfo/dist/ChangeLog U xsrc/external/mit/xfsinfo/dist/install-sh N xsrc/external/mit/xfsinfo/dist/README.md U xsrc/external/mit/xfsinfo/dist/depcomp U xsrc/external/mit/xfsinfo/dist/configure U xsrc/external/mit/xfsinfo/dist/config.guess U xsrc/external/mit/xfsinfo/dist/missing U xsrc/external/mit/xfsinfo/dist/man/Makefile.in U xsrc/external/mit/xfsinfo/dist/man/xfsinfo.man U xsrc/external/mit/xfsinfo/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfsinfo/dist
CVS import: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:16:15 UTC 2019 Update of /cvsroot/xsrc/external/mit/xclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19092 Log Message: initial import of xclock-1.0.8 Status: Vendor Tag: xorg Release Tags: xclock-1-0-8 U xsrc/external/mit/xclock/dist/compile U xsrc/external/mit/xclock/dist/Clock.c U xsrc/external/mit/xclock/dist/config.rpath U xsrc/external/mit/xclock/dist/Makefile.in U xsrc/external/mit/xclock/dist/COPYING U xsrc/external/mit/xclock/dist/Makefile.am U xsrc/external/mit/xclock/dist/xclock.c U xsrc/external/mit/xclock/dist/install-sh U xsrc/external/mit/xclock/dist/missing U xsrc/external/mit/xclock/dist/depcomp U xsrc/external/mit/xclock/dist/aclocal.m4 U xsrc/external/mit/xclock/dist/config.guess N xsrc/external/mit/xclock/dist/README.md U xsrc/external/mit/xclock/dist/configure.ac U xsrc/external/mit/xclock/dist/INSTALL U xsrc/external/mit/xclock/dist/configure U xsrc/external/mit/xclock/dist/ClockP.h U xsrc/external/mit/xclock/dist/ChangeLog U xsrc/external/mit/xclock/dist/clmask.bit U xsrc/external/mit/xclock/dist/config.h.in U xsrc/external/mit/xclock/dist/clock.bit U xsrc/external/mit/xclock/dist/Clock.h U xsrc/external/mit/xclock/dist/config.sub U xsrc/external/mit/xclock/dist/man/Makefile.am U xsrc/external/mit/xclock/dist/man/xclock.man U xsrc/external/mit/xclock/dist/man/Makefile.in U xsrc/external/mit/xclock/dist/app-defaults/XClock-color U xsrc/external/mit/xclock/dist/app-defaults/XClock No conflicts created by this import
CVS import: xsrc/external/mit/xcalc/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:16:13 UTC 2019 Update of /cvsroot/xsrc/external/mit/xcalc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10692 Log Message: initial import of xcalc-1.0.7 Status: Vendor Tag: xorg Release Tags: xcalc-1-0-7 U xsrc/external/mit/xcalc/dist/compile U xsrc/external/mit/xcalc/dist/config.h.in U xsrc/external/mit/xcalc/dist/COPYING U xsrc/external/mit/xcalc/dist/xcalc.h N xsrc/external/mit/xcalc/dist/README.md U xsrc/external/mit/xcalc/dist/aclocal.m4 U xsrc/external/mit/xcalc/dist/configure U xsrc/external/mit/xcalc/dist/missing U xsrc/external/mit/xcalc/dist/depcomp U xsrc/external/mit/xcalc/dist/install-sh U xsrc/external/mit/xcalc/dist/actions.c U xsrc/external/mit/xcalc/dist/ChangeLog U xsrc/external/mit/xcalc/dist/configure.ac U xsrc/external/mit/xcalc/dist/xcalc.c U xsrc/external/mit/xcalc/dist/config.guess U xsrc/external/mit/xcalc/dist/INSTALL U xsrc/external/mit/xcalc/dist/Makefile.in U xsrc/external/mit/xcalc/dist/config.sub U xsrc/external/mit/xcalc/dist/Makefile.am U xsrc/external/mit/xcalc/dist/math.c U xsrc/external/mit/xcalc/dist/app-defaults/XCalc U xsrc/external/mit/xcalc/dist/app-defaults/XCalc-color U xsrc/external/mit/xcalc/dist/man/Makefile.am U xsrc/external/mit/xcalc/dist/man/xcalc.man U xsrc/external/mit/xcalc/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xev/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:16:16 UTC 2019 Update of /cvsroot/xsrc/external/mit/xev/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9185 Log Message: initial import of xev-1.2.3 Status: Vendor Tag: xorg Release Tags: xev-1-2-3 U xsrc/external/mit/xev/dist/Makefile.in U xsrc/external/mit/xev/dist/COPYING U xsrc/external/mit/xev/dist/xev.c U xsrc/external/mit/xev/dist/compile U xsrc/external/mit/xev/dist/aclocal.m4 U xsrc/external/mit/xev/dist/install-sh U xsrc/external/mit/xev/dist/Makefile.am U xsrc/external/mit/xev/dist/config.guess U xsrc/external/mit/xev/dist/depcomp U xsrc/external/mit/xev/dist/missing U xsrc/external/mit/xev/dist/configure.ac U xsrc/external/mit/xev/dist/ChangeLog U xsrc/external/mit/xev/dist/configure U xsrc/external/mit/xev/dist/INSTALL U xsrc/external/mit/xev/dist/config.h.in N xsrc/external/mit/xev/dist/README.md U xsrc/external/mit/xev/dist/config.sub U xsrc/external/mit/xev/dist/man/xev.man U xsrc/external/mit/xev/dist/man/Makefile.in U xsrc/external/mit/xev/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xlsatoms/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 3 08:16:19 UTC 2019 Update of /cvsroot/xsrc/external/mit/xlsatoms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19009 Log Message: initial import of xlsatoms-1.1.3 Status: Vendor Tag: xorg Release Tags: xlsatoms-1-1-3 U xsrc/external/mit/xlsatoms/dist/missing U xsrc/external/mit/xlsatoms/dist/depcomp U xsrc/external/mit/xlsatoms/dist/Makefile.in U xsrc/external/mit/xlsatoms/dist/compile U xsrc/external/mit/xlsatoms/dist/ChangeLog U xsrc/external/mit/xlsatoms/dist/Makefile.am U xsrc/external/mit/xlsatoms/dist/config.guess U xsrc/external/mit/xlsatoms/dist/install-sh U xsrc/external/mit/xlsatoms/dist/COPYING U xsrc/external/mit/xlsatoms/dist/configure U xsrc/external/mit/xlsatoms/dist/aclocal.m4 N xsrc/external/mit/xlsatoms/dist/README.md U xsrc/external/mit/xlsatoms/dist/config.h.in U xsrc/external/mit/xlsatoms/dist/xlsatoms.c U xsrc/external/mit/xlsatoms/dist/configure.ac U xsrc/external/mit/xlsatoms/dist/config.sub U xsrc/external/mit/xlsatoms/dist/INSTALL U xsrc/external/mit/xlsatoms/dist/man/xlsatoms.man U xsrc/external/mit/xlsatoms/dist/man/Makefile.in U xsrc/external/mit/xlsatoms/dist/man/Makefile.am No conflicts created by this import
