CVS commit: src/sys/netsmb

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:17:35 UTC 2016

Modified Files:
src/sys/netsmb: smb_rq.c

Log Message:
Uninitialized vars, found by brainy


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/netsmb/smb_rq.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/netsmb/smb_rq.c
diff -u src/sys/netsmb/smb_rq.c:1.34 src/sys/netsmb/smb_rq.c:1.35
--- src/sys/netsmb/smb_rq.c:1.34	Fri Dec 17 13:05:29 2010
+++ src/sys/netsmb/smb_rq.c	Mon Aug 15 08:17:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_rq.c,v 1.34 2010/12/17 13:05:29 pooka Exp $	*/
+/*	$NetBSD: smb_rq.c,v 1.35 2016/08/15 08:17:35 maxv Exp $	*/
 
 /*
  * Copyright (c) 2000-2001, Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: smb_rq.c,v 1.34 2010/12/17 13:05:29 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_rq.c,v 1.35 2016/08/15 08:17:35 maxv Exp $");
 
 #include 
 #include 
@@ -343,8 +343,8 @@ smb_rq_reply(struct smb_rq *rqp)
 {
 	struct mdchain *mdp = >sr_rp;
 	int error;
-	u_int8_t errclass;
-	u_int16_t serror;
+	u_int8_t errclass = 0;
+	u_int16_t serror = 0;
 
 	error = smb_iod_waitrq(rqp);
 	if (error)

CVS commit: src/sys/netsmb

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:17:35 UTC 2016

Modified Files:
src/sys/netsmb: smb_rq.c

Log Message:
Uninitialized vars, found by brainy


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/netsmb/smb_rq.c

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

CVS commit: src/sys/arch/evbsh3/stand/mesboot/src

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:32:46 UTC 2016

Modified Files:
src/sys/arch/evbsh3/stand/mesboot/src: mesboot.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/stand/mesboot/src/mesboot.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/evbsh3/stand/mesboot/src/mesboot.c
diff -u src/sys/arch/evbsh3/stand/mesboot/src/mesboot.c:1.1 src/sys/arch/evbsh3/stand/mesboot/src/mesboot.c:1.2
--- src/sys/arch/evbsh3/stand/mesboot/src/mesboot.c:1.1	Tue Apr  6 15:54:30 2010
+++ src/sys/arch/evbsh3/stand/mesboot/src/mesboot.c	Mon Aug 15 08:32:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mesboot.c,v 1.1 2010/04/06 15:54:30 nonaka Exp $	*/
+/*	$NetBSD: mesboot.c,v 1.2 2016/08/15 08:32:46 maxv Exp $	*/
 
 #include 
 #include 
