CVS commit: [netbsd-7-1] src

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Mar 15 05:14:39 UTC 2018

Modified Files:
src/distrib/notes/common [netbsd-7-1]: main
src/doc [netbsd-7-1]: CHANGES-7.1.2 LAST_MINUTE
src/gnu/usr.bin/groff/tmac [netbsd-7-1]: mdoc.local
src/sys/sys [netbsd-7-1]: param.h

Log Message:
this is netbsd 7.1.2


To generate a diff of this commit:
cvs rdiff -u -r1.510.4.8.2.1 -r1.510.4.8.2.2 src/distrib/notes/common/main
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-7.1.2
cvs rdiff -u -r1.2.52.2.2.1 -r1.2.52.2.2.2 src/doc/LAST_MINUTE
cvs rdiff -u -r1.75.4.5.2.3 -r1.75.4.5.2.4 \
src/gnu/usr.bin/groff/tmac/mdoc.local
cvs rdiff -u -r1.459.2.10.2.3 -r1.459.2.10.2.4 src/sys/sys/param.h

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.510.4.8.2.1 src/distrib/notes/common/main:1.510.4.8.2.2
--- src/distrib/notes/common/main:1.510.4.8.2.1	Fri Dec 22 19:13:18 2017
+++ src/distrib/notes/common/main	Thu Mar 15 05:14:39 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.510.4.8.2.1 2017/12/22 19:13:18 snj Exp $
+.\"	$NetBSD: main,v 1.510.4.8.2.2 2018/03/15 05:14:39 snj Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -50,7 +50,7 @@
 .as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
 .so \*[.CURDIR]/../common/macros
 .
-.Dd December 22, 2017
+.Dd March 15, 2018
 .Dt INSTALL 8
 .Os NetBSD
 .Sh NAME
@@ -480,21 +480,21 @@ possible,
 would not exist.
 .
 .if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 7.1 and 7.1.1 Releases
+.Ss Changes Between The NetBSD 7.1.1 and 7.1.2 Releases
 .Pp
 .Nx
 \*V
-is the first security/critical update of the NetBSD 7.1 release branch.
+is the second security/critical update of the NetBSD 7.1 release branch.
 It represents a selected subset of fixes deemed important for security
 or stability reasons.
 .Pp
 The complete list of changes can be found in the
-CHANGES-7.1.1 file in the top level directory of the NetBSD 7.1.1
+CHANGES-7.1.2 file in the top level directory of the NetBSD 7.1.2
 release tree:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-7.1.1/CHANGES-7.1.1
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-7.1.2/CHANGES-7.1.2
 .Pp
 See
-.Lk http://www.NetBSD.org/releases/formal-7/NetBSD-7.1.1.html
+.Lk http://www.NetBSD.org/releases/formal-7/NetBSD-7.1.2.html
 for some of the more noteworthy changes in this release.
 .\} \" \n[FOR_RELEASE]
 .
@@ -566,6 +566,8 @@ Changes between the initial 7.0 branch a
 Changes between the final release of 7.0 and the final release of 7.1.
 .It Li CHANGES-7.1.1
 Changes between the final release of 7.1 and the final release of 7.1.1.
+.It Li CHANGES-7.1.2
+Changes between the final release of 7.1.1 and the final release of 7.1.2.
 .It Li CHANGES.prev
 Changes in previous
 .Nx
@@ -845,12 +847,24 @@ _gpio
 _rtadvd
 .bullet)
 .
-.if \n[i386] \{\
 .Ss2 Issues affecting an upgrade from NetBSD 7.1
 .Pp
-The VM86 option has been disabled by default in the GENERIC kernel.
-.
+The following modules have been removed from the autoload list: compat_freebsd,  compat_ibcs2, compat_svr4, compat_svr4_32.
+.if \n[amiga]:\n[i386]:\n[sparc]:\n[sparc64] \{\
+.Pp
+The COMPAT_SVR4 kernel option has been disabled by default.
+\}
+.if \n[sparc64] \{\
+.Pp
+The COMPAT_SVR4_32 kernel option has been disabled by default.
 \}
+.if \n[i386] \{\
+.Pp
+The COMPAT_IBCS2 kernel option has been disabled by default.
+.Pp
+The VM86 kernel option has been disabled by default.
+\}
+.
 .Ss "Using online NetBSD documentation"
 .Pp
 Documentation is available if you installed the manual

Index: src/doc/CHANGES-7.1.2
diff -u src/doc/CHANGES-7.1.2:1.1.2.21 src/doc/CHANGES-7.1.2:1.1.2.22
--- src/doc/CHANGES-7.1.2:1.1.2.21	Sat Mar 10 16:12:16 2018
+++ src/doc/CHANGES-7.1.2	Thu Mar 15 05:14:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.2,v 1.1.2.21 2018/03/10 16:12:16 snj Exp $
+# $NetBSD: CHANGES-7.1.2,v 1.1.2.22 2018/03/15 05:14:39 snj Exp $
 
 A complete list of changes from the NetBSD 7.1.1 release to the NetBSD 7.1.2
 release:
@@ -197,3 +197,11 @@ etc/namedb/bind.keys1.2
 	https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
 	[maya, ticket #1583]
 
+distrib/notes/common/main			patched by hand
+doc/LAST_MINUTE	patched by hand
+gnu/usr.bin/groff/tmac/mdoc.local		patched by hand
+sys/sys/param.h	patched by hand
+
+	Welcome to 7.1.2.
+	[snj]
+

Index: src/doc/LAST_MINUTE
diff -u src/doc/LAST_MINUTE:1.2.52.2.2.1 src/doc/LAST_MINUTE:1.2.52.2.2.2
--- src/doc/LAST_MINUTE:1.2.52.2.2.1	Fri Dec 22 19:13:18 2017
+++ src/doc/LAST_MINUTE	Thu Mar 15 05:14:39 2018
@@ -1,6 +1,6 @@
-#	$NetBSD: LAST_MINUTE,v 1.2.52.2.2.1 2017/12/22 19:13:18 snj Exp $
+#	$NetBSD: LAST_MINUTE,v 1.2.52.2.2.2 2018/03/15 05:14:39 snj Exp $
 
-This file contains important information on the NetBSD 7.1.1 release that
+This file contains 

CVS commit: [pgoyette-compat] src

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Mar 15 05:10:06 UTC 2018

Modified Files:
src/distrib/sets/lists/modules [pgoyette-compat]: mi
src/sys/compat/common [pgoyette-compat]: rtsock_70.c
src/sys/kern [pgoyette-compat]: uipc_usrreq.c
src/sys/modules [pgoyette-compat]: Makefile
src/sys/net [pgoyette-compat]: rtsock.c
Added Files:
src/sys/compat/common [pgoyette-compat]: compat_70_mod.c
src/sys/compat/net [pgoyette-compat]: route_70.h
src/sys/modules/compat_70 [pgoyette-compat]: Makefile

Log Message:
Create a separate module for COMPAT_70 code only, and untangle the
70 compat code from the current.


To generate a diff of this commit:
cvs rdiff -u -r1.114.2.2 -r1.114.2.3 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/common/compat_70_mod.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/compat/common/rtsock_70.c
cvs rdiff -u -r0 -r1.1.2.1 src/sys/compat/net/route_70.h
cvs rdiff -u -r1.183 -r1.183.2.1 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.202.2.2 -r1.202.2.3 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/sys/modules/compat_70/Makefile
cvs rdiff -u -r1.238 -r1.238.2.1 src/sys/net/rtsock.c

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/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.114.2.2 src/distrib/sets/lists/modules/mi:1.114.2.3
--- src/distrib/sets/lists/modules/mi:1.114.2.2	Fri Mar  9 01:47:14 2018
+++ src/distrib/sets/lists/modules/mi	Thu Mar 15 05:10:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.114.2.2 2018/03/09 01:47:14 pgoyette Exp $
+# $NetBSD: mi,v 1.114.2.3 2018/03/15 05:10:05 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -68,6 +68,8 @@
 ./@MODULEDIR@/coda5/coda5.kmod			base-kernel-modules	kmod
 ./@MODULEDIR@/compatbase-kernel-modules	kmod
 ./@MODULEDIR@/compat/compat.kmod		base-kernel-modules	kmod
+./@MODULEDIR@/compat_70base-kernel-modules	kmod
+./@MODULEDIR@/compat_70/compat_70.kmod		base-kernel-modules	kmod
 ./@MODULEDIR@/compat_ossaudio			base-kernel-modules	kmod
 ./@MODULEDIR@/compat_ossaudio/compat_ossaudio.kmod	base-kernel-modules	kmod
 ./@MODULEDIR@/compat_sysv			base-kernel-modules	kmod

Index: src/sys/compat/common/rtsock_70.c
diff -u src/sys/compat/common/rtsock_70.c:1.2 src/sys/compat/common/rtsock_70.c:1.2.2.1
--- src/sys/compat/common/rtsock_70.c:1.2	Sat Dec 16 09:10:30 2017
+++ src/sys/compat/common/rtsock_70.c	Thu Mar 15 05:10:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock_70.c,v 1.2 2017/12/16 09:10:30 maxv Exp $	*/
+/*	$NetBSD: rtsock_70.c,v 1.2.2.1 2018/03/15 05:10:05 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.2 2017/12/16 09:10:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.2.2.1 2018/03/15 05:10:05 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -42,6 +42,24 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,
 
 #include 
 #include 
+#include 
+
+static void (*orig_70_rt_newaddrmsg1)(int, struct ifaddr *);
+
+void
+rtsock_70_init(void)
+{
+
+	orig_70_rt_newaddrmsg1 = vec_70_rt_newaddrmsg1;
+	vec_70_rt_newaddrmsg1 = compat_70_rt_newaddrmsg1;
+}
+
+void
+rtsock_70_fini(void)
+{
+
+	vec_70_rt_newaddrmsg1 = orig_70_rt_newaddrmsg1;
+}
 
 void
 compat_70_rt_newaddrmsg1(int cmd, struct ifaddr *ifa)

Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.183 src/sys/kern/uipc_usrreq.c:1.183.2.1
--- src/sys/kern/uipc_usrreq.c:1.183	Sat Feb 17 20:19:36 2018
+++ src/sys/kern/uipc_usrreq.c	Thu Mar 15 05:10:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_usrreq.c,v 1.183 2018/02/17 20:19:36 christos Exp $	*/
+/*	$NetBSD: uipc_usrreq.c,v 1.183.2.1 2018/03/15 05:10:05 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.183 2018/02/17 20:19:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.183.2.1 2018/03/15 05:10:05 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -124,9 +124,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.
 #include 
 #include 
 
-#ifdef COMPAT_70
 #include 
-#endif
 
 /*
  * Unix communications domain.
@@ -197,6 +195,22 @@ static lwp_t *unp_thread_lwp;
 static SLIST_HEAD(,file) unp_thread_discard;
 static int unp_defer;
 
+/* Compat interface */
+
+static struct mbuf *stub_compat_70_unp_addsockcred(lwp_t *, struct mbuf *);
+struct mbuf *(*vec_compat_70_unp_addsockcred)(struct lwp *, struct mbuf *) =
+stub_compat_70_unp_addsockcred;
+
+struct mbuf *stub_compat_70_unp_addsockcred(struct lwp *lwp,
+struct mbuf *control)
+{
+
+	/* just return our initial argument */
+	return control;
+}
+
+bool *vec_ocreds_valid = false;
+
 /*
  * Initialize Unix 

CVS commit: src/sys/arch/x86/x86

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Mar 15 03:45:05 UTC 2018

Modified Files:
src/sys/arch/x86/x86: db_memrw.c

Log Message:
Use db_printf instead of printf in ddb


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/x86/db_memrw.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/x86/db_memrw.c
diff -u src/sys/arch/x86/x86/db_memrw.c:1.4 src/sys/arch/x86/x86/db_memrw.c:1.5
--- src/sys/arch/x86/x86/db_memrw.c:1.4	Sat Nov 11 12:51:05 2017
+++ src/sys/arch/x86/x86/db_memrw.c	Thu Mar 15 03:45:05 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_memrw.c,v 1.4 2017/11/11 12:51:05 maxv Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.5 2018/03/15 03:45:05 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.4 2017/11/11 12:51:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.5 2018/03/15 03:45:05 ozaki-r Exp $");
 
 #include 
 #include 
@@ -62,6 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v
 #include 
 
 #include 
+#include 
 
 /*
  * Read bytes from kernel address space for debugger.
@@ -117,7 +118,7 @@ db_write_text(vaddr_t addr, size_t size,
 		pte = *ppte;
 
 		if ((pte & PG_V) == 0) {
-			printf(" address %p not a valid page\n", dst);
+			db_printf(" address %p not a valid page\n", dst);
 			return;
 		}
 

CVS commit: src/sys/compat/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Mar 15 03:22:23 UTC 2018

Modified Files:
src/sys/compat/sys: uvm.h

Log Message:
tidy up


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/sys/uvm.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/compat/sys/uvm.h
diff -u src/sys/compat/sys/uvm.h:1.1 src/sys/compat/sys/uvm.h:1.2
--- src/sys/compat/sys/uvm.h:1.1	Wed Mar 14 23:13:51 2018
+++ src/sys/compat/sys/uvm.h	Wed Mar 14 23:22:23 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm.h,v 1.1 2018/03/15 03:13:51 christos Exp $	*/
+/*	$NetBSD: uvm.h,v 1.2 2018/03/15 03:22:23 christos Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,17 +32,6 @@
 #ifndef _COMPAT_SYS_UVM_H_
 #define _COMPAT_SYS_UVM_H_
 
-void uvm_13_init(void);
-void uvm_50_init(void);
-void uvm_13_fini(void);
-void uvm_50_fini(void);
-
-struct sys_swapctl_args;
-
-int (*uvm_swap_stats13)(const struct sys_swapctl_args *, register_t *);
-int (*uvm_swap_stats50)(const struct sys_swapctl_args *, register_t *);
-
-#endif /* _COMPAT_SYS_UVM_H_ */
 /*
  * NetBSD 1.3 swapctl(SWAP_STATS, ...) swapent structure; uses 32 bit
  * dev_t and has no se_path[] member.
@@ -67,3 +56,19 @@ struct swapent50 {
 	int	se50_priority;		/* priority of this device */
 	char	se50_path[PATH_MAX+1];	/* path name */
 };
+
+__BEGIN_DECLS
+
+void uvm_13_init(void);
+void uvm_50_init(void);
+void uvm_13_fini(void);
+void uvm_50_fini(void);
+
+struct sys_swapctl_args;
+
+extern int (*uvm_swap_stats13)(const struct sys_swapctl_args *, register_t *);
+extern int (*uvm_swap_stats50)(const struct sys_swapctl_args *, register_t *);
+
+__END_DECLS
+
+#endif /* _COMPAT_SYS_UVM_H_ */

CVS commit: src/sys/uvm

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Mar 15 03:21:58 UTC 2018

Modified Files:
src/sys/uvm: uvm_swap.c uvm_swap.h

Log Message:
finish moving the compat code out.


To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/uvm/uvm_swap.c
cvs rdiff -u -r1.23 -r1.24 src/sys/uvm/uvm_swap.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/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.176 src/sys/uvm/uvm_swap.c:1.177
--- src/sys/uvm/uvm_swap.c:1.176	Wed Mar 14 20:48:13 2018
+++ src/sys/uvm/uvm_swap.c	Wed Mar 14 23:21:58 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_swap.c,v 1.176 2018/03/15 00:48:13 christos Exp $	*/
+/*	$NetBSD: uvm_swap.c,v 1.177 2018/03/15 03:21:58 christos Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.176 2018/03/15 00:48:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.177 2018/03/15 03:21:58 christos Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
@@ -176,31 +176,6 @@ struct vndbuf {
 };
 
 /*
- * NetBSD 1.3 swapctl(SWAP_STATS, ...) swapent structure; uses 32 bit
- * dev_t and has no se_path[] member.
- */
-struct swapent13 {
-	int32_t	se13_dev;		/* device id */
-	int	se13_flags;		/* flags */
-	int	se13_nblks;		/* total blocks */
-	int	se13_inuse;		/* blocks in use */
-	int	se13_priority;		/* priority of this device */
-};
-
-/*
- * NetBSD 5.0 swapctl(SWAP_STATS, ...) swapent structure; uses 32 bit
- * dev_t.
- */
-struct swapent50 {
-	int32_t	se50_dev;		/* device id */
-	int	se50_flags;		/* flags */
-	int	se50_nblks;		/* total blocks */
-	int	se50_inuse;		/* blocks in use */
-	int	se50_priority;		/* priority of this device */
-	char	se50_path[PATH_MAX+1];	/* path name */
-};
-
-/*
  * We keep a of pool vndbuf's and vndxfer structures.
  */
 static struct pool vndxfer_pool, vndbuf_pool;
@@ -440,36 +415,6 @@ void swapsys_unlock(void)
 	rw_exit(_syscall_lock);
 }
 
-#if defined(COMPAT_13)
-static void
-swapent13_cvt(void *p, const struct swapent *se)
-{
-	struct swapent13 *sep13 = p;
-
-	sep13->se13_dev = se->se_dev;
-	sep13->se13_flags = se->se_flags;
-	sep13->sse13_nblks = se->se_nblks;
-	sep13->se13_inuse = se->se_inuse;
-	sep13->se13_priority = se->se_priority;
-}
-#endif
-
-#if defined(COMPAT_50)
-static void
-swapent50_cvt(void *p, const struct swapent *se)
-{
-	struct swapent50 *sep50 = p;
-
-	sep50->se50_dev = se->se_dev;
-	sep50->se50_flags = se->se_flags;
-	sep50->se50_nblks = se->se_nblks;
-	sep50->se50_inuse = se->se_inuse;
-	sep50->se50_priority = se->se_priority;
-	KASSERT(sizeof(se->se_path) <= sizeof(sep50->se50_path));
-	strcpy(sep50->se50_path, se->se_path);
-}
-#endif
-
 static void
 swapent_cvt(struct swapent *se, const struct swapdev *sdp, int inuse)
 {
@@ -482,42 +427,10 @@ swapent_cvt(struct swapent *se, const st
 	strcpy(se->se_path, sdp->swd_path);
 }
 
-static size_t
-swapent_size(int cmd)
-{
-	switch (cmd) {
-#if defined(COMPAT_13)
-	case SWAP_STATS13:
-		return sizeof(struct swapent13);
-#endif
-#if defined(COMPAT_50)
-	case SWAP_STATS50:
-		return sizeof(struct swapent50);
-#endif
-	case SWAP_STATS:
-		return sizeof(struct swapent);
-	default:
-		return 0;
-	}
-}
-
-static void (*
-swapent_fun(int cmd))(void *, const struct swapent *)
-{
-	switch (cmd) {
-#if defined(COMPAT_13)
-	case SWAP_STATS13:
-		return swapent13_cvt;
-#endif
-#if defined(COMPAT_50)
-	case SWAP_STATS50:
-		return swapent50_cvt;
-#endif
-	case SWAP_STATS:
-	default:
-		return NULL;
-	}
-}
+int (*uvm_swap_stats13)(const struct sys_swapctl_args *, register_t *) =
+(void *)enosys;
+int (*uvm_swap_stats50)(const struct sys_swapctl_args *, register_t *) =
+(void *)enosys;
 
 /*
  * sys_swapctl: main entry point for swapctl(2) system call
@@ -572,16 +485,15 @@ sys_swapctl(struct lwp *l, const struct 
 	 * copyout() and we don't want to be holding that lock then!
 	 */
 	switch (SCARG(uap, cmd)) {
-	case SWAP_STATS:
-#if defined(COMPAT_50)
-	case SWAP_STATS50:
-#endif
-#if defined(COMPAT_13)
 	case SWAP_STATS13:
-#endif
+		error = (*uvm_swap_stats13)(uap, retval);
+		goto out;
+	case SWAP_STATS50:
+		error = (*uvm_swap_stats50)(uap, retval);
+		goto out;
+	case SWAP_STATS:
 		error = uvm_swap_stats(SCARG(uap, arg), SCARG(uap, misc),
-		swapent_fun(SCARG(uap, cmd)), swapent_size(SCARG(uap, cmd)),
-		retval);
+		NULL, sizeof(struct swapent), retval);
 		UVMHIST_LOG(pdhist, "<- done SWAP_STATS", 0, 0, 0, 0);
 		goto out;
 	

Index: src/sys/uvm/uvm_swap.h
diff -u src/sys/uvm/uvm_swap.h:1.23 src/sys/uvm/uvm_swap.h:1.24
--- src/sys/uvm/uvm_swap.h:1.23	Wed Mar 14 20:48:13 2018
+++ src/sys/uvm/uvm_swap.h	Wed Mar 14 23:21:58 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_swap.h,v 1.23 2018/03/15 00:48:13 christos Exp $	*/
+/*	$NetBSD: uvm_swap.h,v 1.24 2018/03/15 03:21:58 christos Exp $	*/
 
 /*
  * Copyright (c) 

CVS commit: src/sys/compat

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Mar 15 03:13:51 UTC 2018

Modified Files:
src/sys/compat/common: Makefile.sysio compat_mod.c
Added Files:
src/sys/compat/common: uvm_13.c uvm_50.c
src/sys/compat/sys: uvm.h

Log Message:
add uvm swap compat code.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/compat/common/Makefile.sysio
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/common/compat_mod.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/common/uvm_13.c \
src/sys/compat/common/uvm_50.c
cvs rdiff -u -r0 -r1.1 src/sys/compat/sys/uvm.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/compat/common/Makefile.sysio
diff -u src/sys/compat/common/Makefile.sysio:1.7 src/sys/compat/common/Makefile.sysio:1.8
--- src/sys/compat/common/Makefile.sysio:1.7	Sat Nov  5 19:30:22 2016
+++ src/sys/compat/common/Makefile.sysio	Wed Mar 14 23:13:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sysio,v 1.7 2016/11/05 23:30:22 pgoyette Exp $
+#	$NetBSD: Makefile.sysio,v 1.8 2018/03/15 03:13:51 christos Exp $
 
 # Sources for syscall and ioctl compatibility across the versions.
 
@@ -13,7 +13,7 @@ SRCS+=	kern_info_09.c
 SRCS+=	kern_xxx_12.c vfs_syscalls_12.c vm_12.c
 
 # Compatibility code for NetBSD 1.3
-SRCS+=	kern_sig_13.c
+SRCS+=	kern_sig_13.c uvm_13.c
 
 # Compatibility code for NetBSD 1.6
 SRCS+=	kern_sig_16.c
@@ -32,7 +32,7 @@ SRCS+=	vfs_syscalls_40.c uipc_syscalls_4
 
 # Compatibility code for NetBSD 5.0
 SRCS+=	kern_50.c kern_time_50.c kern_select_50.c rndpseudo_50.c rtsock_50.c \
-	vfs_syscalls_50.c  uipc_syscalls_50.c
+	vfs_syscalls_50.c  uipc_syscalls_50.c uvm_50.c
 
 # Compatibility code for NetBSD 6.0
 SRCS+=	kern_sa_60.c tty_60.c kern_time_60.c

Index: src/sys/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.24 src/sys/compat/common/compat_mod.c:1.25
--- src/sys/compat/common/compat_mod.c:1.24	Sat Nov  5 19:30:22 2016
+++ src/sys/compat/common/compat_mod.c	Wed Mar 14 23:13:51 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_mod.c,v 1.24 2016/11/05 23:30:22 pgoyette Exp $	*/
+/*	$NetBSD: compat_mod.c,v 1.25 2018/03/15 03:13:51 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.24 2016/11/05 23:30:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_mod.c,v 1.25 2018/03/15 03:13:51 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_mod.c
 #include 
 #include 
 #include 
+#include 
 
 #if defined(COMPAT_09) || defined(COMPAT_43) || defined(COMPAT_50)
 static struct sysctllog *compat_clog = NULL;
@@ -238,6 +239,9 @@ compat_modcmd(modcmd_t cmd, void *arg)
 		ttcompatvec = ttcompat;
 		if_43_init();
 #endif
+#ifdef COMPAT_13
+		uvm_13_init();
+#endif
 #ifdef COMPAT_16
 #if defined(COMPAT_SIGCONTEXT)
 		KASSERT(emul_netbsd.e_sigobject == NULL);
@@ -251,9 +255,15 @@ compat_modcmd(modcmd_t cmd, void *arg)
 #endif
 #endif
 		compat_sysctl_init();
+#ifdef COMPAT_50
+		uvm_50_init();
+#endif
 		return 0;
 
 	case MODULE_CMD_FINI:
+#ifdef COMPAT_13
+		uvm_13_fini();
+#endif
 #ifdef COMPAT_16
 		/*
 		 * Ensure sendsig_sigcontext() is not being used.
@@ -308,6 +318,9 @@ compat_modcmd(modcmd_t cmd, void *arg)
 #endif
 #endif	/* COMPAT_16 */
 		compat_sysctl_fini();
+#ifdef COMPAT_50
+		uvm_50_fini();
+#endif
 		return 0;
 
 	default:

Added files:

Index: src/sys/compat/common/uvm_13.c
diff -u /dev/null src/sys/compat/common/uvm_13.c:1.1
--- /dev/null	Wed Mar 14 23:13:51 2018
+++ src/sys/compat/common/uvm_13.c	Wed Mar 14 23:13:51 2018
@@ -0,0 +1,84 @@
+/*	$NetBSD: uvm_13.c,v 1.1 2018/03/15 03:13:51 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * 

CVS commit: src/usr.sbin/ypbind

[Brian Ginsbach]

Module Name:src
Committed By:   ginsbach
Date:   Thu Mar 15 02:25:31 UTC 2018

Modified Files:
src/usr.sbin/ypbind: ypbind.c

Log Message:
Initialize ypbind_resp before first possible error return condition.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/usr.sbin/ypbind/ypbind.c

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

Modified files:

Index: src/usr.sbin/ypbind/ypbind.c
diff -u src/usr.sbin/ypbind/ypbind.c:1.99 src/usr.sbin/ypbind/ypbind.c:1.100
--- src/usr.sbin/ypbind/ypbind.c:1.99	Wed Aug  9 01:56:42 2017
+++ src/usr.sbin/ypbind/ypbind.c	Thu Mar 15 02:25:31 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ypbind.c,v 1.99 2017/08/09 01:56:42 ginsbach Exp $	*/
+/*	$NetBSD: ypbind.c,v 1.100 2018/03/15 02:25:31 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt 
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.99 2017/08/09 01:56:42 ginsbach Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.100 2018/03/15 02:25:31 ginsbach Exp $");
 #endif
 
 #include 
@@ -710,15 +710,15 @@ ypbindproc_domain_2(SVCXPRT *transp, voi
 
 	DPRINTF("ypbindproc_domain_2 %s\n", arg);
 
+	(void)memset(, 0, sizeof res);
+	res.ypbind_status = YPBIND_FAIL_VAL;
+
 	/* Reject invalid domains. */
 	if (_yp_invalid_domain(arg)) {
 		res.ypbind_respbody.ypbind_error = YPBIND_ERR_NOSERV;
 		return 
 	}
 
-	(void)memset(, 0, sizeof res);
-	res.ypbind_status = YPBIND_FAIL_VAL;
-
 	/*
 	 * Look for the domain. XXX: Behave erratically if we have
 	 * more than 100 domains. The intent here is to avoid allowing

CVS commit: src/bin/sh

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu Mar 15 01:20:43 UTC 2018

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

Log Message:
Start adding more gaudy markup.  Use .Li or .Dv when referring to
parameters.  Use more .Ic and .Ar when defining syntax.

The manual is still rather inconsistent e.g. when referring to
parameters where it randomly uses both $0 and 0 or $@ and @ - but I'm
not shaving that yak at least for now.


To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.192 src/bin/sh/sh.1:1.193
--- src/bin/sh/sh.1:1.192	Wed Mar 14 10:38:52 2018
+++ src/bin/sh/sh.1	Thu Mar 15 01:20:43 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.192 2018/03/14 10:38:52 uwe Exp $
+.\"	$NetBSD: sh.1,v 1.193 2018/03/15 01:20:43 uwe Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -196,8 +196,12 @@ nor
 .Fl s
 was given, then the shell treats the first argument
 as the name of a file from which to read commands (a shell script).
-This also becomes $0 and the remaining arguments are set as the
-positional parameters of the shell ($1, $2, etc).
+This also becomes
+.Li $0
+and the remaining arguments are set as the
+positional parameters of the shell
+.Li ( $1 , $2 ,
+etc).
 Otherwise, if
 .Fl c
 was given, then the first argument, which must exist,
@@ -205,14 +209,22 @@ is taken to be a string of
 .Nm
 commands to execute.
 Then if any additional arguments follow the command string,
-those arguments become $0, $1, ...
+those arguments become
+.Li $0 , $1 ,
+\&...
 Otherwise, if additional arguments were given
 (which implies that
 .Fl s
 was set)
-those arguments become $1, $2, ...
-If $0 has not been set by the preceding processing, it
-will be set to argv[0] as passed to the shell, which will
+those arguments become
+.Li $1 , $2 ,
+\&...
+If
+.Li $0
+has not been set by the preceding processing, it
+will be set to
+.Va argv\^ Ns [ 0 ]
+as passed to the shell, which will
 usually be the name of the shell itself.
 If
 .Fl s
@@ -273,15 +285,19 @@ Don't overwrite existing files with
 Read commands from the
 .Ar command_string
 operand instead of, or in addition to, from the standard input.
-Special parameter 0 will be set from the
+Special parameter
+.Dv 0 \" $0
+will be set from the
 .Ar command_name
-operand if given, and the positional parameters ($1, $2, etc.)
+operand if given, and the positional parameters
+.Li ( $1 , $2 ,
+etc.)
 set from the remaining argument operands, if any.
 .Fl c
 is only available at invocation, it cannot be
 .Ic set ,
 and there is no form using
-.Dq \&+ .
+.Dq Cm \&+ .
 .It Fl E Em emacs
 Enable the built-in emacs style
 command line editor (disables
@@ -577,17 +593,20 @@ single quotes in a single-quoted string)
 .Ss Double Quotes
 Enclosing characters within double quotes preserves the literal
 meaning of all characters except dollar sign
-.Pq $ ,
+.Pq Li \&$ ,
 backquote
-.Pq ` ,
+.Pq Li \&` ,
 and backslash
-.Pq \e .
+.Pq Li \e .
 The backslash inside double quotes is historically weird, and serves to
 quote only the following characters (and these not in all contexts):
 .Dl $  `  \*q  \e   ,
 where a backslash newline is a line continuation as above.
 Otherwise it remains literal.
-.Ss Dollar Single Quotes (\&$'...')
+.\"
+.\"
+.Ss Dollar Single Quotes ( Li \&$'...' )
+.\"
 .Bd -filled -offset indent
 .Bf Em
 Note: this form of quoting is still somewhat experimental,
@@ -600,10 +619,10 @@ adopted text differ.
 .Pp
 Enclosing characters in a matched pair of single quotes, with the
 first immediately preceded by an unquoted dollar sign
-.Pq \&$
+.Pq Li \&$
 provides a quoting mechanism similar to single quotes, except
 that within the sequence of characters, any backslash
-.Pq \e ,
+.Pq Li \e ,
 is an escape character, which causes the following character to
 be treated specially.
 Only a subset of the characters that can occur in the string
@@ -614,14 +633,14 @@ in strings in the C programming language
 .Pp
 The following characters are treated literally when following
 the escape character (backslash):
-.Dl \e \&' \&"
+.Dl \e \&' \(dq
 The sequence
-.Dq \e\e
+.Dq Li \e\e
 allows the escape character (backslash) to appear in the string literally.
-.Dq \e'
+.Dq Li \e'
 allows a single quote character into the string, such an
 escaped single quote does not terminate the quoted string.
-.Dq \e"
+.Dq Li \e\(dq
 is for compatibility with C strings, the double quote has
 no special meaning in a shell C-style string,
 and does not need to be escaped, but may be.
@@ -659,7 +678,7 @@ is vertical tab (0x13).
 In addition to those there are 5 forms that need additional
 data, which is obtained from the subsequent characters.
 An escape
-.Pq \e
+.Pq Li \e
 followed by one, two or three, octal digits
 .Po So 0 Sc Ns \&.. Ns 

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Mar 15 00:48:13 UTC 2018

Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
src/sys/sys: param.h
src/sys/uvm: uvm_swap.c uvm_swap.h

Log Message:
Untangle the swapctl compat code mess. Welcome to lucky 13.


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.557 -r1.558 src/sys/sys/param.h
cvs rdiff -u -r1.175 -r1.176 src/sys/uvm/uvm_swap.c
cvs rdiff -u -r1.22 -r1.23 src/sys/uvm/uvm_swap.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/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.215
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214	Tue Jan  9 15:55:43 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c	Wed Mar 14 20:48:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.214 2018/01/09 20:55:43 maya Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.215 2018/03/15 00:48:13 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214 2018/01/09 20:55:43 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.215 2018/03/15 00:48:13 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
@@ -1718,59 +1718,23 @@ netbsd32___posix_rename(struct lwp *l, c
 	return (sys___posix_rename(l, , retval));
 }
 
-static int
-netbsd32_swapctl_stats(struct lwp *l, struct sys_swapctl_args *uap, register_t *retval)
+static void
+swapent32_cvt(void *p, const struct swapent *se)
 {
-	struct swapent *ksep;
-	struct netbsd32_swapent *usep32;
-	struct netbsd32_swapent se32;
-	int count = SCARG(uap, misc);
-	int i, error = 0;
-	size_t ksep_len;
-
-	if (count < 0)
-		return EINVAL;
-
-	swapsys_lock(RW_WRITER);
-
-	if ((size_t)count > (size_t)uvmexp.nswapdev)
-		count = uvmexp.nswapdev;
-	if (count == 0) {
-		/* No swap device */
-		swapsys_unlock();
-		return 0;
-	}
-
-	ksep_len = sizeof(*ksep) * count;
-	ksep = kmem_alloc(ksep_len, KM_SLEEP);
-	usep32 = (struct netbsd32_swapent *)SCARG(uap, arg);
-
-	uvm_swap_stats(SWAP_STATS, ksep, count, retval);
-	count = *retval;
-
-	swapsys_unlock();
-
-	for (i = 0; i < count; i++) {
-		se32.se_dev = ksep[i].se_dev;
-		se32.se_flags = ksep[i].se_flags;
-		se32.se_nblks = ksep[i].se_nblks;
-		se32.se_inuse = ksep[i].se_inuse;
-		se32.se_priority = ksep[i].se_priority;
-		memcpy(se32.se_path, ksep[i].se_path,
-			sizeof(se32.se_path));
+	struct netbsd32_swapent *se32 = p;
 
-		error = copyout(, usep32 + i, sizeof(se32));
-		if (error)
-			break;
-	}
-
-	kmem_free(ksep, ksep_len);
-
-	return error;
+	se32->se_dev = se->se_dev;
+	se32->se_flags = se->se_flags;
+	se32->se_nblks = se->se_nblks;
+	se32->se_inuse = se->se_inuse;
+	se32->se_priority = se->se_priority;
+	KASSERT(sizeof(se->se_path) <= sizeof(se32->se_path));
+	strcpy(se32->se_path, se->se_path);
 }
 
 int
-netbsd32_swapctl(struct lwp *l, const struct netbsd32_swapctl_args *uap, register_t *retval)
+netbsd32_swapctl(struct lwp *l, const struct netbsd32_swapctl_args *uap,
+register_t *retval)
 {
 	/* {
 		syscallarg(int) cmd;
@@ -1784,8 +1748,13 @@ netbsd32_swapctl(struct lwp *l, const st
 	NETBSD32TO64_UAP(misc);
 
 	/* SWAP_STATS50 and SWAP_STATS13 structures need no translation */
-	if (SCARG(, cmd) == SWAP_STATS)
-		return netbsd32_swapctl_stats(l, , retval);
+	if (SCARG(, cmd) == SWAP_STATS) {
+		swapsys_lock(RW_READER);
+		int error = uvm_swap_stats(SCARG(, arg), SCARG(, misc),
+		swapent32_cvt, sizeof(struct netbsd32_swapent), retval);
+		swapsys_unlock();
+		return error;
+	}
 
 	return (sys_swapctl(l, , retval));
 }

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.557 src/sys/sys/param.h:1.558
--- src/sys/sys/param.h:1.557	Tue Jan  9 14:52:29 2018
+++ src/sys/sys/param.h	Wed Mar 14 20:48:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.557 2018/01/09 19:52:29 christos Exp $	*/
+/*	$NetBSD: param.h,v 1.558 2018/03/15 00:48:13 christos Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	899001200	/* NetBSD 8.99.12 */
+#define	__NetBSD_Version__	899001300	/* NetBSD 8.99.13 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

Index: src/sys/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.175 src/sys/uvm/uvm_swap.c:1.176
--- src/sys/uvm/uvm_swap.c:1.175	Fri Oct 27 20:37:13 2017
+++ src/sys/uvm/uvm_swap.c	Wed Mar 14 20:48:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_swap.c,v 1.175 2017/10/28 00:37:13 pgoyette Exp $	*/
+/*	$NetBSD: uvm_swap.c,v 1.176 2018/03/15 00:48:13 christos Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
  */
 
 #include 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 23:42:10 UTC 2018