@@ -25,7 +25,7 @@ usage(void)
 int
 main(int argc, char **argv)
 {
-	char *kernel;
+	char *kernel = NULL;
 	char *ptr, *mem, *rdptr;
 	void (*func)();
 	int fd, size, c;

CVS commit: src/sys/arch/evbsh3/stand/mesboot/src

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:32:46 UTC 2016

Modified Files:
src/sys/arch/evbsh3/stand/mesboot/src: mesboot.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/stand/mesboot/src/mesboot.c

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

CVS commit: src/sys/dev/microcode/aic7xxx

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:52:33 UTC 2016

Modified Files:
src/sys/dev/microcode/aic7xxx: aicasm.c

Log Message:
This thing is completely buggy. There is a use-after-free and NULL pointer
dereference. Just fix the uaf, and add a comment. Not tested, but obvious
enough; found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/aic7xxx/aicasm.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/microcode/aic7xxx/aicasm.c
diff -u src/sys/dev/microcode/aic7xxx/aicasm.c:1.8 src/sys/dev/microcode/aic7xxx/aicasm.c:1.9
--- src/sys/dev/microcode/aic7xxx/aicasm.c:1.8	Sun Dec 27 16:03:49 2009
+++ src/sys/dev/microcode/aic7xxx/aicasm.c	Mon Aug 15 08:52:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: aicasm.c,v 1.8 2009/12/27 16:03:49 jakllsch Exp $	*/
+/*	$NetBSD: aicasm.c,v 1.9 2016/08/15 08:52:33 maxv Exp $	*/
 
 /*
  * Aic7xxx SCSI host adapter firmware asssembler
@@ -43,7 +43,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: aicasm.c,v 1.8 2009/12/27 16:03:49 jakllsch Exp $");
+__RCSID("$NetBSD: aicasm.c,v 1.9 2016/08/15 08:52:33 maxv Exp $");
 
 #include 
 #include 
@@ -595,6 +595,7 @@ output_listing(char *ifilename)
 putchar(input);
 		}
 		free(func_values);
+		func_values = NULL;
 		fprintf(stdout, "\nThanks!\n");
 	}
 
@@ -604,6 +605,11 @@ output_listing(char *ifilename)
 	 cur_instr != NULL;
 	 cur_instr = STAILQ_NEXT(cur_instr, links), instrcount++) {
 
+		/*
+		 * XXX XXX XXX: What exactly are we trying to do here?
+		 * 'func_values' is always NULL, so check_patch will
+		 * necessarily crash.
+		 */
 		if (check_patch(_patch, instrcount,
 _addr, func_values) == 0) {
 			/* Don't count this instruction as it is in a patch

CVS commit: src/sys/dev/microcode/aic7xxx

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:52:33 UTC 2016

Modified Files:
src/sys/dev/microcode/aic7xxx: aicasm.c

Log Message:
This thing is completely buggy. There is a use-after-free and NULL pointer
dereference. Just fix the uaf, and add a comment. Not tested, but obvious
enough; found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/aic7xxx/aicasm.c

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

CVS commit: src/sys/arch/ia64/stand/efi/libefi

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:00:52 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: devicename.c

Log Message:
Uninitialized var, found by brainy. I haven't tested this change, and it
may not be the perfect way to fix it. But it seems correct enough.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/stand/efi/libefi/devicename.c

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

CVS commit: src/sys/arch/ia64/stand/ia64/ski

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:06:40 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/ia64/ski: devicename.c

Log Message:
Two uninitialized vars, found by brainy. The former is similar to the one
I fixed in ia64/stand/efi/libefi/devicename.c. I don't know how to fix the
latter, so just add a comment. I will probably file a PR for this one.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/ia64/ski/devicename.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/ia64/stand/ia64/ski/devicename.c
diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.7 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.8
--- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.7	Tue Apr  8 21:51:06 2014
+++ src/sys/arch/ia64/stand/ia64/ski/devicename.c	Mon Aug 15 09:06:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.7 2014/04/08 21:51:06 martin Exp $	*/
+/*	$NetBSD: devicename.c,v 1.8 2016/08/15 09:06:39 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -91,7 +91,7 @@ ski_parsedev(struct ski_devdesc **dev, c
 	struct devsw	*dv;
 	int dv_type;
 	int		i, unit, slice, partition, err;
-	char		*cp;
+	char		*cp = NULL;
 	const char	*np;
 
 	/* minimum length check */
@@ -146,6 +146,10 @@ ski_parsedev(struct ski_devdesc **dev, c
 cp++;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;
@@ -169,6 +173,10 @@ ski_parsedev(struct ski_devdesc **dev, c
 goto fail;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;
@@ -228,6 +236,7 @@ ski_fmtdev(void *vdev)
 		break;
 
 	case DEVT_NET:
+		/* XXX XXX XXX: Yay, 'len' is not initialized here */
 		snprintf(buf, buflen - len, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit);
 		break;
 	}

CVS commit: src/sys/arch/ia64/stand/ia64/ski

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:06:40 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/ia64/ski: devicename.c

Log Message:
Two uninitialized vars, found by brainy. The former is similar to the one
I fixed in ia64/stand/efi/libefi/devicename.c. I don't know how to fix the
latter, so just add a comment. I will probably file a PR for this one.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/ia64/ski/devicename.c

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

CVS commit: src/sys/compat/linux/common

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:20:11 UTC 2016

Modified Files:
src/sys/compat/linux/common: linux_futex.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/linux/common/linux_futex.c

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

CVS commit: src/sys/compat/linux/common

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:20:11 UTC 2016

Modified Files:
src/sys/compat/linux/common: linux_futex.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/linux/common/linux_futex.c

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

Modified files:

Index: src/sys/compat/linux/common/linux_futex.c
diff -u src/sys/compat/linux/common/linux_futex.c:1.34 src/sys/compat/linux/common/linux_futex.c:1.35
--- src/sys/compat/linux/common/linux_futex.c:1.34	Fri May 20 13:54:34 2016
+++ src/sys/compat/linux/common/linux_futex.c	Mon Aug 15 09:20:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_futex.c,v 1.34 2016/05/20 13:54:34 chs Exp $ */
+/*	$NetBSD: linux_futex.c,v 1.35 2016/08/15 09:20:11 maxv Exp $ */
 
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.34 2016/05/20 13:54:34 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.35 2016/08/15 09:20:11 maxv Exp $");
 
 #include 
 #include 
@@ -769,6 +769,7 @@ release_futexes(struct lwp *l)
 			return;
 
 		head.futex_offset = (unsigned long)u32;
+		futex_offset = head.futex_offset;
 	} else
 #endif
 	if (copyin(_offset, _offset, sizeof(unsigned long)))

CVS commit: src/sys/dev/if_ndis

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:12:32 UTC 2016

Modified Files:
src/sys/dev/if_ndis: if_ndis.c

Log Message:
Uninitialized var, found by brainy


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/if_ndis/if_ndis.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/if_ndis/if_ndis.c
diff -u src/sys/dev/if_ndis/if_ndis.c:1.36 src/sys/dev/if_ndis/if_ndis.c:1.37
--- src/sys/dev/if_ndis/if_ndis.c:1.36	Fri Jun 10 13:27:14 2016
+++ src/sys/dev/if_ndis/if_ndis.c	Mon Aug 15 08:12:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ndis.c,v 1.36 2016/06/10 13:27:14 ozaki-r Exp $	*/
+/*	$NetBSD: if_ndis.c,v 1.37 2016/08/15 08:12:32 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2003
@@ -37,7 +37,7 @@
 __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.36 2016/06/10 13:27:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.37 2016/08/15 08:12:32 maxv Exp $");
 #endif
 
 
@@ -1967,7 +1967,7 @@ ndis_getstate_80211(struct ndis_softc *s
 			break;
 		default:
 			aprint_error_dev(sc->ndis_dev, "unknown nettype %d\n", 
- arg);
+(int)bs->nwbx_nettype);
 			break;
 		}
 		free(bs, M_TEMP);

CVS commit: src/sys/dev/if_ndis

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:12:32 UTC 2016

Modified Files:
src/sys/dev/if_ndis: if_ndis.c

Log Message:
Uninitialized var, found by brainy


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/if_ndis/if_ndis.c

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

CVS commit: src/sys/dev/bluetooth

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:20:11 UTC 2016

Modified Files:
src/sys/dev/bluetooth: bcsp.c

Log Message:
Curious typo, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/bluetooth/bcsp.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/bluetooth/bcsp.c
diff -u src/sys/dev/bluetooth/bcsp.c:1.29 src/sys/dev/bluetooth/bcsp.c:1.30
--- src/sys/dev/bluetooth/bcsp.c:1.29	Thu Aug 20 14:40:17 2015
+++ src/sys/dev/bluetooth/bcsp.c	Mon Aug 15 08:20:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcsp.c,v 1.29 2015/08/20 14:40:17 christos Exp $	*/
+/*	$NetBSD: bcsp.c,v 1.30 2016/08/15 08:20:11 maxv Exp $	*/
 /*
  * Copyright (c) 2007 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.29 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.30 2016/08/15 08:20:11 maxv Exp $");
 
 #include 
 #include 
@@ -780,7 +780,7 @@ bcsp_pktintegrity_receive(struct bcsp_so
 	u_int pldlen;
 	int discard = 0;
 	uint16_t crc = 0x;
-	const char *errstr 
+	const char *errstr;
 
 	DPRINTFN(3, ("%s: pi receive\n", device_xname(sc->sc_dev)));
 #ifdef BCSP_DEBUG

CVS commit: src/sys/dev/bluetooth

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:20:11 UTC 2016

Modified Files:
src/sys/dev/bluetooth: bcsp.c

Log Message:
Curious typo, found by mootja


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/bluetooth/bcsp.c

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

CVS commit: src/sys/arch/ia64/stand/common

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:24:05 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/common: load_elf64.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/load_elf64.c

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

CVS commit: src/sys/arch/ia64/stand/common

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:24:05 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/common: load_elf64.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/stand/common/load_elf64.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/ia64/stand/common/load_elf64.c
diff -u src/sys/arch/ia64/stand/common/load_elf64.c:1.2 src/sys/arch/ia64/stand/common/load_elf64.c:1.3
--- src/sys/arch/ia64/stand/common/load_elf64.c:1.2	Sat Apr 22 07:58:53 2006
+++ src/sys/arch/ia64/stand/common/load_elf64.c	Mon Aug 15 08:24:05 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: load_elf64.c,v 1.2 2006/04/22 07:58:53 cherry Exp $	*/
+/*	$NetBSD: load_elf64.c,v 1.3 2016/08/15 08:24:05 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -75,8 +75,10 @@ elf64_loadfile(char *filename, u_int64_t
 
 marks[MARK_START] = dest;
 
-if ((fd = loadfile(filename, marks, LOAD_KERNEL)) == -1)
+if ((fd = loadfile(filename, marks, LOAD_KERNEL)) == -1) {
+	err = EPERM;
 	goto oerr;
+}
 close(fd);
 
 dest = marks[MARK_ENTRY];

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:29:34 UTC 2016

Modified Files:
src/sys/arch/sparc/stand/ofwboot: loadfile_machdep.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/sys/arch/sparc/stand/ofwboot/loadfile_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/sparc/stand/ofwboot/loadfile_machdep.c
diff -u src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.14 src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.15
--- src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.14	Sun Jun 14 16:20:44 2015
+++ src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c	Mon Aug 15 08:29:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadfile_machdep.c,v 1.14 2015/06/14 16:20:44 martin Exp $	*/
+/*	$NetBSD: loadfile_machdep.c,v 1.15 2016/08/15 08:29:34 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -216,6 +216,7 @@ tlb_init_sun4u(void)
 	phandle_t child;
 	phandle_t root;
 	char buf[128];
+	bool foundcpu = false;
 	u_int bootcpu;
 	u_int cpu;
 
@@ -236,10 +237,13 @@ tlb_init_sun4u(void)
 			sizeof(cpu)) == -1 && _prom_getprop(child, "portid",
 			, sizeof(cpu)) == -1)
 panic("tlb_init: prom_getprop");
+			foundcpu = true;
 			if (cpu == bootcpu)
 break;
 		}
 	}
+	if (!foundcpu)
+		panic("tlb_init: no cpu found!");
 	if (cpu != bootcpu)
 		panic("tlb_init: no node for bootcpu?!?!");
 	if (_prom_getprop(child, "#dtlb-entries", _slot_max,

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

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:29:34 UTC 2016

Modified Files:
src/sys/arch/sparc/stand/ofwboot: loadfile_machdep.c

Log Message:
Uninitialized var, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c

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

CVS commit: src/sys/dev/if_ndis

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:40:23 UTC 2016

Modified Files:
src/sys/dev/if_ndis: if_ndis_pccard.c

Log Message:
Uninitialized var, found by brainy. FreeBSD fixed it this way four years
ago. I haven't tested this change, but it is rather obvious, as the FreeBSD
commit indicates, that sc->ndis_io_rid should be used instead.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/if_ndis/if_ndis_pccard.c

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

CVS commit: src/sys/dev/if_ndis

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:40:23 UTC 2016

Modified Files:
src/sys/dev/if_ndis: if_ndis_pccard.c

Log Message:
Uninitialized var, found by brainy. FreeBSD fixed it this way four years
ago. I haven't tested this change, but it is rather obvious, as the FreeBSD
commit indicates, that sc->ndis_io_rid should be used instead.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/if_ndis/if_ndis_pccard.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/if_ndis/if_ndis_pccard.c
diff -u src/sys/dev/if_ndis/if_ndis_pccard.c:1.4 src/sys/dev/if_ndis/if_ndis_pccard.c:1.5
--- src/sys/dev/if_ndis/if_ndis_pccard.c:1.4	Sat Mar 14 15:36:18 2009
+++ src/sys/dev/if_ndis/if_ndis_pccard.c	Mon Aug 15 08:40:23 2016
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ndis_pccard.c,v 1.4 2009/03/14 15:36:18 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis_pccard.c,v 1.5 2016/08/15 08:40:23 maxv Exp $");
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.6.2.3 2005/03/31 04:24:36 wpaul Exp $");
 #endif
@@ -209,7 +209,7 @@ ndis_attach_pccard(device_t dev)
 		goto fail;
 	}
 	sc->ndis_rescnt++;
-	resource_list_add(>ndis_rl, SYS_RES_IOPORT, rid,
+	resource_list_add(>ndis_rl, SYS_RES_IOPORT, sc->ndis_io_rid,
 	rman_get_start(sc->ndis_res_io), rman_get_end(sc->ndis_res_io),
 	rman_get_size(sc->ndis_res_io));
 

CVS commit: src/sys/arch/sparc/sparc

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:43:19 UTC 2016

Modified Files:
src/sys/arch/sparc/sparc: emul.c

Log Message:
Return zero instead of error, otherwise it looks like it is supposed to
return an error; found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/emul.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/sparc/sparc/emul.c
diff -u src/sys/arch/sparc/sparc/emul.c:1.18 src/sys/arch/sparc/sparc/emul.c:1.19
--- src/sys/arch/sparc/sparc/emul.c:1.18	Fri Nov 27 13:45:17 2015
+++ src/sys/arch/sparc/sparc/emul.c	Mon Aug 15 08:43:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: emul.c,v 1.18 2015/11/27 13:45:17 joerg Exp $	*/
+/*	$NetBSD: emul.c,v 1.19 2016/08/15 08:43:19 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.18 2015/11/27 13:45:17 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.19 2016/08/15 08:43:19 maxv Exp $");
 
 #include 
 #include 
@@ -84,7 +84,7 @@ writegpreg(struct trapframe *tf, int i, 
 	int error = 0;
 
 	if (i == 0)
-		return error;
+		return 0;
 	else if (i < 16)
 		GPR(tf, i) = *(const int32_t *) val;
 	else

CVS commit: src/sys/arch/sparc/sparc

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:43:19 UTC 2016

Modified Files:
src/sys/arch/sparc/sparc: emul.c

Log Message:
Return zero instead of error, otherwise it looks like it is supposed to
return an error; found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sparc/sparc/emul.c

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

CVS commit: src/sys/arch/ia64/stand/efi/libefi

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:00:52 UTC 2016

Modified Files:
src/sys/arch/ia64/stand/efi/libefi: devicename.c

Log Message:
Uninitialized var, found by brainy. I haven't tested this change, and it
may not be the perfect way to fix it. But it seems correct enough.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/stand/efi/libefi/devicename.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/ia64/stand/efi/libefi/devicename.c
diff -u src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.8 src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.9
--- src/sys/arch/ia64/stand/efi/libefi/devicename.c:1.8	Tue Apr  8 21:51:06 2014
+++ src/sys/arch/ia64/stand/efi/libefi/devicename.c	Mon Aug 15 09:00:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: devicename.c,v 1.8 2014/04/08 21:51:06 martin Exp $	*/
+/*	$NetBSD: devicename.c,v 1.9 2016/08/15 09:00:52 maxv Exp $	*/
 
 /*-
  * Copyright (c) 1998 Michael Smith 
@@ -95,7 +95,7 @@ efi_parsedev(struct efi_devdesc **dev, c
 	struct devsw	*dv;
 	int dv_type;
 	int		i, unit, slice, partition, err;
-	char		*cp;
+	char		*cp = NULL;
 	const char	*np;
 
 	/* minimum length check */
@@ -151,6 +151,10 @@ efi_parsedev(struct efi_devdesc **dev, c
 cp++;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;
@@ -174,6 +178,10 @@ efi_parsedev(struct efi_devdesc **dev, c
 goto fail;
 			}
 		}
+		if (cp == NULL) {
+			err = EINVAL;
+			goto fail;
+		}
 		if (*cp && (*cp != ':')) {
 			err = EINVAL;
 			goto fail;

CVS commit: src/sys/net

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:14:12 UTC 2016

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

Log Message:
Memory leak, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/net/if_ieee1394subr.c

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

Modified files:

Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.56 src/sys/net/if_ieee1394subr.c:1.57
--- src/sys/net/if_ieee1394subr.c:1.56	Wed Jun 22 10:44:32 2016
+++ src/sys/net/if_ieee1394subr.c	Mon Aug 15 09:14:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ieee1394subr.c,v 1.56 2016/06/22 10:44:32 knakahara Exp $	*/
+/*	$NetBSD: if_ieee1394subr.c,v 1.57 2016/08/15 09:14:12 maxv Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.56 2016/06/22 10:44:32 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.57 2016/08/15 09:14:12 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -288,8 +288,10 @@ ieee1394_fragment(struct ifnet *ifp, str
 		ifh->ifh_dgl = htons(ic->ic_dgl);
 		ifh->ifh_reserved = 0;
 		m->m_next = m_copy(m0, sizeof(*ifh) + off, fraglen);
-		if (m->m_next == NULL)
+		if (m->m_next == NULL) {
+			m_freem(m);
 			goto bad;
+		}
 		m->m_pkthdr.len = sizeof(*ifh) + fraglen;
 		off += fraglen;
 		*mp = m;

CVS commit: src/sys/net

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:14:12 UTC 2016

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

Log Message:
Memory leak, found by brainy; not tested, but obvious enough


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/net/if_ieee1394subr.c

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

CVS commit: src/sys/dev/pci

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:30:22 UTC 2016

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

Log Message:
Use the exact same argument for kmem_alloc and kmem_free; from brainy


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/cmpci.c

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

Modified files:

Index: src/sys/dev/pci/cmpci.c
diff -u src/sys/dev/pci/cmpci.c:1.48 src/sys/dev/pci/cmpci.c:1.49
--- src/sys/dev/pci/cmpci.c:1.48	Thu Jul  7 06:55:41 2016
+++ src/sys/dev/pci/cmpci.c	Mon Aug 15 09:30:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmpci.c,v 1.48 2016/07/07 06:55:41 msaitoh Exp $	*/
+/*	$NetBSD: cmpci.c,v 1.49 2016/08/15 09:30:22 maxv Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.48 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.49 2016/08/15 09:30:22 maxv Exp $");
 
 #if defined(AUDIO_DEBUG) || defined(DEBUG)
 #define DPRINTF(x) if (cmpcidebug) printf x
@@ -1016,7 +1016,7 @@ cmpci_alloc_dmamem(struct cmpci_softc *s
 	struct cmpci_dmanode *n;
 
 	error = 0;
-	n = kmem_alloc(sizeof(struct cmpci_dmanode), KM_SLEEP);
+	n = kmem_alloc(sizeof(*n), KM_SLEEP);
 	if (n == NULL) {
 		error = ENOMEM;
 		goto quit;

CVS commit: src/sys/dev/pci

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 09:30:22 UTC 2016

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

Log Message:
Use the exact same argument for kmem_alloc and kmem_free; from brainy


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/cmpci.c

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

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

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Aug 15 11:01:16 UTC 2016

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

Log Message:
Import dhcpcd-6.11.3 with the following changes:
  *  Workaround a 14 year old BSD issue where initial address lifetimes
 are transfered to the prefix route and are not updated again,
 causing the kernel to remove the route.
 The fix is to initially add the address with infinite lifetimes
 and then change the lifetimes to the correct ones.
  *  IPv6 RA routes are now expired by dhcpcd.
  *  Fix gateway interface assignment on BSD.
  *  Only mask off signals we do something with
 (allows coredumps on some platforms)
  *  Fix a memory issue where an old lease could be read and discarded
 but the buffer length not reset.
  *  Bind DHCPv6 to the link-local address when not running in master
 mode so that many dhcpcd instances can run per interface.

Status:

Vendor Tag: roy
Release Tags:   dhcpcd-6-11-3

U src/external/bsd/dhcpcd/dist/common.c
U src/external/bsd/dhcpcd/dist/control.c
U src/external/bsd/dhcpcd/dist/dhcpcd.c
U src/external/bsd/dhcpcd/dist/duid.c
C src/external/bsd/dhcpcd/dist/eloop.c
U src/external/bsd/dhcpcd/dist/if.c
U src/external/bsd/dhcpcd/dist/if-options.c
U src/external/bsd/dhcpcd/dist/script.c
U src/external/bsd/dhcpcd/dist/dhcp-common.c
C src/external/bsd/dhcpcd/dist/if-bsd.c
U src/external/bsd/dhcpcd/dist/arp.c
C src/external/bsd/dhcpcd/dist/dhcp.c
C src/external/bsd/dhcpcd/dist/ipv4.c
U src/external/bsd/dhcpcd/dist/ipv4ll.c
C src/external/bsd/dhcpcd/dist/ipv6.c
C src/external/bsd/dhcpcd/dist/ipv6nd.c
C src/external/bsd/dhcpcd/dist/dhcp6.c
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c
U src/external/bsd/dhcpcd/dist/auth.c
U src/external/bsd/dhcpcd/dist/dhcpcd.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
C src/external/bsd/dhcpcd/dist/dhcpcd.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
U src/external/bsd/dhcpcd/dist/arp.h
U src/external/bsd/dhcpcd/dist/auth.h
U src/external/bsd/dhcpcd/dist/bpf-filter.h
U src/external/bsd/dhcpcd/dist/common.h
U src/external/bsd/dhcpcd/dist/config.h
U src/external/bsd/dhcpcd/dist/control.h
C src/external/bsd/dhcpcd/dist/defs.h
U src/external/bsd/dhcpcd/dist/dev.h
U src/external/bsd/dhcpcd/dist/dhcp-common.h
U src/external/bsd/dhcpcd/dist/dhcp.h
U src/external/bsd/dhcpcd/dist/dhcp6.h
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h
U src/external/bsd/dhcpcd/dist/dhcpcd.h
U src/external/bsd/dhcpcd/dist/duid.h
U src/external/bsd/dhcpcd/dist/eloop.h
U src/external/bsd/dhcpcd/dist/if-options.h
U src/external/bsd/dhcpcd/dist/if.h
U src/external/bsd/dhcpcd/dist/ipv4.h
U src/external/bsd/dhcpcd/dist/ipv4ll.h
U src/external/bsd/dhcpcd/dist/ipv6.h
U src/external/bsd/dhcpcd/dist/ipv6nd.h
U src/external/bsd/dhcpcd/dist/script.h
U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
U src/external/bsd/dhcpcd/dist/crypt/crypt.h
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind

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

cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist

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

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Aug 15 11:01:16 UTC 2016

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

Log Message:
Import dhcpcd-6.11.3 with the following changes:
  *  Workaround a 14 year old BSD issue where initial address lifetimes
 are transfered to the prefix route and are not updated again,
 causing the kernel to remove the route.
 The fix is to initially add the address with infinite lifetimes
 and then change the lifetimes to the correct ones.
  *  IPv6 RA routes are now expired by dhcpcd.
  *  Fix gateway interface assignment on BSD.
  *  Only mask off signals we do something with
 (allows coredumps on some platforms)
  *  Fix a memory issue where an old lease could be read and discarded
 but the buffer length not reset.
  *  Bind DHCPv6 to the link-local address when not running in master
 mode so that many dhcpcd instances can run per interface.

Status:

Vendor Tag: roy
Release Tags:   dhcpcd-6-11-3

U src/external/bsd/dhcpcd/dist/common.c
U src/external/bsd/dhcpcd/dist/control.c
U src/external/bsd/dhcpcd/dist/dhcpcd.c
U src/external/bsd/dhcpcd/dist/duid.c
C src/external/bsd/dhcpcd/dist/eloop.c
U src/external/bsd/dhcpcd/dist/if.c
U src/external/bsd/dhcpcd/dist/if-options.c
U src/external/bsd/dhcpcd/dist/script.c
U src/external/bsd/dhcpcd/dist/dhcp-common.c
C src/external/bsd/dhcpcd/dist/if-bsd.c
U src/external/bsd/dhcpcd/dist/arp.c
C src/external/bsd/dhcpcd/dist/dhcp.c
C src/external/bsd/dhcpcd/dist/ipv4.c
U src/external/bsd/dhcpcd/dist/ipv4ll.c
C src/external/bsd/dhcpcd/dist/ipv6.c
C src/external/bsd/dhcpcd/dist/ipv6nd.c
C src/external/bsd/dhcpcd/dist/dhcp6.c
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c
U src/external/bsd/dhcpcd/dist/auth.c
U src/external/bsd/dhcpcd/dist/dhcpcd.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
C src/external/bsd/dhcpcd/dist/dhcpcd.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
U src/external/bsd/dhcpcd/dist/arp.h
U src/external/bsd/dhcpcd/dist/auth.h
U src/external/bsd/dhcpcd/dist/bpf-filter.h
U src/external/bsd/dhcpcd/dist/common.h
U src/external/bsd/dhcpcd/dist/config.h
U src/external/bsd/dhcpcd/dist/control.h
C src/external/bsd/dhcpcd/dist/defs.h
U src/external/bsd/dhcpcd/dist/dev.h
U src/external/bsd/dhcpcd/dist/dhcp-common.h
U src/external/bsd/dhcpcd/dist/dhcp.h
U src/external/bsd/dhcpcd/dist/dhcp6.h
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h
U src/external/bsd/dhcpcd/dist/dhcpcd.h
U src/external/bsd/dhcpcd/dist/duid.h
U src/external/bsd/dhcpcd/dist/eloop.h
U src/external/bsd/dhcpcd/dist/if-options.h
U src/external/bsd/dhcpcd/dist/if.h
U src/external/bsd/dhcpcd/dist/ipv4.h
U src/external/bsd/dhcpcd/dist/ipv4ll.h
U src/external/bsd/dhcpcd/dist/ipv6.h
U src/external/bsd/dhcpcd/dist/ipv6nd.h
U src/external/bsd/dhcpcd/dist/script.h
U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
U src/external/bsd/dhcpcd/dist/crypt/crypt.h
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind

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

cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist

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

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Aug 15 11:04:53 UTC 2016

Modified Files:
src/external/bsd/dhcpcd/dist: defs.h dhcp.c dhcp6.c dhcpcd.8.in eloop.c
if-bsd.c ipv4.c ipv6.c ipv6nd.c

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.44 -r1.45 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/dhcpcd/dist/dhcp6.c
cvs rdiff -u -r1.49 -r1.50 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/eloop.c
cvs rdiff -u -r1.32 -r1.33 src/external/bsd/dhcpcd/dist/if-bsd.c
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/dhcpcd/dist/ipv4.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/ipv6.c
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/dhcpcd/dist/ipv6nd.c

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

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

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Aug 15 11:04:53 UTC 2016

Modified Files:
src/external/bsd/dhcpcd/dist: defs.h dhcp.c dhcp6.c dhcpcd.8.in eloop.c
if-bsd.c ipv4.c ipv6.c ipv6nd.c

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.44 -r1.45 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/dhcpcd/dist/dhcp6.c
cvs rdiff -u -r1.49 -r1.50 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/eloop.c
cvs rdiff -u -r1.32 -r1.33 src/external/bsd/dhcpcd/dist/if-bsd.c
cvs rdiff -u -r1.24 -r1.25 src/external/bsd/dhcpcd/dist/ipv4.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/ipv6.c
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/dhcpcd/dist/ipv6nd.c

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

Modified files:

Index: src/external/bsd/dhcpcd/dist/defs.h
diff -u src/external/bsd/dhcpcd/dist/defs.h:1.29 src/external/bsd/dhcpcd/dist/defs.h:1.30
--- src/external/bsd/dhcpcd/dist/defs.h:1.29	Fri Jul 29 10:07:57 2016
+++ src/external/bsd/dhcpcd/dist/defs.h	Mon Aug 15 11:04:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.29 2016/07/29 10:07:57 roy Exp $ */
+/* $NetBSD: defs.h,v 1.30 2016/08/15 11:04:53 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
@@ -30,7 +30,7 @@
 #define CONFIG_H
 
 #define PACKAGE			"dhcpcd"
-#define VERSION			"6.11.2"
+#define VERSION			"6.11.3"
 
 #ifndef CONFIG
 # define CONFIG			SYSCONFDIR "/" PACKAGE ".conf"

Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.44 src/external/bsd/dhcpcd/dist/dhcp.c:1.45
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.44	Fri Jul 29 10:07:57 2016
+++ src/external/bsd/dhcpcd/dist/dhcp.c	Mon Aug 15 11:04:53 2016
@@ -1,5 +1,5 @@
 #include 
- __RCSID("$NetBSD: dhcp.c,v 1.44 2016/07/29 10:07:57 roy Exp $");
+ __RCSID("$NetBSD: dhcp.c,v 1.45 2016/08/15 11:04:53 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
@@ -1541,7 +1541,6 @@ dhcp_openudp(struct interface *ifp)
 	struct dhcp_state *state;
 #ifdef SO_BINDTODEVICE
 	struct ifreq ifr;
-	char *p;
 #endif
 
 	if ((s = xsocket(PF_INET, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP)) == -1)
@@ -1554,10 +1553,6 @@ dhcp_openudp(struct interface *ifp)
 	if (ifp) {
 		memset(, 0, sizeof(ifr));
 		strlcpy(ifr.ifr_name, ifp->name, sizeof(ifr.ifr_name));
-		/* We can only bind to the real device */
-		p = strchr(ifr.ifr_name, ':');
-		if (p)
-			*p = '\0';
 		if (setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, ,
 		sizeof(ifr)) == -1)
 		goto eexit;
@@ -2401,6 +2396,7 @@ dhcp_inform(struct interface *ifp)
 	state->state = DHS_INFORM;
 	free(state->offer);
 	state->offer = NULL;
+	state->offer_len = 0;
 
 	if (ifo->req_addr.s_addr == INADDR_ANY) {
 		ia = ipv4_iffindaddr(ifp, NULL, NULL);
@@ -2976,8 +2972,8 @@ dhcp_handledhcp(struct interface *ifp, s
 return;
 			}
 		}
-		memcpy(state->offer, bootp, bootp_len);
 		state->offer_len = bootp_len;
+		memcpy(state->offer, bootp, bootp_len);
 		bootp_copied = true;
 		if (ifp->ctx->options & DHCPCD_TEST) {
 			free(state->old);
@@ -3054,8 +3050,8 @@ rapidcommit:
 return;
 			}
 		}
-		memcpy(state->offer, bootp, bootp_len);
 		state->offer_len = bootp_len;
+		memcpy(state->offer, bootp, bootp_len);
 	}
 
 	lease->frominfo = 0;
@@ -3439,6 +3435,7 @@ dhcp_start1(void *arg)
 	clock_gettime(CLOCK_MONOTONIC, >started);
 	free(state->offer);
 	state->offer = NULL;
+	state->offer_len = 0;
 
 	if (state->arping_index < ifo->arping_len) {
 		struct arp_state *astate;
@@ -3495,6 +3492,7 @@ dhcp_start1(void *arg)
 			{
 free(state->offer);
 state->offer = NULL;
+state->offer_len = 0;
 			}
 		}
 	}
@@ -3660,7 +3658,7 @@ dhcp_handleifa(int cmd, struct ipv4_addr
 	if (cmd == RTM_DELADDR) {
 		if (IPV4_BRD_EQ(state->addr, ia)) {
 			logger(ifp->ctx, LOG_INFO,
-			"%s: removing IP address %s", ifp->name, ia->saddr);
+			"%s: deleted IP address %s", ifp->name, ia->saddr);
 			dhcp_drop(ifp, "EXPIRE");
 		}
 		return;

Index: src/external/bsd/dhcpcd/dist/dhcp6.c
diff -u src/external/bsd/dhcpcd/dist/dhcp6.c:1.23 src/external/bsd/dhcpcd/dist/dhcp6.c:1.24
--- src/external/bsd/dhcpcd/dist/dhcp6.c:1.23	Fri Jul 29 10:07:57 2016
+++ src/external/bsd/dhcpcd/dist/dhcp6.c	Mon Aug 15 11:04:53 2016
@@ -1,5 +1,5 @@
 #include 
- __RCSID("$NetBSD: dhcp6.c,v 1.23 2016/07/29 10:07:57 roy Exp $");
+ __RCSID("$NetBSD: dhcp6.c,v 1.24 2016/08/15 11:04:53 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
@@ -3177,6 +3177,22 @@ dhcp6_open(struct dhcpcd_ctx *dctx)
 		logger(dctx, LOG_WARNING, "setsockopt: SO_REUSEPORT: %m");
 #endif
 
+	if (!(dctx->options & DHCPCD_MASTER)) {
+		/* Bind to the link-local address to allow more than one
+		 * DHCPv6 client to work. */
+		struct interface *ifp;
+		struct ipv6_addr *ia;
+
+		TAILQ_FOREACH(ifp, dctx->ifaces, next) {
+			if (ifp->active)
+

CVS commit: src/doc

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Aug 15 11:06:46 UTC 2016

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note import of dhcpcd-6.11.3


To generate a diff of this commit:
cvs rdiff -u -r1.1350 -r1.1351 src/doc/3RDPARTY
cvs rdiff -u -r1.2179 -r1.2180 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1350 src/doc/3RDPARTY:1.1351
--- src/doc/3RDPARTY:1.1350	Sun Aug  7 00:56:02 2016
+++ src/doc/3RDPARTY	Mon Aug 15 11:06:46 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1350 2016/08/07 00:56:02 kre Exp $
+#	$NetBSD: 3RDPARTY,v 1.1351 2016/08/15 11:06:46 roy Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -306,8 +306,8 @@ Notes:
 Use the dhcp2netbsd script.
 
 Package:	dhcpcd
-Version:	6.11.1
-Current Vers:	6.11.1
+Version:	6.11.3
+Current Vers:	6.11.3
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2179 src/doc/CHANGES:1.2180
--- src/doc/CHANGES:1.2179	Sun Aug  7 00:56:02 2016
+++ src/doc/CHANGES	Mon Aug 15 11:06:46 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2179 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2180 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -338,3 +338,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	sdtemp(4): Add JEDEC TSE2004av support. [msaitoh 20160728]
 	OpenSSH: Imported 7.3. [christos 20160802]
 	zoneinfo: Import tzdata2016f. [kre 20160807]
+	dhcpcd(8): Import dhcpcd-6.11.3. [roy 20160815]

CVS commit: src/doc

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Aug 15 11:06:46 UTC 2016

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note import of dhcpcd-6.11.3


To generate a diff of this commit:
cvs rdiff -u -r1.1350 -r1.1351 src/doc/3RDPARTY
cvs rdiff -u -r1.2179 -r1.2180 src/doc/CHANGES

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Aug 15 14:45:31 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Fix copy shift value - hopefully this will fix LOONGSON/GDIUM


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/mips/mips/mipsX_subr.S

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Aug 15 14:45:31 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Fix copy shift value - hopefully this will fix LOONGSON/GDIUM


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/mips/mips/mipsX_subr.S

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/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.89 src/sys/arch/mips/mips/mipsX_subr.S:1.90
--- src/sys/arch/mips/mips/mipsX_subr.S:1.89	Mon Aug 15 14:44:44 2016
+++ src/sys/arch/mips/mips/mipsX_subr.S	Mon Aug 15 14:45:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.89 2016/08/15 14:44:44 skrll Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.90 2016/08/15 14:45:31 skrll Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -373,7 +373,7 @@ VECTOR(MIPSX(tlb_miss), unknown)
 	nop	#01: nop
 	PTR_SRL k1, k0, 31			#02: clear useg bits
 	beqz	k1, 2f#03: k1==0 -> useg address
-	 PTR_SRL k1,k0,XSEGSHIFT+XSEGLENGTH+2	#04: clear valid bits
+	 PTR_SRL k1,k0,XSEGSHIFT+XSEGLENGTH	#04: clear valid bits
 	bnez	k1, MIPSX(nopagetable)		#05: not legal address
 	 PTR_SRL k0, XSEGSHIFT - PTR_SCALESHIFT #06: k0=seg offset (almost)
 	bgez	k0, 1f#07: k0<0 -> kernel fault

CVS commit: src/sys/arch/arm/omap

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Mon Aug 15 13:02:07 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c

Log Message:
use symbolic interrupt level for sdmmc, no functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/omap/omap3_sdhc.c

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

CVS commit: src/sys/arch/arm/omap

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Mon Aug 15 13:02:07 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c

Log Message:
use symbolic interrupt level for sdmmc, no functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/omap/omap3_sdhc.c

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

Modified files:

Index: src/sys/arch/arm/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.23 src/sys/arch/arm/omap/omap3_sdhc.c:1.24
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.23	Thu Aug  4 20:07:18 2016
+++ src/sys/arch/arm/omap/omap3_sdhc.c	Mon Aug 15 13:02:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap3_sdhc.c,v 1.23 2016/08/04 20:07:18 jakllsch Exp $	*/
+/*	$NetBSD: omap3_sdhc.c,v 1.24 2016/08/15 13:02:07 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.23 2016/08/04 20:07:18 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.24 2016/08/15 13:02:07 mlelstv Exp $");
 
 #include "opt_omap.h"
 #include "edma.h"
@@ -399,7 +399,7 @@ no_dma:
 	SYSCONFIG_ENAWAKEUP | SYSCONFIG_AUTOIDLE | SYSCONFIG_SIDLEMODE_AUTO |
 	SYSCONFIG_CLOCKACTIVITY_FCLK | SYSCONFIG_CLOCKACTIVITY_ICLK);
 
-	sc->sc_ih = intr_establish(oa->obio_intr, IPL_VM, IST_LEVEL,
+	sc->sc_ih = intr_establish(oa->obio_intr, IPL_SDMMC, IST_LEVEL,
 	sdhc_intr, >sc);
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "failed to establish interrupt %d\n",

CVS commit: src/sbin/devpubd/hooks

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Mon Aug 15 12:54:40 UTC 2016

Modified Files:
src/sbin/devpubd/hooks: 02-wedgenames

Log Message:
Avoid error message when /dev/wedges doesn't exist yet.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/devpubd/hooks/02-wedgenames

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

Modified files:

Index: src/sbin/devpubd/hooks/02-wedgenames
diff -u src/sbin/devpubd/hooks/02-wedgenames:1.3 src/sbin/devpubd/hooks/02-wedgenames:1.4
--- src/sbin/devpubd/hooks/02-wedgenames:1.3	Sun Mar  1 14:21:17 2015
+++ src/sbin/devpubd/hooks/02-wedgenames	Mon Aug 15 12:54:40 2016
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: 02-wedgenames,v 1.3 2015/03/01 14:21:17 mlelstv Exp $
+# $NetBSD: 02-wedgenames,v 1.4 2016/08/15 12:54:40 mlelstv Exp $
 #
 # Try to maintain symlinks to wedge devices
 #
@@ -12,7 +12,7 @@ devices=$@
 wedgedir=/dev/wedges
 
 remove_wedge() {
-	find $wedgedir -print \
+	test -d $wedgedir && find $wedgedir -print \
 	| sed -e 's# #\\ #g' \
 	| while read w; do
 		t=$(readlink "$w")

CVS commit: src/sbin/devpubd/hooks

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Mon Aug 15 12:54:40 UTC 2016

Modified Files:
src/sbin/devpubd/hooks: 02-wedgenames

Log Message:
Avoid error message when /dev/wedges doesn't exist yet.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/devpubd/hooks/02-wedgenames

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Aug 15 14:26:48 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Fix an instruction number in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/mips/mips/mipsX_subr.S

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Aug 15 14:26:48 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Fix an instruction number in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/mips/mips/mipsX_subr.S

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/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.87 src/sys/arch/mips/mips/mipsX_subr.S:1.88
--- src/sys/arch/mips/mips/mipsX_subr.S:1.87	Tue Aug  9 09:06:31 2016
+++ src/sys/arch/mips/mips/mipsX_subr.S	Mon Aug 15 14:26:48 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.87 2016/08/09 09:06:31 skrll Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.88 2016/08/15 14:26:48 skrll Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -387,9 +387,9 @@ VECTOR(MIPSX(tlb_miss), unknown)
 	PTR_L	k1, 0(k1)			#0e: k1=seg entry
 	b	MIPSX(tlb_miss_common)		#0f
 #ifdef MIPSNNR2
-	 _EXT	k0, k0, SEGSHIFT, SEGLENGTH	#0f: k0=seg index
+	 _EXT	k0, k0, SEGSHIFT, SEGLENGTH	#10: k0=seg index
 #else
-	 PTR_SRL k0, SEGSHIFT - PTR_SCALESHIFT	#0f: k0=seg offset (almost)
+	 PTR_SRL k0, SEGSHIFT - PTR_SCALESHIFT	#10: k0=seg offset (almost)
 #endif
 #endif /* LP64 */
 2: /* handle useg addresses */

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Aug 15 14:44:44 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/mips/mips/mipsX_subr.S

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

CVS commit: src/sys/arch/mips/mips

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Aug 15 14:44:44 UTC 2016

Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/mips/mips/mipsX_subr.S

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/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.88 src/sys/arch/mips/mips/mipsX_subr.S:1.89
--- src/sys/arch/mips/mips/mipsX_subr.S:1.88	Mon Aug 15 14:26:48 2016
+++ src/sys/arch/mips/mips/mipsX_subr.S	Mon Aug 15 14:44:44 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mipsX_subr.S,v 1.88 2016/08/15 14:26:48 skrll Exp $	*/
+/*	$NetBSD: mipsX_subr.S,v 1.89 2016/08/15 14:44:44 skrll Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -360,7 +360,7 @@
  *
  * Loongson2 processors don't have separate tlbmiss and xtlbmiss handlers;
  * so we have to check for useg addresses in tlb_miss. The good news is that
- * we can use 64 intructions form tlbmiss instead of 32.
+ * we can use 64 intructions from tlbmiss instead of 32.
  *
  *
  */

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 17:01:25 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile

Log Message:
updates for xf86-video-nouveau 1.0.12.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.1	Tue Oct 13 04:33:22 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile	Mon Aug 15 17:01:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2015/10/13 04:33:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
 
 DRIVER=		xf86-video-nouveau
 DRIVER_NAME=	nouveau_drv
@@ -10,7 +10,6 @@ SRCS=		nouveau_copy.c \
 		nouveau_exa.c \
 		nouveau_xv.c \
 		nouveau_dri2.c \
-		nouveau_glamor.c \
 		nouveau_present.c \
 		nouveau_sync.c \
 		nouveau_wfb.c \
@@ -39,7 +38,6 @@ LIBDPLIBS+=	drm_nouveau ${.CURDIR}/../..
 
 MAN=		nouveau.4
 
-CPPFLAGS+=	-DHAVE_XAA_H
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
 
 CPPFLAGS+=	-DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
@@ -47,7 +45,15 @@ CPPFLAGS+=	-DNV_MINOR_VERSION=${PACKAGE_
 CPPFLAGS+=	-DNV_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=	-DNV_DRIVER_DATE=${DRIVER_DATE}
 
+# XXX
+COPTS.nouveau_xv.c+=	-Wno-error=discarded-qualifiers
+
 .include "../Makefile.xf86-driver"
 
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+=	-DHAVE_XORG_LIST
+CPPFLAGS+=	-DHAVE_XAA_H
+.endif
+
 # from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
 DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-nouveau

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 17:01:25 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile

Log Message:
updates for xf86-video-nouveau 1.0.12.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile

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

CVS commit: src/sys/dev

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Aug 15 15:51:39 UTC 2016

Modified Files:
src/sys/dev: clock_subr.c

Log Message:
Fix leap year handling for years 2100 and greater.

I can not explain why this works and the existing code doesn't.
Maybe it has something to do with leap years happening at the end of a
four year period and not at the beggining, and there being no year 0?


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/clock_subr.c

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

CVS commit: src/sys/dev

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Mon Aug 15 15:51:39 UTC 2016

Modified Files:
src/sys/dev: clock_subr.c

Log Message:
Fix leap year handling for years 2100 and greater.

I can not explain why this works and the existing code doesn't.
Maybe it has something to do with leap years happening at the end of a
four year period and not at the beggining, and there being no year 0?


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/clock_subr.c

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

Modified files:

Index: src/sys/dev/clock_subr.c
diff -u src/sys/dev/clock_subr.c:1.26 src/sys/dev/clock_subr.c:1.27
--- src/sys/dev/clock_subr.c:1.26	Mon Dec 22 18:09:20 2014
+++ src/sys/dev/clock_subr.c	Mon Aug 15 15:51:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock_subr.c,v 1.26 2014/12/22 18:09:20 christos Exp $	*/
+/*	$NetBSD: clock_subr.c,v 1.27 2016/08/15 15:51:39 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,7 +50,7 @@
 
 #ifdef _KERNEL
 #include 
-__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.26 2014/12/22 18:09:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.27 2016/08/15 15:51:39 jakllsch Exp $");
 
 #include 
 #include 
@@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: clock_subr.c
 #define FEBRUARY	2
 
 /* for easier alignment:
- * time from the epoch to 2000 (there were 7 leap years): */
-#define	DAYSTO2000	(365*30+7)
+ * time from the epoch to 2001 (there were 8 leap years): */
+#define	DAYSTO2001	(365*31+8)
 
 /* 4 year intervals include 1 leap year */
 #define	DAYS4YEARS	(365*4+1)
@@ -96,14 +96,14 @@ clock_ymdhms_to_secs(struct clock_ymdhms
 	if (is_leap_year(year) && dt->dt_mon > FEBRUARY)
 		days++;
 
-	if (year < 2000) {
+	if (year < 2001) {
 		/* simple way for early years */
 		for (i = POSIX_BASE_YEAR; i < year; i++)
 			days += days_per_year(i);
 	} else {
 		/* years are properly aligned */
-		days += DAYSTO2000;
-		year -= 2000;
+		days += DAYSTO2001;
+		year -= 2001;
 
 		i = year / 400;
 		days += i * DAYS400YEARS;
@@ -155,9 +155,9 @@ clock_secs_to_ymdhms(time_t secs, struct
 	/* Day of week (Note: 1/1/1970 was a Thursday) */
 	dt->dt_wday = (days + 4) % 7;
 
-	if (days >= DAYSTO2000) {
-		days -= DAYSTO2000;
-		dt->dt_year = 2000;
+	if (days >= DAYSTO2001) {
+		days -= DAYSTO2001;
+		dt->dt_year = 2001;
 
 		i = days / DAYS400YEARS;
 		days -= i*DAYS400YEARS;

CVS commit: xsrc/external/mit/xf86-video-sis/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:44:03 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
update for xf86-video-sis 0.10.8


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-sis/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/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.7 xsrc/external/mit/xf86-video-sis/include/config.h:1.8
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.7	Mon Jun  3 09:23:42 2013
+++ xsrc/external/mit/xf86-video-sis/include/config.h	Mon Aug 15 17:44:03 2016
@@ -33,8 +33,10 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_UNISTD_H 1
 
+#if 0
  /* Define to 1 if you have the  header file. */
 #define HAVE_XAA_H 1
+#endif
 
 /* xextproto 7.1 available */
 #define HAVE_XEXTPROTO_71 1
@@ -53,7 +55,7 @@
 #define PACKAGE_NAME "xf86-video-sis"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-sis 0.10.7"
+#define PACKAGE_STRING "xf86-video-sis 0.10.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xf86-video-sis"
@@ -63,7 +65,7 @@
 
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.7"
+#define PACKAGE_VERSION "0.10.8"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 0
@@ -72,7 +74,7 @@
 #define PACKAGE_VERSION_MINOR 10
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 7
+#define PACKAGE_VERSION_PATCHLEVEL 8
 
 /* Enable DRI driver support */
 #undef SISDRI
@@ -84,7 +86,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.10.7"
+#define VERSION "0.10.8"
 
 /* Build support for Exa */
 #define XF86EXA 1

CVS commit: xsrc/external/mit/xf86-video-sis/include

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:44:03 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
update for xf86-video-sis 0.10.8


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-sis/include/config.h

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

CVS commit: src/sbin/fsck_ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 19:13:24 UTC 2016

Modified Files:
src/sbin/fsck_ext2fs: setup.c

Log Message:
more informative debug output for unsupported features


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sbin/fsck_ext2fs/setup.c

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

CVS commit: src/sbin/fsck_ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 19:13:24 UTC 2016

Modified Files:
src/sbin/fsck_ext2fs: setup.c

Log Message:
more informative debug output for unsupported features


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sbin/fsck_ext2fs/setup.c

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

Modified files:

Index: src/sbin/fsck_ext2fs/setup.c
diff -u src/sbin/fsck_ext2fs/setup.c:1.34 src/sbin/fsck_ext2fs/setup.c:1.35
--- src/sbin/fsck_ext2fs/setup.c:1.34	Mon Aug 15 18:57:06 2016
+++ src/sbin/fsck_ext2fs/setup.c	Mon Aug 15 19:13:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.34 2016/08/15 18:57:06 jdolecek Exp $	*/
+/*	$NetBSD: setup.c,v 1.35 2016/08/15 19:13:24 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.5 (Berkeley) 11/23/94";
 #else
-__RCSID("$NetBSD: setup.c,v 1.34 2016/08/15 18:57:06 jdolecek Exp $");
+__RCSID("$NetBSD: setup.c,v 1.35 2016/08/15 19:13:24 jdolecek Exp $");
 #endif
 #endif /* not lint */
 
@@ -78,6 +78,8 @@ __RCSID("$NetBSD: setup.c,v 1.34 2016/08
 #include 
 #include 
 
+#include 
+
 #include "fsck.h"
 #include "extern.h"
 #include "fsutil.h"
@@ -385,6 +387,21 @@ readsb(int listerr)
 			sblock.e2fs.e2fs_features_compat,
 			sblock.e2fs.e2fs_features_incompat,
 			sblock.e2fs.e2fs_features_rocompat);
+
+			if ((sblock.e2fs.e2fs_features_rocompat & ~EXT2F_ROCOMPAT_SUPP_FSCK)) {
+char buf[512];
+
+snprintb(buf, sizeof(buf), EXT2F_ROCOMPAT_BITS,
+	sblock.e2fs.e2fs_features_rocompat & ~EXT2F_ROCOMPAT_SUPP_FSCK);
+printf("unsupported rocompat features: %s\n", buf);
+			}
+			if ((sblock.e2fs.e2fs_features_incompat & ~EXT2F_INCOMPAT_SUPP_FSCK)) {
+char buf[512];
+
+snprintb(buf, sizeof(buf), EXT2F_INCOMPAT_BITS,
+	sblock.e2fs.e2fs_features_incompat & ~EXT2F_INCOMPAT_SUPP_FSCK);
+printf("unsupported incompat features: %s\n", buf);
+			}
 		}
 		badsb(listerr, "INCOMPATIBLE FEATURE BITS IN SUPER BLOCK");
 		return 0;

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:42:06 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c

Log Message:
merge xf86-video-sis 0.10.8


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.5 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.6
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.5	Sun Feb 28 15:22:34 2016
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c	Mon Aug 15 17:42:06 2016
@@ -57,7 +57,6 @@
 #include "fb.h"
 #include "micmap.h"
 #include "mipointer.h"
-#include "mibstore.h"
 #include "edid.h"
 
 #define SIS_NEED_inSISREG
@@ -94,6 +93,10 @@
 #include "dri.h"
 #endif
 
+#ifndef DEFAULT_DPI
+#define DEFAULT_DPI 96
+#endif
+
 /*
  * LookupWindow was removed with video abi 11.
  */
@@ -426,14 +429,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const cha
 static const char str[] = "**\n";
 
 va_start(ap, format);
-xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	"  ERROR:\n");
 xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
 va_end(ap);
 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	"  END OF MESSAGE\n");
-xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
 }
 
 static void
@@ -1911,14 +1914,14 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr 
if(infochanged && !usenonrect) {
 	  xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
 			"Virtual screen size does not match maximum display modes...\n");
-	  xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
+	  xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine);
 
}
 } else if(infochanged && usenonrect) {
usenonrect = FALSE;
xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
 		"Only clone modes available for this virtual screen size...\n");
-   xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
+   xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine);
 }
 
 if(pSiS->maxCRT1_X1) {		/* Means we have at least one non-clone mode */
@@ -3276,9 +3279,11 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo); /*SIS_PCI_DEVICE(pSiS->PciInfo);*/
 pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo);  /*SIS_PCI_FUNC(pSiS->PciInfo);*/
 
+#ifndef XSERVER_LIBPCIACCESS
 pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo),
 			  PCI_DEV_DEV(pSiS->PciInfo),
 			  PCI_DEV_FUNC(pSiS->PciInfo));