Removed Files:
xsrc/external/mit/bigreqsproto/dist: COPYING ChangeLog INSTALL
Makefile.am Makefile.in README aclocal.m4 bigreqsproto.h
bigreqsproto.pc.in bigreqstr.h config.guess config.sub configure
configure.ac docbook.am install-sh missing
xsrc/external/mit/bigreqsproto/dist/specs: Makefile.am Makefile.in
bigreq.xml
xsrc/external/mit/compositeproto/dist: AUTHORS COPYING ChangeLog
INSTALL Makefile.am Makefile.in NEWS README aclocal.m4 autogen.sh
composite.h compositeproto.h compositeproto.pc.in
compositeproto.txt config.guess config.sub configure configure.ac
install-sh missing
xsrc/external/mit/damageproto/dist: AUTHORS COPYING ChangeLog INSTALL
Makefile.am Makefile.in NEWS README aclocal.m4 config.guess
config.sub configure configure.ac damageproto.h damageproto.pc.in
damageproto.txt damagewire.h install-sh missing
xsrc/external/mit/dri2proto/dist: COPYING ChangeLog INSTALL Makefile.am
Makefile.in README aclocal.m4 config.guess config.sub configure
configure.ac dri2proto.h dri2proto.pc.in dri2proto.txt dri2tokens.h
install-sh missing
xsrc/external/mit/dri3proto/dist: ChangeLog INSTALL Makefile.am
Makefile.in aclocal.m4 config.guess config.sub configure
configure.ac dri3proto.h dri3proto.pc.in dri3proto.txt install-sh
missing
xsrc/external/mit/fixesproto/dist: AUTHORS COPYING ChangeLog INSTALL
Makefile.am Makefile.in README aclocal.m4 config.guess config.sub
configure configure.ac fixesproto.pc.in fixesproto.txt install-sh
missing xfixesproto.h xfixeswire.h
xsrc/external/mit/fontcacheproto/dist: COPYING ChangeLog Makefile.am
Makefile.in README aclocal.m4 autogen.sh config.guess config.sub
configure configure.ac fontcache.h fontcacheP.h
fontcacheproto.pc.in fontcachstr.h install-sh missing mkinstalldirs
xsrc/external/mit/fontsproto/dist: COPYING ChangeLog FS.h FSproto.h
INSTALL Makefile.am Makefile.in README aclocal.m4 compile
config.guess config.sub configure configure.ac docbook.am font.h
fontproto.h fontsproto.pc.in fontstruct.h fsmasks.h install-sh
missing
xsrc/external/mit/fontsproto/dist/specs: Makefile.am Makefile.in
fsproto.xml
xsrc/external/mit/glproto/dist: COPYING ChangeLog INSTALL Makefile.am
Makefile.in README aclocal.m4 autogen.sh compile config.guess
config.sub configure configure.ac glcore.h glproto.pc.in glxint.h
glxmd.h glxproto.h glxtokens.h install-sh missing
xsrc/external/mit/inputproto/dist: COPYING ChangeLog INSTALL
Makefile.am Makefile.in README XI.h XI2.h XI2proto.h XIproto.h
aclocal.m4 compile config.guess config.sub configure configure.ac
inputproto.pc.in install-sh missing
xsrc/external/mit/inputproto/dist/specs: Makefile.am Makefile.in
XI2proto.txt XIproto.txt
xsrc/external/mit/kbproto/dist: COPYING ChangeLog INSTALL Makefile.am
Makefile.in README XKB.h XKBgeom.h XKBproto.h XKBsrv.h XKBstr.h
aclocal.m4 autogen.sh compile config.guess config.sub configure
configure.ac docbook.am install-sh kbproto.pc.in missing
xsrc/external/mit/kbproto/dist/specs: Makefile.am Makefile.in
XKBproto-1.svg XKBproto-10.svg XKBproto-11.svg XKBproto-2.svg
XKBproto-3.svg XKBproto-4.svg XKBproto-5.svg XKBproto-6.svg
XKBproto-7.svg XKBproto-8.svg XKBproto-9.svg acknowledgements.xml
appA.xml appB.xml appC.xml appD.xml ch01.xml ch02.xml ch03.xml
ch04.xml ch05.xml ch06.xml ch07.xml ch08.xml ch09.xml ch10.xml
ch11.xml ch12.xml ch13.xml ch14.xml ch15.xml ch16.xml xkbproto.xml
xsrc/external/mit/presentproto/dist: COPYING ChangeLog INSTALL
Makefile.am Makefile.in README aclocal.m4 compile config.guess
config.sub configure configure.ac install-sh missing presentproto.h
presentproto.pc.in presentproto.txt presenttokens.h
xsrc/external/mit/randrproto/dist: COPYING ChangeLog INSTALL
Makefile.am Makefile.in README aclocal.m4 config.guess config.sub
configure configure.ac install-sh missing randr.h randrproto.h
randrproto.pc.in randrproto.txt
xsrc/external/mit/recordproto/dist: COPYING ChangeLog INSTALL
Makefile.am Makefile.in README aclocal.m4 config.guess config.sub
configure configure.ac docbook.am install-sh missing recordconst.h
recordproto.h recordproto.pc.in recordstr.h
xsrc/external/mit/recordproto/dist/specs: Makefile.am Makefile.in

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 23:41:08 UTC 2018

Modified Files:
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/tools/makekeys: Makefile
src/share/mk: bsd.own.mk
Removed Files:
src/external/mit/xorg/include/bigreqsproto: Makefile
src/external/mit/xorg/include/compositeproto: Makefile
src/external/mit/xorg/include/damageproto: Makefile
src/external/mit/xorg/include/dri2proto: Makefile
src/external/mit/xorg/include/dri3proto: Makefile
src/external/mit/xorg/include/evieext: Makefile
src/external/mit/xorg/include/fixesproto: Makefile
src/external/mit/xorg/include/fontcacheproto: Makefile
src/external/mit/xorg/include/fontsproto: Makefile
src/external/mit/xorg/include/glproto: Makefile
src/external/mit/xorg/include/glproto/internal: Makefile
src/external/mit/xorg/include/inputproto: Makefile
src/external/mit/xorg/include/kbproto: Makefile
src/external/mit/xorg/include/presentproto: Makefile
src/external/mit/xorg/include/randrproto: Makefile
src/external/mit/xorg/include/recordproto: Makefile
src/external/mit/xorg/include/renderproto: Makefile
src/external/mit/xorg/include/resourceproto: Makefile
src/external/mit/xorg/include/scrnsaverproto: Makefile
src/external/mit/xorg/include/trapproto: Makefile
src/external/mit/xorg/include/videoproto: Makefile
src/external/mit/xorg/include/xcmiscproto: Makefile
src/external/mit/xorg/include/xextproto: Makefile
src/external/mit/xorg/include/xf86bigfontproto: Makefile
src/external/mit/xorg/include/xf86dgaproto: Makefile
src/external/mit/xorg/include/xf86driproto: Makefile
src/external/mit/xorg/include/xf86miscproto: Makefile
src/external/mit/xorg/include/xf86vidmodeproto: Makefile
src/external/mit/xorg/include/xineramaproto: Makefile
src/external/mit/xorg/include/xproto: Makefile
src/external/mit/xorg/include/xproxymanagementprotocol: Makefile

Log Message:
complete the switch to xorgproto over *proto split packages
- remove old package makefiles
- update makekeys for Xfuncproto.h being a real file now
- clean up deleted package X11SRCDIR.pkg settings

this should be functionally equivalent.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/bigreqsproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/compositeproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/damageproto/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/include/dri2proto/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/include/dri3proto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/evieext/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/fixesproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/fontcacheproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/fontsproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/glproto/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/include/glproto/internal/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/inputproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/kbproto/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/include/presentproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/randrproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/recordproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/renderproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/resourceproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/scrnsaverproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/trapproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/videoproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xcmiscproto/Makefile
cvs rdiff -u -r1.5 -r0 src/external/mit/xorg/include/xextproto/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/include/xf86bigfontproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xf86dgaproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xf86driproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/xf86miscproto/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/include/xf86vidmodeproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xineramaproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xproto/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/include/xproxymanagementprotocol/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/makekeys/Makefile
cvs rdiff -u -r1.1049 -r1.1050 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; 

CVS commit: [pgoyette-compat] src/sys/conf

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Mar 14 22:26:16 UTC 2018

Modified Files:
src/sys/conf [pgoyette-compat]: files

Log Message:
Revert previous.

>From mrg@:

this isn't traditionally how we did COMPAT_43.  it's more
"enable obsolete interfaces", which is not quite the same
as "make old binaries work".

eg, they enable the old sgtty interfaces that _are_ still
visible and potentially callable from modern binaries.
we still install the headers for this interfaces.

COMPAT_09 enables old binaries with changed interfaces.


To generate a diff of this commit:
cvs rdiff -u -r1.1196.2.6 -r1.1196.2.7 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1196.2.6 src/sys/conf/files:1.1196.2.7
--- src/sys/conf/files:1.1196.2.6	Wed Mar 14 21:46:51 2018
+++ src/sys/conf/files	Wed Mar 14 22:26:15 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1196.2.6 2018/03/14 21:46:51 pgoyette Exp $
+#	$NetBSD: files,v 1.1196.2.7 2018/03/14 22:26:15 pgoyette Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -148,7 +148,6 @@ defflag	opt_compat_netbsd.h	COMPAT_12: C
 defflag	opt_compat_netbsd.h	COMPAT_11: COMPAT_12, COMPAT_NETBSD
 defflag	opt_compat_netbsd.h	COMPAT_10: COMPAT_11, COMPAT_NETBSD
 defflag	opt_compat_netbsd.h	COMPAT_09: COMPAT_10, COMPAT_NETBSD
-defflagCOMPAT_43: COMPAT_09, COMPAT_NETBSD
 defflagCOMPAT_OSSAUDIO
 defflagCOMPAT_FREEBSD: COMPAT_30
 defflagCOMPAT_IBCS2
@@ -170,6 +169,7 @@ defflagCOMPAT_LINUX32 : COMPAT_LINUX
 defflagCOMPAT_AOUT_M68K: COMPAT_40
 defflagCOMPAT_M68K4K
 defflagCOMPAT_VAX1K
+defflagCOMPAT_43
 defflag	opt_compat_netbsd.h	COMPAT_NOMID
 
 include	"compat/common/files.common"

CVS commit: [pgoyette-compat] src/sys/compat/common

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Mar 14 22:04:27 UTC 2018

Modified Files:
src/sys/compat/common [pgoyette-compat]: files.common

Log Message:
Tag files with their specific compat version required.  This way
the files only get included if needed, allowing for subsequent
loading of COMPAT_xx modules for older-than-built-in code.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/files.common

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/common/files.common
diff -u src/sys/compat/common/files.common:1.1.2.8 src/sys/compat/common/files.common:1.1.2.9
--- src/sys/compat/common/files.common:1.1.2.8	Wed Mar 14 02:24:56 2018
+++ src/sys/compat/common/files.common	Wed Mar 14 22:04:27 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.common,v 1.1.2.8 2018/03/14 02:24:56 pgoyette Exp $
+#	$NetBSD: files.common,v 1.1.2.9 2018/03/14 22:04:27 pgoyette Exp $
 
 #
 # Generic files, used by all compat options.
@@ -12,67 +12,67 @@ file	compat/common/compat_util.c		compat
 #
 
 # Compatibility code for 4.3BSD
-file	compat/common/kern_exit_43.c		compat_netbsd
-file	compat/common/kern_info_43.c		compat_netbsd
-file	compat/common/kern_resource_43.c	compat_netbsd
-file	compat/common/kern_sig_43.c		compat_netbsd
-file	compat/common/tty_43.c			compat_netbsd
-file	compat/common/uipc_syscalls_43.c	compat_netbsd
-file	compat/common/vfs_syscalls_43.c		compat_netbsd
-file	compat/common/vm_43.c			compat_netbsd
-file	compat/common/if_43.c			compat_netbsd
+file	compat/common/kern_exit_43.c		compat_43
+file	compat/common/kern_info_43.c		compat_43
+file	compat/common/kern_resource_43.c	compat_43
+file	compat/common/kern_sig_43.c		compat_43
+file	compat/common/tty_43.c			compat_43
+file	compat/common/uipc_syscalls_43.c	compat_43
+file	compat/common/vfs_syscalls_43.c		compat_43
+file	compat/common/vm_43.c			compat_43
+file	compat/common/if_43.c			compat_43
 
 # Compatibility code for NetBSD 0.9
-file	compat/common/kern_info_09.c		compat_netbsd
+file	compat/common/kern_info_09.c		compat_09
 
 # Compatability code for NetBSD 1.0
-file	compat/common/vfs_syscalls_10.c		compat_netbsd
+file	compat/common/vfs_syscalls_10.c		compat_10
 
 # Compatibility code for NetBSD 1.2
-file	compat/common/kern_xxx_12.c		compat_netbsd
-file	compat/common/vfs_syscalls_12.c		compat_netbsd
-file	compat/common/vm_12.c			compat_netbsd
+file	compat/common/kern_xxx_12.c		compat_12
+file	compat/common/vfs_syscalls_12.c		compat_12
+file	compat/common/vm_12.c			compat_12
 
 # Compatibility code for NetBSD 1.3
-file	compat/common/kern_sig_13.c		compat_netbsd
-file	compat/common/uvm_stats_13.c		compat_netbsd
+file	compat/common/kern_sig_13.c		compat_13
+file	compat/common/uvm_stats_13.c		compat_13
 
 # Compatibility code for NetBSD 1.4
-file	compat/common/rtsock_14.c		compat_netbsd
+file	compat/common/rtsock_14.c		compat_14
 
 # Compatibility code for NetBSD 1.6
-file	compat/common/kern_sig_16.c		compat_netbsd
+file	compat/common/kern_sig_16.c		compat_16
 
 # Compatibility code for NetBSD 2.0
-file	compat/common/vfs_syscalls_20.c		compat_netbsd
+file	compat/common/vfs_syscalls_20.c		compat_20
 
 # Compatibility code for NetBSD 3.0
-file	compat/common/kern_time_30.c		compat_netbsd
-file	compat/common/vfs_syscalls_30.c		compat_netbsd
-file	compat/common/uipc_syscalls_30.c	compat_netbsd
+file	compat/common/kern_time_30.c		compat_30
+file	compat/common/vfs_syscalls_30.c		compat_30
+file	compat/common/uipc_syscalls_30.c	compat_30
 
 # Compatibility code for NetBSD 4.0
-file	compat/common/vfs_syscalls_40.c		compat_netbsd
-file	compat/common/uipc_syscalls_40.c	compat_netbsd
+file	compat/common/vfs_syscalls_40.c		compat_40
+file	compat/common/uipc_syscalls_40.c	compat_40
 
 # Compatibility code for NetBSD 5.0
-file	compat/common/kern_50.c			compat_netbsd
-file	compat/common/kern_time_50.c		compat_netbsd
-file	compat/common/kern_select_50.c		compat_netbsd
-file	compat/common/rndpseudo_50.c		compat_netbsd
-file	compat/common/rtsock_50.c		compat_netbsd
-file	compat/common/vfs_syscalls_50.c		compat_netbsd
-file	compat/common/uipc_syscalls_50.c	compat_netbsd
-file	compat/common/uvm_stats_50.c		compat_netbsd
+file	compat/common/kern_50.c			compat_50
+file	compat/common/kern_time_50.c		compat_50
+file	compat/common/kern_select_50.c		compat_50
+file	compat/common/rndpseudo_50.c		compat_50
+file	compat/common/rtsock_50.c		compat_50
+file	compat/common/vfs_syscalls_50.c		compat_50
+file	compat/common/uipc_syscalls_50.c	compat_50
+file	compat/common/uvm_stats_50.c		compat_50
 
 # Compatibility code for NetBSD 6.0
-file	compat/common/kern_sa_60.c		compat_netbsd
-file	compat/common/tty_60.c			compat_netbsd
-file	compat/common/kern_time_60.c		compat_netbsd
+file	compat/common/kern_sa_60.c		compat_60
+file	compat/common/tty_60.c			compat_60
+file	compat/common/kern_time_60.c		compat_60
 
 # Compatibility code for NetBSD 7.0

CVS commit: [pgoyette-compat] src/sys/conf

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Wed Mar 14 21:46:51 UTC 2018

Modified Files:
src/sys/conf [pgoyette-compat]: files

Log Message:
COMPAT_43 is even older than COMPAT_09, so if _43 is enabled, we'll
need everything newer as well.


To generate a diff of this commit:
cvs rdiff -u -r1.1196.2.5 -r1.1196.2.6 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1196.2.5 src/sys/conf/files:1.1196.2.6
--- src/sys/conf/files:1.1196.2.5	Tue Mar 13 09:07:20 2018
+++ src/sys/conf/files	Wed Mar 14 21:46:51 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1196.2.5 2018/03/13 09:07:20 pgoyette Exp $
+#	$NetBSD: files,v 1.1196.2.6 2018/03/14 21:46:51 pgoyette Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -148,6 +148,7 @@ defflag	opt_compat_netbsd.h	COMPAT_12: C
 defflag	opt_compat_netbsd.h	COMPAT_11: COMPAT_12, COMPAT_NETBSD
 defflag	opt_compat_netbsd.h	COMPAT_10: COMPAT_11, COMPAT_NETBSD
 defflag	opt_compat_netbsd.h	COMPAT_09: COMPAT_10, COMPAT_NETBSD
+defflagCOMPAT_43: COMPAT_09, COMPAT_NETBSD
 defflagCOMPAT_OSSAUDIO
 defflagCOMPAT_FREEBSD: COMPAT_30
 defflagCOMPAT_IBCS2
@@ -169,7 +170,6 @@ defflagCOMPAT_LINUX32 : COMPAT_LINUX
 defflagCOMPAT_AOUT_M68K: COMPAT_40
 defflagCOMPAT_M68K4K
 defflagCOMPAT_VAX1K
-defflagCOMPAT_43
 defflag	opt_compat_netbsd.h	COMPAT_NOMID
 
 include	"compat/common/files.common"

CVS commit: src/sys/dev/ic

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Mar 14 18:58:32 UTC 2018

Modified Files:
src/sys/dev/ic: igsfb.c

Log Message:
Don't left shift a negative, use unsigned for bit masks.
Appeases GCC 6 in some build configuration (ALL kernel)

ok uwe


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/igsfb.c

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

Modified files:

Index: src/sys/dev/ic/igsfb.c
diff -u src/sys/dev/ic/igsfb.c:1.57 src/sys/dev/ic/igsfb.c:1.58
--- src/sys/dev/ic/igsfb.c:1.57	Wed Jan 24 05:35:58 2018
+++ src/sys/dev/ic/igsfb.c	Wed Mar 14 18:58:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: igsfb.c,v 1.57 2018/01/24 05:35:58 riastradh Exp $ */
+/*	$NetBSD: igsfb.c,v 1.58 2018/03/14 18:58:32 maya Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
  * Integraphics Systems IGA 168x and CyberPro series.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.57 2018/01/24 05:35:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.58 2018/03/14 18:58:32 maya Exp $");
 
 #include 
 #include 
@@ -1001,7 +1001,7 @@ igsfb_set_cursor(struct igsfb_devconfig 
 		/* clear trailing bits in the "partial" mask bytes */
 		trailing_bits = p->size.x & 0x07;
 		if (trailing_bits != 0) {
-			const u_int cutmask = ~((~0) << trailing_bits);
+			const u_int cutmask = ~((~0U) << trailing_bits);
 			u_char *mp;
 			u_int i;
 

CVS commit: [netbsd-8] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Wed Mar 14 18:37:49 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Ticket 630


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.141 -r1.1.2.142 src/doc/CHANGES-8.0

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.0
diff -u src/doc/CHANGES-8.0:1.1.2.141 src/doc/CHANGES-8.0:1.1.2.142
--- src/doc/CHANGES-8.0:1.1.2.141	Tue Mar 13 15:50:31 2018
+++ src/doc/CHANGES-8.0	Wed Mar 14 18:37:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.141 2018/03/13 15:50:31 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.142 2018/03/14 18:37:48 bouyer Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -10302,3 +10302,10 @@ sys/arch/xen/x86/cpu.cvia patch: 1.1
 	allocate it dynamically.
 	[maxv, ticket #629]
 
+lib/libc/stdio/vfwprintf.c			1.35, 1.36
+tests/lib/libc/locale/t_sprintf.c		1.2
+
+	Do not use thousands grouping when none is specified by the locale.
+	Fixes PR standards/52282.
+	[martin, ticket #630]
+

CVS commit: [netbsd-8] src

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Wed Mar 14 18:37:00 UTC 2018

Modified Files:
src/lib/libc/stdio [netbsd-8]: vfwprintf.c
src/tests/lib/libc/locale [netbsd-8]: t_sprintf.c

Log Message:
Pull up following revision(s) (requested by martin in ticket #630):
lib/libc/stdio/vfwprintf.c: revision 1.35
lib/libc/stdio/vfwprintf.c: revision 1.36
tests/lib/libc/locale/t_sprintf.c: revision 1.2
Change t_sprintf to an expected failure, since we don't respect the empty
thousands separator of the C/POSIX locale (PR standards/52282).
Do not use thousands grouping when none is specified by the locale.
Fixes PR standards/52282.
A more correct fix for PR standards/52282.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.18.1 src/lib/libc/stdio/vfwprintf.c
cvs rdiff -u -r1.1 -r1.1.2.1 src/tests/lib/libc/locale/t_sprintf.c

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

Modified files:

Index: src/lib/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.34 src/lib/libc/stdio/vfwprintf.c:1.34.18.1
--- src/lib/libc/stdio/vfwprintf.c:1.34	Mon Jan 20 14:11:03 2014
+++ src/lib/libc/stdio/vfwprintf.c	Wed Mar 14 18:37:00 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfwprintf.c,v 1.34 2014/01/20 14:11:03 yamt Exp $	*/
+/*	$NetBSD: vfwprintf.c,v 1.34.18.1 2018/03/14 18:37:00 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
 __FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
 #else
-__RCSID("$NetBSD: vfwprintf.c,v 1.34 2014/01/20 14:11:03 yamt Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.34.18.1 2018/03/14 18:37:00 bouyer Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -923,15 +923,15 @@ reswitch:	switch (ch) {
 			sign = '+';
 			goto rflag;
 		case '\'':
-			flags |= GROUPING;
 			thousands_sep = *(localeconv_l(loc)->thousands_sep);
 			grouping = localeconv_l(loc)->grouping;
-			/* If the locale doesn't define the above, use sane
-			 * defaults - otherwise silly things happen! */
-			if (thousands_sep == 0)
-thousands_sep = ',';
-			if (!grouping || !*grouping)
-grouping = "\3";
+			/* Use grouping if defined by locale */
+			if (thousands_sep && grouping && *grouping)
+flags |= GROUPING;
+			else {
+thousands_sep = '\0';
+grouping = NULL;
+			}
 			goto rflag;
 		case '.':
 			if ((ch = *fmt++) == '*') {

Index: src/tests/lib/libc/locale/t_sprintf.c
diff -u src/tests/lib/libc/locale/t_sprintf.c:1.1 src/tests/lib/libc/locale/t_sprintf.c:1.1.2.1
--- src/tests/lib/libc/locale/t_sprintf.c:1.1	Tue May 30 23:44:02 2017
+++ src/tests/lib/libc/locale/t_sprintf.c	Wed Mar 14 18:37:00 2018
@@ -1,11 +1,11 @@
-/* $NetBSD: t_sprintf.c,v 1.1 2017/05/30 23:44:02 perseant Exp $ */
+/* $NetBSD: t_sprintf.c,v 1.1.2.1 2018/03/14 18:37:00 bouyer Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Konrad Schroder
+ * by Konrad Schroder.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2017\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sprintf.c,v 1.1 2017/05/30 23:44:02 perseant Exp $");
+__RCSID("$NetBSD: t_sprintf.c,v 1.1.2.1 2018/03/14 18:37:00 bouyer Exp $");
 
 #include 
 #include 
@@ -53,14 +53,6 @@ static struct test {
 	const char *double_input;
 } tests[] = {
 	{
-		"C",
-		-12345,
-		"-12,345",
-		"-12345",
-		-12345.6789,
-		"-12,345.678900",
-		"-12345.678900",
-	}, {
 		"en_US.UTF-8",
 		-12345,
 		"-12,345",
@@ -77,6 +69,30 @@ static struct test {
 		"-12\240345,678900",
 		"-12345,678900",
 	}, {
+		"it_IT.ISO8859-1",
+		-12345,
+		"-12.345",
+		"-12345",
+		-12345.6789,
+		"-12.345,678900",
+		"-12345,678900",
+	}, {
+		"POSIX",
+		/*
+		 * POSIX-1.2008 specifies that the C and POSIX
+		 * locales shall be identical (section 7.2) and
+		 * that the POSIX locale shall have an empty
+		 * thousands separator and "" as its
+		 * decimal point (section 7.3.4).  *printf
+		 * ought to honor these settings.
+		 */
+		-12345,
+		"-12345",
+		"-12345",
+		-12345.6789,
+		"-12345.678900",
+		"-12345.678900",
+	}, {
 		NULL,
 		0,
 		NULL,
@@ -95,12 +111,18 @@ h_sprintf(const struct test *t)
 	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
 	printf("Trying locale %s...\n", t->locale);
 	ATF_REQUIRE(setlocale(LC_NUMERIC, t->locale) != NULL);
+	printf("Using locale: %s\n", setlocale(LC_ALL, NULL));
+
+	if (!strcmp("POSIX", t->locale))
+	atf_tc_expect_fail("%s", "PR standards/52282, printf doesn't respect empty thousands separator");
 
 	sprintf(buf, "%'f", t->double_value);
 	ATF_REQUIRE_STREQ(buf, t->double_result);
 
 	sprintf(buf, 

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 14 17:40:41 UTC 2018

Modified Files:
src/sys/arch/x86/x86: cpu.c x86_machdep.c

Log Message:
Spectre V2 mitigation for certain families of AMD CPUs.

A new sysctl is added, machdep.spectreV2.mitigated, that controls whether
Spectre V2 is mitigated. For now it defaults to "false".

The code is written in such a way that there can be several methods. For
now only one method is supported, on AMD Families 10h, 12h and 16h, where
an MSR is available to disable branch prediction entirely.

Compile-tested on Intel, AMD will be tested soon.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/x86/x86/x86_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/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.150 src/sys/arch/x86/x86/cpu.c:1.151
--- src/sys/arch/x86/x86/cpu.c:1.150	Sun Mar 11 13:38:02 2018
+++ src/sys/arch/x86/x86/cpu.c	Wed Mar 14 17:40:41 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.150 2018/03/11 13:38:02 maxv Exp $	*/
+/*	$NetBSD: cpu.c,v 1.151 2018/03/14 17:40:41 maxv Exp $	*/
 
 /*
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.150 2018/03/11 13:38:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.151 2018/03/14 17:40:41 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
@@ -82,6 +82,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.15
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -104,6 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.15
 #include 
 
 #include 
+#include 
 
 #if NLAPIC > 0
 #include 
@@ -1334,3 +1337,172 @@ cpu_kick(struct cpu_info *ci)
 {
 	x86_send_ipi(ci, 0);
 }
+
+#if !defined(XEN)
+
+/* - */
+
+/*
+ * Speculation-related mitigations.
+ */
+
+enum spec_mitigation {
+	MITIGATION_NONE,
+	MITIGATION_AMD_DIS_IND,
+	MITIGATION_INTEL_IBRS
+};
+
+bool spec_mitigation_enabled __read_mostly = false;
+static enum spec_mitigation mitigation_method = MITIGATION_NONE;
+
+static void
+speculation_detect_method(void)
+{
+	struct cpu_info *ci = curcpu();
+
+	if (cpu_vendor == CPUVENDOR_INTEL) {
+		/* TODO: detect MITIGATION_INTEL_IBRS */
+		mitigation_method = MITIGATION_NONE;
+	} else if (cpu_vendor == CPUVENDOR_AMD) {
+		switch (CPUID_TO_FAMILY(ci->ci_signature)) {
+		case 0x10:
+		case 0x12:
+		case 0x16:
+			mitigation_method = MITIGATION_AMD_DIS_IND;
+			break;
+		default:
+			mitigation_method = MITIGATION_NONE;
+			break;
+		}
+	} else {
+		mitigation_method = MITIGATION_NONE;
+	}
+}
+
+static void
+mitigation_disable_cpu(void *arg1, void *arg2)
+{
+	uint64_t msr;
+
+	switch (mitigation_method) {
+	case MITIGATION_NONE:
+		panic("impossible");
+		break;
+	case MITIGATION_AMD_DIS_IND:
+		msr = rdmsr(MSR_IC_CFG);
+		msr &= ~IC_CFG_DIS_IND;
+		wrmsr(MSR_IC_CFG, msr);
+		break;
+	case MITIGATION_INTEL_IBRS:
+		/* ibrs_disable() TODO */
+		break;
+	}
+}
+
+static void
+mitigation_enable_cpu(void *arg1, void *arg2)
+{
+	uint64_t msr;
+
+	switch (mitigation_method) {
+	case MITIGATION_NONE:
+		panic("impossible");
+		break;
+	case MITIGATION_AMD_DIS_IND:
+		msr = rdmsr(MSR_IC_CFG);
+		msr |= IC_CFG_DIS_IND;
+		wrmsr(MSR_IC_CFG, msr);
+		break;
+	case MITIGATION_INTEL_IBRS:
+		/* ibrs_enable() TODO */
+		break;
+	}
+}
+
+static int
+mitigation_disable(void)
+{
+	uint64_t xc;
+
+	speculation_detect_method();
+
+	switch (mitigation_method) {
+	case MITIGATION_NONE:
+		printf("[!] No mitigation available\n");
+		return EOPNOTSUPP;
+	case MITIGATION_AMD_DIS_IND:
+		printf("[+] Disabling SpectreV2 Mitigation...");
+		xc = xc_broadcast(0, mitigation_disable_cpu,
+		NULL, NULL);
+		xc_wait(xc);
+		printf(" done!\n");
+		spec_mitigation_enabled = false;
+		return 0;
+	case MITIGATION_INTEL_IBRS:
+		/* TODO */
+		return 0;
+	default:
+		panic("impossible");
+	}
+}
+
+static int
+mitigation_enable(void)
+{
+	uint64_t xc;
+
+	speculation_detect_method();
+
+	switch (mitigation_method) {
+	case MITIGATION_NONE:
+		printf("[!] No mitigation available\n");
+		return EOPNOTSUPP;
+	case MITIGATION_AMD_DIS_IND:
+		printf("[+] Enabling SpectreV2 Mitigation...");
+		xc = xc_broadcast(0, mitigation_enable_cpu,
+		NULL, NULL);
+		xc_wait(xc);
+		printf(" done!\n");
+		spec_mitigation_enabled = true;
+		return 0;
+	case MITIGATION_INTEL_IBRS:
+		/* TODO */
+		return 0;
+	default:
+		panic("impossible");
+	}
+}
+
+int sysctl_machdep_spectreV2_mitigated(SYSCTLFN_ARGS);
+
+int
+sysctl_machdep_spectreV2_mitigated(SYSCTLFN_ARGS)
+{
+	struct sysctlnode node;
+	int error, val;
+
+	val = *(int *)rnode->sysctl_data;
+
+	node = *rnode;
+	node.sysctl_data = 
+
+	error = sysctl_lookup(SYSCTLFN_CALL());
+	if (error != 0 || newp == NULL)
+		return error;
+
+	

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 14 15:03:16 UTC 2018

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
... and also add IBPB ...


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/x86/include/specialreg.h

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

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.116 src/sys/arch/x86/include/specialreg.h:1.117
--- src/sys/arch/x86/include/specialreg.h:1.116	Wed Mar 14 14:44:25 2018
+++ src/sys/arch/x86/include/specialreg.h	Wed Mar 14 15:03:16 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.116 2018/03/14 14:44:25 maxv Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.117 2018/03/14 15:03:16 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -633,6 +633,7 @@
 #define 	IA32_SPEC_CTRL_IBRS	0x01
 #define 	IA32_SPEC_CTRL_STIBP	0x02
 #define MSR_IA32_PRED_CMD	0x049
+#define 	IA32_PRED_CMD_IBPB	0x01
 #define MSR_BIOS_UPDT_TRIG	0x079
 #define MSR_BBL_CR_D0		0x088	/* PII+ only */
 #define MSR_BBL_CR_D1		0x089	/* PII+ only */

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 14 14:44:25 UTC 2018

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
Add the IBRS and STIBP MSRs.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/x86/include/specialreg.h

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

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.115 src/sys/arch/x86/include/specialreg.h:1.116
--- src/sys/arch/x86/include/specialreg.h:1.115	Wed Mar 14 14:15:02 2018
+++ src/sys/arch/x86/include/specialreg.h	Wed Mar 14 14:44:25 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.115 2018/03/14 14:15:02 maxv Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.116 2018/03/14 14:44:25 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -630,6 +630,8 @@
 #define MSR_EBC_FREQUENCY_ID	0x02c	/* PIV only */
 #define MSR_TEST_CTL		0x033
 #define MSR_IA32_SPEC_CTRL	0x048
+#define 	IA32_SPEC_CTRL_IBRS	0x01
+#define 	IA32_SPEC_CTRL_STIBP	0x02
 #define MSR_IA32_PRED_CMD	0x049
 #define MSR_BIOS_UPDT_TRIG	0x079
 #define MSR_BBL_CR_D0		0x088	/* PII+ only */

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 14 14:15:02 UTC 2018

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
Add IC_CFG.DIS_IND: "Disable Indirect Branch Predictor". Available (at
least) on AMD Families 10h, 12h and 16h.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/x86/include/specialreg.h

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

Modified files:

Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.114 src/sys/arch/x86/include/specialreg.h:1.115
--- src/sys/arch/x86/include/specialreg.h:1.114	Mon Mar 12 07:12:54 2018
+++ src/sys/arch/x86/include/specialreg.h	Wed Mar 14 14:15:02 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.114 2018/03/12 07:12:54 msaitoh Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.115 2018/03/14 14:15:02 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -842,6 +842,7 @@
 
 #define MSR_IC_CFG	0xc0011021
 #define 	IC_CFG_DIS_SEQ_PREFETCH	0x0800
+#define 	IC_CFG_DIS_IND		0x4000
 
 #define MSR_DC_CFG	0xc0011022
 #define 	DC_CFG_DIS_CNV_WC_SSO	0x0008

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

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Wed Mar 14 13:23:31 UTC 2018

Modified Files:
src/distrib/sets/lists/xdebug: md.i386

Log Message:
Restore shlib version accidentally bumped in the previous commit.
Fix debug build for i386.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xdebug/md.i386

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/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.35 src/distrib/sets/lists/xdebug/md.i386:1.36
--- src/distrib/sets/lists/xdebug/md.i386:1.35	Mon Mar 12 18:48:49 2018
+++ src/distrib/sets/lists/xdebug/md.i386	Wed Mar 14 13:23:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.35 2018/03/12 18:48:49 mrg Exp $
+# $NetBSD: md.i386,v 1.36 2018/03/14 13:23:31 rin Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libIntelXvMC_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			-unknown-	debuglib,xorg
@@ -90,7 +90,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	-unknown-		xorg,debug,xorg_server_ver=118,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.18.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=118,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110

CVS commit: src/bin/sh

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Wed Mar 14 10:38:53 UTC 2018

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

Log Message:
Compute tag width for the list of options in Argument List Processing,
mandoc *is* up to that.  Remove the part of the comment before the
list that was wondering about that.


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.191 src/bin/sh/sh.1:1.192
--- src/bin/sh/sh.1:1.191	Wed Mar 14 10:30:40 2018
+++ src/bin/sh/sh.1	Wed Mar 14 10:38:52 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.191 2018/03/14 10:30:40 uwe Exp $
+.\"	$NetBSD: sh.1,v 1.192 2018/03/14 10:38:52 uwe Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -257,11 +257,8 @@ built-in (described later).
 .\" strlen("quietprofile") == strlen("local_lineno"): pick the latter
 .\" to give the indent as the _ in local_lineno, and the fi ligature in
 .\" quietprofile combine to make "local_lineno' slightly wider when printed
-.\" (in italics) in a variable width font.   Probably should test the actual
-.\" widths and use the wider, but I am not sure if mandoc is up to that...
-.\" (and I don't know how to get at the font that will be used easily anyway!)
-.\" The X's just provide a little extra space.
-.Bl -tag -width \-WXXlocal_linenoXX -offset indent
+.\" (in italics) in a variable width font.
+.Bl -tag -width ".Fl L Em local_lineno" -offset indent
 .\"
 .It Fl a Em allexport
 Automatically export any variable to which a value is assigned

CVS commit: src/bin/sh

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Wed Mar 14 10:30:40 UTC 2018

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

Log Message:
Small markup tweaks in Argument List Processing


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.190 src/bin/sh/sh.1:1.191
--- src/bin/sh/sh.1:1.190	Wed Mar 14 09:46:45 2018
+++ src/bin/sh/sh.1	Wed Mar 14 10:30:40 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.190 2018/03/14 09:46:45 uwe Exp $
+.\"	$NetBSD: sh.1,v 1.191 2018/03/14 10:30:40 uwe Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -220,7 +220,10 @@ was given, or if neither
 .Fl c
 nor any additional (non-option) arguments were present,
 the shell reads commands from its standard input.
+.\"
+.\"
 .Ss Argument List Processing
+.\"
 Currently, all of the single letter options that can meaningfully
 be set using the
 .Ic set
@@ -228,8 +231,8 @@ built-in, have a corresponding name
 that can be used as an argument to the
 .Fl o
 option.
-The set
-.Fl o
+The
+.Ic set Fl o
 name is provided next to the single letter option in
 the description below.
 Some options have only a long name, they are described after
@@ -242,9 +245,9 @@ only, either on the command line, or wit
 built-in command.
 Other options described are for the command line only.
 Specifying a dash
-.Dq -
+.Dq Cm \-
 turns the option on, while using a plus
-.Dq +
+.Dq Cm +
 disables the option.
 The following options can be set from the command line and,
 unless otherwise stated, with the

CVS commit: src/bin/sh

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Wed Mar 14 09:46:45 UTC 2018

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

Log Message:
Instead of .Oo/.Oc use .Op directly where possible.


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.189 src/bin/sh/sh.1:1.190
--- src/bin/sh/sh.1:1.189	Wed Mar 14 09:42:37 2018
+++ src/bin/sh/sh.1	Wed Mar 14 09:46:45 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.189 2018/03/14 09:42:37 uwe Exp $
+.\"	$NetBSD: sh.1,v 1.190 2018/03/14 09:46:45 uwe Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -50,7 +50,7 @@
 .Op Cm +o Ar option_name
 .Ek
 .Bk -words
-.Op Ar command_file Oo Ar argument ... Oc
+.Op Ar command_file Op Ar argument ...
 .Ek
 .Nm
 .Fl c
@@ -65,7 +65,7 @@
 .Ek
 .Bk -words
 .Ar command_string
-.Op Ar command_name Oo Ar argument ... Oc
+.Op Ar command_name Op Ar argument ...
 .Ek
 .Nm
 .Fl s
@@ -2053,7 +2053,7 @@ be built in for efficiency (e.g.
 .Xr test 1 ,
 etc).
 .Bl -tag -width 5n
-.It Ic \&: Oo Ar arg ... Oc
+.It Ic \&: Op Ar arg ...
 A null command that returns a 0 (true) exit value.
 Any arguments or redirects are evaluated, then ignored.
 .It Ic \&. Ar file
@@ -2239,7 +2239,7 @@ If
 is given it is used as the exit status of the shell; otherwise the
 exit status of the preceding command (the current value of $?) is used.
 .It Ic export Oo Fl npx Oc Ar name ...
-.It Ic export Fl p Oo Fl x Oc
+.It Ic export Fl p Op Fl x
 With no options,
 but one or more names,
 the specified names are exported so that they will appear in the
@@ -3164,7 +3164,7 @@ command, tracked alias and not found.
 For aliases the alias expansion is
 printed; for commands and tracked aliases the complete pathname of the
 command is printed.
-.It Ic ulimit Oo Fl H \*(Ba Fl S Oc Oo Fl a \*(Ba Fl btfdscmlrpnv Oo Ar value Oc Oc
+.It Ic ulimit Oo Fl H \*(Ba Fl S Oc Op Fl a \*(Ba Fl btfdscmlrpnv Op Ar value
 Inquire about or set the hard or soft limits on processes or set new
 limits.
 The choice between hard limit (which no process is allowed to

CVS commit: src/bin/sh

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Wed Mar 14 09:42:37 UTC 2018

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

Log Message:
Revert previous.  Fix the real problem properly.


To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.188 src/bin/sh/sh.1:1.189
--- src/bin/sh/sh.1:1.188	Wed Mar 14 07:53:14 2018
+++ src/bin/sh/sh.1	Wed Mar 14 09:42:37 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.188 2018/03/14 07:53:14 wiz Exp $
+.\"	$NetBSD: sh.1,v 1.189 2018/03/14 09:42:37 uwe Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -2053,7 +2053,7 @@ be built in for efficiency (e.g.
 .Xr test 1 ,
 etc).
 .Bl -tag -width 5n
-.It : Oo Ar arg ... Oc
+.It Ic \&: Oo Ar arg ... Oc
 A null command that returns a 0 (true) exit value.
 Any arguments or redirects are evaluated, then ignored.
 .It Ic \&. Ar file

CVS commit: src/external/mit/xorg/include/xorgproto/X11

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 09:38:33 UTC 2018

Modified Files:
src/external/mit/xorg/include/xorgproto/X11: Makefile

Log Message:
Xfuncproto.h is a normal file now.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/include/xorgproto/X11/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/X11/Makefile
diff -u src/external/mit/xorg/include/xorgproto/X11/Makefile:1.1 src/external/mit/xorg/include/xorgproto/X11/Makefile:1.2
--- src/external/mit/xorg/include/xorgproto/X11/Makefile:1.1	Wed Mar 14 08:55:35 2018
+++ src/external/mit/xorg/include/xorgproto/X11/Makefile	Wed Mar 14 09:38:33 2018
@@ -1,14 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2018/03/14 08:55:35 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2018/03/14 09:38:33 mrg Exp $
 
 .include 
 
 .PATH:	${X11SRCDIR.xorgproto}/include/X11
 
-Xfuncproto.h: Xfuncproto.h.in
-	${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/'  \
-	-e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \
-	< ${.ALLSRC} > ${.TARGET}
-
 Xpoll.h: Xpoll.h.in
 	${TOOL_SED} 's/@USE_FDS_BITS@/fds_bits/' \
 	< ${.ALLSRC} > ${.TARGET}
@@ -41,11 +36,12 @@ INCS=	DECkeysym.h \
 	keysymdef.h
 INCSDIR=${X11INCDIR}/X11
 
-CLEANFILES+=	Xpoll.h Xfuncproto.h
+CLEANFILES+=	Xpoll.h
 
 NOOBJ=	# defined
 
 SUBDIR= PM dri extensions fonts
 
 .include 
+.include 
 .include 

CVS commit: src/sys/net/npf

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Wed Mar 14 09:32:04 UTC 2018

Modified Files:
src/sys/net/npf: npf_sendpkt.c

Log Message:
Fix the "return-rst" rule on IPv6 packets.

The scopes needed to be set on the addresses before invoking ip6_output,
because ip6_output needs them. The reason they are not here already is
because pfil_run_hooks (in ip6_input) is called _before_ the kernel
initializes the scopes.

Until now ip6_output was always failing, and the IPv6-TCP-RST packet was
never actually sent.

Perhaps it would be better to have the kernel initialize the scopes
before invoking pfil_run_hooks, but several things will need to be fixed
in several places.

Tested with a simple TCPv6 server. Until now the client would block
waiting for an answer that never came; now it receives an RST right away
and closes the connection, as expected.

I believe that the same problem exists in the "return-icmp" rules, but I
can't investigate this right now (some problems with wireshark).


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/net/npf/npf_sendpkt.c

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

Modified files:

Index: src/sys/net/npf/npf_sendpkt.c
diff -u src/sys/net/npf/npf_sendpkt.c:1.16 src/sys/net/npf/npf_sendpkt.c:1.17
--- src/sys/net/npf/npf_sendpkt.c:1.16	Mon Dec 26 23:05:06 2016
+++ src/sys/net/npf/npf_sendpkt.c	Wed Mar 14 09:32:04 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_sendpkt.c,v 1.16 2016/12/26 23:05:06 christos Exp $	*/
+/*	$NetBSD: npf_sendpkt.c,v 1.17 2018/03/14 09:32:04 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2010-2011 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #ifdef _KERNEL
 #include 
-__KERNEL_RCSID(0, "$NetBSD: npf_sendpkt.c,v 1.16 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_sendpkt.c,v 1.17 2018/03/14 09:32:04 maxv Exp $");
 
 #include 
 #include 
@@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_sendpkt.
 #include 
 #include 
 #include 
+#include 
 #include 
 #endif
 
@@ -175,11 +176,29 @@ npf_return_tcp(npf_cache_t *npc)
 		sizeof(struct tcphdr));
 	}
 
+	/* Handle IPv6 scopes */
+	if (npf_iscached(npc, NPC_IP6)) {
+		const struct ifnet *rcvif = npc->npc_nbuf->nb_ifp;
+
+		if (in6_clearscope(>ip6_src) ||
+		in6_clearscope(>ip6_dst)) {
+			goto bad;
+		}
+		if (in6_setscope(>ip6_src, rcvif, NULL) ||
+		in6_setscope(>ip6_dst, rcvif, NULL)) {
+			goto bad;
+		}
+	}
+
 	/* Pass to IP layer. */
 	if (npf_iscached(npc, NPC_IP4)) {
 		return ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL);
 	}
 	return ip6_output(m, NULL, NULL, IPV6_FORWARDING, NULL, NULL, NULL);
+
+bad:
+	m_freem(m);
+	return EINVAL;
 }
 
 /*

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 09:09:46 UTC 2018

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/include: Makefile

Log Message:
obsolete fontcacheproto.
prepare for xorgproto - split the non replaced list out.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/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/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.196 src/distrib/sets/lists/xcomp/mi:1.197
--- src/distrib/sets/lists/xcomp/mi:1.196	Sun Mar 11 23:49:39 2018
+++ src/distrib/sets/lists/xcomp/mi	Wed Mar 14 09:09:46 2018
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.196 2018/03/11 23:49:39 christos Exp $
+#	 $NetBSD: mi,v 1.197 2018/03/14 09:09:46 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -407,9 +407,9 @@
 ./usr/X11R7/include/X11/extensions/dri3proto.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/evieproto.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/extutil.h		-unknown-	xorg
-./usr/X11R7/include/X11/extensions/fontcache.h		-unknown-	xorg
-./usr/X11R7/include/X11/extensions/fontcacheP.h		-unknown-	xorg
-./usr/X11R7/include/X11/extensions/fontcachstr.h	-unknown-	xorg
+./usr/X11R7/include/X11/extensions/fontcache.h		-unknown-	obsolete
+./usr/X11R7/include/X11/extensions/fontcacheP.h		-unknown-	obsolete
+./usr/X11R7/include/X11/extensions/fontcachstr.h	-unknown-	obsolete
 ./usr/X11R7/include/X11/extensions/ge.h			-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/geproto.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/lbx.h		-unknown-	xorg
@@ -1304,7 +1304,7 @@
 ./usr/X11R7/lib/pkgconfig/epoxy.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/evieproto.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/fixesproto.pc			-unknown-	xorg
-./usr/X11R7/lib/pkgconfig/fontcacheproto.pc		-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/fontcacheproto.pc		-unknown-	obsolete
 ./usr/X11R7/lib/pkgconfig/fontconfig.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/fontenc.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/fontsproto.pc			-unknown-	xorg

Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.5 src/external/mit/xorg/include/Makefile:1.6
--- src/external/mit/xorg/include/Makefile:1.5	Sun Mar 16 23:25:15 2014
+++ src/external/mit/xorg/include/Makefile	Wed Mar 14 09:09:46 2018
@@ -1,13 +1,17 @@
-#	$NetBSD: Makefile,v 1.5 2014/03/16 23:25:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2018/03/14 09:09:46 mrg Exp $
 
 # *proto packages for xorg
 
+.if 0
+SUBDIR=	xorgproto
+.else
 SUBDIR=	xproto fontsproto bigreqsproto kbproto xcmiscproto xf86bigfontproto \
 	fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \
 	resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
-	compositeproto damageproto trapproto glproto randrproto fontcacheproto \
+	compositeproto damageproto trapproto glproto randrproto \
 	xf86driproto xf86vidmodeproto renderproto dri2proto dri3proto \
-	presentproto xproxymanagementprotocol xbitmaps xcb-proto .WAIT \
-	xtrans
+	presentproto xproxymanagementprotocol
+.endif
+SUBDIR+= xbitmaps xcb-proto .WAIT xtrans
 
 .include 

CVS commit: src/external/mit/xorg/include/xorgproto

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 08:55:36 UTC 2018

Added Files:
src/external/mit/xorg/include/xorgproto: Makefile
src/external/mit/xorg/include/xorgproto/GL: Makefile
src/external/mit/xorg/include/xorgproto/GL/internal: Makefile
src/external/mit/xorg/include/xorgproto/X11: Makefile
src/external/mit/xorg/include/xorgproto/X11/PM: Makefile
src/external/mit/xorg/include/xorgproto/X11/dri: Makefile
src/external/mit/xorg/include/xorgproto/X11/extensions: Makefile
src/external/mit/xorg/include/xorgproto/X11/fonts: Makefile

Log Message:
reacharound framework for xorgproto.  functionally identical
to the split *proto packages except we're dropping the long
obsolete fontcacheproto.

not used yet.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/xorgproto/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/xorgproto/GL/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/include/xorgproto/GL/internal/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/include/xorgproto/X11/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/include/xorgproto/X11/PM/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/include/xorgproto/X11/dri/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/include/xorgproto/X11/extensions/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/include/xorgproto/X11/fonts/Makefile

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

Added files:

Index: src/external/mit/xorg/include/xorgproto/Makefile
diff -u /dev/null src/external/mit/xorg/include/xorgproto/Makefile:1.1
--- /dev/null	Wed Mar 14 08:55:36 2018
+++ src/external/mit/xorg/include/xorgproto/Makefile	Wed Mar 14 08:55:35 2018
@@ -0,0 +1,42 @@
+#	$NetBSD: Makefile,v 1.1 2018/03/14 08:55:35 mrg Exp $
+
+.include 
+
+SUBDIR=	GL X11
+
+PKGCONFIG= bigreqsproto \
+	compositeproto \
+	damageproto \
+	dri2proto \
+	dri3proto \
+	evieproto \
+	fixesproto \
+	fontcacheproto \
+	fontsproto \
+	glproto \
+	inputproto \
+	kbproto \
+	presentproto \
+	randrproto \
+	recordproto \
+	renderproto \
+	resourceproto \
+	scrnsaverproto \
+	trapproto \
+	videoproto \
+	xcmiscproto \
+	xextproto \
+	xf86bigfontproto \
+	xf86dgaproto \
+	xf86driproto \
+	xf86miscproto \
+	xf86vidmodeproto \
+	xineramaproto \
+	xproto \
+	xproxymngproto
+PKGDIST=xorgproto
+
+.include 
+.include 
+
+.PATH:	${X11SRCDIR.xorgproto}

Index: src/external/mit/xorg/include/xorgproto/GL/Makefile
diff -u /dev/null src/external/mit/xorg/include/xorgproto/GL/Makefile:1.1
--- /dev/null	Wed Mar 14 08:55:36 2018
+++ src/external/mit/xorg/include/xorgproto/GL/Makefile	Wed Mar 14 08:55:35 2018
@@ -0,0 +1,19 @@
+#	$NetBSD: Makefile,v 1.1 2018/03/14 08:55:35 mrg Exp $
+
+.include 
+
+.PATH:  ${X11SRCDIR.xorgproto}/include/GL
+
+INCS=	glxint.h \
+	glxmd.h \
+	glxproto.h \
+	glxtokens.h
+INCSDIR=${X11INCDIR}/GL
+
+SUBDIR=	internal
+
+NOOBJ=  # defined
+
+.include 
+.include 
+.include 

Index: src/external/mit/xorg/include/xorgproto/GL/internal/Makefile
diff -u /dev/null src/external/mit/xorg/include/xorgproto/GL/internal/Makefile:1.1
--- /dev/null	Wed Mar 14 08:55:36 2018
+++ src/external/mit/xorg/include/xorgproto/GL/internal/Makefile	Wed Mar 14 08:55:35 2018
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.1 2018/03/14 08:55:35 mrg Exp $
+
+.include 
+
+.PATH:	${X11SRCDIR.xorgproto}/include/GL/internal
+
+INCS=	glcore.h
+INCSDIR=${X11INCDIR}/GL/internal
+
+NOOBJ=	# defined
+
+.include 
+.include 

Index: src/external/mit/xorg/include/xorgproto/X11/Makefile
diff -u /dev/null src/external/mit/xorg/include/xorgproto/X11/Makefile:1.1
--- /dev/null	Wed Mar 14 08:55:36 2018
+++ src/external/mit/xorg/include/xorgproto/X11/Makefile	Wed Mar 14 08:55:35 2018
@@ -0,0 +1,51 @@
+#	$NetBSD: Makefile,v 1.1 2018/03/14 08:55:35 mrg Exp $
+
+.include 
+
+.PATH:	${X11SRCDIR.xorgproto}/include/X11
+
+Xfuncproto.h: Xfuncproto.h.in
+	${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/'  \
+	-e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \
+	< ${.ALLSRC} > ${.TARGET}
+
+Xpoll.h: Xpoll.h.in
+	${TOOL_SED} 's/@USE_FDS_BITS@/fds_bits/' \
+	< ${.ALLSRC} > ${.TARGET}
+
+INCS=	DECkeysym.h \
+	HPkeysym.h \
+	Sunkeysym.h \
+	X.h \
+	XF86keysym.h \
+	XWDFile.h \
+	Xalloca.h \
+	Xarch.h \
+	Xatom.h \
+	Xdefs.h \
+	Xfuncproto.h \
+	Xfuncs.h \
+	Xmd.h \
+	Xos.h \
+	Xos_r.h \
+	Xosdefs.h \
+	Xpoll.h \
+	Xproto.h \
+	Xprotostr.h \
+	Xthreads.h \
+	Xw32defs.h \
+	Xwindows.h \
+	Xwinsock.h \
+	ap_keysym.h \
+	keysym.h \
+	keysymdef.h
+INCSDIR=${X11INCDIR}/X11
+
+CLEANFILES+=	Xpoll.h Xfuncproto.h
+
+NOOBJ=	# defined
+
+SUBDIR= PM dri extensions fonts
+
+.include 
+.include 

Index: src/external/mit/xorg/include/xorgproto/X11/PM/Makefile
diff -u /dev/null src/external/mit/xorg/include/xorgproto/X11/PM/Makefile:1.1
--- /dev/null	Wed Mar 14 08:55:36 2018
+++ 

CVS commit: xsrc/external/mit/xorgproto/dist/include/X11

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 07:57:44 UTC 2018

Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11: Xpoll.h.in

Log Message:
merge our local fixes for Xpoll.h.in -- moves FD_SETSIZE.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in

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/xorgproto/dist/include/X11/Xpoll.h.in
diff -u xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in:1.1.1.1 xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in:1.2
--- xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in:1.1.1.1	Wed Mar 14 07:25:45 2018
+++ xsrc/external/mit/xorgproto/dist/include/X11/Xpoll.h.in	Wed Mar 14 07:57:43 2018
@@ -54,6 +54,15 @@ from The Open Group.
 
 #ifndef USE_POLL
 
+#if defined(FD_SETSIZE) && FD_SETSIZE < 512
+# define XFD_SETSIZE	FD_SETSIZE
+#else
+# define XFD_SETSIZE	512
+# ifndef FD_SETSIZE
+#  define FD_SETSIZE	XFD_SETSIZE
+# endif
+#endif
+
 #include 
 
 #include   /* Get the FD_* macros. */
@@ -67,15 +76,6 @@ typedef long fd_mask;
 # endif
 #endif
 
-#if defined(FD_SETSIZE) && FD_SETSIZE < 512
-# define XFD_SETSIZE	FD_SETSIZE
-#else
-# define XFD_SETSIZE	512
-# ifndef FD_SETSIZE
-#  define FD_SETSIZE	XFD_SETSIZE
-# endif
-#endif
-
 #ifndef NBBY
 #define NBBY	8		/* number of bits in a byte */
 #endif

CVS commit: src/sys/netinet6

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Mar 14 07:56:32 UTC 2018

Modified Files:
src/sys/netinet6: in6_gif.c

Log Message:
Fix error checking in in6_gif_ctlinput().

if_gif.c:r1.133 introduces gif_update_variant() which ensure ifp->if_flags
is set IFF_RUNNING when gif_softc->gif_var->gv_{psrc,pdst} are not null.
So, in6_gif_ctlinput() is not required IFF_RUNNING checking. In contrast,
it is required gv_{psrc,pdst} NULL checking.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/netinet6/in6_gif.c

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

Modified files:

Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.90 src/sys/netinet6/in6_gif.c:1.91
--- src/sys/netinet6/in6_gif.c:1.90	Wed Jan 10 11:13:26 2018
+++ src/sys/netinet6/in6_gif.c	Wed Mar 14 07:56:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.90 2018/01/10 11:13:26 knakahara Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.91 2018/03/14 07:56:32 knakahara Exp $	*/
 /*	$KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.90 2018/01/10 11:13:26 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.91 2018/03/14 07:56:32 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -459,9 +459,11 @@ in6_gif_ctlinput(int cmd, const struct s
 	if (!ip6)
 		return NULL;
 
-	if ((sc->gif_if.if_flags & IFF_RUNNING) == 0)
-		return NULL;
 	var = gif_getref_variant(sc, );
+	if (var->gv_psrc == NULL || var->gv_pdst == NULL) {
+		gif_putref_variant(var, );
+		return NULL;
+	}
 	if (var->gv_psrc->sa_family != AF_INET6) {
 		gif_putref_variant(var, );
 		return NULL;

CVS commit: src/bin/sh

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Wed Mar 14 07:53:14 UTC 2018

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

Log Message:
Remove Ic macro without effect.


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/bin/sh/sh.1

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.187 src/bin/sh/sh.1:1.188
--- src/bin/sh/sh.1:1.187	Tue Mar 13 23:03:21 2018
+++ src/bin/sh/sh.1	Wed Mar 14 07:53:14 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.187 2018/03/13 23:03:21 uwe Exp $
+.\"	$NetBSD: sh.1,v 1.188 2018/03/14 07:53:14 wiz Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -2053,7 +2053,7 @@ be built in for efficiency (e.g.
 .Xr test 1 ,
 etc).
 .Bl -tag -width 5n
-.It Ic : Oo Ar arg ... Oc
+.It : Oo Ar arg ... Oc
 A null command that returns a 0 (true) exit value.
 Any arguments or redirects are evaluated, then ignored.
 .It Ic \&. Ar file

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 07:35:56 UTC 2018

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

Log Message:
add xorgproto srcdir.


To generate a diff of this commit:
cvs rdiff -u -r1.1048 -r1.1049 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.1048 src/share/mk/bsd.own.mk:1.1049
--- src/share/mk/bsd.own.mk:1.1048	Sun Mar 11 07:18:49 2018
+++ src/share/mk/bsd.own.mk	Wed Mar 14 07:35:56 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1048 2018/03/11 07:18:49 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.1049 2018/03/14 07:35:56 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1394,7 +1394,7 @@ X11SRCDIR.${_lib}?=		${X11SRCDIRMIT}/lib
 	xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
 	xinerama dri2 dri3 render resource record video xf86dga xf86misc \
 	xf86vidmode composite damage trap gl randr fontcache xf86dri \
-	present xcb-
+	present xcb- xorg
 X11SRCDIR.${_proto}proto?=		${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor
 

CVS import: xsrc/external/mit/xorgproto/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 07:25:47 UTC 2018

Update of /cvsroot/xsrc/external/mit/xorgproto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv26524

Log Message:
initial import of xorgproto-2018.4

Status:

Vendor Tag: xorg
Release Tags:   xorgproto-2018-4

N xsrc/external/mit/xorgproto/dist/COPYING-kbproto
N xsrc/external/mit/xorgproto/dist/aclocal.m4
N xsrc/external/mit/xorgproto/dist/COPYING-fontsproto
N xsrc/external/mit/xorgproto/dist/presentproto.txt
N xsrc/external/mit/xorgproto/dist/lg3dproto.pc.in
N xsrc/external/mit/xorgproto/dist/kbproto.pc.in
N xsrc/external/mit/xorgproto/dist/dri2proto.txt
N xsrc/external/mit/xorgproto/dist/PM_spec
N xsrc/external/mit/xorgproto/dist/COPYING-windowswmproto
N xsrc/external/mit/xorgproto/dist/COPYING-xf86driproto
N xsrc/external/mit/xorgproto/dist/COPYING-xf86bigfontproto
N xsrc/external/mit/xorgproto/dist/COPYING-xf86dgaproto
N xsrc/external/mit/xorgproto/dist/COPYING-trapproto
N xsrc/external/mit/xorgproto/dist/xf86miscproto.pc.in
N xsrc/external/mit/xorgproto/dist/glproto.pc.in
N xsrc/external/mit/xorgproto/dist/windowswmproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-lg3dproto
N xsrc/external/mit/xorgproto/dist/damageproto.txt
N xsrc/external/mit/xorgproto/dist/randrproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-glproto
N xsrc/external/mit/xorgproto/dist/README
N xsrc/external/mit/xorgproto/dist/xineramaproto.pc.in
N xsrc/external/mit/xorgproto/dist/resproto.txt
N xsrc/external/mit/xorgproto/dist/COPYING-xf86miscproto
N xsrc/external/mit/xorgproto/dist/COPYING-videoproto
N xsrc/external/mit/xorgproto/dist/COPYING-evieproto
N xsrc/external/mit/xorgproto/dist/videoproto.pc.in
N xsrc/external/mit/xorgproto/dist/configure
N xsrc/external/mit/xorgproto/dist/COPYING-scrnsaverproto
N xsrc/external/mit/xorgproto/dist/xf86rushproto.pc.in
N xsrc/external/mit/xorgproto/dist/scrnsaverproto.pc.in
N xsrc/external/mit/xorgproto/dist/xproxymngproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-xf86vidmodeproto
N xsrc/external/mit/xorgproto/dist/meson.build
N xsrc/external/mit/xorgproto/dist/dri2proto.pc.in
N xsrc/external/mit/xorgproto/dist/fontsproto.pc.in
N xsrc/external/mit/xorgproto/dist/renderproto.txt
N xsrc/external/mit/xorgproto/dist/COPYING-printproto
N xsrc/external/mit/xorgproto/dist/COPYING-pmproto
N xsrc/external/mit/xorgproto/dist/Makefile.am
N xsrc/external/mit/xorgproto/dist/configure.ac
N xsrc/external/mit/xorgproto/dist/missing
N xsrc/external/mit/xorgproto/dist/xf86vidmodeproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-applewmproto
N xsrc/external/mit/xorgproto/dist/COPYING-xextproto
N xsrc/external/mit/xorgproto/dist/resourceproto.pc.in
N xsrc/external/mit/xorgproto/dist/xproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-damageproto
N xsrc/external/mit/xorgproto/dist/COPYING-bigreqsproto
N xsrc/external/mit/xorgproto/dist/dri3proto.pc.in
N xsrc/external/mit/xorgproto/dist/INSTALL
N xsrc/external/mit/xorgproto/dist/COPYING-renderproto
N xsrc/external/mit/xorgproto/dist/xcmiscproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-randrproto
N xsrc/external/mit/xorgproto/dist/dri3proto.txt
N xsrc/external/mit/xorgproto/dist/COPYING-resourceproto
N xsrc/external/mit/xorgproto/dist/install-sh
N xsrc/external/mit/xorgproto/dist/COPYING-dri3proto
N xsrc/external/mit/xorgproto/dist/COPYING-x11proto
N xsrc/external/mit/xorgproto/dist/COPYING-compositeproto
N xsrc/external/mit/xorgproto/dist/COPYING-fixesproto
N xsrc/external/mit/xorgproto/dist/applewmproto.pc.in
N xsrc/external/mit/xorgproto/dist/randrproto.txt
N xsrc/external/mit/xorgproto/dist/COPYING-recordproto
N xsrc/external/mit/xorgproto/dist/bigreqsproto.pc.in
N xsrc/external/mit/xorgproto/dist/xcalibrateproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-fontcacheproto
N xsrc/external/mit/xorgproto/dist/COPYING-dri2proto
N xsrc/external/mit/xorgproto/dist/xf86dgaproto.pc.in
N xsrc/external/mit/xorgproto/dist/compile
N xsrc/external/mit/xorgproto/dist/xf86bigfontproto.pc.in
N xsrc/external/mit/xorgproto/dist/compositeproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-xcmiscproto
N xsrc/external/mit/xorgproto/dist/COPYING-dmxproto
N xsrc/external/mit/xorgproto/dist/fixesproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-panoramixproto
N xsrc/external/mit/xorgproto/dist/recordproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-xf86rushproto
N xsrc/external/mit/xorgproto/dist/fontcacheproto.pc.in
N xsrc/external/mit/xorgproto/dist/damageproto.pc.in
N xsrc/external/mit/xorgproto/dist/evieproto.pc.in
N xsrc/external/mit/xorgproto/dist/Makefile.in
N xsrc/external/mit/xorgproto/dist/COPYING-xineramaproto
N xsrc/external/mit/xorgproto/dist/xv-protocol-v2.txt
N xsrc/external/mit/xorgproto/dist/printproto.pc.in
N xsrc/external/mit/xorgproto/dist/dmxproto.pc.in
N xsrc/external/mit/xorgproto/dist/COPYING-presentproto
N xsrc/external/mit/xorgproto/dist/presentproto.pc.in
N 

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 07:23:00 UTC 2018

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile.defines
src/external/mit/xorg/lib/libdrm_amdgpu: Makefile

Log Message:
update for libdrm 2.4.91.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libdrm/Makefile.defines
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libdrm_amdgpu/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/lib/libdrm/Makefile.defines
diff -u src/external/mit/xorg/lib/libdrm/Makefile.defines:1.2 src/external/mit/xorg/lib/libdrm/Makefile.defines:1.3
--- src/external/mit/xorg/lib/libdrm/Makefile.defines:1.2	Mon Mar  6 13:50:40 2017
+++ src/external/mit/xorg/lib/libdrm/Makefile.defines	Wed Mar 14 07:23:00 2018
@@ -1,15 +1,19 @@
-#	$NetBSD: Makefile.defines,v 1.2 2017/03/06 13:50:40 maya Exp $
+#	$NetBSD: Makefile.defines,v 1.3 2018/03/14 07:23:00 mrg Exp $
 
 # common defiles for libdrm components
 
 CPPFLAGS+=	-DHAVE_INTTYPES_H \
-		-DHAVE_NOUVEAU \
-		-DHAVE_RADEON \
-		-DHAVE_SETENV \
 		-DHAVE_STDINT_H \
 		-DHAVE_STRINGS_H \
 		-DHAVE_STRING_H  \
 		-DHAVE_SYS_STAT_H \
+		-DHAVE_SYS_SYSCTL_H \
 		-DHAVE_SYS_TYPES_H \
 		-DHAVE_UNISTD_H
+CPPFLAGS+=	-DHAVE_SETENV
 
+# NetBSD has __sync_*().
+CPPFLAGS+=	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES \
+
+CPPFLAGS+=	-DHAVE_NOUVEAU \
+		-DHAVE_RADEON

Index: src/external/mit/xorg/lib/libdrm_amdgpu/Makefile
diff -u src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.3 src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.4
--- src/external/mit/xorg/lib/libdrm_amdgpu/Makefile:1.3	Tue Aug 29 07:12:13 2017
+++ src/external/mit/xorg/lib/libdrm_amdgpu/Makefile	Wed Mar 14 07:23:00 2018
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.3 2017/08/29 07:12:13 mrg Exp $
+#  $NetBSD: Makefile,v 1.4 2018/03/14 07:23:00 mrg Exp $
 
 .include 
 
@@ -13,15 +13,16 @@ SRCS= \
 	amdgpu_device.c \
 	amdgpu_gpu_info.c \
 	amdgpu_vamgr.c \
+	amdgpu_vm.c \
 	util_hash.c \
 	util_hash_table.c
 
 LIBDRMDATADIR=	${X11ROOTDIR}/share/libdrm
+# XXX goes away in new libdrm.
 IDS_NENT!=	egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' ${X11SRCDIR.drm}/data/amdgpu.ids
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm} \
-		-DHAVE_SYS_SYSCTL_H
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
 CPPFLAGS+=	-DAMDGPU_ASIC_ID_TABLE=\"${LIBDRMDATADIR}/amdgpu.ids\" \
 		-DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(IDS_NENT)
 

CVS commit: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 07:19:26 UTC 2018

Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c

Log Message:
merge libdrm 2.4.91


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.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/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.9 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.10
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.9	Thu Feb 25 05:01:21 2016
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h	Wed Mar 14 07:19:26 2018
@@ -101,7 +101,7 @@ typedef struct { volatile LIBDRM_ATOMIC_
 
 #endif
 
-#if ! HAS_ATOMIC_OPS
+#if !defined(HAS_ATOMIC_OPS)
 #error libdrm requires atomic operations, please define them for your CPU/compiler.
 #endif
 

Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.15 xsrc/external/mit/libdrm/dist/xf86drm.c:1.16
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.15	Tue Aug 29 06:31:24 2017
+++ xsrc/external/mit/libdrm/dist/xf86drm.c	Wed Mar 14 07:19:26 2018
@@ -1696,6 +1696,43 @@ int drmUpdateDrawableInfo(int fd, drm_dr
 return 0;
 }
 
+int drmCrtcGetSequence(int fd, uint32_t crtcId, uint64_t *sequence, uint64_t *ns)
+{
+struct drm_crtc_get_sequence get_seq;
+int ret;
+
+memclear(get_seq);
+get_seq.crtc_id = crtcId;
+ret = drmIoctl(fd, DRM_IOCTL_CRTC_GET_SEQUENCE, _seq);
+if (ret)
+return ret;
+
+if (sequence)
+*sequence = get_seq.sequence;
+if (ns)
+*ns = get_seq.sequence_ns;
+return 0;
+}
+
+int drmCrtcQueueSequence(int fd, uint32_t crtcId, uint32_t flags, uint64_t sequence,
+ uint64_t *sequence_queued, uint64_t user_data)
+{
+struct drm_crtc_queue_sequence queue_seq;
+int ret;
+
+memclear(queue_seq);
+queue_seq.crtc_id = crtcId;
+queue_seq.flags = flags;
+queue_seq.sequence = sequence;
+queue_seq.user_data = user_data;
+
+ret = drmIoctl(fd, DRM_IOCTL_CRTC_QUEUE_SEQUENCE, _seq);
+if (ret == 0 && sequence_queued)
+*sequence_queued = queue_seq.sequence;
+
+return ret;
+}
+
 /**
  * Acquire the AGP device.
  *
@@ -4156,7 +4193,7 @@ int drmSyncobjCreate(int fd, uint32_t fl
 args.handle = 0;
 ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_CREATE, );
 if (ret)
-	return ret;
+return ret;
 *handle = args.handle;
 return 0;
 }
@@ -4180,7 +4217,7 @@ int drmSyncobjHandleToFD(int fd, uint32_
 args.handle = handle;
 ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, );
 if (ret)
-	return ret;
+return ret;
 *obj_fd = args.fd;
 return 0;
 }
@@ -4195,7 +4232,7 @@ int drmSyncobjFDToHandle(int fd, int obj
 args.handle = 0;
 ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE, );
 if (ret)
-	return ret;
+return ret;
 *handle = args.handle;
 return 0;
 }
@@ -4222,7 +4259,55 @@ int drmSyncobjExportSyncFile(int fd, uin
 args.flags = DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE;
 ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, );
 if (ret)
-	return ret;
+return ret;
 *sync_file_fd = args.fd;
 return 0;
 }
+
+int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles,
+   int64_t timeout_nsec, unsigned flags,
+   uint32_t *first_signaled)
+{
+struct drm_syncobj_wait args;
+int ret;
+
+memclear(args);
+args.handles = (uintptr_t)handles;
+args.timeout_nsec = timeout_nsec;
+args.count_handles = num_handles;
+args.flags = flags;
+
+ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_WAIT, );
+if (ret < 0)
+return -errno;
+
+if (first_signaled)
+*first_signaled = args.first_signaled;
+return ret;
+}
+
+int drmSyncobjReset(int fd, const uint32_t *handles, uint32_t handle_count)
+{
+struct drm_syncobj_array args;
+int ret;
+
+memclear(args);
+args.handles = (uintptr_t)handles;
+args.count_handles = handle_count;
+
+ret = drmIoctl(fd, DRM_IOCTL_SYNCOBJ_RESET, );
+return ret;

CVS import: xsrc/external/mit/libdrm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 07:18:38 UTC 2018

Update of /cvsroot/xsrc/external/mit/libdrm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1827

Log Message:
initial import of libdrm-2.4.91

Status:

Vendor Tag: xorg
Release Tags:   libdrm-2-4-91

C xsrc/external/mit/libdrm/dist/xf86drmMode.h
U xsrc/external/mit/libdrm/dist/Makefile.am
U xsrc/external/mit/libdrm/dist/configure
U xsrc/external/mit/libdrm/dist/configure.ac
U xsrc/external/mit/libdrm/dist/aclocal.m4
U xsrc/external/mit/libdrm/dist/libsync.h
C xsrc/external/mit/libdrm/dist/xf86drm.h
U xsrc/external/mit/libdrm/dist/util_double_list.h
U xsrc/external/mit/libdrm/dist/Makefile.in
U xsrc/external/mit/libdrm/dist/config.h.in
U xsrc/external/mit/libdrm/dist/Makefile.sources
U xsrc/external/mit/libdrm/dist/libdrm.pc.in
U xsrc/external/mit/libdrm/dist/README
C xsrc/external/mit/libdrm/dist/xf86drm.c
U xsrc/external/mit/libdrm/dist/xf86drmHash.c
U xsrc/external/mit/libdrm/dist/xf86drmHash.h
U xsrc/external/mit/libdrm/dist/xf86drmRandom.c
U xsrc/external/mit/libdrm/dist/xf86drmRandom.h
U xsrc/external/mit/libdrm/dist/xf86drmSL.c
C xsrc/external/mit/libdrm/dist/xf86drmMode.c
C xsrc/external/mit/libdrm/dist/xf86atomic.h
U xsrc/external/mit/libdrm/dist/libdrm_macros.h
U xsrc/external/mit/libdrm/dist/libdrm_lists.h
N xsrc/external/mit/libdrm/dist/meson_options.txt
U xsrc/external/mit/libdrm/dist/util_math.h
N xsrc/external/mit/libdrm/dist/meson.build
U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources
N xsrc/external/mit/libdrm/dist/amdgpu/meson.build
U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.am
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.in
U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
N xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c
U xsrc/external/mit/libdrm/dist/amdgpu/util_hash.c
U xsrc/external/mit/libdrm/dist/amdgpu/util_hash.h
U xsrc/external/mit/libdrm/dist/amdgpu/util_hash_table.c
U xsrc/external/mit/libdrm/dist/amdgpu/util_hash_table.h
U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbol-check
U xsrc/external/mit/libdrm/dist/build-aux/config.guess
U xsrc/external/mit/libdrm/dist/build-aux/compile
U xsrc/external/mit/libdrm/dist/build-aux/config.sub
U xsrc/external/mit/libdrm/dist/build-aux/depcomp
U xsrc/external/mit/libdrm/dist/build-aux/install-sh
U xsrc/external/mit/libdrm/dist/build-aux/ltmain.sh
U xsrc/external/mit/libdrm/dist/build-aux/missing
U xsrc/external/mit/libdrm/dist/build-aux/test-driver
N xsrc/external/mit/libdrm/dist/data/meson.build
U xsrc/external/mit/libdrm/dist/data/Makefile.am
U xsrc/external/mit/libdrm/dist/data/amdgpu.ids
U xsrc/external/mit/libdrm/dist/data/Makefile.in
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h
N xsrc/external/mit/libdrm/dist/etnaviv/meson.build
U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.am
U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources
U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.in
U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c
N xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h
U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbol-check
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h
N xsrc/external/mit/libdrm/dist/exynos/meson.build
U xsrc/external/mit/libdrm/dist/exynos/Makefile.am
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h
U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in
U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h
U xsrc/external/mit/libdrm/dist/exynos/Makefile.in
U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c
U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c
U xsrc/external/mit/libdrm/dist/exynos/exynos-symbol-check
U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h
N xsrc/external/mit/libdrm/dist/freedreno/meson.build
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h
U xsrc/external/mit/libdrm/dist/freedreno/Makefile.am
U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h
U xsrc/external/mit/libdrm/dist/freedreno/Makefile.in
U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources
U 

CVS commit: src/external/mit/xorg/lib/libxcb/files

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 06:47:28 UTC 2018

Modified Files:
src/external/mit/xorg/lib/libxcb/files: config.h dri3.c dri3.h
present.h randr.c randr.h res.c shm.c xinput.c xinput.h xkb.c
xproto.c

Log Message:
regenerate these for libxcb 1.13.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libxcb/files/config.h \
src/external/mit/xorg/lib/libxcb/files/xkb.c
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libxcb/files/dri3.c \
src/external/mit/xorg/lib/libxcb/files/dri3.h \
src/external/mit/xorg/lib/libxcb/files/present.h
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libxcb/files/randr.c \
src/external/mit/xorg/lib/libxcb/files/randr.h \
src/external/mit/xorg/lib/libxcb/files/res.c \
src/external/mit/xorg/lib/libxcb/files/shm.c \
src/external/mit/xorg/lib/libxcb/files/xinput.c \
src/external/mit/xorg/lib/libxcb/files/xinput.h \
src/external/mit/xorg/lib/libxcb/files/xproto.c

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

Modified files:

Index: src/external/mit/xorg/lib/libxcb/files/config.h
diff -u src/external/mit/xorg/lib/libxcb/files/config.h:1.4 src/external/mit/xorg/lib/libxcb/files/config.h:1.5
--- src/external/mit/xorg/lib/libxcb/files/config.h:1.4	Sun Mar  5 09:27:53 2017
+++ src/external/mit/xorg/lib/libxcb/files/config.h	Wed Mar 14 06:47:28 2018
@@ -77,7 +77,7 @@
 #define PACKAGE_NAME "libxcb"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxcb 1.12"
+#define PACKAGE_STRING "libxcb 1.13"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxcb"
@@ -86,13 +86,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.12"
+#define PACKAGE_VERSION "1.13"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 12
+#define PACKAGE_VERSION_MINOR 13
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -126,7 +126,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.12"
+#define VERSION "1.13"
 
 /* XCB buffer queue size */
 #define XCB_QUEUE_BUFFER_SIZE 16384
Index: src/external/mit/xorg/lib/libxcb/files/xkb.c
diff -u src/external/mit/xorg/lib/libxcb/files/xkb.c:1.4 src/external/mit/xorg/lib/libxcb/files/xkb.c:1.5
--- src/external/mit/xorg/lib/libxcb/files/xkb.c:1.4	Sun Mar  5 09:27:53 2017
+++ src/external/mit/xorg/lib/libxcb/files/xkb.c	Wed Mar 14 06:47:28 2018
@@ -11373,9 +11373,9 @@ xcb_xkb_set_device_info_checked (xcb_con
 struct iovec xcb_parts[8];
 xcb_void_cookie_t xcb_ret;
 xcb_xkb_set_device_info_request_t xcb_out;
-unsigned int i;
 unsigned int xcb_tmp_len;
 char *xcb_tmp;
+unsigned int i;
 
 xcb_out.deviceSpec = deviceSpec;
 xcb_out.firstBtn = firstBtn;
@@ -11428,9 +11428,9 @@ xcb_xkb_set_device_info (xcb_connection_
 struct iovec xcb_parts[8];
 xcb_void_cookie_t xcb_ret;
 xcb_xkb_set_device_info_request_t xcb_out;
-unsigned int i;
 unsigned int xcb_tmp_len;
 char *xcb_tmp;
+unsigned int i;
 
 xcb_out.deviceSpec = deviceSpec;
 xcb_out.firstBtn = firstBtn;

Index: src/external/mit/xorg/lib/libxcb/files/dri3.c
diff -u src/external/mit/xorg/lib/libxcb/files/dri3.c:1.3 src/external/mit/xorg/lib/libxcb/files/dri3.c:1.4
--- src/external/mit/xorg/lib/libxcb/files/dri3.c:1.3	Sun Mar  5 09:27:53 2017
+++ src/external/mit/xorg/lib/libxcb/files/dri3.c	Wed Mar 14 06:47:28 2018
@@ -176,6 +176,7 @@ xcb_dri3_pixmap_from_buffer_checked (xcb
 xcb_void_cookie_t xcb_ret;
 xcb_dri3_pixmap_from_buffer_request_t xcb_out;
 int fds[1];
+int fd_index = 0;
 
 xcb_out.pixmap = pixmap;
 xcb_out.drawable = drawable;
@@ -191,7 +192,7 @@ xcb_dri3_pixmap_from_buffer_checked (xcb
 xcb_parts[3].iov_base = 0;
 xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
 
-fds[0] = pixmap_fd;
+fds[fd_index++] = pixmap_fd;
 xcb_ret.sequence = xcb_send_request_with_fds(c, XCB_REQUEST_CHECKED, xcb_parts + 2, _req, 1, fds);
 return xcb_ret;
 }
@@ -219,6 +220,7 @@ xcb_dri3_pixmap_from_buffer (xcb_connect
 xcb_void_cookie_t xcb_ret;
 xcb_dri3_pixmap_from_buffer_request_t xcb_out;
 int fds[1];
+int fd_index = 0;
 
 xcb_out.pixmap = pixmap;
 xcb_out.drawable = drawable;
@@ -234,7 +236,7 @@ xcb_dri3_pixmap_from_buffer (xcb_connect
 xcb_parts[3].iov_base = 0;
 xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
 
-fds[0] = pixmap_fd;
+fds[fd_index++] = pixmap_fd;
 xcb_ret.sequence = xcb_send_request_with_fds(c, 0, xcb_parts + 2, _req, 1, fds);
 return xcb_ret;
 }
@@ -324,6 +326,7 @@ xcb_dri3_fence_from_fd_checked (xcb_conn
 xcb_void_cookie_t xcb_ret;
 xcb_dri3_fence_from_fd_request_t xcb_out;
 int fds[1];
+  

CVS commit: xsrc/external/mit/libxcb

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 06:43:46 UTC 2018

Modified Files:
xsrc/external/mit/libxcb/dist/src: xcb_in.c
xsrc/external/mit/libxcb/include: config.h
Removed Files:
xsrc/external/mit/libxcb/dist: compile config.guess config.sub depcomp
install-sh ltmain.sh missing

Log Message:
merge libxcb 1.13.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxcb/dist/compile
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libxcb/dist/config.guess \
xsrc/external/mit/libxcb/dist/config.sub
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libxcb/dist/depcomp \
xsrc/external/mit/libxcb/dist/ltmain.sh
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libxcb/dist/install-sh \
xsrc/external/mit/libxcb/dist/missing
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libxcb/dist/src/xcb_in.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libxcb/include/config.h

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

Modified files:

Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c
diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.5 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.6
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.5	Tue Oct  4 22:01:49 2016
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c	Wed Mar 14 06:43:45 2018
@@ -661,6 +661,8 @@ int xcb_poll_for_reply(xcb_connection_t 
 assert(reply != 0);
 pthread_mutex_lock(>iolock);
 ret = poll_for_reply(c, widen(c, request), reply, error);
+if(!ret && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+ret = poll_for_reply(c, widen(c, request), reply, error);
 pthread_mutex_unlock(>iolock);
 return ret;
 }
@@ -678,6 +680,8 @@ int xcb_poll_for_reply64(xcb_connection_
 assert(reply != 0);
 pthread_mutex_lock(>iolock);
 ret = poll_for_reply(c, request, reply, error);
+if(!ret && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+ret = poll_for_reply(c, request, reply, error);
 pthread_mutex_unlock(>iolock);
 return ret;
 }
@@ -768,6 +772,8 @@ xcb_generic_event_t *xcb_poll_for_specia
 return 0;
 pthread_mutex_lock(>iolock);
 event = get_special_event(c, se);
+if(!event && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+event = get_special_event(c, se);
 pthread_mutex_unlock(>iolock);
 return event;
 }

Index: xsrc/external/mit/libxcb/include/config.h
diff -u xsrc/external/mit/libxcb/include/config.h:1.7 xsrc/external/mit/libxcb/include/config.h:1.8
--- xsrc/external/mit/libxcb/include/config.h:1.7	Sun Mar  5 08:58:25 2017
+++ xsrc/external/mit/libxcb/include/config.h	Wed Mar 14 06:43:45 2018
@@ -75,7 +75,7 @@
 #define PACKAGE_NAME "libxcb"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxcb 1.12"
+#define PACKAGE_STRING "libxcb 1.13"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxcb"
@@ -84,13 +84,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.12"
+#define PACKAGE_VERSION "1.13"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 12
+#define PACKAGE_VERSION_MINOR 13
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -124,7 +124,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.12"
+#define VERSION "1.13"
 
 /* XCB buffer queue size */
 #define XCB_QUEUE_BUFFER_SIZE 16384

CVS import: xsrc/external/mit/libxcb/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 06:43:05 UTC 2018

Update of /cvsroot/xsrc/external/mit/libxcb/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv2658

Log Message:
initial import of libxcb-1.13

Status:

Vendor Tag: xorg
Release Tags:   libxcb-1-13

U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in
U xsrc/external/mit/libxcb/dist/Makefile.am
U xsrc/external/mit/libxcb/dist/configure
U xsrc/external/mit/libxcb/dist/configure.ac
U xsrc/external/mit/libxcb/dist/aclocal.m4
U xsrc/external/mit/libxcb/dist/Makefile.in
U xsrc/external/mit/libxcb/dist/xcb-present.pc.in
U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri3.pc.in
N xsrc/external/mit/libxcb/dist/xcb-ge.pc.in
U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in
U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in
U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in
U xsrc/external/mit/libxcb/dist/xcb-record.pc.in
U xsrc/external/mit/libxcb/dist/xcb-render.pc.in
U xsrc/external/mit/libxcb/dist/COPYING
U xsrc/external/mit/libxcb/dist/xcb-res.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in
U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in
U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in
U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in
U xsrc/external/mit/libxcb/dist/README
U xsrc/external/mit/libxcb/dist/check-pc-requires
U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in
U xsrc/external/mit/libxcb/dist/xcb.pc.in
U xsrc/external/mit/libxcb/dist/ChangeLog
U xsrc/external/mit/libxcb/dist/INSTALL
U xsrc/external/mit/libxcb/dist/NEWS
U xsrc/external/mit/libxcb/dist/autogen.sh
U xsrc/external/mit/libxcb/dist/build-aux/config.guess
U xsrc/external/mit/libxcb/dist/build-aux/compile
U xsrc/external/mit/libxcb/dist/build-aux/config.sub
U xsrc/external/mit/libxcb/dist/build-aux/install-sh
U xsrc/external/mit/libxcb/dist/build-aux/ltmain.sh
U xsrc/external/mit/libxcb/dist/build-aux/missing
U xsrc/external/mit/libxcb/dist/build-aux/test-driver
U xsrc/external/mit/libxcb/dist/build-aux/depcomp
U xsrc/external/mit/libxcb/dist/m4/lt~obsolete.m4
U xsrc/external/mit/libxcb/dist/m4/libtool.m4
U xsrc/external/mit/libxcb/dist/m4/ltoptions.m4
U xsrc/external/mit/libxcb/dist/m4/ltsugar.m4
U xsrc/external/mit/libxcb/dist/m4/ltversion.m4
U xsrc/external/mit/libxcb/dist/m4/xcb.m4
U xsrc/external/mit/libxcb/dist/tools/api_conv.pl
U xsrc/external/mit/libxcb/dist/tools/README
U xsrc/external/mit/libxcb/dist/tools/constants
U xsrc/external/mit/libxcb/dist/src/xcb_windefs.h
U xsrc/external/mit/libxcb/dist/src/Makefile.am
U xsrc/external/mit/libxcb/dist/src/xcbint.h
U xsrc/external/mit/libxcb/dist/src/xcb.h
U xsrc/external/mit/libxcb/dist/src/xcbext.h
U xsrc/external/mit/libxcb/dist/src/Makefile.in
U xsrc/external/mit/libxcb/dist/src/config.h.in
U xsrc/external/mit/libxcb/dist/src/xcb_conn.c
U xsrc/external/mit/libxcb/dist/src/xcb_out.c
C xsrc/external/mit/libxcb/dist/src/xcb_in.c
U xsrc/external/mit/libxcb/dist/src/xcb_ext.c
U xsrc/external/mit/libxcb/dist/src/xcb_xid.c
U xsrc/external/mit/libxcb/dist/src/xcb_list.c
U xsrc/external/mit/libxcb/dist/src/xcb_util.c
U xsrc/external/mit/libxcb/dist/src/xcb_auth.c
U xsrc/external/mit/libxcb/dist/src/c_client.py
U xsrc/external/mit/libxcb/dist/tests/check_suites.h
U xsrc/external/mit/libxcb/dist/tests/Makefile.am
U xsrc/external/mit/libxcb/dist/tests/Makefile.in
U xsrc/external/mit/libxcb/dist/tests/check_all.c
U xsrc/external/mit/libxcb/dist/tests/check_public.c
U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl
U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in
U xsrc/external/mit/libxcb/dist/doc/Makefile.am
U xsrc/external/mit/libxcb/dist/doc/Makefile.in
U xsrc/external/mit/libxcb/dist/doc/xkb_internals
U xsrc/external/mit/libxcb/dist/doc/xkb_issues
U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html
U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css
U xsrc/external/mit/libxcb/dist/man/xcb-examples.man
U xsrc/external/mit/libxcb/dist/man/Makefile.am
U xsrc/external/mit/libxcb/dist/man/Makefile.in
U xsrc/external/mit/libxcb/dist/man/xcb-requests.man

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

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libxcb/dist

CVS import: xsrc/external/mit/xcb-proto/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 06:43:06 UTC 2018

Update of /cvsroot/xsrc/external/mit/xcb-proto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv9739

Log Message:
initial import of xcb-proto-1.13

Status:

Vendor Tag: xorg
Release Tags:   xcb-proto-1-13

U xsrc/external/mit/xcb-proto/dist/xcb-proto.pc.in
U xsrc/external/mit/xcb-proto/dist/Makefile.am
U xsrc/external/mit/xcb-proto/dist/configure
U xsrc/external/mit/xcb-proto/dist/configure.ac
U xsrc/external/mit/xcb-proto/dist/aclocal.m4
U xsrc/external/mit/xcb-proto/dist/Makefile.in
U xsrc/external/mit/xcb-proto/dist/install-sh
U xsrc/external/mit/xcb-proto/dist/COPYING
U xsrc/external/mit/xcb-proto/dist/INSTALL
U xsrc/external/mit/xcb-proto/dist/NEWS
U xsrc/external/mit/xcb-proto/dist/README
U xsrc/external/mit/xcb-proto/dist/TODO
U xsrc/external/mit/xcb-proto/dist/missing
U xsrc/external/mit/xcb-proto/dist/autogen.sh
U xsrc/external/mit/xcb-proto/dist/py-compile
U xsrc/external/mit/xcb-proto/dist/doc/xml-xcb.txt
U xsrc/external/mit/xcb-proto/dist/src/composite.xml
U xsrc/external/mit/xcb-proto/dist/src/Makefile.am
U xsrc/external/mit/xcb-proto/dist/src/xcb.xsd
U xsrc/external/mit/xcb-proto/dist/src/xproto.xml
U xsrc/external/mit/xcb-proto/dist/src/bigreq.xml
U xsrc/external/mit/xcb-proto/dist/src/screensaver.xml
U xsrc/external/mit/xcb-proto/dist/src/damage.xml
U xsrc/external/mit/xcb-proto/dist/src/dpms.xml
U xsrc/external/mit/xcb-proto/dist/src/dri2.xml
U xsrc/external/mit/xcb-proto/dist/src/dri3.xml
U xsrc/external/mit/xcb-proto/dist/src/ge.xml
U xsrc/external/mit/xcb-proto/dist/src/glx.xml
U xsrc/external/mit/xcb-proto/dist/src/present.xml
U xsrc/external/mit/xcb-proto/dist/src/randr.xml
U xsrc/external/mit/xcb-proto/dist/src/record.xml
U xsrc/external/mit/xcb-proto/dist/src/render.xml
U xsrc/external/mit/xcb-proto/dist/src/res.xml
U xsrc/external/mit/xcb-proto/dist/src/shape.xml
U xsrc/external/mit/xcb-proto/dist/src/shm.xml
U xsrc/external/mit/xcb-proto/dist/src/sync.xml
U xsrc/external/mit/xcb-proto/dist/src/xc_misc.xml
U xsrc/external/mit/xcb-proto/dist/src/xevie.xml
U xsrc/external/mit/xcb-proto/dist/src/xf86dri.xml
U xsrc/external/mit/xcb-proto/dist/src/xf86vidmode.xml
U xsrc/external/mit/xcb-proto/dist/src/xfixes.xml
U xsrc/external/mit/xcb-proto/dist/src/xinerama.xml
U xsrc/external/mit/xcb-proto/dist/src/xinput.xml
U xsrc/external/mit/xcb-proto/dist/src/xkb.xml
U xsrc/external/mit/xcb-proto/dist/src/xprint.xml
U xsrc/external/mit/xcb-proto/dist/src/xselinux.xml
U xsrc/external/mit/xcb-proto/dist/src/xtest.xml
U xsrc/external/mit/xcb-proto/dist/src/xv.xml
U xsrc/external/mit/xcb-proto/dist/src/xvmc.xml
U xsrc/external/mit/xcb-proto/dist/src/Makefile.in
U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.am
U xsrc/external/mit/xcb-proto/dist/xcbgen/__init__.py
U xsrc/external/mit/xcb-proto/dist/xcbgen/error.py
U xsrc/external/mit/xcb-proto/dist/xcbgen/expr.py
U xsrc/external/mit/xcb-proto/dist/xcbgen/align.py
U xsrc/external/mit/xcb-proto/dist/xcbgen/matcher.py
U xsrc/external/mit/xcb-proto/dist/xcbgen/state.py
U xsrc/external/mit/xcb-proto/dist/xcbgen/xtypes.py
U xsrc/external/mit/xcb-proto/dist/xcbgen/Makefile.in

No conflicts created by this import

CVS commit: src/sys/arch/evbarm/fdt

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Wed Mar 14 06:35:31 UTC 2018

Modified Files:
src/sys/arch/evbarm/fdt: platform.h

Log Message:
fix compile error on evbarm/EXYNOS. platform.h may be included from *.S


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/fdt/platform.h

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

Modified files:

Index: src/sys/arch/evbarm/fdt/platform.h
diff -u src/sys/arch/evbarm/fdt/platform.h:1.2 src/sys/arch/evbarm/fdt/platform.h:1.3
--- src/sys/arch/evbarm/fdt/platform.h:1.2	Sun Dec 10 21:38:27 2017
+++ src/sys/arch/evbarm/fdt/platform.h	Wed Mar 14 06:35:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: platform.h,v 1.2 2017/12/10 21:38:27 skrll Exp $ */
+/* $NetBSD: platform.h,v 1.3 2018/03/14 06:35:31 ryo Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -29,7 +29,9 @@
 #ifndef _EVBARM_FDT_PLATFORM_H
 #define _EVBARM_FDT_PLATFORM_H
 
+#ifndef _LOCORE
 void fdt_add_reserved_memory_range(uint64_t, uint64_t);
+#endif
 
 #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 #define KERNEL_VM_BASE		0xc000

CVS commit: src/external/mit/xorg/bin/xterm

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Wed Mar 14 06:06:40 UTC 2018

Modified Files:
src/external/mit/xorg/bin/xterm: Makefile

Log Message:
build Tekparse.hin VTparse.hin normally.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/bin/xterm/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/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.15 src/external/mit/xorg/bin/xterm/Makefile:1.16
--- src/external/mit/xorg/bin/xterm/Makefile:1.15	Thu Jul 23 09:37:59 2015
+++ src/external/mit/xorg/bin/xterm/Makefile	Wed Mar 14 06:06:40 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2015/07/23 09:37:59 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2018/03/14 06:06:40 mrg Exp $
 
 .include 
 
@@ -12,7 +12,8 @@ SRCS=	button.c charproc.c charsets.c cur
 # graphics_regis.c graphics_sixel.c
 # xterm.appdata.xml
 
-CPPFLAGS+=	-I${X11SRCDIR.${PROG}} \
+CPPFLAGS+=	-I. \
+		-I${X11SRCDIR.${PROG}} \
 		-I${X11SRCDIR.${PROG}}/../include \
 		-I${DESTDIR}${X11INCDIR}/freetype2 \
 		-DPROJECTROOT=${X11ROOTDIR} \
@@ -44,6 +45,12 @@ COPTS.input.c+=	-Wno-error	# uses XKeyco
 
 # XXXMRG should probably build builtin_icons.h
 
+.SUFFIXES: .def .hin
+.def.hin:
+	${TOOL_AWK} '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+DPSRCS+= Tekparse.hin VTparse.hin
+CLEANFILES+= Tekparse.hin VTparse.hin
+
 .include "Makefile.inc"
 
 .include 

CVS commit: xsrc/external/mit/xterm/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 06:06:01 UTC 2018

Modified Files:
xsrc/external/mit/xterm/include: xtermcfg.h
Removed Files:
xsrc/external/mit/xterm/include: Tekparse.hin VTparse.hin

Log Message:
merge xterm 330.  remove files we'll build now.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 xsrc/external/mit/xterm/include/Tekparse.hin \
xsrc/external/mit/xterm/include/VTparse.hin
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xterm/include/xtermcfg.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/xterm/include/xtermcfg.h
diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.11 xsrc/external/mit/xterm/include/xtermcfg.h:1.12
--- xsrc/external/mit/xterm/include/xtermcfg.h:1.11	Wed Mar  8 02:55:45 2017
+++ xsrc/external/mit/xterm/include/xtermcfg.h	Wed Mar 14 06:06:01 2018
@@ -187,6 +187,7 @@
 /* #undef OPT_XMC_GLITCH */		/* CF_ARG_ENABLE(xmc-glitch) */
 /* #undef OPT_ZICONBEEP */		/* CF_ARG_DISABLE(ziconbeep) */
 /* #undef OWN_TERMINFO_DIR */		/* AC_ARG_WITH(own-terminfo) */
+/* #undef OWN_TERMINFO_ENV */		/* AC_ARG_ENABLE(env-terminfo) */
 /* #undef PROCFS_ROOT */		/* CF_ARG_ENABLE(exec-xterm) */
 #define SCROLLBAR_RIGHT 1		/* CF_ARG_ENABLE(rightbar) */
 #define SIG_ATOMIC_T volatile sig_atomic_t		/* CF_SIG_ATOMIC_T */

CVS commit: xsrc/external/mit/xterm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 06:04:47 UTC 2018

Modified Files:
xsrc/external/mit/xterm/dist: XTerm.ad fontutils.c misc.c ptyx.h
xterm.man

Log Message:
merge xterm 330.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xterm/dist/XTerm.ad
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xterm/dist/xterm.man

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/xterm/dist/XTerm.ad
diff -u xsrc/external/mit/xterm/dist/XTerm.ad:1.9 xsrc/external/mit/xterm/dist/XTerm.ad:1.10
--- xsrc/external/mit/xterm/dist/XTerm.ad:1.9	Wed Mar  8 02:55:12 2017
+++ xsrc/external/mit/xterm/dist/XTerm.ad	Wed Mar 14 06:04:47 2018
@@ -1,4 +1,4 @@
-! $XTermId: XTerm.ad,v 1.101 2016/01/28 02:15:29 tom Exp $
+! $XTermId: XTerm.ad,v 1.102 2016/12/22 02:07:39 tom Exp $
 ! -
 ! this file is part of xterm
 !
@@ -135,6 +135,7 @@
 
 *fontMenu*allow-color-ops*Label:	Allow Color Ops
 *fontMenu*allow-font-ops*Label:	Allow Font Ops
+*fontMenu*allow-mouse-ops*Label:	Allow Mouse Ops
 *fontMenu*allow-tcap-ops*Label:	Allow Termcap Ops
 *fontMenu*allow-title-ops*Label:	Allow Title Ops
 *fontMenu*allow-window-ops*Label:	Allow Window Ops

Index: xsrc/external/mit/xterm/dist/fontutils.c
diff -u xsrc/external/mit/xterm/dist/fontutils.c:1.6 xsrc/external/mit/xterm/dist/fontutils.c:1.7
--- xsrc/external/mit/xterm/dist/fontutils.c:1.6	Wed Mar  8 02:55:12 2017
+++ xsrc/external/mit/xterm/dist/fontutils.c	Wed Mar 14 06:04:47 2018
@@ -1,7 +1,7 @@
-/* $XTermId: fontutils.c,v 1.453 2016/06/03 08:56:53 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.531 2017/06/20 09:10:19 tom Exp $ */
 
 /*
- * Copyright 1998-2015,2016 by Thomas E. Dickey
+ * Copyright 1998-2016,2017 by Thomas E. Dickey
  *
  * All Rights Reserved
  *
@@ -120,6 +120,13 @@ typedef struct {
 char *end;
 } FontNameProperties;
 
+#if OPT_LOAD_VTFONTS || OPT_WIDE_CHARS
+static Boolean merge_sublist(char ***, char **);
+#endif
+
+static void save2FontList(XtermWidget, const char *, XtermFontNames *,
+			  VTFontEnum, const char *, Bool);
+
 #if OPT_RENDERFONT
 static void fillInFaceSize(XtermWidget, int);
 #endif
@@ -178,20 +185,18 @@ setupPackedFonts(XtermWidget xw)
 Bool value = False;
 
 #if OPT_RENDERFONT
-#define MIXED(name) screen->name[fontnum].map.mixed
 if (xw->work.render_font == True) {
-	int fontnum = screen->menu_font_number;
+	int e;
 
-	screen->allow_packing = (Boolean) (MIXED(renderFontNorm)
-	   || MIXED(renderFontBold)
-	   || MIXED(renderFontItal)
-#if OPT_RENDERWIDE
-	   || MIXED(renderWideNorm)
-	   || MIXED(renderWideBold)
-	   || MIXED(renderWideItal)
-#endif
-	);
-#undef MIXED
+	for (e = 0; e < fMAX; ++e) {
+	XTermXftFonts *data = getMyXftFont(xw, e, screen->menu_font_number);
+	if (data != 0) {
+		if (data->map.mixed) {
+		screen->allow_packing = True;
+		break;
+		}
+	}
+	}
 }
 #endif /* OPT_RENDERFONT */
 
@@ -455,11 +460,58 @@ bold_font_name(FontNameProperties *props
 
 #if OPT_WIDE_ATTRS
 static char *
-italic_font_name(FontNameProperties *props, int use_average_width)
+italic_font_name(FontNameProperties *props, const char *slant)
 {
 FontNameProperties myprops = *props;
-myprops.slant = "o";
-return derive_font_name(, props->weight, use_average_width, props->end);
+myprops.slant = slant;
+return derive_font_name(, props->weight, myprops.average_width, props->end);
+}
+
+static Boolean
+open_italic_font(XtermWidget xw, int n, FontNameProperties *fp, XTermFonts * data)
+{
+static const char *slant[] =
+{
+	"o",
+	"i"
+};
+char *name;
+Cardinal pass;
+Boolean result = False;
+
+for (pass = 0; pass < XtNumber(slant); ++pass) {
+	if ((name = italic_font_name(fp, slant[pass])) != 0) {
+	TRACE(("open_italic_font %s %s\n",
+		   whichFontEnum((VTFontEnum) n), name));
+	if (xtermOpenFont(xw, name, data, False)) {
+		result = (data->fs != 0);
+#if OPT_REPORT_FONTS
+		if (resource.reportFonts) {
+		printf("opened italic version of %s:\n\t%s\n",
+			   whichFontEnum(n),
+			   name);
+		}
+#endif
+	}
+	free(name);
+	if (result)
+		break;
+	}
+}
+#if OPT_TRACE
+if (result) {
+	XFontStruct *fs = data->fs;
+	if (fs != 0) {
+	TRACE(("...actual size %dx%d (ascent %d, descent %d)\n",
+		   fs->ascent +
+		   fs->descent,
+		   fs->max_bounds.width,
+		   fs->ascent,
+		   fs->descent));
+	}
+}
+#endif
+return result;
 }
 #endif
 
@@ -489,8 +541,9 @@ widebold_font_name(FontNameProperties *p
  * fonts we double the pixel-size and Y-resolution
  */
 char *

CVS import: xsrc/external/mit/xterm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 14 06:04:24 UTC 2018

Update of /cvsroot/xsrc/external/mit/xterm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv22335

Log Message:
initial import of xterm-330

Status:

Vendor Tag: xorg
Release Tags:   xterm-330

C xsrc/external/mit/xterm/dist/fontutils.c
U xsrc/external/mit/xterm/dist/data.h
U xsrc/external/mit/xterm/dist/uxterm.desktop
U xsrc/external/mit/xterm/dist/make.com
U xsrc/external/mit/xterm/dist/graphics_sixel.h
U xsrc/external/mit/xterm/dist/256colres.pl
U xsrc/external/mit/xterm/dist/xtermcfg.hin
U xsrc/external/mit/xterm/dist/Tekparse.h
U xsrc/external/mit/xterm/dist/README.i18n
U xsrc/external/mit/xterm/dist/XTerm-col.ad
U xsrc/external/mit/xterm/dist/charclass.c
U xsrc/external/mit/xterm/dist/xterm.desktop
C xsrc/external/mit/xterm/dist/xterm.man
U xsrc/external/mit/xterm/dist/data.c
U xsrc/external/mit/xterm/dist/print.c
U xsrc/external/mit/xterm/dist/fontutils.h
U xsrc/external/mit/xterm/dist/precompose.h
C xsrc/external/mit/xterm/dist/misc.c
U xsrc/external/mit/xterm/dist/precompose.c
U xsrc/external/mit/xterm/dist/main.h
U xsrc/external/mit/xterm/dist/keysym2ucs.c
U xsrc/external/mit/xterm/dist/trace.c
U xsrc/external/mit/xterm/dist/error.h
U xsrc/external/mit/xterm/dist/version.c
U xsrc/external/mit/xterm/dist/tabs.c
U xsrc/external/mit/xterm/dist/koi8rxterm.man
U xsrc/external/mit/xterm/dist/scrollback.c
U xsrc/external/mit/xterm/dist/graphics.c
U xsrc/external/mit/xterm/dist/ctlseqs.ms
U xsrc/external/mit/xterm/dist/version.h
U xsrc/external/mit/xterm/dist/ptydata.c
U xsrc/external/mit/xterm/dist/aclocal.m4
C xsrc/external/mit/xterm/dist/ptyx.h
U xsrc/external/mit/xterm/dist/trace.h
U xsrc/external/mit/xterm/dist/button.c
U xsrc/external/mit/xterm/dist/xtermcap.c
U xsrc/external/mit/xterm/dist/charsets.c
U xsrc/external/mit/xterm/dist/xutf8.h
U xsrc/external/mit/xterm/dist/xterm.log.html
U xsrc/external/mit/xterm/dist/charproc.c
U xsrc/external/mit/xterm/dist/install-sh
U xsrc/external/mit/xterm/dist/plink.sh
U xsrc/external/mit/xterm/dist/Makefile.in
U xsrc/external/mit/xterm/dist/minstall.in
U xsrc/external/mit/xterm/dist/ctlseqs.txt
U xsrc/external/mit/xterm/dist/README
U xsrc/external/mit/xterm/dist/xstrings.c
U xsrc/external/mit/xterm/dist/xstrings.h
U xsrc/external/mit/xterm/dist/configure.in
U xsrc/external/mit/xterm/dist/Tekproc.c
U xsrc/external/mit/xterm/dist/vms.h
U xsrc/external/mit/xterm/dist/cachedGCs.c
U xsrc/external/mit/xterm/dist/uxterm.man
U xsrc/external/mit/xterm/dist/configure
U xsrc/external/mit/xterm/dist/resize.c
U xsrc/external/mit/xterm/dist/charclass.h
U xsrc/external/mit/xterm/dist/xutf8.c
U xsrc/external/mit/xterm/dist/NEWS
U xsrc/external/mit/xterm/dist/cursor.c
U xsrc/external/mit/xterm/dist/terminfo
U xsrc/external/mit/xterm/dist/xterm.dat
U xsrc/external/mit/xterm/dist/html.c
U xsrc/external/mit/xterm/dist/uxterm
U xsrc/external/mit/xterm/dist/graphics.h
C xsrc/external/mit/xterm/dist/XTerm.ad
U xsrc/external/mit/xterm/dist/df-install.in
U xsrc/external/mit/xterm/dist/termcap
U xsrc/external/mit/xterm/dist/256colres.h
U xsrc/external/mit/xterm/dist/menu.c
U xsrc/external/mit/xterm/dist/vms.c
U xsrc/external/mit/xterm/dist/88colres.h
U xsrc/external/mit/xterm/dist/TekPrsTbl.c
U xsrc/external/mit/xterm/dist/xterm.appdata.xml
U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt
U xsrc/external/mit/xterm/dist/graphics_regis.h
U xsrc/external/mit/xterm/dist/koi8rxterm
U xsrc/external/mit/xterm/dist/xtermcap.h
U xsrc/external/mit/xterm/dist/scrollbar.c
U xsrc/external/mit/xterm/dist/link_axp.com
U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad
U xsrc/external/mit/xterm/dist/88colres.pl
U xsrc/external/mit/xterm/dist/graphics_regis.c
U xsrc/external/mit/xterm/dist/run-tic.sh
U xsrc/external/mit/xterm/dist/VTPrsTbl.c
U xsrc/external/mit/xterm/dist/graphics_sixel.c
U xsrc/external/mit/xterm/dist/doublechr.c
U xsrc/external/mit/xterm/dist/xcharmouse.h
U xsrc/external/mit/xterm/dist/Tests
U xsrc/external/mit/xterm/dist/xterm_io.h
U xsrc/external/mit/xterm/dist/wcwidth.c
U xsrc/external/mit/xterm/dist/menu.h
U xsrc/external/mit/xterm/dist/keysym2ucs.h
U xsrc/external/mit/xterm/dist/resize.man
U xsrc/external/mit/xterm/dist/THANKS
U xsrc/external/mit/xterm/dist/config.sub
U xsrc/external/mit/xterm/dist/Imakefile
U xsrc/external/mit/xterm/dist/Tekparse.def
U xsrc/external/mit/xterm/dist/INSTALL
U xsrc/external/mit/xterm/dist/xterm.h
U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl
U xsrc/external/mit/xterm/dist/UXTerm.ad
U xsrc/external/mit/xterm/dist/main.c
U xsrc/external/mit/xterm/dist/input.c
U xsrc/external/mit/xterm/dist/README.os390
U xsrc/external/mit/xterm/dist/config.guess
U xsrc/external/mit/xterm/dist/wcwidth.h
U xsrc/external/mit/xterm/dist/svg.c
U xsrc/external/mit/xterm/dist/xterm_axp.opt
U xsrc/external/mit/xterm/dist/VTparse.h
U xsrc/external/mit/xterm/dist/MANIFEST
U xsrc/external/mit/xterm/dist/testxmc.c
U xsrc/external/mit/xterm/dist/util.c
U