+#endif
 
 #ifdef SIS_NEED_MAP_IOP
 //
@@ -3902,7 +3907,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if(pSiSEnt) pSiSEnt->SiS_Pr = pSiS->SiS_Pr;
 #endif
memset(pSiS->SiS_Pr, 0, sizeof(struct SiS_Private));
+#ifndef XSERVER_LIBPCIACCESS
pSiS->SiS_Pr->PciTag = pSiS->PciTag;
+#endif
pSiS->SiS_Pr->ChipType = pSiS->ChipType;
pSiS->SiS_Pr->ChipRevision = pSiS->ChipRev;
pSiS->SiS_Pr->SiS_Backup70xx = 0xff;
@@ -7131,7 +7138,9 @@ static Bool
 SISMapMem(ScrnInfoPtr pScrn)
 {
 SISPtr pSiS = SISPTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
 int mmioFlags = VIDMEM_MMIO;
+#endif
 #ifdef SISDUALHEAD
 SISEntPtr pSiSEnt = pSiS->entityPrivate;
 #endif
@@ -7141,9 +7150,11 @@ SISMapMem(ScrnInfoPtr pScrn)
  * (For Alpha, we need to map SPARSE memory, since we need
  * byte/short access.)
  */
+#ifndef XSERVER_LIBPCIACCESS
 #if defined(__alpha__)
 mmioFlags |= VIDMEM_SPARSE;
 #endif
+#endif
 
 #ifdef SISDUALHEAD
 if(pSiS->DualHeadMode) {
@@ -7344,7 +7355,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
 if(pSiSEnt->MapCountIOBase) {
 	pSiSEnt->MapCountIOBase--;
 	if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
+#ifndef XSERVER_LIBPCIACCESS
 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
+#else
+	pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
+#endif
 		pSiSEnt->IOBase = NULL;
 		pSiSEnt->MapCountIOBase = 0;
 		pSiSEnt->forceUnmapIOBase = FALSE;
@@ -7355,7 +7370,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
 	if(pSiSEnt->MapCountIOBaseDense) {
 	pSiSEnt->MapCountIOBaseDense--;
 	if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) {
+#ifndef XSERVER_LIBPCIACCESS
 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
+#else
+		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
+#endif
 		pSiSEnt->IOBaseDense = NULL;
 		pSiSEnt->MapCountIOBaseDense 

CVS import: xsrc/external/mit/xf86-video-sis/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:40:26 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-sis/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25791

Log Message:
initial import of xf86-video-sis-0.10.8

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-sis-0-10-8

U xsrc/external/mit/xf86-video-sis/dist/config.h.in
U xsrc/external/mit/xf86-video-sis/dist/COPYING
U xsrc/external/mit/xf86-video-sis/dist/missing
U xsrc/external/mit/xf86-video-sis/dist/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/configure
U xsrc/external/mit/xf86-video-sis/dist/config.sub
U xsrc/external/mit/xf86-video-sis/dist/INSTALL
U xsrc/external/mit/xf86-video-sis/dist/install-sh
U xsrc/external/mit/xf86-video-sis/dist/configure.ac
U xsrc/external/mit/xf86-video-sis/dist/aclocal.m4
U xsrc/external/mit/xf86-video-sis/dist/depcomp
U xsrc/external/mit/xf86-video-sis/dist/README
U xsrc/external/mit/xf86-video-sis/dist/ltmain.sh
U xsrc/external/mit/xf86-video-sis/dist/config.guess
U xsrc/external/mit/xf86-video-sis/dist/ChangeLog
U xsrc/external/mit/xf86-video-sis/dist/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/man/sis.man
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/src/sispcirename.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_opt.c
U xsrc/external/mit/xf86-video-sis/dist/src/init.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/osdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_memcpy.c
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vb.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dga.c
U xsrc/external/mit/xf86-video-sis/dist/src/init.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_shadow.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis6326_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-sis/dist/src/310vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.am
C xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_regs.h
U xsrc/external/mit/xf86-video-sis/dist/src/300vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/oem300.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.c
U xsrc/external/mit/xf86-video-sis/dist/src/initdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_common.h
U xsrc/external/mit/xf86-video-sis/dist/src/oem310.h
U xsrc/external/mit/xf86-video-sis/dist/src/init301.c
U xsrc/external/mit/xf86-video-sis/dist/src/init301.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_videostr.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/vgatypes.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.c
U xsrc/external/mit/xf86-video-sis/dist/src/vstruct.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vga.c
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_setup.c

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

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-sis/dist

CVS import: xsrc/external/mit/xf86-video-sis/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:40:26 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-sis/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25791

Log Message:
initial import of xf86-video-sis-0.10.8

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-sis-0-10-8

U xsrc/external/mit/xf86-video-sis/dist/config.h.in
U xsrc/external/mit/xf86-video-sis/dist/COPYING
U xsrc/external/mit/xf86-video-sis/dist/missing
U xsrc/external/mit/xf86-video-sis/dist/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/configure
U xsrc/external/mit/xf86-video-sis/dist/config.sub
U xsrc/external/mit/xf86-video-sis/dist/INSTALL
U xsrc/external/mit/xf86-video-sis/dist/install-sh
U xsrc/external/mit/xf86-video-sis/dist/configure.ac
U xsrc/external/mit/xf86-video-sis/dist/aclocal.m4
U xsrc/external/mit/xf86-video-sis/dist/depcomp
U xsrc/external/mit/xf86-video-sis/dist/README
U xsrc/external/mit/xf86-video-sis/dist/ltmain.sh
U xsrc/external/mit/xf86-video-sis/dist/config.guess
U xsrc/external/mit/xf86-video-sis/dist/ChangeLog
U xsrc/external/mit/xf86-video-sis/dist/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/man/sis.man
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/src/sispcirename.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_opt.c
U xsrc/external/mit/xf86-video-sis/dist/src/init.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/osdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_memcpy.c
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vb.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dga.c
U xsrc/external/mit/xf86-video-sis/dist/src/init.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_shadow.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis6326_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-sis/dist/src/310vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.am
C xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_regs.h
U xsrc/external/mit/xf86-video-sis/dist/src/300vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/oem300.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.c
U xsrc/external/mit/xf86-video-sis/dist/src/initdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_common.h
U xsrc/external/mit/xf86-video-sis/dist/src/oem310.h
U xsrc/external/mit/xf86-video-sis/dist/src/init301.c
U xsrc/external/mit/xf86-video-sis/dist/src/init301.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_videostr.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/vgatypes.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.c
U xsrc/external/mit/xf86-video-sis/dist/src/vstruct.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vga.c
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_setup.c

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

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-sis/dist

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:38:10 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_rename.c ext2fs_vnops.c

Log Message:
bump link limit to 65000 for files, and add support for 
EXT2F_ROCOMPAT_DIR_NLINK to make link count unlimited for directories


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/ext2fs/ext2fs_rename.c
cvs rdiff -u -r1.124 -r1.125 src/sys/ufs/ext2fs/ext2fs_vnops.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/ufs/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.45 src/sys/ufs/ext2fs/ext2fs.h:1.46
--- src/sys/ufs/ext2fs/ext2fs.h:1.45	Sun Aug 14 11:42:50 2016
+++ src/sys/ufs/ext2fs/ext2fs.h	Mon Aug 15 18:38:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs.h,v 1.45 2016/08/14 11:42:50 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs.h,v 1.46 2016/08/15 18:38:10 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -128,6 +128,13 @@
 #define MINFREE		5
 
 /*
+ * This is maximum amount of links allowed for files. For directories,
+ * going over this means setting DIR_NLINK feature.
+ */
+#define EXT2FS_LINK_MAX		65000
+#define EXT2FS_LINK_INF		1		/* link count unknown */
+
+/*
  * Super block for an ext2fs file system.
  */
 struct ext2fs {
@@ -358,7 +365,8 @@ struct m_ext2fs {
 #define EXT2F_ROCOMPAT_SUPP		(EXT2F_ROCOMPAT_SPARSESUPER \
 	 | EXT2F_ROCOMPAT_LARGEFILE \
 	 | EXT2F_ROCOMPAT_HUGE_FILE \
-	 | EXT2F_ROCOMPAT_EXTRA_ISIZE)
+	 | EXT2F_ROCOMPAT_EXTRA_ISIZE \
+	 | EXT2F_ROCOMPAT_DIR_NLINK)
 #define EXT2F_INCOMPAT_SUPP		(EXT2F_INCOMPAT_FTYPE \
 	 | EXT2F_INCOMPAT_EXTENTS)
 

Index: src/sys/ufs/ext2fs/ext2fs_rename.c
diff -u src/sys/ufs/ext2fs/ext2fs_rename.c:1.10 src/sys/ufs/ext2fs/ext2fs_rename.c:1.11
--- src/sys/ufs/ext2fs/ext2fs_rename.c:1.10	Sat Aug 13 07:40:10 2016
+++ src/sys/ufs/ext2fs/ext2fs_rename.c	Mon Aug 15 18:38:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_rename.c,v 1.10 2016/08/13 07:40:10 christos Exp $	*/
+/*	$NetBSD: ext2fs_rename.c,v 1.11 2016/08/15 18:38:10 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_rename.c,v 1.10 2016/08/13 07:40:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_rename.c,v 1.11 2016/08/15 18:38:10 jdolecek Exp $");
 
 #include 
 #include 
@@ -307,7 +307,7 @@ ext2fs_gro_rename(struct mount *mp, kaut
 	 * We shall need to temporarily bump the link count, so make
 	 * sure there is room to do so.
 	 */
-	if ((nlink_t)VTOI(fvp)->i_e2fs_nlink >= LINK_MAX)
+	if ((nlink_t)VTOI(fvp)->i_e2fs_nlink >= EXT2FS_LINK_MAX)
 		return EMLINK;
 
 	directory_p = (fvp->v_type == VDIR);
@@ -330,7 +330,7 @@ ext2fs_gro_rename(struct mount *mp, kaut
 	 *may be wrong, but correctable.
 	 */
 
-	KASSERT((nlink_t)VTOI(fvp)->i_e2fs_nlink < LINK_MAX);
+	KASSERT((nlink_t)VTOI(fvp)->i_e2fs_nlink < EXT2FS_LINK_MAX);
 	VTOI(fvp)->i_e2fs_nlink++;
 	VTOI(fvp)->i_flag |= IN_CHANGE;
 	error = ext2fs_update(fvp, NULL, NULL, UPDATE_WAIT);
@@ -352,11 +352,11 @@ ext2fs_gro_rename(struct mount *mp, kaut
 		 * parent we don't fool with the link count.
 		 */
 		if (directory_p && reparent_p) {
-			if ((nlink_t)VTOI(tdvp)->i_e2fs_nlink >= LINK_MAX) {
+			if ((nlink_t)VTOI(tdvp)->i_e2fs_nlink >= EXT2FS_LINK_MAX) {
 error = EMLINK;
 goto whymustithurtsomuch;
 			}
-			KASSERT((nlink_t)VTOI(tdvp)->i_e2fs_nlink < LINK_MAX);
+			KASSERT((nlink_t)VTOI(tdvp)->i_e2fs_nlink < EXT2FS_LINK_MAX);
 			VTOI(tdvp)->i_e2fs_nlink++;
 			VTOI(tdvp)->i_flag |= IN_CHANGE;
 			error = ext2fs_update(tdvp, NULL, NULL, UPDATE_WAIT);

Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.124 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.125
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.124	Mon Aug 15 18:29:34 2016
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c	Mon Aug 15 18:38:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vnops.c,v 1.124 2016/08/15 18:29:34 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_vnops.c,v 1.125 2016/08/15 18:38:10 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.124 2016/08/15 18:29:34 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.125 2016/08/15 18:38:10 jdolecek Exp $");
 
 #include 
 #include 
@@ -626,7 +626,7 @@ ext2fs_link(void *v)
 		goto out2;
 	}
 	ip = VTOI(vp);
-	if ((nlink_t)ip->i_e2fs_nlink >= LINK_MAX) {
+	if ((nlink_t)ip->i_e2fs_nlink >= EXT2FS_LINK_MAX) {
 		VOP_ABORTOP(dvp, cnp);
 		error = EMLINK;
 		goto out1;
@@ -677,11 +677,6 @@ ext2fs_mkdir(void *v)
 	ulr = (dvp)->i_crap;
 	UFS_CHECK_CRAPCOUNTER(VTOI(dvp));
 
-	if ((nlink_t)dp->i_e2fs_nlink >= LINK_MAX) {
-		error = EMLINK;
-		goto out;
-	}
-
 	/*
 	 * Acquire the inode, but don't sync/direnter it just yet
 	 */
@@ -700,7 

CVS commit: src/sbin/fsck_ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:42:15 UTC 2016

Modified Files:
src/sbin/fsck_ext2fs: fsck.h setup.c

Log Message:
divorce list of features supported by fsck_ext2fs from the kernel;
while kernel might support e.g. extents, extra_isize or dir_nlink,
fsck could actually have no idea about the features


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/fsck_ext2fs/fsck.h
cvs rdiff -u -r1.32 -r1.33 src/sbin/fsck_ext2fs/setup.c

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

Modified files:

Index: src/sbin/fsck_ext2fs/fsck.h
diff -u src/sbin/fsck_ext2fs/fsck.h:1.15 src/sbin/fsck_ext2fs/fsck.h:1.16
--- src/sbin/fsck_ext2fs/fsck.h:1.15	Mon Oct 19 18:41:08 2009
+++ src/sbin/fsck_ext2fs/fsck.h	Mon Aug 15 18:42:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fsck.h,v 1.15 2009/10/19 18:41:08 bouyer Exp $	*/
+/*	$NetBSD: fsck.h,v 1.16 2016/08/15 18:42:15 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -230,6 +230,17 @@ struct	ext2fs_dinode zino;
 #define	ALTERED	0x08
 #define	FOUND	0x10
 
+/*
+ * Kernel support for features doesn't imply fsck support
+ */
+#define EXT2F_COMPAT_SUPP_FSCK		0x00
+#define EXT2F_ROCOMPAT_SUPP_FSCK	(EXT2F_ROCOMPAT_SPARSESUPER \
+ | EXT2F_ROCOMPAT_LARGEFILE \
+ | EXT2F_ROCOMPAT_HUGE_FILE \
+	)
+#define EXT2F_INCOMPAT_SUPP_FSCK	(EXT2F_INCOMPAT_FTYPE \
+	)
+
 struct ext2fs_dinode *ginode(ino_t);
 struct inoinfo *getinoinfo(ino_t);
 void getblk(struct bufarea *, daddr_t, long);

Index: src/sbin/fsck_ext2fs/setup.c
diff -u src/sbin/fsck_ext2fs/setup.c:1.32 src/sbin/fsck_ext2fs/setup.c:1.33
--- src/sbin/fsck_ext2fs/setup.c:1.32	Thu Dec  4 01:41:37 2014
+++ src/sbin/fsck_ext2fs/setup.c	Mon Aug 15 18:42:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.32 2014/12/04 01:41:37 christos Exp $	*/
+/*	$NetBSD: setup.c,v 1.33 2016/08/15 18:42:15 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.5 (Berkeley) 11/23/94";
 #else
-__RCSID("$NetBSD: setup.c,v 1.32 2014/12/04 01:41:37 christos Exp $");
+__RCSID("$NetBSD: setup.c,v 1.33 2016/08/15 18:42:15 jdolecek Exp $");
 #endif
 #endif /* not lint */
 
@@ -377,8 +377,8 @@ readsb(int listerr)
 	asblk.b_un.b_fs->e2fs_features_rocompat |=
 	sblk.b_un.b_fs->e2fs_features_rocompat & EXT2F_ROCOMPAT_LARGEFILE;
 	if (sblock.e2fs.e2fs_rev > E2FS_REV0 &&
-	((sblock.e2fs.e2fs_features_incompat & ~EXT2F_INCOMPAT_SUPP) ||
-	(sblock.e2fs.e2fs_features_rocompat & ~EXT2F_ROCOMPAT_SUPP))) {
+	((sblock.e2fs.e2fs_features_incompat & ~EXT2F_INCOMPAT_SUPP_FSCK) ||
+	(sblock.e2fs.e2fs_features_rocompat & ~EXT2F_ROCOMPAT_SUPP_FSCK))) {
 		if (debug) {
 			printf("compat 0x%08x, incompat 0x%08x, compat_ro "
 			"0x%08x\n",

CVS commit: src/sbin/fsck_ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:42:15 UTC 2016

Modified Files:
src/sbin/fsck_ext2fs: fsck.h setup.c

Log Message:
divorce list of features supported by fsck_ext2fs from the kernel;
while kernel might support e.g. extents, extra_isize or dir_nlink,
fsck could actually have no idea about the features


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/fsck_ext2fs/fsck.h
cvs rdiff -u -r1.32 -r1.33 src/sbin/fsck_ext2fs/setup.c

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

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:46:11 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h

Log Message:
EXT2F_INCOMPAT_FLEX_BG feature actually doesn't require any explicit
code changes, all magic is done by setting the block offsets appropriately
in group descriptors by newfs; add it to the list of supported INCOMPAT flags


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/ufs/ext2fs/ext2fs.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/ufs/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.46 src/sys/ufs/ext2fs/ext2fs.h:1.47
--- src/sys/ufs/ext2fs/ext2fs.h:1.46	Mon Aug 15 18:38:10 2016
+++ src/sys/ufs/ext2fs/ext2fs.h	Mon Aug 15 18:46:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs.h,v 1.46 2016/08/15 18:38:10 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs.h,v 1.47 2016/08/15 18:46:11 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -368,7 +368,8 @@ struct m_ext2fs {
 	 | EXT2F_ROCOMPAT_EXTRA_ISIZE \
 	 | EXT2F_ROCOMPAT_DIR_NLINK)
 #define EXT2F_INCOMPAT_SUPP		(EXT2F_INCOMPAT_FTYPE \
-	 | EXT2F_INCOMPAT_EXTENTS)
+	 | EXT2F_INCOMPAT_EXTENTS \
+	 | EXT2F_INCOMPAT_FLEX_BG)
 
 /*
  * Feature set definitions

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:46:11 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h

Log Message:
EXT2F_INCOMPAT_FLEX_BG feature actually doesn't require any explicit
code changes, all magic is done by setting the block offsets appropriately
in group descriptors by newfs; add it to the list of supported INCOMPAT flags


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/ufs/ext2fs/ext2fs.h

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

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Mon Aug 15 19:20:17 UTC 2016

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

Log Message:
Add .MAKE.META.IGNORE_FILTER to allow more complicated filtering of filemon 
data.

The filter is applied to paths Read or Excuted, and if it expands to
nothing, the entry is skipped.

For example; dirdeps.mk can set this to:

.MAKE.META.IGNORE_FILTER = M*/${.MAKE.DEPENDFILE_PREFIX}*

when checking if DIRDEPS_CACHE is up to date, where only Makefile.depend*
are of interest.


To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 src/usr.bin/make/make.1
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/make/meta.c

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

Modified files:

Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.260 src/usr.bin/make/make.1:1.261
--- src/usr.bin/make/make.1:1.260	Wed Aug 10 23:49:12 2016
+++ src/usr.bin/make/make.1	Mon Aug 15 19:20:17 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.260 2016/08/10 23:49:12 sjg Exp $
+.\"	$NetBSD: make.1,v 1.261 2016/08/15 19:20:17 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd August 10, 2016
+.Dd August 15, 2016
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -927,6 +927,9 @@ The default list includes:
 .It Va .MAKE.META.IGNORE_PATTERNS
 Provides a list of patterns to match against pathnames.
 Ignore any that match.
+.It Va .MAKE.META.IGNORE_FILTER
+Provides a list of variable modifiers to apply to each pathname.
+Ignore if the expansion is an empty string.
 .It Va .MAKE.META.PREFIX
 Defines the message printed for each meta file updated in "meta verbose" mode.
 The default value is:

Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.65 src/usr.bin/make/meta.c:1.66
--- src/usr.bin/make/meta.c:1.65	Wed Aug 10 18:49:40 2016
+++ src/usr.bin/make/meta.c	Mon Aug 15 19:20:17 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: meta.c,v 1.65 2016/08/10 18:49:40 sjg Exp $ */
+/*  $NetBSD: meta.c,v 1.66 2016/08/15 19:20:17 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -65,6 +65,9 @@ static char *metaIgnorePathsStr;	/* stri
 #ifndef MAKE_META_IGNORE_PATTERNS
 #define MAKE_META_IGNORE_PATTERNS ".MAKE.META.IGNORE_PATTERNS"
 #endif
+#ifndef MAKE_META_IGNORE_FILTER
+#define MAKE_META_IGNORE_FILTER ".MAKE.META.IGNORE_FILTER"
+#endif
 
 Boolean useMeta = FALSE;
 static Boolean useFilemon = FALSE;
@@ -75,6 +78,7 @@ static Boolean metaEnv = FALSE;		/* don'
 static Boolean metaVerbose = FALSE;
 static Boolean metaIgnoreCMDs = FALSE;	/* ignore CMDs in .meta files */
 static Boolean metaIgnorePatterns = FALSE; /* do we need to do pattern matches */
+static Boolean metaIgnoreFilter = FALSE;   /* do we have more complex filtering? */
 static Boolean metaCurdirOk = FALSE;	/* write .meta in .CURDIR Ok? */
 static Boolean metaSilent = FALSE;	/* if we have a .meta be SILENT */
 
@@ -641,6 +645,11 @@ meta_mode_init(const char *make_mode)
 	metaIgnorePatterns = TRUE;
 	free(cp);
 }
+cp = NULL;
+if (Var_Value(MAKE_META_IGNORE_FILTER, VAR_GLOBAL, )) {
+	metaIgnoreFilter = TRUE;
+	free(cp);
+}
 }
 
 /*
@@ -1320,6 +1329,26 @@ meta_oodate(GNode *gn, Boolean oodate)
 			free(pm);
 		}
 
+		if (metaIgnoreFilter) {
+			char *fm;
+
+			/* skip if filter result is empty */
+			snprintf(fname1, sizeof(fname1),
+ "${%s:L:${%s:ts:}}",
+ p, MAKE_META_IGNORE_FILTER);
+			fm = Var_Subst(NULL, fname1, gn, VARF_WANTRES);
+			if (*fm == '\0') {
+#ifdef DEBUG_META_MODE
+			if (DEBUG(META))
+fprintf(debug_file, "meta_oodate: ignoring filtered: %s\n",
+	p);
+#endif
+			free(fm);
+			break;
+			}
+			free(fm);
+		}
+		
 		/*
 		 * The rest of the record is the file name.
 		 * Check if it's not an absolute path.

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Mon Aug 15 19:20:17 UTC 2016

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

Log Message:
Add .MAKE.META.IGNORE_FILTER to allow more complicated filtering of filemon 
data.

The filter is applied to paths Read or Excuted, and if it expands to
nothing, the entry is skipped.

For example; dirdeps.mk can set this to:

.MAKE.META.IGNORE_FILTER = M*/${.MAKE.DEPENDFILE_PREFIX}*

when checking if DIRDEPS_CACHE is up to date, where only Makefile.depend*
are of interest.


To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 src/usr.bin/make/make.1
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/make/meta.c

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

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:42:06 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c

Log Message:
merge xf86-video-sis 0.10.8


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c

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

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:29:34 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_bswap.c ext2fs_extern.h ext2fs_vnops.c

Log Message:
adjust ext2fs_makeinode() so that the direnter is optional, use the function 
(with the direnter off) in ext2fs_mkdir() instead of the code copy; adjust 
ext2fs_makeinode() to initialize extra_isize and set creation time, if 
supported by the filesystem


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/ext2fs/ext2fs_bswap.c
cvs rdiff -u -r1.52 -r1.53 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.123 -r1.124 src/sys/ufs/ext2fs/ext2fs_vnops.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/ufs/ext2fs/ext2fs_bswap.c
diff -u src/sys/ufs/ext2fs/ext2fs_bswap.c:1.22 src/sys/ufs/ext2fs/ext2fs_bswap.c:1.23
--- src/sys/ufs/ext2fs/ext2fs_bswap.c:1.22	Thu Aug  4 17:43:48 2016
+++ src/sys/ufs/ext2fs/ext2fs_bswap.c	Mon Aug 15 18:29:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_bswap.c,v 1.22 2016/08/04 17:43:48 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_bswap.c,v 1.23 2016/08/15 18:29:34 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.22 2016/08/04 17:43:48 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_bswap.c,v 1.23 2016/08/15 18:29:34 jdolecek Exp $");
 
 #include 
 #include 
@@ -79,6 +79,7 @@ e2fs_sb_bswap(struct ext2fs *old, struct
 	new->e2fs_features_rocompat =	bswap32(old->e2fs_features_rocompat);
 	new->e2fs_algo		=	bswap32(old->e2fs_algo);
 	new->e2fs_reserved_ngdb	=	bswap16(old->e2fs_reserved_ngdb);
+	new->e4fs_want_extra_isize =	bswap16(old->e4fs_want_extra_isize);
 }
 
 void

Index: src/sys/ufs/ext2fs/ext2fs_extern.h
diff -u src/sys/ufs/ext2fs/ext2fs_extern.h:1.52 src/sys/ufs/ext2fs/ext2fs_extern.h:1.53
--- src/sys/ufs/ext2fs/ext2fs_extern.h:1.52	Tue Aug  9 21:08:02 2016
+++ src/sys/ufs/ext2fs/ext2fs_extern.h	Mon Aug 15 18:29:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_extern.h,v 1.52 2016/08/09 21:08:02 kre Exp $	*/
+/*	$NetBSD: ext2fs_extern.h,v 1.53 2016/08/15 18:29:34 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -176,7 +176,7 @@ int ext2fs_fsync(void *);
 int ext2fs_vinit(struct mount *, int (**specops)(void *),
 		  int (**fifoops)(void *), struct vnode **);
 int ext2fs_makeinode(int, struct vnode *, struct vnode **,
-			  struct componentname *cnp);
+			  struct componentname *cnp, int);
 int ext2fs_reclaim(void *);
 
 /* ext2fs_hash.c */

Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.123 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.124
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.123	Sun Aug 14 11:44:54 2016
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c	Mon Aug 15 18:29:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_vnops.c,v 1.123 2016/08/14 11:44:54 jdolecek Exp $	*/
+/*	$NetBSD: ext2fs_vnops.c,v 1.124 2016/08/15 18:29:34 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.123 2016/08/14 11:44:54 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.124 2016/08/15 18:29:34 jdolecek Exp $");
 
 #include 
 #include 
@@ -136,7 +136,7 @@ ext2fs_create(void *v)
 
 	error =
 	ext2fs_makeinode(MAKEIMODE(ap->a_vap->va_type, ap->a_vap->va_mode),
-			 ap->a_dvp, ap->a_vpp, ap->a_cnp);
+			 ap->a_dvp, ap->a_vpp, ap->a_cnp, 1);
 
 	if (error)
 		return error;
@@ -166,7 +166,7 @@ ext2fs_mknod(void *v)
 	ino_t		ino;
 
 	if ((error = ext2fs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode),
-		ap->a_dvp, vpp, ap->a_cnp)) != 0)
+		ap->a_dvp, vpp, ap->a_cnp, 1)) != 0)
 		return error;
 	VN_KNOTE(ap->a_dvp, NOTE_WRITE);
 	ip = VTOI(*vpp);
@@ -666,12 +666,11 @@ ext2fs_mkdir(void *v)
 		struct vattr *a_vap;
 	} */ *ap = v;
 	struct vnode		*dvp = ap->a_dvp;
-	struct vattr		*vap = ap->a_vap;
 	struct componentname	*cnp = ap->a_cnp;
 	struct inode		*ip, *dp = VTOI(dvp);
 	struct vnode		*tvp;
 	struct ext2fs_dirtemplate dirtemplate;
-	int			error, dmode;
+	int			error;
 	struct ufs_lookup_results *ulr;
 
 	/* XXX should handle this material another way */
@@ -682,30 +681,17 @@ ext2fs_mkdir(void *v)
 		error = EMLINK;
 		goto out;
 	}
-	dmode = vap->va_mode & ACCESSPERMS;
-	dmode |= IFDIR;
+
 	/*
-	 * Must simulate part of ext2fs_makeinode here to acquire the inode,
-	 * but not have it entered in the parent directory. The entry is
-	 * made later after writing "." and ".." entries.
+	 * Acquire the inode, but don't sync/direnter it just yet
 	 */
-	if ((error = ext2fs_valloc(dvp, dmode, cnp->cn_cred, )) != 0)
+	error = ext2fs_makeinode(IFDIR | ap->a_vap->va_mode, ap->a_dvp,
+			  , ap->a_cnp, 0);
+	if (error)
 		goto out;
+
+	/* the link count is going to be 2 when all is done */
 	ip = VTOI(tvp);
-	ip->i_uid = 

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:29:34 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs_bswap.c ext2fs_extern.h ext2fs_vnops.c

Log Message:
adjust ext2fs_makeinode() so that the direnter is optional, use the function 
(with the direnter off) in ext2fs_mkdir() instead of the code copy; adjust 
ext2fs_makeinode() to initialize extra_isize and set creation time, if 
supported by the filesystem


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/ext2fs/ext2fs_bswap.c
cvs rdiff -u -r1.52 -r1.53 src/sys/ufs/ext2fs/ext2fs_extern.h
cvs rdiff -u -r1.123 -r1.124 src/sys/ufs/ext2fs/ext2fs_vnops.c

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

CVS commit: src/sys/ufs/ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:38:10 UTC 2016

Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_rename.c ext2fs_vnops.c

Log Message:
bump link limit to 65000 for files, and add support for 
EXT2F_ROCOMPAT_DIR_NLINK to make link count unlimited for directories


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/ext2fs/ext2fs_rename.c
cvs rdiff -u -r1.124 -r1.125 src/sys/ufs/ext2fs/ext2fs_vnops.c

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

CVS commit: src/sbin/fsck_ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:57:07 UTC 2016

Modified Files:
src/sbin/fsck_ext2fs: setup.c

Log Message:
adjust inode size check to compare against EXT2_REV0_DINODE_SIZE, rather then 
sizeof(struct ext2fs_dinode), as the structure definition was expanded with the 
optional fields


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_ext2fs/setup.c

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

CVS commit: src/sbin/fsck_ext2fs

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Mon Aug 15 18:57:07 UTC 2016

Modified Files:
src/sbin/fsck_ext2fs: setup.c

Log Message:
adjust inode size check to compare against EXT2_REV0_DINODE_SIZE, rather then 
sizeof(struct ext2fs_dinode), as the structure definition was expanded with the 
optional fields


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_ext2fs/setup.c

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

Modified files:

Index: src/sbin/fsck_ext2fs/setup.c
diff -u src/sbin/fsck_ext2fs/setup.c:1.33 src/sbin/fsck_ext2fs/setup.c:1.34
--- src/sbin/fsck_ext2fs/setup.c:1.33	Mon Aug 15 18:42:15 2016
+++ src/sbin/fsck_ext2fs/setup.c	Mon Aug 15 18:57:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.33 2016/08/15 18:42:15 jdolecek Exp $	*/
+/*	$NetBSD: setup.c,v 1.34 2016/08/15 18:57:06 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.5 (Berkeley) 11/23/94";
 #else
-__RCSID("$NetBSD: setup.c,v 1.33 2016/08/15 18:42:15 jdolecek Exp $");
+__RCSID("$NetBSD: setup.c,v 1.34 2016/08/15 18:57:06 jdolecek Exp $");
 #endif
 #endif /* not lint */
 
@@ -306,7 +306,7 @@ readsb(int listerr)
 	}
 	if (sblock.e2fs.e2fs_rev > E2FS_REV0 &&
 	(!powerof2(sblock.e2fs.e2fs_inode_size) ||
-	 sblock.e2fs.e2fs_inode_size < sizeof(struct ext2fs_dinode) ||
+	 sblock.e2fs.e2fs_inode_size < EXT2_REV0_DINODE_SIZE ||
 	 sblock.e2fs.e2fs_inode_size >
 	  (1024 << sblock.e2fs.e2fs_log_bsize))) {
 		badsb(listerr, "BAD INODE_SIZE");

CVS commit: src/share/man/man7

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Mon Aug 15 21:42:05 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
We don't use mfs for /tmp by default, so the man page shouldn't
suggest this is the typical case.

Because there's so little content in this entry, eliminate the
parentheses around the explanation that /tmp is usually not preserved
across reboots.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/share/man/man7/hier.7

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

CVS commit: src/share/man/man7

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Mon Aug 15 21:42:05 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
We don't use mfs for /tmp by default, so the man page shouldn't
suggest this is the typical case.

Because there's so little content in this entry, eliminate the
parentheses around the explanation that /tmp is usually not preserved
across reboots.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/share/man/man7/hier.7

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

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.111 src/share/man/man7/hier.7:1.112
--- src/share/man/man7/hier.7:1.111	Fri Mar 11 15:18:01 2016
+++ src/share/man/man7/hier.7	Mon Aug 15 21:42:05 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.111 2016/03/11 15:18:01 wiz Exp $
+.\"	$NetBSD: hier.7,v 1.112 2016/08/15 21:42:05 maya Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)hier.7	8.5 (Berkeley) 6/1/94
 .\"
-.Dd March 11, 2016
+.Dd August 15, 2016
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -388,13 +388,11 @@ used in both single-user and multi-user 
 .It Sy /stand/
 programs used in a standalone environment
 .It Sy /tmp/
-temporary files, usually a
-.Xr mfs 8
-memory-based filesystem (the contents of
+temporary files. the contents of
 .Pa /tmp
 are usually
 .Em not
-preserved across a system reboot)
+preserved across a system reboot
 .It Sy /usr/
 contains the majority of the system utilities and files
 .Pp

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:08:17 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
Harmfully sentence fragments. Use sentences instead.

I've also made some additional minor edits, and added missing
/usr/src/sys/ufs/{chfs,ext2fs}.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/share/man/man7/hier.7

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

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:08:17 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
Harmfully sentence fragments. Use sentences instead.

I've also made some additional minor edits, and added missing
/usr/src/sys/ufs/{chfs,ext2fs}.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/share/man/man7/hier.7

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

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.112 src/share/man/man7/hier.7:1.113
--- src/share/man/man7/hier.7:1.112	Mon Aug 15 21:42:05 2016
+++ src/share/man/man7/hier.7	Tue Aug 16 00:08:17 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.112 2016/08/15 21:42:05 maya Exp $
+.\"	$NetBSD: hier.7,v 1.113 2016/08/16 00:08:17 dholland Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -50,596 +50,601 @@ Not all files will be in every system.
 .Pp
 .Bl -tag -width "/altroot/"
 .It Sy \&/
-root directory of the system
+Root directory of the system.
 .It Sy /COPYRIGHT
-system copyright notice, most often put on
+System copyright notice, most often put on
 .Tn CD-ROM
 distributions.
 .It Sy "/[a-z]/"
-user filesystems
+User filesystems.
 .It Sy /altroot/
-alternate root filesystem, in case of disaster
+Alternate root filesystem, in case of disaster.
 .\" .It Sy /amd/
-.\" home directories mount point; see
-.\" .Xr amd 8
+.\" Home directories mount point; see
+.\" .Xr amd 8 .
 .It Sy /bin/
-utilities used in both single and multi-user environments
+Utilities used in both single and multi-user environments.
 .It Sy /boot*
-second-stage boot loader(s) for some platforms; see
-.Xr installboot 8
+Second-stage boot loader(s) for some platforms; see
+.Xr installboot 8 .
 .It Sy /cdrom/
-empty directory commonly used by
-system administrators as a temporary mount point for CD devices
-for ISO-9660 file systems
+Empty directory commonly used by
+system administrators as a temporary mount point for ISO-9660 file
+systems on CD (or DVD) media.
 .It Sy /dev/
-block, character and other special device files
+Block, character, and other special device files.
 .Pp
 .Bl -tag -width "MAKEDEV" -compact
 .It Sy MAKEDEV
-script for creating device files;
+Script for creating device files;
 see
-.Xr makedev 8
+.Xr makedev 8 .
 .It Sy console
-the computer's console device
+The computer's console device.
 .It Sy drum
-system swap space; see
-.Xr drum 4
+The computer's swap space device; see
+.Xr drum 4 .
 .It Sy fd/
-file descriptor files;
+File descriptor files;
 see
-.Xr fd 4
+.Xr fd 4 .
 .It Sy klog
-kernel logging device; see
-.Xr syslog 3
+Kernel logging device; see
+.Xr syslog 3 .
 .It Sy kmem
-kernel virtual memory device; see
-.Xr mem 4
+Kernel virtual memory device; see
+.Xr mem 4 .
 .It Sy log
 .Ux
 domain datagram log socket; see
-.Xr syslogd 8
+.Xr syslogd 8 .
 .It Sy mem
-kernel physical memory device; see
-.Xr mem 4
+Kernel physical memory device; see
+.Xr mem 4 .
 .It Sy null
-the null device; see
-.Xr null 4
+The null device; see
+.Xr null 4 .
 .It Sy pts/
-mount point for the pseudo-terminal device file system; see
-.Xr mount_ptyfs 8
+Mount point for the pseudo-terminal device file system; see
+.Xr mount_ptyfs 8 .
 .It Sy stderr
 .It Sy stdin
 .It Sy stdout
-file descriptor files;
+File descriptor files;
 see
-.Xr fd 4
+.Xr fd 4 .
 .It Sy tty
-process' controlling terminal device; see
-.Xr tty 4
+Device pointing to each process's own controlling terminal; see
+.Xr tty 4 .
 .It Sy zero
-the zero device; see
-.Xr zero 4
+The zero device; see
+.Xr zero 4 .
 .El
 .\" .It Sy /dump/
-.\" online
+.\" Online
 .\" .Xr dump 8
-.\" repository
+.\" repository.
 .It Sy /etc/
-system configuration files and scripts
+System configuration files and scripts.
 .Pp
 .Bl -tag -width "master.passwd" -compact
 .It Sy amd*
-configuration files for
-.Xr amd 8
+Configuration files for
+.Xr amd 8 .
 .It Sy changelist
-files backed up by the security script
+Files backed up by the
+.Sy security
+script.
 .It Sy crontab
-schedule used by the
+Schedule used by the
 .Xr cron 8
-daemon
+daemon.
 .It Sy csh.cshrc
 .It Sy csh.login
 .It Sy csh.logout
-system-wide scripts for
-.Xr csh 1
+System-wide scripts for
+.Xr csh 1 .
 .It Sy daily
-script run each day by
-.Xr cron 8
+Script run each day by
+.Xr cron 8 .
 .It Sy daily.conf
-configuration file for
+Configuration file for
 .Sy daily ;
 see
-.Xr daily.conf 5
+.Xr daily.conf 5 .
 .It Sy defaults/
-default configuration files read by various
+Default configuration files read by various
 .Pa /etc/*.conf
-files
+files.
 .It Sy disktab
-disk description file, see
-.Xr disktab 5
+Disk description file; see
+.Xr disktab 5 .
 .It Sy dm.conf
-dungeon master configuration; see
-.Xr dm.conf 5
+Dungeon master configuration; see
+.Xr dm.conf 5 .
 .It Sy dumpdates
-dump history; see
-.Xr dump 8
+Dump 

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 21:52:46 UTC 2016

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

Log Message:
add libxshmfence.


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

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 21:52:46 UTC 2016

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

Log Message:
add libxshmfence.


To generate a diff of this commit:
cvs rdiff -u -r1.939 -r1.940 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.939 src/share/mk/bsd.own.mk:1.940
--- src/share/mk/bsd.own.mk:1.939	Fri Aug  5 16:44:31 2016
+++ src/share/mk/bsd.own.mk	Mon Aug 15 21:52:46 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.939 2016/08/05 16:44:31 scole Exp $
+#	$NetBSD: bsd.own.mk,v 1.940 2016/08/15 21:52:46 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1375,7 +1375,7 @@ X11SRCDIRMIT?=		${X11SRCDIR}/external/mi
 	FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
 	Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpresent Xpm \
 	Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
-	fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \
+	fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb xshmfence \
 	pthread-stubs
 X11SRCDIR.${_lib}?=		${X11SRCDIRMIT}/lib${_lib}/dist
 .endfor

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 21:58:40 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.serverlib

Log Message:
don't define HAVE_XORG_CONFIG_H or _HAVE_DIX_CONFIG_H here.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/Makefile.serverlib
diff -u src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.10 src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.11
--- src/external/mit/xorg/server/xorg-server/Makefile.serverlib:1.10	Sun Aug 14 03:43:03 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.serverlib	Mon Aug 15 21:58:40 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.serverlib,v 1.10 2016/08/14 03:43:03 mrg Exp $
+#	$NetBSD: Makefile.serverlib,v 1.11 2016/08/15 21:58:40 mrg Exp $
 
 .include 		# for NETBSDSRCDIR and mk.conf processing
 
@@ -21,9 +21,6 @@ X_BYTE_ORDER=0
 CPPFLAGS+=	${X11FLAGS.SERVER}
 CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
-CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/../include \
-		-DHAVE_XORG_CONFIG_H -D_HAVE_DIX_CONFIG_H
-
 .if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
 CPPFLAGS+=	-D__GLX_ALIGN64
 .endif

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 21:58:40 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.serverlib

Log Message:
don't define HAVE_XORG_CONFIG_H or _HAVE_DIX_CONFIG_H here.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/Makefile.serverlib

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 22:01:44 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/include: Makefile

Log Message:
add new mi headers in xorg-server 1.18.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/include/Makefile

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

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:12:34 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
typo in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/share/man/man7/hier.7

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

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.113 src/share/man/man7/hier.7:1.114
--- src/share/man/man7/hier.7:1.113	Tue Aug 16 00:08:17 2016
+++ src/share/man/man7/hier.7	Tue Aug 16 00:12:34 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.113 2016/08/16 00:08:17 dholland Exp $
+.\"	$NetBSD: hier.7,v 1.114 2016/08/16 00:12:34 dholland Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -383,7 +383,7 @@ super-user start-up file for
 .Xr csh 1 .
 .It Sy \&.profile
 super-user start-up file for
-.Xr sh 1.
+.Xr sh 1 .
 .It Sy \&.rhosts
 Super-user id mapping between machines.
 (Obsolete.)

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:12:34 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
typo in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/share/man/man7/hier.7

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 22:01:16 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/Xi: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile

Log Message:
add missing include paths.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/randr/Makefile

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 22:01:44 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/include: Makefile

Log Message:
add new mi headers in xorg-server 1.18.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/include/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/include/Makefile
diff -u src/external/mit/xorg/server/xorg-server/include/Makefile:1.15 src/external/mit/xorg/server/xorg-server/include/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/include/Makefile:1.15	Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/include/Makefile	Mon Aug 15 22:01:44 2016
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile,v 1.15 2016/08/14 00:03:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2016/08/15 22:01:44 mrg Exp $
 
 .include 
 
 XORGSRC=	${X11SRCDIR.xorg-server}
 
 XORGINC_SUBDIR=	Xext composite dbe dri3 exa fb include mi \
-		miext/damage miext/shadow present randr render xkb record
+		miext/damage miext/shadow miext/sync \
+		present randr render xkb record
 XF86_SUBDIR=	common ddc dri fbdevhw i2c int10 modes \
 		os-support os-support/bus parser rac ramdac shadowfb \
 		vbe vgahw xf1bpp xf4bpp xf8_16bpp xf8_32bpp dri2
@@ -37,6 +38,7 @@ INCS=	BT.h IBM.h TI.h XIstubs.h Xprintf.
 	mi.h micmap.h micoord.h \
 	migc.h miline.h mipict.h mipointer.h mipointrst.h misc.h miscstruct.h \
 	mistruct.h mizerarc.h opaque.h \
+	misync.h misyncstr.h misyncshm.h misyncfd.h \
 	nonsdk_extinit.h optionstr.h \
 	os.h picture.h picturestr.h pixmap.h pixmapstr.h \
 	present.h presentext.h \

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Aug 15 22:01:16 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/Xi: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile

Log Message:
add missing include paths.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/Xi/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/randr/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/Xi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.6 src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/Xi/Makefile:1.6	Sun Aug 14 00:03:58 2016
+++ src/external/mit/xorg/server/xorg-server/Xi/Makefile	Mon Aug 15 22:01:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2016/08/14 00:03:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2016/08/15 22:01:16 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -37,6 +37,7 @@ CPPFLAGS+=  -I${DESTDIR}${X11INCDIR}
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/xfixes \
 		-I${X11SRCDIR.xorg-server}/Xi \
+		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=  ${X11FLAGS.DIX}
 

Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.7 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.7	Fri Aug 12 01:15:52 2016
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile	Mon Aug 15 22:01:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2016/08/12 01:15:52 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2016/08/15 22:01:16 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -26,6 +26,7 @@ SRCS=  \
 CPPFLAGS+=  -I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${X11SRCDIR.xorg-server}/Xext \
+		-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/../include
 CPPFLAGS+=  ${X11FLAGS.DIX}
 

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:40:09 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
another typo; spotted by jnemeth


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/share/man/man7/hier.7

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

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.114 src/share/man/man7/hier.7:1.115
--- src/share/man/man7/hier.7:1.114	Tue Aug 16 00:12:34 2016
+++ src/share/man/man7/hier.7	Tue Aug 16 00:40:09 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.114 2016/08/16 00:12:34 dholland Exp $
+.\"	$NetBSD: hier.7,v 1.115 2016/08/16 00:40:09 dholland Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -429,8 +429,8 @@ Standard C (and extension) include files
 .It Sy arpa/
 Include files for Internet service protocols.
 .It Sy atf/
-Include files for the Automated Testing Framework; see.
-.Xr atf 7
+Include files for the Automated Testing Framework; see
+.Xr atf 7 .
 .It Sy g++/
 Include files for the GNU C++ compiler.
 .It Sy machine/

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:47:19 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
Another typo.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/share/man/man7/hier.7

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

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.115 src/share/man/man7/hier.7:1.116
--- src/share/man/man7/hier.7:1.115	Tue Aug 16 00:40:09 2016
+++ src/share/man/man7/hier.7	Tue Aug 16 00:47:19 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.115 2016/08/16 00:40:09 dholland Exp $
+.\"	$NetBSD: hier.7,v 1.116 2016/08/16 00:47:19 dholland Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -958,7 +958,7 @@ Union file system; see
 .Xr mount_union 8 .
 .El
 .It Sy gdbscripts/
-Support for accessing kernel structures from within the debugger.
+Support for accessing kernel structures from within the debugger
 .Xr gdb 1 .
 .It Sy ipkdb/
 Support for kernel debugging over the network.

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:47:19 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
Another typo.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/share/man/man7/hier.7

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

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 00:55:09 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/lib: Makefile

Log Message:
build libxshmfence.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.69 src/distrib/sets/lists/xbase/shl.mi:1.70
--- src/distrib/sets/lists/xbase/shl.mi:1.69	Mon May 16 22:20:10 2016
+++ src/distrib/sets/lists/xbase/shl.mi	Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.69 2016/05/16 22:20:10 christos Exp $
+# $NetBSD: shl.mi,v 1.70 2016/08/16 00:55:09 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -447,3 +447,6 @@
 ./usr/X11R7/lib/libxkbui.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxkbui.so.2			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libxkbui.so.2.0			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.so			-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.so.1		-unknown-		xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.so.1.0		-unknown-		xorg,compatx11file

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.177 src/distrib/sets/lists/xcomp/mi:1.178
--- src/distrib/sets/lists/xcomp/mi:1.177	Mon May 16 22:20:10 2016
+++ src/distrib/sets/lists/xcomp/mi	Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.177 2016/05/16 22:20:10 christos Exp $
+#	 $NetBSD: mi,v 1.178 2016/08/16 00:55:09 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5611,6 +5611,7 @@
 ./usr/X11R7/include/X11/extensions/xtraplib.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/xtraplibp.h		-unknown-	xorg
 ./usr/X11R7/include/X11/extensions/xtrapproto.h		-unknown-	xorg
+./usr/X11R7/include/X11/xshmfence.h			-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/FS.h			-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/FSlib.h			-unknown-	xorg
 ./usr/X11R7/include/X11/fonts/FSproto.h			-unknown-	xorg
@@ -6360,6 +6361,8 @@
 ./usr/X11R7/lib/libxkbfile_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libxkbui.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libxkbui_p.a-unknown-	profile,xorg,compatx11file
+./usr/X11R7/lib/libxshmfence.a-unknown-	xorg,compatx11file
+./usr/X11R7/lib/libxshmfence_p.a			-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/pkgconfig/bigreqsproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/compositeproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/damageproto.pc		-unknown-	xorg
@@ -6479,6 +6482,7 @@
 ./usr/X11R7/lib/pkgconfig/xrender.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xres.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xscrnsaver.pc			-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/xshmfence.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xt.pc-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xtrans.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xtrap.pc			-unknown-	xorg

Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.43 src/distrib/sets/lists/xcomp/shl.mi:1.44
--- src/distrib/sets/lists/xcomp/shl.mi:1.43	Thu Jul 23 05:46:39 2015
+++ src/distrib/sets/lists/xcomp/shl.mi	Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: shl.mi,v 1.43 2015/07/23 05:46:39 mrg Exp $
+#	$NetBSD: shl.mi,v 1.44 2016/08/16 00:55:09 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -144,3 +144,4 @@
 ./usr/X11R7/lib/libxcb_pic.a-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libxkbfile_pic.a			-unknown-	xorg,picinstall,compatx11file
 ./usr/X11R7/lib/libxkbui_pic.a-unknown-	xorg,picinstall,compatx11file
+./usr/X11R7/lib/libxshmfence_pic.a			-unknown-	xorg,picinstall,compatx11file

Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.21 src/distrib/sets/lists/xdebug/mi:1.22
--- src/distrib/sets/lists/xdebug/mi:1.21	Sat Sep 12 15:25:01 2015
+++ src/distrib/sets/lists/xdebug/mi	Tue Aug 16 00:55:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.21 2015/09/12 15:25:01 snj Exp $
+# $NetBSD: mi,v 1.22 2016/08/16 00:55:09 mrg Exp $
 ./etc/mtree/set.xdebug	comp-sys-root
 ./usr/X11R6/lib/libFS_g.a-unknown-	debuglib,x11
 ./usr/X11R6/lib/libGLU_g.a-unknown-	debuglib,x11
@@ -146,6 +146,7 @@
 ./usr/X11R7/lib/libxcb_g.a-unknown-	

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 00:55:09 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/lib: Makefile

Log Message:
build libxshmfence.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.37 -r1.38 src/external/mit/xorg/lib/Makefile

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

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 01:03:07 UTC 2016

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

Log Message:
add a HAVE_XORG_SERVER_VER for use in sets.  clean up the x11
defines a little for modern xorg, particularly the version.


To generate a diff of this commit:
cvs rdiff -u -r1.940 -r1.941 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.119 -r1.120 src/share/mk/bsd.x11.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.940 src/share/mk/bsd.own.mk:1.941
--- src/share/mk/bsd.own.mk:1.940	Mon Aug 15 21:52:46 2016
+++ src/share/mk/bsd.own.mk	Tue Aug 16 01:03:07 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.940 2016/08/15 21:52:46 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.941 2016/08/16 01:03:07 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1389,7 +1389,9 @@ X11SRCDIR.${_proto}proto?=		${X11SRCDIRM
 .endfor
 
 # During transition from xorg-server 1.10 to 1.18
-.if 0
+HAVE_XORG_SERVER_VER?=110
+
+.if ${HAVE_XORG_SERVER_VER:U0} == "118"
 XORG_SERVER_SUBDIR?=xorg-server
 .else
 XORG_SERVER_SUBDIR?=xorg-server.old

Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.119 src/share/mk/bsd.x11.mk:1.120
--- src/share/mk/bsd.x11.mk:1.119	Sun May 29 03:02:07 2016
+++ src/share/mk/bsd.x11.mk	Tue Aug 16 01:03:07 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.x11.mk,v 1.119 2016/05/29 03:02:07 nakayama Exp $
+#	$NetBSD: bsd.x11.mk,v 1.120 2016/08/16 01:03:07 mrg Exp $
 
 .include 
 
@@ -90,7 +90,7 @@ X11FLAGS.OS_DEFINES=	-DDDXOSINIT -DSERVE
 X11FLAGS.EXTENSION+=	-DXF86VIDMODE
 
 #	ServerDefines
-X11FLAGS.SERVER+=	-DXINPUT -DXFreeXDGA -DXF86VIDMODE
+X11FLAGS.SERVER+=	-DXINPUT -DXFreeXDGA -DXF86VIDMODE -DXSERVER_LIBPCIACCESS
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"	|| \
@@ -117,17 +117,25 @@ X11FLAGS.EXTENSION+=	-D__GLX_ALIGN64
 X11FLAGS.LOADABLE=	-DXFree86LOADER -DIN_MODULE -DXFree86Module \
 			${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
 .endif
-  
+
 # XXX FIX ME
+XORG_SERVER_MAJOR=	1
+.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
+XORG_SERVER_MINOR=	10
+XORG_SERVER_TEENY=	6
+.else
+XORG_SERVER_MINOR=	18
+XORG_SERVER_TEENY=	4
+.endif
+  
 XVENDORNAMESHORT=	'"X.Org"'
 XVENDORNAME=		'"The X.Org Foundation"'
-XORG_RELEASE=		'"Release 1.10.6"'
+XORG_RELEASE=		'"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"'
 __XKBDEFRULES__=	'"xorg"'
 XLOCALE.DEFINES=	-DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
 			-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
 
-# XXX oh yeah, fix me later
-XORG_VERSION_CURRENT="(((1) * 1000) + ((10) * 10) + ((6) * 1000) + 0)"
+XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 1000) + ((${XORG_SERVER_MINOR}) * 10) + ((${XORG_SERVER_TEENY}) * 1000) + 0)"
 
 PRINT_PACKAGE_VERSION=	awk '/^PACKAGE_VERSION=/ {			\
 match($$1, "([0-9]+\\.)+[0-9]+");	\

CVS commit: src/share/mk

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 01:03:07 UTC 2016

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

Log Message:
add a HAVE_XORG_SERVER_VER for use in sets.  clean up the x11
defines a little for modern xorg, particularly the version.


To generate a diff of this commit:
cvs rdiff -u -r1.940 -r1.941 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.119 -r1.120 src/share/mk/bsd.x11.mk

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

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 00:40:09 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
another typo; spotted by jnemeth


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/share/man/man7/hier.7

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

CVS commit: src/distrib/sets

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 01:05:19 UTC 2016

Modified Files:
src/distrib/sets: Makefile mkvars.mk sets.subr

Log Message:
support xorg_server_ver define, currently settable to 110 (1.10.x)
or 118 (1.18.x).


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/Makefile
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.176 -r1.177 src/distrib/sets/sets.subr

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/Makefile
diff -u src/distrib/sets/Makefile:1.102 src/distrib/sets/Makefile:1.103
--- src/distrib/sets/Makefile:1.102	Wed May 25 00:07:20 2016
+++ src/distrib/sets/Makefile	Tue Aug 16 01:05:19 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.102 2016/05/25 00:07:20 christos Exp $
+#	$NetBSD: Makefile,v 1.103 2016/08/16 01:05:19 mrg Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -67,6 +67,9 @@ MAKESRCTARS_FLAGS+= 	-q
 MAKETARSETS!= ${SETSCMD} ./makeflist -l ${MAKEFLIST_FLAGS}
 .endif
 
+print_have_xorg_server_ver: .PHONY
+	@echo ${HAVE_XORG_SERVER_VER}
+
 print_have_gcc: .PHONY
 	@echo ${HAVE_GCC}
 

Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.28 src/distrib/sets/mkvars.mk:1.29
--- src/distrib/sets/mkvars.mk:1.28	Wed May 25 00:14:47 2016
+++ src/distrib/sets/mkvars.mk	Tue Aug 16 01:05:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.28 2016/05/25 00:14:47 christos Exp $
+# $NetBSD: mkvars.mk,v 1.29 2016/08/16 01:05:19 mrg Exp $
 
 MKEXTRAVARS= \
 	MACHINE \
@@ -6,6 +6,7 @@ MKEXTRAVARS= \
 	MACHINE_CPU \
 	HAVE_GCC \
 	HAVE_GDB \
+	HAVE_XORG_SERVER_VER \
 	HAVE_BINUTILS \
 	HAVE_LIBGCC_EH \
 	HAVE_SSP \

Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.176 src/distrib/sets/sets.subr:1.177
--- src/distrib/sets/sets.subr:1.176	Wed May 25 00:14:47 2016
+++ src/distrib/sets/sets.subr	Tue Aug 16 01:05:19 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.176 2016/05/25 00:14:47 christos Exp $
+#	$NetBSD: sets.subr,v 1.177 2016/08/16 01:05:19 mrg Exp $
 #
 
 #
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.176 2016/05/25 00:14:47 christos Exp $
+# 	# $NetBSD: sets.subr,v 1.177 2016/08/16 01:05:19 mrg Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -272,6 +272,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 #	binutils=		 = value of ${HAVE_BINUTILS}
 #	gcc=			 = value of ${HAVE_GCC}
 #	gdb=			 = value of ${HAVE_GDB}
+#	xorg_server_ver=	 = value of ${HAVE_XORG_SERVER_VER}
 #
 #	use_inet6		${USE_INET6} != no
 #	use_kerberos		${USE_KERBEROS} != no
@@ -348,6 +349,11 @@ list_set_files()
 if ("gdb" in wanted)
 	wanted["gdb=" "'"${HAVE_GDB}"'"] = 1
 			}
+			if ("'"${MKXORG_SERVER}"'" != "no") {
+if ("xorg_server_ver" in wanted) {
+	wanted["xorg_server_ver=" "'"${HAVE_XORG_SERVER_VER}"'"] = 1
+}
+			}
 			if (("man" in wanted) && ("catpages" in wanted))
 wanted[".cat"] = 1
 			if (("man" in wanted) && ("manpages" in wanted))

CVS commit: src/distrib/sets

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 01:05:19 UTC 2016

Modified Files:
src/distrib/sets: Makefile mkvars.mk sets.subr

Log Message:
support xorg_server_ver define, currently settable to 110 (1.10.x)
or 118 (1.18.x).


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/Makefile
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.176 -r1.177 src/distrib/sets/sets.subr

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

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 01:10:19 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
sets lists updates for xorg-server 1.18.  mark the obsolete files
with xorg_server_ver=110 and the new-only files with 118.


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/xserver/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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.178 src/distrib/sets/lists/xcomp/mi:1.179
--- src/distrib/sets/lists/xcomp/mi:1.178	Tue Aug 16 00:55:09 2016
+++ src/distrib/sets/lists/xcomp/mi	Tue Aug 16 01:10:19 2016
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.178 2016/08/16 00:55:09 mrg Exp $
+#	 $NetBSD: mi,v 1.179 2016/08/16 01:10:19 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5877,7 +5877,7 @@
 ./usr/X11R7/include/xorg/atKeynames.h			-unknown-	obsolete
 ./usr/X11R7/include/xorg/bstore.h			-unknown-	obsolete
 ./usr/X11R7/include/xorg/bstorestr.h			-unknown-	obsolete
-./usr/X11R7/include/xorg/bt829.h			-unknown-	xorg
+./usr/X11R7/include/xorg/bt829.h			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/include/xorg/callback.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/cfb.h-unknown-	obsolete
 ./usr/X11R7/include/xorg/cfb16.h			-unknown-	obsolete
@@ -5887,6 +5887,7 @@
 ./usr/X11R7/include/xorg/cfbmap.h			-unknown-	obsolete
 ./usr/X11R7/include/xorg/cfbmskbits.h			-unknown-	obsolete
 ./usr/X11R7/include/xorg/cfbunmap.h			-unknown-	obsolete
+./usr/X11R7/include/xorg/client.h			-unknown-	xorg,xorg_server_ver=118
 ./usr/X11R7/include/xorg/closestr.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/closure.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/colormap.h			-unknown-	xorg
@@ -5899,6 +5900,7 @@
 ./usr/X11R7/include/xorg/damagestr.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/dbestruct.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/dgaproc.h			-unknown-	xorg
+./usr/X11R7/include/xorg/displaymode.h			-unknown-	xorg,xorg_server_ver=118
 ./usr/X11R7/include/xorg/dix-config.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/dix.h-unknown-	xorg
 ./usr/X11R7/include/xorg/dixaccess.h			-unknown-	xorg
@@ -5909,6 +5911,7 @@
 ./usr/X11R7/include/xorg/dixstruct.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/dri.h-unknown-	xorg
 ./usr/X11R7/include/xorg/dri2.h-unknown-	xorg
+./usr/X11R7/include/xorg/dri3.h-unknown-	xorg,xorg_server_ver=118
 ./usr/X11R7/include/xorg/dristruct.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/edid.h-unknown-	xorg
 ./usr/X11R7/include/xorg/eventconvert.h			-unknown-	xorg
@@ -5925,12 +5928,13 @@
 ./usr/X11R7/include/xorg/fbpict.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/fbpseudocolor.h		-unknown-	obsolete
 ./usr/X11R7/include/xorg/fbrop.h			-unknown-	xorg
-./usr/X11R7/include/xorg/fi1236.h			-unknown-	xorg
+./usr/X11R7/include/xorg/fi1236.h			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/include/xorg/fourcc.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/gc.h-unknown-	xorg
 ./usr/X11R7/include/xorg/gcstruct.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/geext.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/globals.h			-unknown-	xorg
+./usr/X11R7/include/xorg/glx_extinit.h			-unknown-	xorg,xorg_server_ver=118
 ./usr/X11R7/include/xorg/glyphstr.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/hotplug.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/i2c_def.h			-unknown-	xorg
@@ -5943,11 +5947,11 @@
 ./usr/X11R7/include/xorg/mfbunmap.h			-unknown-	obsolete
 ./usr/X11R7/include/xorg/mi.h-unknown-	xorg
 ./usr/X11R7/include/xorg/mibank.h			-unknown-	obsolete
-./usr/X11R7/include/xorg/mibstore.h			-unknown-	xorg
+./usr/X11R7/include/xorg/mibstore.h			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/include/xorg/micmap.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/micoord.h			-unknown-	xorg
-./usr/X11R7/include/xorg/mifillarc.h			-unknown-	xorg
-./usr/X11R7/include/xorg/mifpoly.h			-unknown-	xorg
+./usr/X11R7/include/xorg/mifillarc.h			-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/include/xorg/mifpoly.h			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/include/xorg/migc.h-unknown-	xorg
 ./usr/X11R7/include/xorg/miline.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/mipict.h			-unknown-	xorg
@@ -5955,17 +5959,25 @@
 ./usr/X11R7/include/xorg/mipointrst.h			-unknown-	xorg
 ./usr/X11R7/include/xorg/misc.h-unknown-	xorg
 ./usr/X11R7/include/xorg/miscstruct.h			-unknown-	xorg
-./usr/X11R7/include/xorg/mispans.h			-unknown-	xorg
+./usr/X11R7/include/xorg/mispans.h			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/include/xorg/mistruct.h			-unknown-	xorg
-./usr/X11R7/include/xorg/miwideline.h			-unknown-	xorg

CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 01:10:19 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
sets lists updates for xorg-server 1.18.  mark the obsolete files
with xorg_server_ver=110 and the new-only files with 118.


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/xserver/md.i386

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 16 01:27:48 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e_driver.c
xsrc/external/mit/xf86-video-apm/dist/src: apm.h apm_driver.c
xsrc/external/mit/xf86-video-ark/dist/src: ark_driver.c
xsrc/external/mit/xf86-video-ati/dist/src: radeon_driver.c radeon_kms.c
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
xsrc/external/mit/xf86-video-crime/dist/src: crime_driver.c
xsrc/external/mit/xf86-video-glint/dist/src: glint_driver.c
xsrc/external/mit/xf86-video-i128/dist/src: i128_driver.c
xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c
xsrc/external/mit/xf86-video-imstt/dist/src: imstt_driver.c
xsrc/external/mit/xf86-video-intel-old/dist/src: i810_driver.c
i830_driver.c i830_i2c.c
xsrc/external/mit/xf86-video-intel-old/dist/uxa: uxa-priv.h
xsrc/external/mit/xf86-video-newport/dist/src: newport_driver.c
xsrc/external/mit/xf86-video-nsc/dist/src: nsc_driver.c
nsc_gx1_driver.c nsc_gx2_driver.c
xsrc/external/mit/xf86-video-nv/dist/src: g80_driver.c nv_driver.c
nv_include.h riva_driver.c riva_include.h
xsrc/external/mit/xf86-video-nvxbox/dist/src: nv_driver.c nv_include.h
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_driver.c
xsrc/external/mit/xf86-video-rendition/dist/src: rendition.c
rendition.h
xsrc/external/mit/xf86-video-s3/dist/src: s3_driver.c
xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_driver.c
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_driver.c
xsrc/external/mit/xf86-video-tga/dist/src: tga_accel.c tga_driver.c
xsrc/external/mit/xf86-video-tseng/dist/src: tseng_driver.c
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
xsrc/external/mit/xf86-video-xgi/dist/src: xgi_driver.c
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kGraph.c

Log Message:
mibstore.h and its miInitializeBackingStore() have been otherwise empty
since at least xorg-server 1.10.  remove all reference to them as the
header is gone in xorg-server 1.18.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xf86-video-apm/dist/src/apm.h
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-ark/dist/src/ark_driver.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-old/dist/src/i810_driver.c \
xsrc/external/mit/xf86-video-intel-old/dist/src/i830_i2c.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel-old/dist/src/i830_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel-old/dist/uxa/uxa-priv.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nsc/dist/src/nsc_driver.c \
xsrc/external/mit/xf86-video-nsc/dist/src/nsc_gx1_driver.c \
xsrc/external/mit/xf86-video-nsc/dist/src/nsc_gx2_driver.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_include.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c \
xsrc/external/mit/xf86-video-rendition/dist/src/rendition.h
cvs rdiff -u -r1.3 -r1.4 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Aug 16 01:27:48 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e_driver.c
xsrc/external/mit/xf86-video-apm/dist/src: apm.h apm_driver.c
xsrc/external/mit/xf86-video-ark/dist/src: ark_driver.c
xsrc/external/mit/xf86-video-ati/dist/src: radeon_driver.c radeon_kms.c
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
xsrc/external/mit/xf86-video-crime/dist/src: crime_driver.c
xsrc/external/mit/xf86-video-glint/dist/src: glint_driver.c
xsrc/external/mit/xf86-video-i128/dist/src: i128_driver.c
xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c
xsrc/external/mit/xf86-video-imstt/dist/src: imstt_driver.c
xsrc/external/mit/xf86-video-intel-old/dist/src: i810_driver.c
i830_driver.c i830_i2c.c
xsrc/external/mit/xf86-video-intel-old/dist/uxa: uxa-priv.h
xsrc/external/mit/xf86-video-newport/dist/src: newport_driver.c
xsrc/external/mit/xf86-video-nsc/dist/src: nsc_driver.c
nsc_gx1_driver.c nsc_gx2_driver.c
xsrc/external/mit/xf86-video-nv/dist/src: g80_driver.c nv_driver.c
nv_include.h riva_driver.c riva_include.h
xsrc/external/mit/xf86-video-nvxbox/dist/src: nv_driver.c nv_include.h
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz_driver.c
xsrc/external/mit/xf86-video-rendition/dist/src: rendition.c
rendition.h
xsrc/external/mit/xf86-video-s3/dist/src: s3_driver.c
xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_driver.c
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_driver.c
xsrc/external/mit/xf86-video-tga/dist/src: tga_accel.c tga_driver.c
xsrc/external/mit/xf86-video-tseng/dist/src: tseng_driver.c
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
xsrc/external/mit/xf86-video-xgi/dist/src: xgi_driver.c
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kGraph.c

Log Message:
mibstore.h and its miInitializeBackingStore() have been otherwise empty
since at least xorg-server 1.10.  remove all reference to them as the
header is gone in xorg-server 1.18.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e_driver.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xf86-video-apm/dist/src/apm.h
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-ark/dist/src/ark_driver.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
cvs rdiff -u -r1.1.1.8 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-imstt/dist/src/imstt_driver.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-old/dist/src/i810_driver.c \
xsrc/external/mit/xf86-video-intel-old/dist/src/i830_i2c.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel-old/dist/src/i830_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel-old/dist/uxa/uxa-priv.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nsc/dist/src/nsc_driver.c \
xsrc/external/mit/xf86-video-nsc/dist/src/nsc_gx1_driver.c \
xsrc/external/mit/xf86-video-nsc/dist/src/nsc_gx2_driver.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/g80_driver.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_include.h
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-nv/dist/src/riva_include.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_driver.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-nvxbox/dist/src/nv_include.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz_driver.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c \
xsrc/external/mit/xf86-video-rendition/dist/src/rendition.h
cvs rdiff -u -r1.3 -r1.4 

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 01:39:40 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
More improvements from jnemeth


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/share/man/man7/hier.7

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

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.116 src/share/man/man7/hier.7:1.117
--- src/share/man/man7/hier.7:1.116	Tue Aug 16 00:47:19 2016
+++ src/share/man/man7/hier.7	Tue Aug 16 01:39:40 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.116 2016/08/16 00:47:19 dholland Exp $
+.\"	$NetBSD: hier.7,v 1.117 2016/08/16 01:39:40 dholland Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -507,7 +507,7 @@ Package system utilities.
 .It Sy pkgsrc/
 Build descriptions (packaging) for the
 .Nx
-packages system.
+package system.
 .Pp
 .Bl -tag -width "distfilesX" -compact
 .It Sy distfiles/
@@ -539,7 +539,7 @@ and
 .It Sy words
 Common words.
 .It Sy web2
-Words of Webster's 2nd International.
+Words from Webster's Second International Dictionary.
 .It Sy papers/
 Reference databases;
 see
@@ -606,7 +606,7 @@ see
 .El
 .It Sy tests/
 Test programs; see
-.Xr atf-run 1
+.Xr tests 7
 for information on how to run them.
 .El
 .Pp
@@ -828,7 +828,8 @@ Digital MIPS-based DECstations and DECsy
 .It Sy powerpc/
 PowerPC processor general support.
 .It Sy prep/
-PReP (PowerPC Reference Platform) and CHRP machines
+PReP (PowerPC Reference Platform) and CHRP (Common Hardware Reference
+Platform) machines.
 .It Sy sandpoint/
 Motorola Sandpoint reference platform.
 .It Sy sbmips/
@@ -913,7 +914,7 @@ Support for
 .Tn ULTRIX
 binaries.
 .It Sy vax1k/
-Support for older VAX binaries that started on a 1 KB boundary
+Support for older VAX binaries that started on a 1 KB boundary.
 .El
 .Pp
 .It Sy conf/
@@ -1035,7 +1036,7 @@ Still more file systems.
 .Bl -tag -width "ffs/" -compact
 .It Sy chfs/
 A FFS-based file system for use on raw flash.
-.It Sy chfs/
+.It Sy ext2fs/
 The Linux ext2 file system.
 .It Sy ffs/
 The Berkeley Fast File System.
@@ -1139,6 +1140,9 @@ Printer daemon error logs; see
 .Xr lpd 8 .
 .It Sy maillog.*
 .Xr sendmail 1
+and
+.Xr postfix 1
+(and other mail-related)
 log files.
 .It Sy messages.*
 General system information log.

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 01:39:40 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
More improvements from jnemeth


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/share/man/man7/hier.7

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

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 01:41:18 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
More important fix: there is an /etc/skel but no /usr/share/skel.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/share/man/man7/hier.7

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

CVS commit: src/share/man/man7

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Aug 16 01:41:18 UTC 2016

Modified Files:
src/share/man/man7: hier.7

Log Message:
More important fix: there is an /etc/skel but no /usr/share/skel.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/share/man/man7/hier.7

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

Modified files:

Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.117 src/share/man/man7/hier.7:1.118
--- src/share/man/man7/hier.7:1.117	Tue Aug 16 01:39:40 2016
+++ src/share/man/man7/hier.7	Tue Aug 16 01:41:18 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hier.7,v 1.117 2016/08/16 01:39:40 dholland Exp $
+.\"	$NetBSD: hier.7,v 1.118 2016/08/16 01:41:18 dholland Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -313,6 +313,8 @@ Service name data base; see
 .It Sy shells
 List of permitted shells; see
 .Xr shells 5 .
+.It Sy skel/
+Sample initialization files for new user accounts.
 .It Sy sliphome/
 .Tn SLIP
 login/logout scripts; see
@@ -591,8 +593,6 @@ roff macro package.
 .It Sy nls/
 Message catalogs; see
 .Xr catgets 3 .
-.It Sy skel/
-Sample initialization files for new user accounts.
 .It Sy tmac/
 Text processing macros;
 see