CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:52:54 UTC 2024

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

Log Message:
tap(4): Just use mutex_enter.

PR kern/58167


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.131 src/sys/net/if_tap.c:1.132
--- src/sys/net/if_tap.c:1.131	Wed Apr 17 18:52:39 2024
+++ src/sys/net/if_tap.c	Wed Apr 17 18:52:54 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.131 2024/04/17 18:52:39 riastradh Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.132 2024/04/17 18:52:54 riastradh Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.131 2024/04/17 18:52:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.132 2024/04/17 18:52:54 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -857,13 +857,7 @@ tap_dev_read(int unit, struct uio *uio, 
 	if ((ifp->if_flags & IFF_UP) == 0)
 		return EHOSTDOWN;
 
-	/* In the TAP_NBIO case, we have to make sure we won't be sleeping */
-	if ((sc->sc_flags & TAP_NBIO) != 0) {
-		if (!mutex_tryenter(>sc_lock))
-			return EWOULDBLOCK;
-	} else
-		mutex_enter(>sc_lock);
-
+	mutex_enter(>sc_lock);
 	if (IFQ_IS_EMPTY(>if_snd)) {
 		ifp->if_flags &= ~IFF_OACTIVE;
 		if (sc->sc_flags & TAP_NBIO)



CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:52:54 UTC 2024

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

Log Message:
tap(4): Just use mutex_enter.

PR kern/58167


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/net/if_tap.c

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



CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:52:39 UTC 2024

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

Log Message:
tap(4): Use DETACH_FORCE with config_detach.

It doesn't make a difference here, because tap_detach never fails,
but let's make it more obvious at the call site that failure is
forbidden here.

No functional change intended.

PR kern/58166


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.130 src/sys/net/if_tap.c:1.131
--- src/sys/net/if_tap.c:1.130	Wed Apr 17 18:52:25 2024
+++ src/sys/net/if_tap.c	Wed Apr 17 18:52:39 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.130 2024/04/17 18:52:25 riastradh Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.131 2024/04/17 18:52:39 riastradh Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.130 2024/04/17 18:52:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.131 2024/04/17 18:52:39 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -641,7 +641,7 @@ tap_clone_destroyer(device_t dev)
 	cfdata_t cf = device_cfdata(dev);
 	int error;
 
-	error = config_detach(dev, 0);
+	error = config_detach(dev, DETACH_FORCE);
 	KASSERTMSG(error == 0, "error=%d", error);
 	kmem_free(cf, sizeof(*cf));
 }



CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:52:39 UTC 2024

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

Log Message:
tap(4): Use DETACH_FORCE with config_detach.

It doesn't make a difference here, because tap_detach never fails,
but let's make it more obvious at the call site that failure is
forbidden here.

No functional change intended.

PR kern/58166


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/net/if_tap.c

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



CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:52:25 UTC 2024

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

Log Message:
tap(4): Prune dead branches around tap_dev_destroyer.

No functional change intended.

PR kern/58166


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/net/if_tap.c

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



CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:52:25 UTC 2024

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

Log Message:
tap(4): Prune dead branches around tap_dev_destroyer.

No functional change intended.

PR kern/58166


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.129 src/sys/net/if_tap.c:1.130
--- src/sys/net/if_tap.c:1.129	Wed Apr 17 18:32:13 2024
+++ src/sys/net/if_tap.c	Wed Apr 17 18:52:25 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 riastradh Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.130 2024/04/17 18:52:25 riastradh Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.130 2024/04/17 18:52:25 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -210,7 +210,7 @@ struct if_clone tap_cloners = IF_CLONE_I
 
 /* Helper functions shared by the two cloning code paths */
 static struct tap_softc *	tap_clone_creator(int);
-int	tap_clone_destroyer(device_t);
+static void			tap_clone_destroyer(device_t);
 
 static struct sysctllog *tap_sysctl_clog;
 
@@ -625,33 +625,25 @@ tap_clone_creator(int unit)
 	return device_private(config_attach_pseudo(cf));
 }
 
-/*
- * The clean design of if_clone and autoconf(9) makes that part
- * really straightforward.  The second argument of config_detach
- * means neither QUIET nor FORCED.
- */
 static int
 tap_clone_destroy(struct ifnet *ifp)
 {
 	struct tap_softc *sc = ifp->if_softc;
-	int error = tap_clone_destroyer(sc->sc_dev);
 
-	if (error == 0)
-		atomic_dec_uint(_count);
-	return error;
+	tap_clone_destroyer(sc->sc_dev);
+	atomic_dec_uint(_count);
+	return 0;
 }
 
-int
+static void
 tap_clone_destroyer(device_t dev)
 {
 	cfdata_t cf = device_cfdata(dev);
 	int error;
 
-	if ((error = config_detach(dev, 0)) != 0)
-		aprint_error_dev(dev, "unable to detach instance\n");
+	error = config_detach(dev, 0);
+	KASSERTMSG(error == 0, "error=%d", error);
 	kmem_free(cf, sizeof(*cf));
-
-	return error;
 }
 
 /*
@@ -774,7 +766,6 @@ tap_fops_close(file_t *fp)
 {
 	struct tap_softc *sc;
 	int unit = fp->f_devunit;
-	int error;
 
 	sc = device_lookup_private(_cd, unit);
 	if (sc == NULL)
@@ -783,16 +774,16 @@ tap_fops_close(file_t *fp)
 	KERNEL_LOCK(1, NULL);
 	tap_dev_close(sc);
 
-	/* Destroy the device now that it is no longer useful,
-	 * unless it's already being destroyed. */
-	if ((sc->sc_flags & TAP_GOING) != 0) {
-		KERNEL_UNLOCK_ONE(NULL);
-		return 0;
-	}
+	/*
+	 * Destroy the device now that it is no longer useful, unless
+	 * it's already being destroyed.
+	 */
+	if ((sc->sc_flags & TAP_GOING) != 0)
+		goto out;
+	tap_clone_destroyer(sc->sc_dev);
 
-	error = tap_clone_destroyer(sc->sc_dev);
-	KERNEL_UNLOCK_ONE(NULL);
-	return error;
+out:	KERNEL_UNLOCK_ONE(NULL);
+	return 0;
 }
 
 static void



CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:32:13 UTC 2024

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

Log Message:
tap(4): Prune dead branches around tap_dev_close.

No functional change intended.

PR kern/58166


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.128 src/sys/net/if_tap.c:1.129
--- src/sys/net/if_tap.c:1.128	Fri Jan  6 01:54:22 2023
+++ src/sys/net/if_tap.c	Wed Apr 17 18:32:13 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tap.c,v 1.128 2023/01/06 01:54:22 ozaki-r Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 riastradh Exp $	*/
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.128 2023/01/06 01:54:22 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.129 2024/04/17 18:32:13 riastradh Exp $");
 
 #if defined(_KERNEL_OPT)
 
@@ -117,7 +117,7 @@ CFATTACH_DECL_NEW(tap, sizeof(struct tap
 extern struct cfdriver tap_cd;
 
 /* Real device access routines */
-static int	tap_dev_close(struct tap_softc *);
+static void	tap_dev_close(struct tap_softc *);
 static int	tap_dev_read(int, struct uio *, int);
 static int	tap_dev_write(int, struct uio *, int);
 static int	tap_dev_ioctl(int, u_long, void *, struct lwp *);
@@ -759,7 +759,8 @@ tap_cdev_close(dev_t dev, int flags, int
 	if (sc == NULL)
 		return ENXIO;
 
-	return tap_dev_close(sc);
+	tap_dev_close(sc);
+	return 0;
 }
 
 /*
@@ -779,13 +780,8 @@ tap_fops_close(file_t *fp)
 	if (sc == NULL)
 		return ENXIO;
 
-	/* tap_dev_close currently always succeeds, but it might not
-	 * always be the case. */
 	KERNEL_LOCK(1, NULL);
-	if ((error = tap_dev_close(sc)) != 0) {
-		KERNEL_UNLOCK_ONE(NULL);
-		return error;
-	}
+	tap_dev_close(sc);
 
 	/* Destroy the device now that it is no longer useful,
 	 * unless it's already being destroyed. */
@@ -799,7 +795,7 @@ tap_fops_close(file_t *fp)
 	return error;
 }
 
-static int
+static void
 tap_dev_close(struct tap_softc *sc)
 {
 	struct ifnet *ifp;
@@ -832,8 +828,6 @@ tap_dev_close(struct tap_softc *sc)
 	}
 	sc->sc_flags &= ~(TAP_INUSE | TAP_ASYNCIO);
 	if_link_state_change(ifp, LINK_STATE_DOWN);
-
-	return 0;
 }
 
 static int



CVS commit: src/sys/net

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:32:13 UTC 2024

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

Log Message:
tap(4): Prune dead branches around tap_dev_close.

No functional change intended.

PR kern/58166


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/net/if_tap.c

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



CVS commit: src/sys/modules/examples/fopsmapper

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:10:27 UTC 2024

Modified Files:
src/sys/modules/examples/fopsmapper: cmd_mapper.c fopsmapper.c

Log Message:
modules/examples/fopsmapper: KNF, sprinkle comments

Missing: MP-safety; this is a kind of broken example.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/fopsmapper/cmd_mapper.c \
src/sys/modules/examples/fopsmapper/fopsmapper.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/modules/examples/fopsmapper/cmd_mapper.c
diff -u src/sys/modules/examples/fopsmapper/cmd_mapper.c:1.2 src/sys/modules/examples/fopsmapper/cmd_mapper.c:1.3
--- src/sys/modules/examples/fopsmapper/cmd_mapper.c:1.2	Wed Apr  1 13:07:32 2020
+++ src/sys/modules/examples/fopsmapper/cmd_mapper.c	Wed Apr 17 18:10:27 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmd_mapper.c,v 1.2 2020/04/01 13:07:32 kamil Exp $	*/
+/*	$NetBSD: cmd_mapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: cmd_mapper.c,v 1.2 2020/04/01 13:07:32 kamil Exp $");
+__RCSID("$NetBSD: cmd_mapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $");
 
 #include 
 
@@ -37,7 +37,7 @@ __RCSID("$NetBSD: cmd_mapper.c,v 1.2 202
 #include 
 #include 
 
-#define _PATH_DEV_MAPPER "/dev/fopsmapper"
+#define	_PATH_DEV_MAPPER	"/dev/fopsmapper"
 
 int main(int argc, char **argv)
 {
@@ -47,12 +47,11 @@ int main(int argc, char **argv)
 	if ((devfd = open(_PATH_DEV_MAPPER, O_RDONLY)) == -1)
 		err(EXIT_FAILURE, "Cannot open %s", _PATH_DEV_MAPPER);
 
-	map = (char *)(mmap(0, sysconf(_SC_PAGESIZE), PROT_READ, MAP_SHARED,
-devfd, 0));
+	map = mmap(0, sysconf(_SC_PAGESIZE), PROT_READ, MAP_SHARED, devfd, 0);
 	if (map == MAP_FAILED)
 		err(EXIT_FAILURE, "Mapping failed");
 
-	printf("Message from device: %s\n",map);
+	printf("Message from device: %s\n", map);
 
 	if (munmap(map, sysconf(_SC_PAGESIZE)) == -1)
 		err(EXIT_FAILURE, "Unmap failed");
Index: src/sys/modules/examples/fopsmapper/fopsmapper.c
diff -u src/sys/modules/examples/fopsmapper/fopsmapper.c:1.2 src/sys/modules/examples/fopsmapper/fopsmapper.c:1.3
--- src/sys/modules/examples/fopsmapper/fopsmapper.c:1.2	Wed Apr  1 11:45:53 2020
+++ src/sys/modules/examples/fopsmapper/fopsmapper.c	Wed Apr 17 18:10:27 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: fopsmapper.c,v 1.2 2020/04/01 11:45:53 kamil Exp $	*/
+/*	$NetBSD: fopsmapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,29 +27,30 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fopsmapper.c,v 1.2 2020/04/01 11:45:53 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fopsmapper.c,v 1.3 2024/04/17 18:10:27 riastradh Exp $");
 
-#include 
-#include 
-#include 
-#include 
+#include 
 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+
 #include 
 
 /*
  * To use this module you need to:
  *
  * mknod /dev/fopsmapper c 351 0
- *
  */
 
-dev_type_open(fopsmapper_open);
+dev_open_t fopsmapper_open;
 
 const struct cdevsw fopsmapper_cdevsw = {
 	.d_open = fopsmapper_open,
@@ -66,9 +67,9 @@ const struct cdevsw fopsmapper_cdevsw = 
 	.d_flag = D_OTHER
 };
 
-static int fopsmapper_mmap(file_t *, off_t *, size_t,
-	   	int, int *, int *,struct uvm_object **, int *);
-static int fopsmapper_close(file_t *);
+static int fopsmapper_mmap(struct file *, off_t *, size_t, int, int *, int *,
+struct uvm_object **, int *);
+static int fopsmapper_close(struct file *);
 
 const struct fileops mapper_fileops = {
 	.fo_read = fbadop_read,
@@ -83,16 +84,16 @@ const struct fileops mapper_fileops = {
 	.fo_mmap = fopsmapper_mmap,
 };
 
-typedef struct fopsmapper_softc {
+struct fopsmapper_softc {
 	char *buf;
 	struct uvm_object *uobj;
 	size_t bufsize;
-} fops_t;
+};
 
 int
 fopsmapper_open(dev_t dev, int flag, int mode, struct lwp *l)
 {
-	fops_t *fo;
+	struct fopsmapper_softc *fo;
 	struct file *fp;
 	int fd, error;
 
@@ -105,11 +106,11 @@ fopsmapper_open(dev_t dev, int flag, int
 }
 
 int
-fopsmapper_mmap(file_t * fp, off_t * offp, size_t size, int prot,
-		int *flagsp, int *advicep, struct uvm_object **uobjp,
-		int *maxprotp)
+fopsmapper_mmap(struct file *fp, off_t *offp, size_t size, int prot,
+int *flagsp, int *advicep, struct uvm_object **uobjp, int *maxprotp)
 {
-	fops_t *fo;
+	struct fopsmapper_softc *fo;
+	vaddr_t va;
 	int error;
 
 	if (prot & PROT_EXEC)
@@ -125,32 +126,35 @@ fopsmapper_mmap(file_t * fp, off_t * off
 	fo->uobj = uao_create(size, 0);
 
 	fo->buf = NULL;
-	/* Map the uvm object into kernel */
-	error =	uvm_map(kernel_map, (vaddr_t *) >buf, fo->bufsize,
-	fo->uobj, 0, 0,
-	UVM_MAPFLAG(UVM_PROT_RW, UVM_PROT_RW,
-	UVM_INH_SHARE,UVM_ADV_RANDOM, 0));
 
+	/*
+	 * Map the uvm object into 

CVS commit: src/sys/modules/examples/fopsmapper

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:10:27 UTC 2024

Modified Files:
src/sys/modules/examples/fopsmapper: cmd_mapper.c fopsmapper.c

Log Message:
modules/examples/fopsmapper: KNF, sprinkle comments

Missing: MP-safety; this is a kind of broken example.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/fopsmapper/cmd_mapper.c \
src/sys/modules/examples/fopsmapper/fopsmapper.c

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



CVS commit: src/sys/sys

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:01:29 UTC 2024

Modified Files:
src/sys/sys: conf.h

Log Message:
sys/conf.h: Need sys/types.h for dev_t, devmajor_t.


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/sys/conf.h

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

Modified files:

Index: src/sys/sys/conf.h
diff -u src/sys/sys/conf.h:1.161 src/sys/sys/conf.h:1.162
--- src/sys/sys/conf.h:1.161	Mon Mar 28 12:39:18 2022
+++ src/sys/sys/conf.h	Wed Apr 17 18:01:29 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.h,v 1.161 2022/03/28 12:39:18 riastradh Exp $	*/
+/*	$NetBSD: conf.h,v 1.162 2024/04/17 18:01:29 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -43,8 +43,9 @@
  * Definitions of device driver entry switches
  */
 
-#include 
 #include 
+#include 
+#include 
 
 struct buf;
 struct knote;
@@ -109,7 +110,7 @@ struct cdevsw {
 extern kmutex_t device_lock;
 
 int devsw_attach(const char *, const struct bdevsw *, devmajor_t *,
-		 const struct cdevsw *, devmajor_t *);
+const struct cdevsw *, devmajor_t *);
 void devsw_detach(const struct bdevsw *, const struct cdevsw *);
 const struct bdevsw *bdevsw_lookup(dev_t);
 const struct cdevsw *cdevsw_lookup(dev_t);



CVS commit: src/sys/sys

2024-04-17 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Apr 17 18:01:29 UTC 2024

Modified Files:
src/sys/sys: conf.h

Log Message:
sys/conf.h: Need sys/types.h for dev_t, devmajor_t.


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/sys/conf.h

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/base32

2024-04-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Apr 17 13:23:33 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el ad.riscv64

Log Message:
more plugin set fixes


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.riscv64

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/base32

2024-04-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Apr 17 13:23:33 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el ad.riscv64

Log Message:
more plugin set fixes


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.riscv64

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/base32/ad.mipsn64eb
diff -u src/distrib/sets/lists/base32/ad.mipsn64eb:1.4 src/distrib/sets/lists/base32/ad.mipsn64eb:1.5
--- src/distrib/sets/lists/base32/ad.mipsn64eb:1.4	Tue Apr 16 10:15:53 2024
+++ src/distrib/sets/lists/base32/ad.mipsn64eb	Wed Apr 17 09:23:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64eb,v 1.4 2024/04/16 14:15:53 martin Exp $
+# $NetBSD: ad.mipsn64eb,v 1.5 2024/04/17 13:23:32 christos Exp $
 ./lib/n32	base-compat-shlib	compat
 ./lib/n32/npf	base-compat-shlib	compat,npf
 ./lib/n32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -493,6 +493,8 @@
 ./usr/lib/n32/lua/5.4/netpgp.so		base-compat-shlib	compat
 ./usr/lib/n32/lua/5.4/sqlite.so		base-compat-shlib	compat
 ./usr/lib/n32/lua/5.4/syslog.so		base-compat-shlib	compat
+./usr/lib/n32/namedbase-compat-shlib	compat
+./usr/lib/n32/named/filter-.so.0		base-compat-shlib	compat
 ./usr/lib/n32/opensslbase-crypto-usr		compat
 ./usr/lib/n32/openssl/engines			base-crypto-usr		compat
 ./usr/lib/n32/openssl/engines/dasync.so	base-crypto-usr		compat,pic,openssl=30
@@ -996,6 +998,8 @@
 ./usr/lib/o32/lua/5.4/netpgp.so		base-compat-shlib	compat
 ./usr/lib/o32/lua/5.4/sqlite.so		base-compat-shlib	compat
 ./usr/lib/o32/lua/5.4/syslog.so		base-compat-shlib	compat
+./usr/lib/o32/namedbase-compat-shlib	compat
+./usr/lib/o32/named/filter-.so.0		base-compat-shlib	compat
 ./usr/lib/o32/opensslbase-crypto-usr		compat
 ./usr/lib/o32/openssl/engines			base-crypto-usr		compat
 ./usr/lib/o32/openssl/engines/dasync.so	base-crypto-usr		compat,pic,openssl=30
@@ -1035,9 +1039,11 @@
 ./usr/libdata/debug/lib/o32/npf		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/n32		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/n32/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/n32/named		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/n32/security		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/o32/named		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/security	base-compat-shlib	compat
 ./usr/libexec/ld.elf_so-n32			base-sys-shlib		compat,pic
 ./usr/libexec/ld.elf_so-o32			base-sys-shlib		compat,pic
Index: src/distrib/sets/lists/base32/ad.mipsn64el
diff -u src/distrib/sets/lists/base32/ad.mipsn64el:1.4 src/distrib/sets/lists/base32/ad.mipsn64el:1.5
--- src/distrib/sets/lists/base32/ad.mipsn64el:1.4	Tue Apr 16 10:15:53 2024
+++ src/distrib/sets/lists/base32/ad.mipsn64el	Wed Apr 17 09:23:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64el,v 1.4 2024/04/16 14:15:53 martin Exp $
+# $NetBSD: ad.mipsn64el,v 1.5 2024/04/17 13:23:32 christos Exp $
 ./lib/n32	base-compat-shlib	compat
 ./lib/n32/npf	base-compat-shlib	compat,npf
 ./lib/n32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -493,6 +493,8 @@
 ./usr/lib/n32/lua/5.4/netpgp.so		base-compat-shlib	compat
 ./usr/lib/n32/lua/5.4/sqlite.so		base-compat-shlib	compat
 ./usr/lib/n32/lua/5.4/syslog.so		base-compat-shlib	compat
+./usr/lib/n32/namedbase-compat-shlib	compat
+./usr/lib/n32/named/filter-.so.0		base-compat-shlib	compat
 ./usr/lib/n32/opensslbase-crypto-usr		compat
 ./usr/lib/n32/openssl/engines			base-crypto-usr		compat
 ./usr/lib/n32/openssl/engines/dasync.so	base-crypto-usr		compat,pic,openssl=30
@@ -996,6 +998,8 @@
 ./usr/lib/o32/lua/5.4/netpgp.so		base-compat-shlib	compat
 ./usr/lib/o32/lua/5.4/sqlite.so		base-compat-shlib	compat
 ./usr/lib/o32/lua/5.4/syslog.so		base-compat-shlib	compat
+./usr/lib/o32/namedbase-compat-shlib	compat
+./usr/lib/o32/named/filter-.so.0		base-compat-shlib	compat
 ./usr/lib/o32/opensslbase-crypto-usr		compat
 ./usr/lib/o32/openssl/engines			base-crypto-usr		compat
 ./usr/lib/o32/openssl/engines/dasync.so	base-crypto-usr		compat,pic,openssl=30
@@ -1035,9 +1039,11 @@
 ./usr/libdata/debug/lib/o32/npf		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/n32		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/n32/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/n32/named		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/n32/security		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/o32/named		base-compat-shlib	compat
 

CVS commit: src/sys/dev/hdaudio

2024-04-17 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Wed Apr 17 11:44:00 UTC 2024

Modified Files:
src/sys/dev/hdaudio: hdaudiodevs.h hdaudiodevs_data.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/hdaudio/hdaudiodevs.h \
src/sys/dev/hdaudio/hdaudiodevs_data.h

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

Modified files:

Index: src/sys/dev/hdaudio/hdaudiodevs.h
diff -u src/sys/dev/hdaudio/hdaudiodevs.h:1.9 src/sys/dev/hdaudio/hdaudiodevs.h:1.10
--- src/sys/dev/hdaudio/hdaudiodevs.h:1.9	Sat Apr  6 13:35:59 2024
+++ src/sys/dev/hdaudio/hdaudiodevs.h	Wed Apr 17 11:43:59 2024
@@ -1,10 +1,10 @@
-/*	$NetBSD: hdaudiodevs.h,v 1.9 2024/04/06 13:35:59 andvar Exp $	*/
+/*	$NetBSD: hdaudiodevs.h,v 1.10 2024/04/17 11:43:59 andvar Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: hdaudiodevs,v 1.8 2024/04/06 13:35:36 andvar Exp
+ *	NetBSD: hdaudiodevs,v 1.9 2024/04/17 11:42:47 andvar Exp
  */
 
 /*
@@ -151,6 +151,8 @@
 #define	HDAUDIO_PRODUCT_VIATECH_VT1812	0x0448		/* VT1812 */
 #define	HDAUDIO_PRODUCT_VIATECH_VT1818S	0x0440		/* VT1818S */
 #define	HDAUDIO_PRODUCT_VIATECH_VT1705	0x4760		/* VT1705 */
+#define	HDAUDIO_PRODUCT_VIATECH_VX900_HDMI_1	0x9f80		/* VX900 HDMI/DP */
+#define	HDAUDIO_PRODUCT_VIATECH_VX900_HDMI_2	0x9f81		/* VX900 HDMI/DP */
 
 /* Analog Devices */
 #define	HDAUDIO_PRODUCT_ANALOG_AD1884A	0x184a		/* AD1884A */
Index: src/sys/dev/hdaudio/hdaudiodevs_data.h
diff -u src/sys/dev/hdaudio/hdaudiodevs_data.h:1.9 src/sys/dev/hdaudio/hdaudiodevs_data.h:1.10
--- src/sys/dev/hdaudio/hdaudiodevs_data.h:1.9	Sat Apr  6 13:35:59 2024
+++ src/sys/dev/hdaudio/hdaudiodevs_data.h	Wed Apr 17 11:43:59 2024
@@ -1,10 +1,10 @@
-/*	$NetBSD: hdaudiodevs_data.h,v 1.9 2024/04/06 13:35:59 andvar Exp $	*/
+/*	$NetBSD: hdaudiodevs_data.h,v 1.10 2024/04/17 11:43:59 andvar Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: hdaudiodevs,v 1.8 2024/04/06 13:35:36 andvar Exp
+ *	NetBSD: hdaudiodevs,v 1.9 2024/04/17 11:42:47 andvar Exp
  */
 
 /*
@@ -231,60 +231,64 @@ static const uint32_t hdaudio_products[]
 	477, 0,
 	HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VT1705, 
 	485, 0,
+	HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VX900_HDMI_1, 
+	492, 160, 0,
+	HDAUDIO_VENDOR_VIATECH, HDAUDIO_PRODUCT_VIATECH_VX900_HDMI_2, 
+	492, 160, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1884A, 
-	492, 0,
+	498, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1882, 
-	500, 0,
+	506, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1883, 
-	507, 0,
+	513, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1884, 
-	514, 0,
+	520, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1984A, 
-	521, 0,
+	527, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1984B, 
-	529, 0,
+	535, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1981HD, 
-	537, 0,
+	543, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1983, 
-	546, 0,
+	552, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1984, 
-	553, 0,
+	559, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1986A, 
-	560, 0,
+	566, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1988A, 
-	568, 0,
+	574, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1988B, 
-	576, 0,
+	582, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1989A, 
-	584, 0,
+	590, 0,
 	HDAUDIO_VENDOR_ANALOG, HDAUDIO_PRODUCT_ANALOG_AD1989B, 
-	592, 0,
+	598, 0,
 	HDAUDIO_VENDOR_CONEXANT, HDAUDIO_PRODUCT_CONEXANT_CX20549, 
-	600, 0,
+	606, 0,
 	HDAUDIO_VENDOR_CONEXANT, HDAUDIO_PRODUCT_CONEXANT_CX20551, 
-	608, 0,
+	614, 0,
 	HDAUDIO_VENDOR_CONEXANT, HDAUDIO_PRODUCT_CONEXANT_CX20561, 
-	616, 0,
+	622, 0,
 	HDAUDIO_VENDOR_CONEXANT, HDAUDIO_PRODUCT_CONEXANT_CX20582, 
-	624, 0,
+	630, 0,
 	HDAUDIO_VENDOR_CONEXANT, HDAUDIO_PRODUCT_CONEXANT_CX20583, 
-	632, 0,
+	638, 0,
 	HDAUDIO_VENDOR_CONEXANT, HDAUDIO_PRODUCT_CONEXANT_CX20585, 
-	640, 0,
+	646, 0,
 	HDAUDIO_VENDOR_CONEXANT, HDAUDIO_PRODUCT_CONEXANT_CX20671, 
-	648, 0,
+	654, 0,
 	HDAUDIO_VENDOR_CMEDIA, HDAUDIO_PRODUCT_CMEDIA_CMI9880, 
-	656, 0,
+	662, 0,
 	HDAUDIO_VENDOR_INTEL, HDAUDIO_PRODUCT_INTEL_Q57_HDMI, 
-	664, 92, 0,
+	670, 92, 0,
 	HDAUDIO_VENDOR_INTEL, HDAUDIO_PRODUCT_INTEL_G45_HDMI_1, 
-	668, 672, 0,
+	674, 678, 0,
 	HDAUDIO_VENDOR_INTEL, HDAUDIO_PRODUCT_INTEL_G45_HDMI_2, 
-	668, 679, 0,
+	674, 685, 0,
 	HDAUDIO_VENDOR_INTEL, HDAUDIO_PRODUCT_INTEL_G45_HDMI_3, 
-	668, 686, 0,
+	674, 692, 0,
 	HDAUDIO_VENDOR_INTEL, HDAUDIO_PRODUCT_INTEL_G45_HDMI_4, 
-	  

CVS commit: src/sys/dev/hdaudio

2024-04-17 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Wed Apr 17 11:44:00 UTC 2024

Modified Files:
src/sys/dev/hdaudio: hdaudiodevs.h hdaudiodevs_data.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/hdaudio/hdaudiodevs.h \
src/sys/dev/hdaudio/hdaudiodevs_data.h

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



CVS commit: src/sys/dev/hdaudio

2024-04-17 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Wed Apr 17 11:42:47 UTC 2024

Modified Files:
src/sys/dev/hdaudio: hdaudiodevs

Log Message:
Add VIA VX900 HDMI.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/hdaudio/hdaudiodevs

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/hdaudio/hdaudiodevs
diff -u src/sys/dev/hdaudio/hdaudiodevs:1.8 src/sys/dev/hdaudio/hdaudiodevs:1.9
--- src/sys/dev/hdaudio/hdaudiodevs:1.8	Sat Apr  6 13:35:36 2024
+++ src/sys/dev/hdaudio/hdaudiodevs	Wed Apr 17 11:42:47 2024
@@ -1,4 +1,4 @@
-$NetBSD: hdaudiodevs,v 1.8 2024/04/06 13:35:36 andvar Exp $
+$NetBSD: hdaudiodevs,v 1.9 2024/04/17 11:42:47 andvar Exp $
 
 /*
  * Copyright (c) 2010 Jared D. McNeill 
@@ -144,6 +144,8 @@ product	VIATECH		VT2002P_1	0x4438	VT2002
 product	VIATECH		VT1812		0x0448	VT1812
 product	VIATECH		VT1818S		0x0440	VT1818S
 product	VIATECH		VT1705		0x4760	VT1705
+product	VIATECH		VX900_HDMI_1	0x9f80	VX900 HDMI/DP
+product	VIATECH		VX900_HDMI_2	0x9f81	VX900 HDMI/DP
 
 /* Analog Devices */
 product	ANALOG		AD1884A		0x184a	AD1884A



CVS commit: src/sys/dev/hdaudio

2024-04-17 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Wed Apr 17 11:42:47 UTC 2024

Modified Files:
src/sys/dev/hdaudio: hdaudiodevs

Log Message:
Add VIA VX900 HDMI.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/hdaudio/hdaudiodevs

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



CVS commit: src/sys/arch/hppa/hppa

2024-04-17 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Apr 17 07:47:48 UTC 2024

Modified Files:
src/sys/arch/hppa/hppa: machdep.c

Log Message:
turn LEDs off when shutting down


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

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

Modified files:

Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.20 src/sys/arch/hppa/hppa/machdep.c:1.21
--- src/sys/arch/hppa/hppa/machdep.c:1.20	Tue Mar  5 14:15:32 2024
+++ src/sys/arch/hppa/hppa/machdep.c	Wed Apr 17 07:47:48 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.20 2024/03/05 14:15:32 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.21 2024/04/17 07:47:48 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2024/03/05 14:15:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2024/04/17 07:47:48 macallan Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -1415,6 +1415,8 @@ cpu_reboot(int howto, char *user_boot_st
 	if (cold_hook)
 		(*cold_hook)(HPPA_COLD_COLD);
 
+	hppa_led_ctl(0xf, 0, 0);
+
 	if (howto & RB_HALT) {
 		if ((howto & RB_POWERDOWN) == RB_POWERDOWN && cold_hook) {
 			printf("Powering off...");



CVS commit: src/sys/arch/hppa/hppa

2024-04-17 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Apr 17 07:47:48 UTC 2024

Modified Files:
src/sys/arch/hppa/hppa: machdep.c

Log Message:
turn LEDs off when shutting down


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

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



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

2024-04-17 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Apr 17 06:11:56 UTC 2024

Modified Files:
src/sys/arch/riscv/conf: GENERIC.common

Log Message:
Re-enable HEARTBEAT


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/riscv/conf/GENERIC.common

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



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

2024-04-17 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Wed Apr 17 06:11:56 UTC 2024

Modified Files:
src/sys/arch/riscv/conf: GENERIC.common

Log Message:
Re-enable HEARTBEAT


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/riscv/conf/GENERIC.common

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

Modified files:

Index: src/sys/arch/riscv/conf/GENERIC.common
diff -u src/sys/arch/riscv/conf/GENERIC.common:1.13 src/sys/arch/riscv/conf/GENERIC.common:1.14
--- src/sys/arch/riscv/conf/GENERIC.common:1.13	Sat Apr  6 13:42:46 2024
+++ src/sys/arch/riscv/conf/GENERIC.common	Wed Apr 17 06:11:56 2024
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.13 2024/04/06 13:42:46 skrll Exp $
+#	$NetBSD: GENERIC.common,v 1.14 2024/04/17 06:11:56 skrll Exp $
 #
 #	GENERIC common RISC-V kernel config items shared between 32 and 64
 #	kernels
@@ -17,8 +17,8 @@ options 	NTP		# NTP phase/frequency lock
 options 	KTRACE		# system call tracing via ktrace(1)
 
 # Heartbeat checks
-#options 	HEARTBEAT
-#options 	HEARTBEAT_MAX_PERIOD_DEFAULT=15
+options 	HEARTBEAT
+options 	HEARTBEAT_MAX_PERIOD_DEFAULT=15
 
 # Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
 options 	SYSVMSG		# System V-like message queues



CVS commit: src/usr.bin/ftp

2024-04-16 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed Apr 17 02:46:03 UTC 2024

Modified Files:
src/usr.bin/ftp: ftp.1

Log Message:
ftp.1: drop a sentence that's no longer accurate


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/usr.bin/ftp/ftp.1

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



CVS commit: src/usr.bin/ftp

2024-04-16 Thread David H. Gutteridge
Module Name:src
Committed By:   gutteridge
Date:   Wed Apr 17 02:46:03 UTC 2024

Modified Files:
src/usr.bin/ftp: ftp.1

Log Message:
ftp.1: drop a sentence that's no longer accurate


To generate a diff of this commit:
cvs rdiff -u -r1.153 -r1.154 src/usr.bin/ftp/ftp.1

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/ftp/ftp.1
diff -u src/usr.bin/ftp/ftp.1:1.153 src/usr.bin/ftp/ftp.1:1.154
--- src/usr.bin/ftp/ftp.1:1.153	Mon Feb 19 00:15:20 2024
+++ src/usr.bin/ftp/ftp.1	Wed Apr 17 02:46:03 2024
@@ -1,4 +1,4 @@
-.\" 	$NetBSD: ftp.1,v 1.153 2024/02/19 00:15:20 christos Exp $
+.\" 	$NetBSD: ftp.1,v 1.154 2024/04/17 02:46:03 gutteridge Exp $
 .\"
 .\" Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -57,7 +57,7 @@
 .\"
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\"
-.Dd February 18, 2024
+.Dd April 17, 2024
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -1905,7 +1905,6 @@ and
 (and optionally
 .Ar password\^ )
 is in the URL, use them for the first attempt to authenticate.
-There is currently no certificate validation and verification.
 .\" file:///path
 .It Li file:/// Ns Ar path
 A local URL, copied from



CVS commit: src/sys/dev/usb

2024-04-16 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Wed Apr 17 02:34:45 UTC 2024

Modified Files:
src/sys/dev/usb: uftdi.c

Log Message:
Add support for a range of USB serial adapters

>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.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/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.77 src/sys/dev/usb/uftdi.c:1.78
--- src/sys/dev/usb/uftdi.c:1.77	Tue Mar 26 03:38:02 2024
+++ src/sys/dev/usb/uftdi.c	Wed Apr 17 02:34:45 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.77 2024/03/26 03:38:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -126,6 +126,25 @@ static const struct ucom_methods uftdi_m
  */
 static const struct usb_devno uftdi_devs[] = {
 	{ USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US101 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US159 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US235 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US257 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_56 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US279_78 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US313 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US320 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US324 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US346_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US701_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_12 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_34 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_56 },
+	{ USB_VENDOR_BRAINBOXES, USB_PRODUCT_BRAINBOXES_US842_78 },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
 	{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
 	{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_230X },



CVS commit: src/sys/dev/usb

2024-04-16 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Wed Apr 17 02:34:45 UTC 2024

Modified Files:
src/sys/dev/usb: uftdi.c

Log Message:
Add support for a range of USB serial adapters

>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/uftdi.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/usb

2024-04-16 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Wed Apr 17 02:33:04 UTC 2024

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
Regen after usbdevs change


To generate a diff of this commit:
cvs rdiff -u -r1.806 -r1.807 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h

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



CVS commit: src/sys/dev/usb

2024-04-16 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Wed Apr 17 02:32:09 UTC 2024

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add some USB serial adapters

>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.814 -r1.815 src/sys/dev/usb/usbdevs

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/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.814 src/sys/dev/usb/usbdevs:1.815
--- src/sys/dev/usb/usbdevs:1.814	Wed Feb 28 21:50:51 2024
+++ src/sys/dev/usb/usbdevs	Wed Apr 17 02:32:08 2024
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.814 2024/02/28 21:50:51 dholland Exp $
+$NetBSD: usbdevs,v 1.815 2024/04/17 02:32:08 maya Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1118,6 +1118,27 @@ product BILLIONTON USBEL100	0x0988	USB10
 product BILLIONTON USBE100	0x8511	USBE100
 product BILLIONTON USB2AR	0x90ff	USB2AR Ethernet
 
+/* Brainboxes Limited products */
+product BRAINBOXES US101	0x1011	US-101 USB2Serial 1xRS232
+product BRAINBOXES US159	0x1021	US-159 USB2Serial 1xRS232
+product BRAINBOXES US235	0x1017	US-235 USB2Serial 1xRS232
+product BRAINBOXES US257	0x5001	US-257 USB2Serial 2xRS232
+product BRAINBOXES US279_12	0x2021	US-279 USB2Serial 8xRS232 (Port 1 and 2)
+product BRAINBOXES US279_34	0x2022	US-279 USB2Serial 8xRS232 (Port 3 and 4)
+product BRAINBOXES US279_56	0x2023	US-279 USB2Serial 8xRS232 (Port 5 and 6)
+product BRAINBOXES US279_78	0x2024	US-279 USB2Serial 8xRS232 (Port 7 and 8)
+product BRAINBOXES US313	0x6001	US-313 USB2Serial 2xRS422/485
+product BRAINBOXES US320	0x1019	US-320 USB2Serial 1xRS422/485
+product BRAINBOXES US324	0x1013	US-324 USB2Serial 1xRS422/485
+product BRAINBOXES US346_12	0x3011	US-346 USB2Serial 4xRS422/485 (Port 1 and 2)
+product BRAINBOXES US346_34	0x3012	US-346 USB2Serial 4xRS422/485 (Port 3 and 4)
+product BRAINBOXES US701_12	0x2011	US-701 USB2Serial 4xRS232 (Port 1 and 2)
+product BRAINBOXES US701_34	0x2012	US-701 USB2Serial 4xRS232 (Port 3 and 4)
+product BRAINBOXES US842_12	0x8001	US-842 USB2Serial 8xRS422/485 (Port 1 and 2)
+product BRAINBOXES US842_34	0x8002	US-842 USB2Serial 8xRS422/485 (Port 3 and 4)
+product BRAINBOXES US842_56	0x8003	US-842 USB2Serial 8xRS422/485 (Port 5 and 6)
+product BRAINBOXES US842_78	0x8004	US-842 USB2Serial 8xRS422/485 (Port 7 and 8)
+
 /* Broadcom products */
 product BROADCOM BCMFW		0x0bdc	BCMFW
 product BROADCOM BCM2033	0x2000	BCM2033



CVS commit: src/sys/dev/usb

2024-04-16 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Wed Apr 17 02:32:09 UTC 2024

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
Add some USB serial adapters

>From Cameron Williams in PR kern/58127


To generate a diff of this commit:
cvs rdiff -u -r1.814 -r1.815 src/sys/dev/usb/usbdevs

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



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

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 23:43:08 UTC 2024

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

Log Message:
Add comparison function so that it can be used to provide a stable sort
(Jan-Benedict Glaw)


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

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

Modified files:

Index: src/external/gpl2/texinfo/dist/makeinfo/index.c
diff -u src/external/gpl2/texinfo/dist/makeinfo/index.c:1.1.1.1 src/external/gpl2/texinfo/dist/makeinfo/index.c:1.2
--- src/external/gpl2/texinfo/dist/makeinfo/index.c:1.1.1.1	Wed Jan 13 19:11:29 2016
+++ src/external/gpl2/texinfo/dist/makeinfo/index.c	Tue Apr 16 19:43:08 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: index.c,v 1.1.1.1 2016/01/14 00:11:29 christos Exp $	*/
+/*	$NetBSD: index.c,v 1.2 2024/04/16 23:43:08 christos Exp $	*/
 
 /* index.c -- indexing for Texinfo.
Id: index.c,v 1.17 2004/11/30 02:03:23 karl Exp 
@@ -511,8 +511,30 @@ index_element_compare (const void *eleme
 {
   INDEX_ELT **elt1 = (INDEX_ELT **) element1;
   INDEX_ELT **elt2 = (INDEX_ELT **) element2;
+  int ret = 0;
 
-  return index_compare_fn ((*elt1)->entry, (*elt2)->entry);
+  /* Find a stable sort order.  */
+  if (ret == 0)
+ret = index_compare_fn ((*elt1)->entry, (*elt2)->entry);
+  if (ret == 0)
+ret = strcmp ((*elt1)->defining_file, (*elt2)->defining_file);
+  if (ret == 0)
+ret = strcmp ((*elt1)->node, (*elt2)->node);
+  if (ret == 0)
+if ((*elt1)->defining_line < (*elt2)->defining_line)
+  ret = -1;
+else if ((*elt1)->defining_line > (*elt2)->defining_line)
+  ret = 1;
+  if (ret == 0)
+if ((*elt1)->entry_number < (*elt2)->entry_number)
+  ret = -1;
+else if ((*elt1)->entry_number > (*elt2)->entry_number)
+  ret = 1;
+  if (ret == 0) {
+abort ();
+  }
+
+  return ret;
 }
 
 /* Force all index entries to be unique. */



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

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 23:43:08 UTC 2024

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

Log Message:
Add comparison function so that it can be used to provide a stable sort
(Jan-Benedict Glaw)


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

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



CVS commit: src/distrib/common

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 23:40:36 UTC 2024

Modified Files:
src/distrib/common: parselist.awk

Log Message:
Set LC_ALL=C before calling sort so that it works consistently. Unfortunately
ENVIRON["LC_ALL"] = "C"; does not work like in gawk (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/common/parselist.awk

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



CVS commit: src/distrib/common

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 23:40:36 UTC 2024

Modified Files:
src/distrib/common: parselist.awk

Log Message:
Set LC_ALL=C before calling sort so that it works consistently. Unfortunately
ENVIRON["LC_ALL"] = "C"; does not work like in gawk (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/common/parselist.awk

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

Modified files:

Index: src/distrib/common/parselist.awk
diff -u src/distrib/common/parselist.awk:1.16 src/distrib/common/parselist.awk:1.17
--- src/distrib/common/parselist.awk:1.16	Fri Apr 10 12:16:12 2009
+++ src/distrib/common/parselist.awk	Tue Apr 16 19:40:36 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: parselist.awk,v 1.16 2009/04/10 16:16:12 apb Exp $
+#	$NetBSD: parselist.awk,v 1.17 2024/04/16 23:40:36 christos Exp $
 #
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -177,7 +177,7 @@ $1 == "COPYDIR" \
 	destdir=$3;
 	if (mode == "mtree") {
 		printf("./%s type=dir mode=755\n", destdir);
-		command="cd " srcdir " && find . -type d -print"
+		command="cd " srcdir " && find . -type d -print | LC_ALL=C sort"
 		while (command | getline dir) {
 			gsub(/^\.\//, "", dir);
 			if (dir == ".")
@@ -187,7 +187,7 @@ $1 == "COPYDIR" \
 		close(command);
 	}
 	if (mode == "install" || mode == "mtree" || mode == "populate") {
-		command="cd " srcdir " && find . -type f -print"
+		command="cd " srcdir " && find . -type f -print | LC_ALL=C sort"
 		while (command | getline srcfile) {
 			gsub(/^\.\//, "", srcfile);
 			copy(srcdir "/" srcfile, destdir "/" srcfile, "");



CVS commit: src/bin/sh

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 23:30:19 UTC 2024

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

Log Message:
Be more explicit with sort fields to produce consistent results with gnu
sort (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/bin/sh/mkoptions.sh

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

Modified files:

Index: src/bin/sh/mkoptions.sh
diff -u src/bin/sh/mkoptions.sh:1.7 src/bin/sh/mkoptions.sh:1.8
--- src/bin/sh/mkoptions.sh:1.7	Sat Apr  6 10:20:27 2024
+++ src/bin/sh/mkoptions.sh	Tue Apr 16 19:30:19 2024
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mkoptions.sh,v 1.7 2024/04/06 14:20:27 kre Exp $
+# $NetBSD: mkoptions.sh,v 1.8 2024/04/16 23:30:19 christos Exp $
 
 #
 # It would be more sensible to generate 2 .h files, one which
@@ -52,8 +52,8 @@ ${SED:-sed} <"${IF}"			\
 	-e '/^#/d'			\
 	-e '/^[ 	]*\//d'		\
 	-e '/^[ 	]*\*/d'		\
-	-e '/^[ 	]*;/d'			|
-sort -b -k2,2f -k2,2|
+	-e '/^[ 	]*;/d'		|
+sort -k2b,2f -k2b,2			|
 while read line
 do
 	# Look for comments in various styles, and ignore them



CVS commit: src/bin/sh

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 23:30:19 UTC 2024

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

Log Message:
Be more explicit with sort fields to produce consistent results with gnu
sort (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/bin/sh/mkoptions.sh

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



CVS commit: src

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 19:15:37 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el
ad.powerpc64 ad.riscv64 md.amd64 md.sparc64
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64
src/etc/mtree: NetBSD.dist.compat.in
src/external/mpl/bind/lib/plugins: Makefile

Log Message:
fix compat build of filter-.so.0


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.mips64eb \
src/distrib/sets/lists/base32/ad.mips64el \
src/distrib/sets/lists/base32/ad.powerpc64 \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.aarch64 \
src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el \
src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.sparc64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug32/md.amd64
cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.compat.in
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/plugins/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/base32/ad.aarch64
diff -u src/distrib/sets/lists/base32/ad.aarch64:1.2 src/distrib/sets/lists/base32/ad.aarch64:1.3
--- src/distrib/sets/lists/base32/ad.aarch64:1.2	Sat Apr 13 04:50:18 2024
+++ src/distrib/sets/lists/base32/ad.aarch64	Tue Apr 16 15:15:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.2 2024/04/13 08:50:18 nakayama Exp $
+# $NetBSD: ad.aarch64,v 1.3 2024/04/16 19:15:36 christos Exp $
 ./lib/eabi	base-compat-shlib	compat
 ./lib/eabi/npf	base-compat-shlib	compat,npf
 ./lib/eabi/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -490,6 +490,8 @@
 ./usr/lib/eabi/lua/5.4/netpgp.so		base-compat-shlib	compat
 ./usr/lib/eabi/lua/5.4/sqlite.so		base-compat-shlib	compat
 ./usr/lib/eabi/lua/5.4/syslog.so		base-compat-shlib	compat
+./usr/lib/eabi/namedbase-compat-shlib	compat
+./usr/lib/eabi/named/filter-.so.0		base-compat-shlib	compat
 ./usr/lib/eabi/opensslbase-crypto-usr		compat
 ./usr/lib/eabi/openssl/engines			base-crypto-usr		compat
 ./usr/lib/eabi/openssl/engines/dasync.so	base-crypto-usr		compat,pic,openssl=30
@@ -990,6 +992,8 @@
 ./usr/lib/eabihf/lua/5.4/netpgp.so		base-compat-shlib	compat
 ./usr/lib/eabihf/lua/5.4/sqlite.so		base-compat-shlib	compat
 ./usr/lib/eabihf/lua/5.4/syslog.so		base-compat-shlib	compat
+./usr/lib/eabihf/namedbase-compat-shlib	compat
+./usr/lib/eabihf/named/filter-.so.0		base-compat-shlib	compat
 ./usr/lib/eabihf/opensslbase-crypto-usr		compat
 ./usr/lib/eabihf/openssl/engines			base-crypto-usr		compat
 ./usr/lib/eabihf/openssl/engines/dasync.so	base-crypto-usr		compat,pic,openssl=30
@@ -1029,9 +1033,11 @@
 ./usr/libdata/debug/lib/eabihf/npf		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabi		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabi/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/eabi/named		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabi/security	base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabihf		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabihf/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/eabihf/named	base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabihf/security	base-compat-shlib	compat
 ./usr/libexec/ld.elf_so-eabi			base-sys-shlib		compat,pic
 ./usr/libexec/ld.elf_so-eabihf			base-sys-shlib		compat,pic
Index: src/distrib/sets/lists/base32/ad.mips64eb
diff -u src/distrib/sets/lists/base32/ad.mips64eb:1.2 src/distrib/sets/lists/base32/ad.mips64eb:1.3
--- src/distrib/sets/lists/base32/ad.mips64eb:1.2	Sat Apr 13 04:50:19 2024
+++ src/distrib/sets/lists/base32/ad.mips64eb	Tue Apr 16 15:15:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.2 2024/04/13 08:50:19 nakayama Exp $
+# $NetBSD: ad.mips64eb,v 1.3 2024/04/16 19:15:36 christos Exp $
 ./lib/64	base-compat-shlib	compat
 ./lib/64/npf	base-compat-shlib	compat,npf
 ./lib/64/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -493,6 +493,8 @@
 ./usr/lib/64/lua/5.4/netpgp.so		base-compat-shlib	compat
 ./usr/lib/64/lua/5.4/sqlite.so		base-compat-shlib	compat
 ./usr/lib/64/lua/5.4/syslog.so		base-compat-shlib	compat
+./usr/lib/64/namedbase-compat-shlib	compat
+./usr/lib/64/named/filter-.so.0		base-compat-shlib	compat
 ./usr/lib/64/opensslbase-crypto-usr		compat
 

CVS commit: src

2024-04-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Apr 16 19:15:37 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el
ad.powerpc64 ad.riscv64 md.amd64 md.sparc64
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64
src/etc/mtree: NetBSD.dist.compat.in
src/external/mpl/bind/lib/plugins: Makefile

Log Message:
fix compat build of filter-.so.0


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.mips64eb \
src/distrib/sets/lists/base32/ad.mips64el \
src/distrib/sets/lists/base32/ad.powerpc64 \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.aarch64 \
src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el \
src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.sparc64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug32/md.amd64
cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.compat.in
cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/plugins/Makefile

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



Re: CVS commit: src/distrib/amd64/liveimage/emuimage

2024-04-16 Thread Izumi Tsutsui
maya@ wrote:

> Module Name:  src
> Committed By: maya
> Date: Tue Apr 16 16:13:45 UTC 2024
> 
> Modified Files:
>   src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
>   spec.emuimage
> 
> Log Message:
> restore amd64 live image support for resize root after combined mbr/gpt commit
> 
> we need to resize_gpt now, as it takes precedence over mbr/disklabel
> this change brings us to behave like the evbarm images.
> 
> XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure 
> whether
> that has any negative repercussions, maybe another system might regard MBR as 
> the
> sole source of truth when GPT also exists.

Actually disklabel or MBR does NOT exist in USE_GPT=YES case.

In src/distrib/common/bootimage/Makefile.bootimage,
both ${TOOL_FDISK} and ${TOOL_DISKLABEL} are only invoked
inside .if ${USE_GPT} == "no".

"${TOOL_GPT} biosboot -c /usr/mdec/gptmbr.bin" by USE_GPTMBR=yes
does all the tricks, i.e. gptmbr.bin in the MBR sector just reads
the first sector of the specified GPT partition:
 https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/mbr/gptmbr.S

and the loaded pbr.S in the primary bootxx checks a GPT partition table
and loads the whole (~8KB) the primary bootxx:
 
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/bootxx/pbr.S#L134-L135
 
https://github.com/NetBSD/src/blob/124fe5e/sys/arch/i386/stand/bootxx/pbr.S#L372-L380

Maybe this is the reason why some odd machines cannot boot UEFI images
(such ugly implemantations might assume MBR partition really exists).

---
Izumi Tsutsui


CVS commit: src/distrib/amd64/liveimage/emuimage

2024-04-16 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Apr 16 16:13:45 UTC 2024

Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
spec.emuimage

Log Message:
restore amd64 live image support for resize root after combined mbr/gpt commit

we need to resize_gpt now, as it takes precedence over mbr/disklabel
this change brings us to behave like the evbarm images.

XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether
that has any negative repercussions, maybe another system might regard MBR as 
the
sole source of truth when GPT also exists.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/spec.emuimage

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



CVS commit: src/distrib/amd64/liveimage/emuimage

2024-04-16 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Apr 16 16:13:45 UTC 2024

Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile rc.conf.emuimage
spec.emuimage

Log Message:
restore amd64 live image support for resize root after combined mbr/gpt commit

we need to resize_gpt now, as it takes precedence over mbr/disklabel
this change brings us to behave like the evbarm images.

XXX: we don't seem to touch disklabel and MBR, but they exist. Not sure whether
that has any negative repercussions, maybe another system might regard MBR as 
the
sole source of truth when GPT also exists.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/spec.emuimage

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

Modified files:

Index: src/distrib/amd64/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.9 src/distrib/amd64/liveimage/emuimage/Makefile:1.10
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.9	Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/Makefile	Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.10 2024/04/16 16:13:44 maya Exp $
 
 LIVEIMGBASE=	NetBSD-${DISTRIBVER}-amd64-live	# gives ${IMGBASE}.img
 
@@ -13,6 +13,6 @@ SPEC_EXTRA=	${.CURDIR}/spec.emuimage
 RC_CONF_EXTRA=	${.CURDIR}/rc.conf.emuimage
 IMGFILE_EXTRA=\
 	${FILESDIR}/ec2_init		etc/rc.d/ec2_init		\
-	${FILESDIR}/resize_disklabel	etc/rc.d/resize_disklabel
+	${FILESDIR}/resize_gpt		etc/rc.d/resize_gpt
 
 .include "${.CURDIR}/../Makefile.liveimage"

Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.4
--- src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.3	Wed Sep 27 00:24:12 2023
+++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage	Tue Apr 16 16:13:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf.emuimage,v 1.3 2023/09/27 00:24:12 riastradh Exp $
+# $NetBSD: rc.conf.emuimage,v 1.4 2024/04/16 16:13:44 maya Exp $
 
 is_ec2() {
 	val=NO
@@ -25,7 +25,7 @@ is_ec2() {
 }
 
 certctl_init=YES
-resize_disklabel=YES
+resize_gpt=YES
 resize_root=YES
 resize_root_flags="-p"
 resize_root_postcmd="/sbin/reboot -n"

Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.3
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2	Sat Jul 24 16:13:44 2021
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage	Tue Apr 16 16:13:44 2024
@@ -1,3 +1,3 @@
-# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $
+# $NetBSD: spec.emuimage,v 1.3 2024/04/16 16:13:44 maya Exp $
 ./etc/rc.d/ec2_init			type=file mode=0555 uname=root gname=wheel
-./etc/rc.d/resize_disklabel		type=file mode=0555 uname=root gname=wheel
+./etc/rc.d/resize_gpt			type=file mode=0555 uname=root gname=wheel



CVS commit: src/sys

2024-04-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Apr 16 14:34:03 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/amdgpu: files.amdgpu
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu.h amdgpu_acpi.c
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr: amdgpu_hwmgr.c
amdgpu_smu7_hwmgr.c
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_acpi.h
intel_opregion.h
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_acpi.c
nouveau_acpi.h nouveau_display.c nouveau_drv.h
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: device.h
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device:
nouveau_nvkm_engine_device_acpi.c nouveau_nvkm_engine_device_base.c
nouveau_nvkm_engine_device_pci.c nouveau_nvkm_engine_device_tegra.c
priv.h
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios:
nouveau_nvkm_subdev_bios_shadowacpi.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm:
nouveau_nvkm_subdev_mxm_base.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_acpi.c
radeon_bios.c radeon_drv.h
src/sys/external/bsd/drm2/include/acpi: video.h
src/sys/external/bsd/drm2/include/linux: acpi.h nbsd-namespace-acpi.h
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/modules/amdgpu: Makefile
Added Files:
src/sys/external/bsd/drm2/include/acpi: acpi_bus.h
src/sys/external/bsd/drm2/include/linux: mxm-wmi.h

Log Message:
drm: Set CONFIG_ACPI in linux/acpi.h and make it build.

Leave a little ACPI-related functionality disabled for now, like
getting EDID out of ACPI -- needs a bit more work to make this work,
and I don't have hardware to work on that.

Should help with failures of the forms:

- unable to locate a BIOS ROM
- bios: unable to locate usable image

on various machines.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c
cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c
 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c
 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h
cvs rdiff -u -r1.12 -r1.13 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
cvs rdiff -u -r1.11 -r1.12 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c
cvs rdiff -u -r1.4 -r1.5 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/acpi/acpi_bus.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/acpi/video.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/acpi.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/mxm-wmi.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.8 -r1.9 

CVS commit: src/sys

2024-04-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Apr 16 14:34:03 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/amdgpu: files.amdgpu
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu.h amdgpu_acpi.c
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr: amdgpu_hwmgr.c
amdgpu_smu7_hwmgr.c
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_acpi.h
intel_opregion.h
src/sys/external/bsd/drm2/dist/drm/nouveau: nouveau_acpi.c
nouveau_acpi.h nouveau_display.c nouveau_drv.h
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core: device.h
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device:
nouveau_nvkm_engine_device_acpi.c nouveau_nvkm_engine_device_base.c
nouveau_nvkm_engine_device_pci.c nouveau_nvkm_engine_device_tegra.c
priv.h
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios:
nouveau_nvkm_subdev_bios_shadowacpi.c
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm:
nouveau_nvkm_subdev_mxm_base.c
src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_acpi.c
radeon_bios.c radeon_drv.h
src/sys/external/bsd/drm2/include/acpi: video.h
src/sys/external/bsd/drm2/include/linux: acpi.h nbsd-namespace-acpi.h
src/sys/external/bsd/drm2/nouveau: files.nouveau
src/sys/external/bsd/drm2/radeon: files.radeon
src/sys/modules/amdgpu: Makefile
Added Files:
src/sys/external/bsd/drm2/include/acpi: acpi_bus.h
src/sys/external/bsd/drm2/include/linux: mxm-wmi.h

Log Message:
drm: Set CONFIG_ACPI in linux/acpi.h and make it build.

Leave a little ACPI-related functionality disabled for now, like
getting EDID out of ACPI -- needs a bit more work to make this work,
and I don't have hardware to work on that.

Should help with failures of the forms:

- unable to locate a BIOS ROM
- bios: unable to locate usable image

on various machines.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c
cvs rdiff -u -r1.48 -r1.49 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c
 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c
 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h
cvs rdiff -u -r1.12 -r1.13 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
cvs rdiff -u -r1.11 -r1.12 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c
cvs rdiff -u -r1.3 -r1.4 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c
cvs rdiff -u -r1.4 -r1.5 \

src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/acpi/acpi_bus.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/include/acpi/video.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/acpi.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/mxm-wmi.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/nouveau/files.nouveau
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/radeon/files.radeon
cvs rdiff -u -r1.8 -r1.9 

CVS commit: src/external/cddl/osnet/sys/sys

2024-04-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Apr 16 14:29:33 UTC 2024

Modified Files:
src/external/cddl/osnet/sys/sys: elf.h

Log Message:
opensolaris/sys/sys/elf.h: Omit needless __ELF_WORD_SIZE.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/elf.h

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

Modified files:

Index: src/external/cddl/osnet/sys/sys/elf.h
diff -u src/external/cddl/osnet/sys/sys/elf.h:1.7 src/external/cddl/osnet/sys/sys/elf.h:1.8
--- src/external/cddl/osnet/sys/sys/elf.h:1.7	Mon Apr  1 18:33:23 2024
+++ src/external/cddl/osnet/sys/sys/elf.h	Tue Apr 16 14:29:33 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: elf.h,v 1.7 2024/04/01 18:33:23 riastradh Exp $	*/
+/*	$NetBSD: elf.h,v 1.8 2024/04/16 14:29:33 riastradh Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -51,6 +51,4 @@
 
 #define	EM_AMD64		EM_X86_64
 
-#define __ELF_WORD_SIZE ELFSIZE
-
 #endif /* !_SYS__ELF_SOLARIS_H_ */



CVS commit: src/external/cddl/osnet/sys/sys

2024-04-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Apr 16 14:29:33 UTC 2024

Modified Files:
src/external/cddl/osnet/sys/sys: elf.h

Log Message:
opensolaris/sys/sys/elf.h: Omit needless __ELF_WORD_SIZE.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/elf.h

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



CVS commit: src/sys/external/bsd/drm2/nouveau

2024-04-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Apr 16 14:26:53 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau2netbsd

Log Message:
nouveau: Rework nouveau2netbsd hack to get ACPI stuff.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd

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

Modified files:

Index: src/sys/external/bsd/drm2/nouveau/nouveau2netbsd
diff -u src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.5 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.6
--- src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.5	Mon Aug 27 00:46:21 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau2netbsd	Tue Apr 16 14:26:53 2024
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#	$NetBSD: nouveau2netbsd,v 1.5 2018/08/27 00:46:21 riastradh Exp $
+#	$NetBSD: nouveau2netbsd,v 1.6 2024/04/16 14:26:53 riastradh Exp $
 #
 # $ /path/to/nouveau2netbsd > /path/to/files.nouveau.new
 #
@@ -32,9 +32,13 @@ filemap="$(mktemp -t ${0##*/})"
 
 cat Kbuild\
 | sed -e 's,^include \(.*\)$,.include "\1",'\
-| sed -e 's,^ifdef \(.*\)$,.if !empty(\1:M[yY][eE][sS]),'		\
+| sed -e 's,^ifdef \(.*\)$,.if !empty(\1:M[yY]),'			\
 | sed -e 's,^endif$,.endif,'		\
-| make -f /dev/stdin -V '$(nouveau-y)' src=.\
+| env	\
+	env CONFIG_ACPI=y		\
+	env CONFIG_X86=y		\
+	env src=.			\
+	make -f /dev/stdin -V '$(nouveau-y)'\
 | tr ' ' '\n'\
 | sed -e 's,^$,,'			\
 | sort -u\



CVS commit: src/sys/external/bsd/drm2/nouveau

2024-04-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue Apr 16 14:26:53 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau2netbsd

Log Message:
nouveau: Rework nouveau2netbsd hack to get ACPI stuff.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd

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

2024-04-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Apr 16 14:15:53 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el
src/distrib/sets/lists/debug32: ad.mipsn64eb ad.mipsn64el

Log Message:
mipsn64 has ld.elf_so-n32 for compat (and -o32), not ld.elf_so-64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el

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/base32/ad.mipsn64eb
diff -u src/distrib/sets/lists/base32/ad.mipsn64eb:1.3 src/distrib/sets/lists/base32/ad.mipsn64eb:1.4
--- src/distrib/sets/lists/base32/ad.mipsn64eb:1.3	Mon Apr 15 12:24:53 2024
+++ src/distrib/sets/lists/base32/ad.mipsn64eb	Tue Apr 16 14:15:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64eb,v 1.3 2024/04/15 12:24:53 martin Exp $
+# $NetBSD: ad.mipsn64eb,v 1.4 2024/04/16 14:15:53 martin Exp $
 ./lib/n32	base-compat-shlib	compat
 ./lib/n32/npf	base-compat-shlib	compat,npf
 ./lib/n32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -21,7 +21,7 @@
 ./lib/o32/npf/ext_rndblock.so			base-compat-shlib	compat,npf
 ./lib/o32/npf/ext_rndblock.so.0		base-compat-shlib	compat,npf
 ./lib/o32/npf/ext_rndblock.so.0.0		base-compat-shlib	compat,npf
-./libexec/ld.elf_so-64			base-compat-shlib	compat,pic
+./libexec/ld.elf_so-n32			base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32			base-compat-shlib	compat,pic
 ./usr/lib/n32	base-compat-shlib	compat
 ./usr/lib/n32/i18nbase-compat-shlib	compat
@@ -1039,5 +1039,5 @@
 ./usr/libdata/debug/usr/lib/o32		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/i18n		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/security	base-compat-shlib	compat
-./usr/libexec/ld.elf_so-64			base-sys-shlib		compat,pic
+./usr/libexec/ld.elf_so-n32			base-sys-shlib		compat,pic
 ./usr/libexec/ld.elf_so-o32			base-sys-shlib		compat,pic
Index: src/distrib/sets/lists/base32/ad.mipsn64el
diff -u src/distrib/sets/lists/base32/ad.mipsn64el:1.3 src/distrib/sets/lists/base32/ad.mipsn64el:1.4
--- src/distrib/sets/lists/base32/ad.mipsn64el:1.3	Mon Apr 15 12:24:53 2024
+++ src/distrib/sets/lists/base32/ad.mipsn64el	Tue Apr 16 14:15:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64el,v 1.3 2024/04/15 12:24:53 martin Exp $
+# $NetBSD: ad.mipsn64el,v 1.4 2024/04/16 14:15:53 martin Exp $
 ./lib/n32	base-compat-shlib	compat
 ./lib/n32/npf	base-compat-shlib	compat,npf
 ./lib/n32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -21,7 +21,7 @@
 ./lib/o32/npf/ext_rndblock.so			base-compat-shlib	compat,npf
 ./lib/o32/npf/ext_rndblock.so.0		base-compat-shlib	compat,npf
 ./lib/o32/npf/ext_rndblock.so.0.0		base-compat-shlib	compat,npf
-./libexec/ld.elf_so-64			base-compat-shlib	compat,pic
+./libexec/ld.elf_so-n32			base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32			base-compat-shlib	compat,pic
 ./usr/lib/n32	base-compat-shlib	compat
 ./usr/lib/n32/i18nbase-compat-shlib	compat
@@ -1039,5 +1039,5 @@
 ./usr/libdata/debug/usr/lib/o32		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/i18n		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/security	base-compat-shlib	compat
-./usr/libexec/ld.elf_so-64			base-sys-shlib		compat,pic
+./usr/libexec/ld.elf_so-n32			base-sys-shlib		compat,pic
 ./usr/libexec/ld.elf_so-o32			base-sys-shlib		compat,pic

Index: src/distrib/sets/lists/debug32/ad.mipsn64eb
diff -u src/distrib/sets/lists/debug32/ad.mipsn64eb:1.4 src/distrib/sets/lists/debug32/ad.mipsn64eb:1.5
--- src/distrib/sets/lists/debug32/ad.mipsn64eb:1.4	Sat Apr 13 08:50:19 2024
+++ src/distrib/sets/lists/debug32/ad.mipsn64eb	Tue Apr 16 14:15:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mipsn64eb,v 1.4 2024/04/13 08:50:19 nakayama Exp $
+# $NetBSD: ad.mipsn64eb,v 1.5 2024/04/16 14:15:53 martin Exp $
 ./usr/lib/n32/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/n32/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -331,7 +331,7 @@
 ./usr/libdata/debug/lib/o32/npf/ext_log.so.0.0.debug	comp-sys-debug	debug,compat,npf
 ./usr/libdata/debug/lib/o32/npf/ext_normalize.so.0.0.debug	comp-sys-debug	debug,compat,npf
 ./usr/libdata/debug/lib/o32/npf/ext_rndblock.so.0.0.debug	comp-sys-debug	debug,compat,npf
-./usr/libdata/debug/libexec/ld.elf_so-64.debug	comp-sys-debug		debug,compat
+./usr/libdata/debug/libexec/ld.elf_so-n32.debug	comp-sys-debug		debug,compat
 ./usr/libdata/debug/libexec/ld.elf_so-o32.debug	comp-sys-debug		debug,compat
 ./usr/libdata/debug/usr/lib/n32/i18n/libBIG5.so.5.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/n32/i18n/libDECHanyu.so.5.0.debug	comp-sys-debug	debug,compat
@@ -681,7 +681,7 @@
 

CVS commit: src/distrib/sets/lists

2024-04-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Apr 16 14:15:53 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el
src/distrib/sets/lists/debug32: ad.mipsn64eb ad.mipsn64el

Log Message:
mipsn64 has ld.elf_so-n32 for compat (and -o32), not ld.elf_so-64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el

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



CVS commit: src/sys/arch/vax/vax

2024-04-15 Thread Kalvis Duckmanton
Module Name:src
Committed By:   kalvisd
Date:   Tue Apr 16 00:03:30 UTC 2024

Modified Files:
src/sys/arch/vax/vax: unimpl_emul.S

Log Message:
vax/unimpl_emul.S: Initialise locations storing floating-point values with
a constant of the appropriate format


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/unimpl_emul.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/vax/vax/unimpl_emul.S
diff -u src/sys/arch/vax/vax/unimpl_emul.S:1.4 src/sys/arch/vax/vax/unimpl_emul.S:1.5
--- src/sys/arch/vax/vax/unimpl_emul.S:1.4	Mon May 22 16:53:05 2017
+++ src/sys/arch/vax/vax/unimpl_emul.S	Tue Apr 16 00:03:30 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: unimpl_emul.S,v 1.4 2017/05/22 16:53:05 ragge Exp $	*/
+/*	$NetBSD: unimpl_emul.S,v 1.5 2024/04/16 00:03:30 kalvisd Exp $	*/
 
 /*
  * Copyright (c) 2001 Brandon Creighton.  All rights reserved.
@@ -683,7 +683,7 @@ emodd:	bsbw	touser
 	 * there aren't any bits left for the fraction.  Therefore we're
 	 * done here;  TMPFRAC1 is equal to TMPFRACTGT and TMPFRAC2 is 0.
 	 */
-	movq $0f0.0, TMPFRAC2
+	movq $0d0.0, TMPFRAC2
 	jmp 9f		/* we're done, move on */
 1:	
 	/*
@@ -727,7 +727,7 @@ emodd:	bsbw	touser
 	 * We are less than 1.0; TMPFRAC1 should be 0, and TMPFRAC2 should
 	 * be equal to TMPFRACTGT.
 	 */
-	movd $0f0.0, TMPFRAC1
+	movd $0d0.0, TMPFRAC1
 	movd TMPFRACTGT, TMPFRAC2
 9:			
 	/*
@@ -763,7 +763,7 @@ zeroexit:
 	bsbw getaddr_byte
 	movl $0x0, (%r0)
 	bsbw getaddr_byte
-	movd $0f0, (%r0)
+	movd $0d0, (%r0)
 	brw goback
 
 



CVS commit: src/sys/arch/vax/vax

2024-04-15 Thread Kalvis Duckmanton
Module Name:src
Committed By:   kalvisd
Date:   Tue Apr 16 00:03:30 UTC 2024

Modified Files:
src/sys/arch/vax/vax: unimpl_emul.S

Log Message:
vax/unimpl_emul.S: Initialise locations storing floating-point values with
a constant of the appropriate format


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/unimpl_emul.S

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/base32

2024-04-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Apr 15 12:24:53 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el

Log Message:
Mipsn64* has no 64bit compat, its userland is native n64 - instead it
has n32 compat.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el

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/base32

2024-04-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Apr 15 12:24:53 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: ad.mipsn64eb ad.mipsn64el

Log Message:
Mipsn64* has no 64bit compat, its userland is native n64 - instead it
has n32 compat.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el

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/base32/ad.mipsn64eb
diff -u src/distrib/sets/lists/base32/ad.mipsn64eb:1.2 src/distrib/sets/lists/base32/ad.mipsn64eb:1.3
--- src/distrib/sets/lists/base32/ad.mipsn64eb:1.2	Sat Apr 13 08:50:19 2024
+++ src/distrib/sets/lists/base32/ad.mipsn64eb	Mon Apr 15 12:24:53 2024
@@ -1,15 +1,15 @@
-# $NetBSD: ad.mipsn64eb,v 1.2 2024/04/13 08:50:19 nakayama Exp $
-./lib/64	base-compat-shlib	compat
-./lib/64/npf	base-compat-shlib	compat,npf
-./lib/64/npf/ext_log.so			base-compat-shlib	compat,npf
-./lib/64/npf/ext_log.so.0			base-compat-shlib	compat,npf
-./lib/64/npf/ext_log.so.0.0			base-compat-shlib	compat,npf
-./lib/64/npf/ext_normalize.so		base-compat-shlib	compat,npf
-./lib/64/npf/ext_normalize.so.0		base-compat-shlib	compat,npf
-./lib/64/npf/ext_normalize.so.0.0		base-compat-shlib	compat,npf
-./lib/64/npf/ext_rndblock.so			base-compat-shlib	compat,npf
-./lib/64/npf/ext_rndblock.so.0		base-compat-shlib	compat,npf
-./lib/64/npf/ext_rndblock.so.0.0		base-compat-shlib	compat,npf
+# $NetBSD: ad.mipsn64eb,v 1.3 2024/04/15 12:24:53 martin Exp $
+./lib/n32	base-compat-shlib	compat
+./lib/n32/npf	base-compat-shlib	compat,npf
+./lib/n32/npf/ext_log.so			base-compat-shlib	compat,npf
+./lib/n32/npf/ext_log.so.0			base-compat-shlib	compat,npf
+./lib/n32/npf/ext_log.so.0.0			base-compat-shlib	compat,npf
+./lib/n32/npf/ext_normalize.so		base-compat-shlib	compat,npf
+./lib/n32/npf/ext_normalize.so.0		base-compat-shlib	compat,npf
+./lib/n32/npf/ext_normalize.so.0.0		base-compat-shlib	compat,npf
+./lib/n32/npf/ext_rndblock.so			base-compat-shlib	compat,npf
+./lib/n32/npf/ext_rndblock.so.0		base-compat-shlib	compat,npf
+./lib/n32/npf/ext_rndblock.so.0.0		base-compat-shlib	compat,npf
 ./lib/o32	base-compat-shlib	compat
 ./lib/o32/npf	base-compat-shlib	compat,npf
 ./lib/o32/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -23,509 +23,509 @@
 ./lib/o32/npf/ext_rndblock.so.0.0		base-compat-shlib	compat,npf
 ./libexec/ld.elf_so-64			base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32			base-compat-shlib	compat,pic
-./usr/lib/64	base-compat-shlib	compat
-./usr/lib/64/i18nbase-compat-shlib	compat
-./usr/lib/64/i18n/libBIG5.so			base-compat-shlib	compat
-./usr/lib/64/i18n/libBIG5.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libBIG5.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libDECHanyu.so		base-compat-shlib	compat
-./usr/lib/64/i18n/libDECHanyu.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libDECHanyu.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libEUC.so			base-compat-shlib	compat
-./usr/lib/64/i18n/libEUC.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libEUC.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libEUCTW.so		base-compat-shlib	compat
-./usr/lib/64/i18n/libEUCTW.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libEUCTW.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libGBK2K.so		base-compat-shlib	compat
-./usr/lib/64/i18n/libGBK2K.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libGBK2K.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libHZ.so			base-compat-shlib	compat
-./usr/lib/64/i18n/libHZ.so.5			base-compat-shlib	compat
-./usr/lib/64/i18n/libHZ.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libISO2022.so		base-compat-shlib	compat
-./usr/lib/64/i18n/libISO2022.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libISO2022.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libJOHAB.so		base-compat-shlib	compat
-./usr/lib/64/i18n/libJOHAB.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libJOHAB.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libMSKanji.so		base-compat-shlib	compat
-./usr/lib/64/i18n/libMSKanji.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libMSKanji.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libUES.so			base-compat-shlib	compat
-./usr/lib/64/i18n/libUES.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libUES.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF1632.so		base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF1632.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF1632.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF7.so			base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF7.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF7.so.5.0		base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF8.so			base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF8.so.5		base-compat-shlib	compat
-./usr/lib/64/i18n/libUTF8.so.5.0		

CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

2024-04-15 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Apr 15 08:06:36 UTC 2024

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev.c

Log Message:
Add a newline to a printf message.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.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/cddl/osnet/dist/uts/common/fs/zfs/vdev.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c:1.6 src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c:1.7
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c:1.6	Thu Nov 15 04:55:06 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c	Mon Apr 15 08:06:36 2024
@@ -3619,7 +3619,7 @@ vdev_deadman(vdev_t *vd)
 vq->vq_io_complete_ts);
 
 printf("SLOW IO: zio timestamp %lluns, "
-"delta %"PRIu64"ns, last io %lluns",
+"delta %"PRIu64"ns, last io %lluns\n",
 fio->io_timestamp, delta,
 vq->vq_io_complete_ts);
 



CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

2024-04-15 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Apr 15 08:06:36 UTC 2024

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: vdev.c

Log Message:
Add a newline to a printf message.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c

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



CVS commit: src/sys/ddb

2024-04-15 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Apr 15 06:48:07 UTC 2024

Modified Files:
src/sys/ddb: db_proc.c

Log Message:
Fix alignment of ddb 'ps/[lw]' output. LID matches PID and has more digits.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/ddb/db_proc.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/ddb/db_proc.c
diff -u src/sys/ddb/db_proc.c:1.15 src/sys/ddb/db_proc.c:1.16
--- src/sys/ddb/db_proc.c:1.15	Mon Jan 22 07:57:48 2024
+++ src/sys/ddb/db_proc.c	Mon Apr 15 06:48:06 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_proc.c,v 1.15 2024/01/22 07:57:48 skrll Exp $	*/
+/*	$NetBSD: db_proc.c,v 1.16 2024/04/15 06:48:06 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2009, 2020 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_proc.c,v 1.15 2024/01/22 07:57:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_proc.c,v 1.16 2024/04/15 06:48:06 skrll Exp $");
 
 #ifndef _KERNEL
 #include 
@@ -153,7 +153,7 @@ db_show_all_procs(db_expr_t addr, bool h
 		"COMMAND", "STRUCT PROC *", "UAREA *", "VMSPACE/VM_MAP");
 		break;
 	case 'l':
-		db_printf("PID   %4s S %3s %9s %18s %18s %-8s\n",
+		db_printf("PID   %5s S %3s %9s %18s %18s %-8s\n",
 		"LID", "CPU", "FLAGS", "STRUCT LWP *", "NAME", "WAIT");
 		break;
 	case 'n':
@@ -161,7 +161,7 @@ db_show_all_procs(db_expr_t addr, bool h
 		"PPID", "PGRP", "UID", "FLAGS", "LWPS", "COMMAND", "WAIT");
 		break;
 	case 'w':
-		db_printf("PID   %4s %16s %8s %4s %-16s %s\n",
+		db_printf("PID   %5s %16s %8s %4s %-16s %s\n",
 		"LID", "COMMAND", "EMUL", "PRI", "WAIT-MSG",
 		"WAIT-CHANNEL");
 		break;
@@ -210,7 +210,7 @@ db_show_all_procs(db_expr_t addr, bool h
 } else {
 	wbuf[0] = '\0';
 }
-db_printf("%c%4d %d %3d %9x %18lx %18s %-8s\n",
+db_printf("%c%5d %d %3d %9x %18lx %18s %-8s\n",
 (run ? '>' : ' '), l.l_lid,
 l.l_stat, cpuno, l.l_flag, (long)lp,
 db_nbuf, wbuf);
@@ -262,7 +262,7 @@ db_show_all_procs(db_expr_t addr, bool h
 db_nbuf[MAXCOMLEN] = '\0';
 
 db_printf(
-"%c%4d %16s %8s %4d %-16s %-18lx\n",
+"%c%5d %16s %8s %4d %-16s %-18lx\n",
 (run ? '>' : ' '), l.l_lid,
 p.p_comm, db_nbuf,
 l.l_priority, wbuf, (long)l.l_wchan);



CVS commit: src/sys/ddb

2024-04-15 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Apr 15 06:48:07 UTC 2024

Modified Files:
src/sys/ddb: db_proc.c

Log Message:
Fix alignment of ddb 'ps/[lw]' output. LID matches PID and has more digits.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/ddb/db_proc.c

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



CVS commit: src/sys/netinet

2024-04-14 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun Apr 14 18:02:55 UTC 2024

Modified Files:
src/sys/netinet: sctputil.h

Log Message:
s/force_comile_error/force_compile_error/


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctputil.h

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

Modified files:

Index: src/sys/netinet/sctputil.h
diff -u src/sys/netinet/sctputil.h:1.3 src/sys/netinet/sctputil.h:1.4
--- src/sys/netinet/sctputil.h:1.3	Sun Jan 19 20:51:13 2020
+++ src/sys/netinet/sctputil.h	Sun Apr 14 18:02:55 2024
@@ -1,5 +1,5 @@
 /*	$KAME: sctputil.h,v 1.15 2005/03/06 16:04:19 itojun Exp $	*/
-/*	$NetBSD: sctputil.h,v 1.3 2020/01/19 20:51:13 riastradh Exp $ */
+/*	$NetBSD: sctputil.h,v 1.4 2024/04/14 18:02:55 andvar Exp $ */
 
 #ifndef __SCTPUTIL_H__
 #define __SCTPUTIL_H__
@@ -85,7 +85,7 @@
 	pool_init(&(zone), size, 0, 0, 0, name, NULL, IPL_NET);
 #else
 	/* don't know this OS! */
-	force_comile_error;
+	force_compile_error;
 #endif
 
 /* SCTP_ZONE_GET: allocate element from the zone */
@@ -105,7 +105,7 @@
 	pool_get(, PR_NOWAIT);
 #else
 	/* don't know this OS! */
-	force_comile_error;
+	force_compile_error;
 #endif
 
 /* SCTP_ZONE_FREE: free element from the zone */
@@ -125,7 +125,7 @@
 	pool_put(, element);
 #else
 	/* don't know this OS! */
-	force_comile_error;
+	force_compile_error;
 #endif
 
 #define sctp_get_associd(stcb) ((sctp_assoc_t)stcb->asoc.my_vtag)



CVS commit: src/sys/netinet

2024-04-14 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun Apr 14 18:02:55 UTC 2024

Modified Files:
src/sys/netinet: sctputil.h

Log Message:
s/force_comile_error/force_compile_error/


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/netinet/sctputil.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

2024-04-14 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 14 15:21:20 UTC 2024

Modified Files:
src/usr.bin/make: str.c

Log Message:
make: make string matching platform-independent

Previously, whether the character range '[a-ä]' matched, depended on the
signedness of the plain 'char' type.  Since make operates on byte
strings and does not support UTF-8 or other multi-byte character
encodings, this edge case is not expected to occur in practice.

No change in the unit tests as this edge case is not covered by tests.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/make/str.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/str.c
diff -u src/usr.bin/make/str.c:1.102 src/usr.bin/make/str.c:1.103
--- src/usr.bin/make/str.c:1.102	Fri Jan  5 23:22:06 2024
+++ src/usr.bin/make/str.c	Sun Apr 14 15:21:20 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: str.c,v 1.102 2024/01/05 23:22:06 rillig Exp $	*/
+/*	$NetBSD: str.c,v 1.103 2024/04/14 15:21:20 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -71,7 +71,7 @@
 #include "make.h"
 
 /*	"@(#)str.c	5.8 (Berkeley) 6/1/90"	*/
-MAKE_RCSID("$NetBSD: str.c,v 1.102 2024/01/05 23:22:06 rillig Exp $");
+MAKE_RCSID("$NetBSD: str.c,v 1.103 2024/04/14 15:21:20 rillig Exp $");
 
 
 static HashTable interned_strings;
@@ -297,26 +297,6 @@ Str_Words(const char *str, bool expand)
 }
 
 /*
- * XXX: In the extreme edge case that one of the characters is from the basic
- * execution character set and the other isn't, the result of the comparison
- * differs depending on whether plain char is signed or unsigned.
- *
- * An example is the character range from \xE4 to 'a', where \xE4 may come
- * from U+00E4 'Latin small letter A with diaeresis'.
- *
- * If char is signed, \xE4 evaluates to -28, the first half of the condition
- * becomes -28 <= '0' && '0' <= 'a', which evaluates to true.
- *
- * If char is unsigned, \xE4 evaluates to 228, the second half of the
- * condition becomes 'a' <= '0' && '0' <= 228, which evaluates to false.
- */
-static bool
-in_range(char e1, char c, char e2)
-{
-	return (e1 <= c && c <= e2) || (e2 <= c && c <= e1);
-}
-
-/*
  * Test if a string matches a pattern like "*.[ch]". The pattern matching
  * characters are '*', '?' and '[]', as in fnmatch(3).
  *
@@ -360,7 +340,11 @@ match_fixed_length:
 return res;
 			}
 			if (pat[1] == '-') {
-if (in_range(pat[0], *str, pat[2]))
+unsigned char e1 = (unsigned char)pat[0];
+unsigned char c = (unsigned char)*str;
+unsigned char e2 = (unsigned char)pat[2];
+if ((e1 <= c && c <= e2)
+|| (e2 <= c && c <= e1))
 	goto end_of_char_list;
 pat += 2;
 			}



CVS commit: src/usr.bin/make

2024-04-14 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 14 15:21:20 UTC 2024

Modified Files:
src/usr.bin/make: str.c

Log Message:
make: make string matching platform-independent

Previously, whether the character range '[a-ä]' matched, depended on the
signedness of the plain 'char' type.  Since make operates on byte
strings and does not support UTF-8 or other multi-byte character
encodings, this edge case is not expected to occur in practice.

No change in the unit tests as this edge case is not covered by tests.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/make/str.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/aarch64/aarch64

2024-04-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 14 12:51:17 UTC 2024

Modified Files:
src/sys/arch/aarch64/aarch64: cpu_machdep.c sig_machdep.c

Log Message:
kern/58149: aarch64: Cannot return from a signal handler if SP was misaligned 
when the signal arrived

Apply the kernel diff from the PR

1. sendsig_siginfo() previously assumed that user SP was always aligned to
   16 bytes and could call signal handlers with SP misaligned. This is a
   wrong assumption because aarch64 demands that SP is aligned *only while*
   it's being used to access memory. Now it properly aligns it before
   pusing anything on the stack.

2. cpu_mcontext_validate() used to check if _REG_SP was aligned and
   considered the ucontext invalid otherwise. This meant if a signal was
   sent to a process whose SP was misaligned, the signal handler would fail
   to return because the ucontext passed from the kernel was an invalid
   one. Now setcontext(2) doesn't complain about misaligned SP.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/aarch64/aarch64/cpu_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/sig_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/aarch64/aarch64/cpu_machdep.c
diff -u src/sys/arch/aarch64/aarch64/cpu_machdep.c:1.14 src/sys/arch/aarch64/aarch64/cpu_machdep.c:1.15
--- src/sys/arch/aarch64/aarch64/cpu_machdep.c:1.14	Sat Feb 25 00:40:22 2023
+++ src/sys/arch/aarch64/aarch64/cpu_machdep.c	Sun Apr 14 12:51:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_machdep.c,v 1.14 2023/02/25 00:40:22 riastradh Exp $ */
+/* $NetBSD: cpu_machdep.c,v 1.15 2024/04/14 12:51:16 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014, 2019 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: cpu_machdep.c,v 1.14 2023/02/25 00:40:22 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu_machdep.c,v 1.15 2024/04/14 12:51:16 skrll Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -158,9 +158,13 @@ dosoftints(void)
 int
 cpu_mcontext_validate(struct lwp *l, const mcontext_t *mcp)
 {
+	/*
+	 * We intentionally don't verify that _REG_SP is aligned to
+	 * 16-bytes boundaries because it can be legally misaligned as long
+	 * as it's not used for accessing memory.
+	 */
 	if ((mcp->__gregs[_REG_SPSR] & ~SPSR_NZCV)
-	|| (mcp->__gregs[_REG_PC] & 3)
-	|| (mcp->__gregs[_REG_SP] & 15))
+	|| (mcp->__gregs[_REG_PC] & 3))
 		return EINVAL;
 
 	return 0;

Index: src/sys/arch/aarch64/aarch64/sig_machdep.c
diff -u src/sys/arch/aarch64/aarch64/sig_machdep.c:1.8 src/sys/arch/aarch64/aarch64/sig_machdep.c:1.9
--- src/sys/arch/aarch64/aarch64/sig_machdep.c:1.8	Mon Nov  1 05:07:15 2021
+++ src/sys/arch/aarch64/aarch64/sig_machdep.c	Sun Apr 14 12:51:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.8 2021/11/01 05:07:15 thorpej Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.9 2024/04/14 12:51:16 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: sig_machdep.c,v 1.8 2021/11/01 05:07:15 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sig_machdep.c,v 1.9 2024/04/14 12:51:16 skrll Exp $");
 
 #include 
 #include 
@@ -58,8 +58,14 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
 
 	vaddr_t sp;
 
-	sp = onstack_p ? ((vaddr_t)ss->ss_sp + ss->ss_size) & -16 : tf->tf_sp;
+	/*
+	 * The user stack isn't guaranteed to be aligned to 16 bytes. Align
+	 * it before pushing anything onto it.
+	 */
+	sp = onstack_p ? ((vaddr_t)ss->ss_sp + ss->ss_size) : tf->tf_sp;
+	sp &= -16;
 
+	__CTASSERT(sizeof(ucontext_t) % 16 == 0);
 	sp -= sizeof(ucontext_t);
 	const vaddr_t ucp = sp;
 



CVS commit: src/sys/arch/aarch64/aarch64

2024-04-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 14 12:51:17 UTC 2024

Modified Files:
src/sys/arch/aarch64/aarch64: cpu_machdep.c sig_machdep.c

Log Message:
kern/58149: aarch64: Cannot return from a signal handler if SP was misaligned 
when the signal arrived

Apply the kernel diff from the PR

1. sendsig_siginfo() previously assumed that user SP was always aligned to
   16 bytes and could call signal handlers with SP misaligned. This is a
   wrong assumption because aarch64 demands that SP is aligned *only while*
   it's being used to access memory. Now it properly aligns it before
   pusing anything on the stack.

2. cpu_mcontext_validate() used to check if _REG_SP was aligned and
   considered the ucontext invalid otherwise. This meant if a signal was
   sent to a process whose SP was misaligned, the signal handler would fail
   to return because the ucontext passed from the kernel was an invalid
   one. Now setcontext(2) doesn't complain about misaligned SP.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/aarch64/aarch64/cpu_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/sig_machdep.c

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

2024-04-14 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 14 12:30:48 UTC 2024

Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: directive-export-impl.exp
directive-for-escape.exp opt-debug-parse.exp var-eval-short.exp
varmod-loop.exp varname-dot-shell.exp

Log Message:
make: add debug logging for .if and .for lines in -dp mode

This helps track down in which line a condition is evaluated.


To generate a diff of this commit:
cvs rdiff -u -r1.718 -r1.719 src/usr.bin/make/parse.c
cvs rdiff -u -r1.17 -r1.18 \
src/usr.bin/make/unit-tests/directive-export-impl.exp
cvs rdiff -u -r1.23 -r1.24 \
src/usr.bin/make/unit-tests/directive-for-escape.exp \
src/usr.bin/make/unit-tests/var-eval-short.exp
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/opt-debug-parse.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varmod-loop.exp
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/varname-dot-shell.exp

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/parse.c
diff -u src/usr.bin/make/parse.c:1.718 src/usr.bin/make/parse.c:1.719
--- src/usr.bin/make/parse.c:1.718	Mon Apr  1 12:26:02 2024
+++ src/usr.bin/make/parse.c	Sun Apr 14 12:30:47 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.718 2024/04/01 12:26:02 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.719 2024/04/14 12:30:47 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.718 2024/04/01 12:26:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.719 2024/04/14 12:30:47 rillig Exp $");
 
 /* Detects a multiple-inclusion guard in a makefile. */
 typedef enum {
@@ -2607,6 +2607,7 @@ ReadHighLevelLine(void)
 		if (line == NULL)
 			return NULL;
 
+		DEBUG2(PARSE, "Parsing line %u: %s\n", curFile->lineno, line);
 		if (curFile->guardState != GS_NO
 		&& ((curFile->guardState == GS_START && line[0] != '.')
 			|| curFile->guardState == GS_DONE))
@@ -2929,8 +2930,6 @@ Parse_File(const char *name, int fd)
 
 	do {
 		while ((line = ReadHighLevelLine()) != NULL) {
-			DEBUG2(PARSE, "Parsing line %u: %s\n",
-			CurFile()->lineno, line);
 			ParseLine(line);
 		}
 	} while (ParseEOF());

Index: src/usr.bin/make/unit-tests/directive-export-impl.exp
diff -u src/usr.bin/make/unit-tests/directive-export-impl.exp:1.17 src/usr.bin/make/unit-tests/directive-export-impl.exp:1.18
--- src/usr.bin/make/unit-tests/directive-export-impl.exp:1.17	Thu Mar  3 19:36:35 2022
+++ src/usr.bin/make/unit-tests/directive-export-impl.exp	Sun Apr 14 12:30:47 2024
@@ -10,6 +10,7 @@ Pattern for ':N' is "*"
 ModifyWords: split "<>" into 1 word
 Result of ${UT_VAR:N*} is ""
 ParseDependency(: )
+Parsing line 42: .if ${:!echo "\$UT_VAR"!} != "<>"
 CondParser_Eval: ${:!echo "\$UT_VAR"!} != "<>"
 Var_Parse: ${:!echo "\$UT_VAR"!} != "<>" (eval-defined)
 Evaluating modifier ${:!...} on value "" (eval-defined, undefined)
@@ -34,6 +35,7 @@ Result of ${UT_VAR:N*} is ""
 ParseDependency(: )
 Parsing line 54: REF=		defined
 Global: REF = defined
+Parsing line 58: .if ${:!echo "\$UT_VAR"!} != ""
 CondParser_Eval: ${:!echo "\$UT_VAR"!} != ""
 Var_Parse: ${:!echo "\$UT_VAR"!} != "" (eval-defined)
 Evaluating modifier ${:!...} on value "" (eval-defined, undefined)

Index: src/usr.bin/make/unit-tests/directive-for-escape.exp
diff -u src/usr.bin/make/unit-tests/directive-for-escape.exp:1.23 src/usr.bin/make/unit-tests/directive-for-escape.exp:1.24
--- src/usr.bin/make/unit-tests/directive-for-escape.exp:1.23	Sun Nov 19 22:06:15 2023
+++ src/usr.bin/make/unit-tests/directive-for-escape.exp	Sun Apr 14 12:30:47 2024
@@ -106,6 +106,7 @@ make: "directive-for-escape.mk" line 228
 For: end for 1
 For: loop body with i = "
 ":
+Parsing line 244: .for i in "${.newline}"
 For: end for 1
 Parse_PushInput: .for loop in directive-for-escape.mk, line 244
 make: "directive-for-escape.mk" line 244: newline in .for value
Index: src/usr.bin/make/unit-tests/var-eval-short.exp
diff -u src/usr.bin/make/unit-tests/var-eval-short.exp:1.23 src/usr.bin/make/unit-tests/var-eval-short.exp:1.24
--- src/usr.bin/make/unit-tests/var-eval-short.exp:1.23	Thu Jun  1 20:56:35 2023
+++ src/usr.bin/make/unit-tests/var-eval-short.exp	Sun Apr 14 12:30:47 2024
@@ -1,5 +1,6 @@
 make: "var-eval-short.mk" line 46: In the :@ modifier of "", the variable name "${FAIL}" must not contain a dollar
 make: "var-eval-short.mk" line 46: Malformed conditional (0 && ${:Uword:@${FAIL}@expr@})
+Parsing line 159: .if 0 && ${0:?${FAIL}then:${FAIL}else}
 CondParser_Eval: 0 && ${0:?${FAIL}then:${FAIL}else}
 Var_Parse: ${0:?${FAIL}then:${FAIL}else} (parse-only)
 Parsing modifier ${0:?...}
@@ -10,6 +11,7 @@ Modifier part: "${FAIL}else"
 Result of ${0:?${FAIL}then:${FAIL}else} is "" (parse-only, defined)
 Parsing line 167: DEFINED=	defined
 Global: 

CVS commit: src/usr.bin/make

2024-04-14 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sun Apr 14 12:30:48 UTC 2024

Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: directive-export-impl.exp
directive-for-escape.exp opt-debug-parse.exp var-eval-short.exp
varmod-loop.exp varname-dot-shell.exp

Log Message:
make: add debug logging for .if and .for lines in -dp mode

This helps track down in which line a condition is evaluated.


To generate a diff of this commit:
cvs rdiff -u -r1.718 -r1.719 src/usr.bin/make/parse.c
cvs rdiff -u -r1.17 -r1.18 \
src/usr.bin/make/unit-tests/directive-export-impl.exp
cvs rdiff -u -r1.23 -r1.24 \
src/usr.bin/make/unit-tests/directive-for-escape.exp \
src/usr.bin/make/unit-tests/var-eval-short.exp
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/opt-debug-parse.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varmod-loop.exp
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/varname-dot-shell.exp

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



CVS commit: src/external/mpl/bind/lib/plugins

2024-04-14 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Apr 14 08:29:54 UTC 2024

Modified Files:
src/external/mpl/bind/lib/plugins: Makefile

Log Message:
Revert previous until Christos has a chance to work out why it breaks
the builds.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/lib/plugins/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/mpl/bind/lib/plugins/Makefile
diff -u src/external/mpl/bind/lib/plugins/Makefile:1.6 src/external/mpl/bind/lib/plugins/Makefile:1.7
--- src/external/mpl/bind/lib/plugins/Makefile:1.6	Sat Apr 13 17:22:33 2024
+++ src/external/mpl/bind/lib/plugins/Makefile	Sun Apr 14 08:29:54 2024
@@ -1,12 +1,10 @@
-#	$NetBSD: Makefile,v 1.6 2024/04/13 17:22:33 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2024/04/14 08:29:54 kre Exp $
 
 LIBISMODULE=	yes
 MAKELINKLIB=	no
-.include 
-
-.if !defined(MLIBDIR)
 LIB=	filter-
 
+.include 
 
 SHLIB_MAJOR=0
 SRCS=	filter-.c
@@ -15,6 +13,5 @@ LIBDIR=	/usr/lib/named
 DIST=${IDIST}/bin/plugins
 
 .PATH: ${DIST}
-.endif
 
 .include 



CVS commit: src/external/mpl/bind/lib/plugins

2024-04-14 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Sun Apr 14 08:29:54 UTC 2024

Modified Files:
src/external/mpl/bind/lib/plugins: Makefile

Log Message:
Revert previous until Christos has a chance to work out why it breaks
the builds.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/bind/lib/plugins/Makefile

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



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

2024-04-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 14 07:56:45 UTC 2024

Modified Files:
src/sys/arch/mips/mips: sig_machdep.c

Log Message:
Trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mips/mips/sig_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/mips/mips/sig_machdep.c
diff -u src/sys/arch/mips/mips/sig_machdep.c:1.24 src/sys/arch/mips/mips/sig_machdep.c:1.25
--- src/sys/arch/mips/mips/sig_machdep.c:1.24	Tue Nov 27 14:09:54 2018
+++ src/sys/arch/mips/mips/sig_machdep.c	Sun Apr 14 07:56:45 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sig_machdep.c,v 1.24 2018/11/27 14:09:54 maxv Exp $	*/
+/*	$NetBSD: sig_machdep.c,v 1.25 2024/04/14 07:56:45 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,8 +30,8 @@
  */
 
 #include 			/* RCS ID & Copyright macro defns */
-	
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.24 2018/11/27 14:09:54 maxv Exp $"); 
+
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.25 2024/04/14 07:56:45 skrll Exp $");
 
 #include "opt_cputype.h"
 
@@ -48,12 +48,12 @@ __KERNEL_RCSID(0, "$NetBSD: sig_machdep.
 #include 
 #include 
 
-void *	
+void *
 getframe(struct lwp *l, int sig, int *onstack)
 {
 	struct proc * const p = l->l_proc;
 	struct trapframe * const tf = l->l_md.md_utf;
- 
+
 	/* Do we need to jump onto the signal stack? */
 	*onstack = (l->l_sigstk.ss_flags & (SS_DISABLE | SS_ONSTACK)) == 0
 	&& (SIGACTION(p, sig).sa_flags & SA_ONSTACK) != 0;



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

2024-04-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 14 07:56:45 UTC 2024

Modified Files:
src/sys/arch/mips/mips: sig_machdep.c

Log Message:
Trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mips/mips/sig_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/arch/arm/arm

2024-04-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 14 07:56:13 UTC 2024

Modified Files:
src/sys/arch/arm/arm: sig_machdep.c

Log Message:
Trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm/sig_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/arm/arm/sig_machdep.c
diff -u src/sys/arch/arm/arm/sig_machdep.c:1.52 src/sys/arch/arm/arm/sig_machdep.c:1.53
--- src/sys/arch/arm/arm/sig_machdep.c:1.52	Mon Feb  1 19:31:34 2021
+++ src/sys/arch/arm/arm/sig_machdep.c	Sun Apr 14 07:56:13 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: sig_machdep.c,v 1.52 2021/02/01 19:31:34 skrll Exp $	*/
+/*	$NetBSD: sig_machdep.c,v 1.53 2024/04/14 07:56:13 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.52 2021/02/01 19:31:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.53 2024/04/14 07:56:13 skrll Exp $");
 
 #include 		/* XXX only needed by syscallargs.h */
 #include 
@@ -97,10 +97,10 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
 	sig_t catcher = SIGACTION(p, sig).sa_handler;
 
 	fp = getframe(l, sig, );
-	
+
 	/* make room on the stack */
 	fp--;
-	
+
 	/* make the stack aligned */
 	fp = (struct sigframe_siginfo *)STACK_ALIGN(fp, STACK_ALIGNBYTES);
 
@@ -134,7 +134,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c
 	 * trampoline version numbers are coordinated with machine-
 	 * dependent code in libc.
 	 */
-	
+
 	tf->tf_r0 = sig;
 	tf->tf_r1 = (int)>sf_si;
 	tf->tf_r2 = (int)>sf_uc;



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

2024-04-14 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Apr 14 07:56:13 UTC 2024

Modified Files:
src/sys/arch/arm/arm: sig_machdep.c

Log Message:
Trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm/sig_machdep.c

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



CVS commit: src/distrib/amd64/liveimage

2024-04-13 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Sat Apr 13 18:38:17 UTC 2024

Modified Files:
src/distrib/amd64/liveimage: Makefile.liveimage

Log Message:
amd64 live image: support EFI as well as BIOS boot

The biggest caveat is that there's a small number of machines that try to
EFI boot but fail, so would prefer a BIOS only image. I'm not adding a
separate BIOS only image because the live image is pretty niche.
(For regular installation images, we do create a separate BIOS-only version)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage

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

Modified files:

Index: src/distrib/amd64/liveimage/Makefile.liveimage
diff -u src/distrib/amd64/liveimage/Makefile.liveimage:1.2 src/distrib/amd64/liveimage/Makefile.liveimage:1.3
--- src/distrib/amd64/liveimage/Makefile.liveimage:1.2	Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/liveimage/Makefile.liveimage	Sat Apr 13 18:38:17 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.liveimage,v 1.2 2018/12/15 18:03:17 gson Exp $
+#	$NetBSD: Makefile.liveimage,v 1.3 2024/04/13 18:38:17 maya Exp $
 
 .include 
 
@@ -7,6 +7,11 @@ PRIMARY_BOOT=		bootxx_ffsv1
 SECONDARY_BOOT=		boot
 SECONDARY_BOOT_ARG=	# unnecessary
 
+EFIBOOT=		${WORKDIR}/usr/mdec/bootx64.efi
+EFIBOOT+=		${WORKDIR}/usr/mdec/bootia32.efi
+
 USE_MBR=		yes
+USE_GPT=		yes
+USE_GPTMBR=		yes
 
 .include "${.CURDIR}/../../../common/bootimage/Makefile.liveimage"



CVS commit: src/distrib/amd64/liveimage

2024-04-13 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Sat Apr 13 18:38:17 UTC 2024

Modified Files:
src/distrib/amd64/liveimage: Makefile.liveimage

Log Message:
amd64 live image: support EFI as well as BIOS boot

The biggest caveat is that there's a small number of machines that try to
EFI boot but fail, so would prefer a BIOS only image. I'm not adding a
separate BIOS only image because the live image is pretty niche.
(For regular installation images, we do create a separate BIOS-only version)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/liveimage/Makefile.liveimage

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



CVS commit: src/external/mpl/bind/lib/plugins

2024-04-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Apr 13 17:22:33 UTC 2024

Modified Files:
src/external/mpl/bind/lib/plugins: Makefile

Log Message:
Don't build/install the compat plugin.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/lib/plugins/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/mpl/bind/lib/plugins/Makefile
diff -u src/external/mpl/bind/lib/plugins/Makefile:1.5 src/external/mpl/bind/lib/plugins/Makefile:1.6
--- src/external/mpl/bind/lib/plugins/Makefile:1.5	Thu Apr  4 21:16:01 2024
+++ src/external/mpl/bind/lib/plugins/Makefile	Sat Apr 13 13:22:33 2024
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.5 2024/04/05 01:16:01 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2024/04/13 17:22:33 christos Exp $
 
 LIBISMODULE=	yes
 MAKELINKLIB=	no
+.include 
+
+.if !defined(MLIBDIR)
 LIB=	filter-
 
-.include 
 
 SHLIB_MAJOR=0
 SRCS=	filter-.c
@@ -13,5 +15,6 @@ LIBDIR=	/usr/lib/named
 DIST=${IDIST}/bin/plugins
 
 .PATH: ${DIST}
+.endif
 
 .include 



CVS commit: src/external/mpl/bind/lib/plugins

2024-04-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Apr 13 17:22:33 UTC 2024

Modified Files:
src/external/mpl/bind/lib/plugins: Makefile

Log Message:
Don't build/install the compat plugin.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/lib/plugins/Makefile

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



CVS commit: src/tests/lib/libc/gen

2024-04-13 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Apr 13 14:02:51 UTC 2024

Modified Files:
src/tests/lib/libc/gen: t_fmtcheck.c

Log Message:
tests/fmtcheck: show that fmtcheck does not support "%2$s"


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/t_fmtcheck.c

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

Modified files:

Index: src/tests/lib/libc/gen/t_fmtcheck.c
diff -u src/tests/lib/libc/gen/t_fmtcheck.c:1.5 src/tests/lib/libc/gen/t_fmtcheck.c:1.6
--- src/tests/lib/libc/gen/t_fmtcheck.c:1.5	Wed Dec 13 06:47:04 2017
+++ src/tests/lib/libc/gen/t_fmtcheck.c	Sat Apr 13 14:02:51 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_fmtcheck.c,v 1.5 2017/12/13 06:47:04 rin Exp $	*/
+/*	$NetBSD: t_fmtcheck.c,v 1.6 2024/04/13 14:02:51 rillig Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -75,6 +75,10 @@ struct test_fmt {
 	{ "%ld %30s %#llx %-10.*e", "This number %lu%% and string %s has %qd numbers and %.*g floats", 1 },
 	{ "%o", "%lx", 2 },
 	{ "%p", "%lu", 2 },
+	// When fmtcheck supports '$', it could be used in dcngettext.
+	{ "%1$s", "%s", 2 },
+	{ "%1$s %2$s", "%s %s", 2 },
+	{ "%2$d %1$s", "%s %d", 2 },
 };
 
 ATF_TC(fmtcheck_basic);



CVS commit: src/tests/lib/libc/gen

2024-04-13 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Sat Apr 13 14:02:51 UTC 2024

Modified Files:
src/tests/lib/libc/gen: t_fmtcheck.c

Log Message:
tests/fmtcheck: show that fmtcheck does not support "%2$s"


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/gen/t_fmtcheck.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/arm32

2024-04-13 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Apr 13 12:28:01 UTC 2024

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
port-arm/58135: reproducible pmap KASSERT failure for armv7 with NFS root

Don't unconditionally set XN in pmap_clearbit - only set it if a mapping
exists VM_PROT_EXEC is being cleared.

I've simplified the #ifdefs in the patch from the PR.


To generate a diff of this commit:
cvs rdiff -u -r1.442 -r1.443 src/sys/arch/arm/arm32/pmap.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/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.442 src/sys/arch/arm/arm32/pmap.c:1.443
--- src/sys/arch/arm/arm32/pmap.c:1.442	Sat Apr 13 10:36:01 2024
+++ src/sys/arch/arm/arm32/pmap.c	Sat Apr 13 12:28:01 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.442 2024/04/13 10:36:01 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.443 2024/04/13 12:28:01 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -193,7 +193,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.442 2024/04/13 10:36:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.443 2024/04/13 12:28:01 skrll Exp $");
 
 #include 
 #include 
@@ -2330,15 +2330,10 @@ pmap_clearbit(struct vm_page_md *md, pad
 #ifdef PMAP_CACHE_VIPT
 	const bool want_syncicache = PV_IS_EXEC_P(md->pvh_attrs);
 	bool need_syncicache = false;
-#ifdef ARM_MMU_EXTENDED
-	const u_int execbits = (maskbits & PVF_EXEC) ? L2_XS_XN : 0;
-#else
-	const u_int execbits = 0;
+#ifndef ARM_MMU_EXTENDED
 	bool need_vac_me_harder = false;
 #endif
-#else
-	const u_int execbits = 0;
-#endif
+#endif /* PMAP_CACHE_VIPT */
 
 	UVMHIST_FUNC(__func__);
 	UVMHIST_CALLARGS(maphist, "md %#jx pa %#jx maskbits %#jx",
@@ -2421,9 +2416,14 @@ pmap_clearbit(struct vm_page_md *md, pad
 
 		pt_entry_t * const ptep = >l2b_kva[l2pte_index(va)];
 		const pt_entry_t opte = *ptep;
-		pt_entry_t npte = opte | execbits;
+		pt_entry_t npte = opte;
+
+#if defined(ARM_MMU_EXTENDED)
+		if ((maskbits & PVF_EXEC) != 0 && l2pte_valid_p(opte)) {
+			KASSERT((opte & L2_TYPE_S) != 0);
+			npte |= L2_XS_XN;
+		}
 
-#ifdef ARM_MMU_EXTENDED
 		KASSERT((opte & L2_XS_nG) == (pm == pmap_kernel() ? 0 : L2_XS_nG));
 #endif
 



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

2024-04-13 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Apr 13 12:28:01 UTC 2024

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
port-arm/58135: reproducible pmap KASSERT failure for armv7 with NFS root

Don't unconditionally set XN in pmap_clearbit - only set it if a mapping
exists VM_PROT_EXEC is being cleared.

I've simplified the #ifdefs in the patch from the PR.


To generate a diff of this commit:
cvs rdiff -u -r1.442 -r1.443 src/sys/arch/arm/arm32/pmap.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/arm32

2024-04-13 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Apr 13 10:36:01 UTC 2024

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Restore a space I accidentally removed from a copyright with

$NetBSD: pmap.c,v 1.396 2020/03/13 16:14:18 skrll Exp $


To generate a diff of this commit:
cvs rdiff -u -r1.441 -r1.442 src/sys/arch/arm/arm32/pmap.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/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.441 src/sys/arch/arm/arm32/pmap.c:1.442
--- src/sys/arch/arm/arm32/pmap.c:1.441	Wed Dec 13 06:42:40 2023
+++ src/sys/arch/arm/arm32/pmap.c	Sat Apr 13 10:36:01 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.441 2023/12/13 06:42:40 rin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.442 2024/04/13 10:36:01 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
  * 3. The name of the company nor the name of the author may be used to
- *   endorse or promote products derived from this software without specific
+ *endorse or promote products derived from this software without specific
  *prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
@@ -193,7 +193,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.441 2023/12/13 06:42:40 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.442 2024/04/13 10:36:01 skrll Exp $");
 
 #include 
 #include 



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

2024-04-13 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sat Apr 13 10:36:01 UTC 2024

Modified Files:
src/sys/arch/arm/arm32: pmap.c

Log Message:
Restore a space I accidentally removed from a copyright with

$NetBSD: pmap.c,v 1.396 2020/03/13 16:14:18 skrll Exp $


To generate a diff of this commit:
cvs rdiff -u -r1.441 -r1.442 src/sys/arch/arm/arm32/pmap.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/x86/x86

2024-04-13 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Apr 13 09:12:09 UTC 2024

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

Log Message:
viac7temp(4): define module metadata using MODULE() macro and implement
viac7temp_modcmd() to handle module load/unload events.

Fixes PR kern/58148. Look OK by mrg@.

XXX pullup-10, -9, -8


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

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

Modified files:

Index: src/sys/arch/x86/x86/viac7temp.c
diff -u src/sys/arch/x86/x86/viac7temp.c:1.9 src/sys/arch/x86/x86/viac7temp.c:1.10
--- src/sys/arch/x86/x86/viac7temp.c:1.9	Thu Oct  7 12:52:27 2021
+++ src/sys/arch/x86/x86/viac7temp.c	Sat Apr 13 09:12:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: viac7temp.c,v 1.9 2021/10/07 12:52:27 msaitoh Exp $ */
+/* $NetBSD: viac7temp.c,v 1.10 2024/04/13 09:12:09 andvar Exp $ */
 
 /*-
  * Copyright (c) 2009 Jared D. McNeill 
@@ -27,11 +27,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.9 2021/10/07 12:52:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.10 2024/04/13 09:12:09 andvar Exp $");
 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -162,3 +163,32 @@ viac7temp_refresh_xcall(void *arg0, void
 	edata->value_cur += 27315;
 	edata->state = ENVSYS_SVALID;
 }
+
+MODULE(MODULE_CLASS_DRIVER, viac7temp, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+viac7temp_modcmd(modcmd_t cmd, void *arg __unused)
+{
+	int error = 0;
+
+	switch (cmd) {
+	case MODULE_CMD_INIT:
+#ifdef _MODULE
+		error = config_init_component(cfdriver_ioconf_viac7temp,
+		cfattach_ioconf_viac7temp, cfdata_ioconf_viac7temp);
+#endif
+		return error;
+	case MODULE_CMD_FINI:
+#ifdef _MODULE
+		error = config_fini_component(cfdriver_ioconf_viac7temp,
+		cfattach_ioconf_viac7temp, cfdata_ioconf_viac7temp);
+#endif
+		return error;
+	default:
+		return ENOTTY;
+	}
+}



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

2024-04-13 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sat Apr 13 09:12:09 UTC 2024

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

Log Message:
viac7temp(4): define module metadata using MODULE() macro and implement
viac7temp_modcmd() to handle module load/unload events.

Fixes PR kern/58148. Look OK by mrg@.

XXX pullup-10, -9, -8


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

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

2024-04-13 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Sat Apr 13 08:50:19 UTC 2024

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64

Log Message:
"./usr/libdata/debug/usr/lib/@ARCH_SUBDIR@/security" directory is
created by mtree regardless of MKDEBUG option, so move the entry from
debug32 to base32.


To generate a diff of this commit:
cvs rdiff -u -r1.1343 -r1.1344 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.mips64eb \
src/distrib/sets/lists/base32/ad.mips64el \
src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el \
src/distrib/sets/lists/base32/ad.powerpc64 \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug32/ad.aarch64 \
src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el \
src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el \
src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.sparc64
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug32/md.amd64

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

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1343 src/distrib/sets/lists/base/mi:1.1344
--- src/distrib/sets/lists/base/mi:1.1343	Thu Apr 11 02:15:39 2024
+++ src/distrib/sets/lists/base/mi	Sat Apr 13 08:50:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1343 2024/04/11 02:15:39 riastradh Exp $
+# $NetBSD: mi,v 1.1344 2024/04/13 08:50:18 nakayama Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1267,7 +1267,7 @@
 ./usr/libdata/debug/usr/lib/i18n		base-i18n-root
 ./usr/libdata/debug/usr/lib/named		base-sys-usr
 ./usr/libdata/debug/usr/lib/npf			base-obsolete		obsolete
-./usr/libdata/debug/usr/lib/security		base-sys-usr		compatfile
+./usr/libdata/debug/usr/lib/security		base-sys-usr
 ./usr/libdata/debug/usr/libexec			base-sys-usr
 ./usr/libdata/debug/usr/libexec/ching		base-sys-usr
 ./usr/libdata/debug/usr/libexec/lpr		base-sys-usr

Index: src/distrib/sets/lists/base32/ad.aarch64
diff -u src/distrib/sets/lists/base32/ad.aarch64:1.1 src/distrib/sets/lists/base32/ad.aarch64:1.2
--- src/distrib/sets/lists/base32/ad.aarch64:1.1	Tue Apr  9 15:17:22 2024
+++ src/distrib/sets/lists/base32/ad.aarch64	Sat Apr 13 08:50:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.1 2024/04/09 15:17:22 nia Exp $
+# $NetBSD: ad.aarch64,v 1.2 2024/04/13 08:50:18 nakayama Exp $
 ./lib/eabi	base-compat-shlib	compat
 ./lib/eabi/npf	base-compat-shlib	compat,npf
 ./lib/eabi/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -1029,7 +1029,9 @@
 ./usr/libdata/debug/lib/eabihf/npf		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabi		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabi/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/eabi/security	base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabihf		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/eabihf/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/eabihf/security	base-compat-shlib	compat
 ./usr/libexec/ld.elf_so-eabi			base-sys-shlib		compat,pic
 ./usr/libexec/ld.elf_so-eabihf			base-sys-shlib		compat,pic
Index: src/distrib/sets/lists/base32/ad.mips64eb
diff -u src/distrib/sets/lists/base32/ad.mips64eb:1.1 src/distrib/sets/lists/base32/ad.mips64eb:1.2
--- src/distrib/sets/lists/base32/ad.mips64eb:1.1	Tue Apr  9 15:17:22 2024
+++ src/distrib/sets/lists/base32/ad.mips64eb	Sat Apr 13 08:50:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.1 2024/04/09 15:17:22 nia Exp $
+# $NetBSD: ad.mips64eb,v 1.2 2024/04/13 08:50:19 nakayama Exp $
 ./lib/64	base-compat-shlib	compat
 ./lib/64/npf	base-compat-shlib	compat,npf
 ./lib/64/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -1035,7 +1035,9 @@
 ./usr/libdata/debug/lib/o32/npf		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/64		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/64/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/64/security		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32		base-compat-shlib	compat
 ./usr/libdata/debug/usr/lib/o32/i18n		base-compat-shlib	compat
+./usr/libdata/debug/usr/lib/o32/security	base-compat-shlib	compat
 

CVS commit: src/distrib/sets/lists

2024-04-13 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Sat Apr 13 08:50:19 UTC 2024

Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64

Log Message:
"./usr/libdata/debug/usr/lib/@ARCH_SUBDIR@/security" directory is
created by mtree regardless of MKDEBUG option, so move the entry from
debug32 to base32.


To generate a diff of this commit:
cvs rdiff -u -r1.1343 -r1.1344 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.mips64eb \
src/distrib/sets/lists/base32/ad.mips64el \
src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/ad.mipsn64el \
src/distrib/sets/lists/base32/ad.powerpc64 \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug32/ad.aarch64 \
src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el \
src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el \
src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.sparc64
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug32/md.amd64

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



CVS commit: src/lib/libintl

2024-04-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Apr 13 02:01:38 UTC 2024

Modified Files:
src/lib/libintl: gettext.c

Log Message:
PR/58136: Paul Ripke: Fix use after free.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libintl/gettext.c

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

Modified files:

Index: src/lib/libintl/gettext.c
diff -u src/lib/libintl/gettext.c:1.31 src/lib/libintl/gettext.c:1.32
--- src/lib/libintl/gettext.c:1.31	Thu Oct  3 12:35:57 2019
+++ src/lib/libintl/gettext.c	Fri Apr 12 22:01:38 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: gettext.c,v 1.31 2019/10/03 16:35:57 christos Exp $	*/
+/*	$NetBSD: gettext.c,v 1.32 2024/04/13 02:01:38 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 Citrus Project,
@@ -29,7 +29,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: gettext.c,v 1.31 2019/10/03 16:35:57 christos Exp $");
+__RCSID("$NetBSD: gettext.c,v 1.32 2024/04/13 02:01:38 christos Exp $");
 
 #include 
 #include 
@@ -176,6 +176,9 @@ pgettext_impl(const char *domainname, co
 		msgid2, n, category);
 	free(msgctxt_id);
 
+	if (translation == msgctxt_id)
+		return msgid1;
+
 	p = strchr(translation, '\004');
 	if (p)
 		return p + 1;



CVS commit: src/lib/libintl

2024-04-12 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Apr 13 02:01:38 UTC 2024

Modified Files:
src/lib/libintl: gettext.c

Log Message:
PR/58136: Paul Ripke: Fix use after free.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libintl/gettext.c

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



CVS commit: src/bin/sh

2024-04-12 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri Apr 12 19:09:50 UTC 2024

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

Log Message:
Edgar Fuß pointed out that sh(1) did not mention comments (at all).
This has been true forever, and no-one else (including me) ever seems
to have noticed this ommission.

Correct that.

While in the area, improve the general sections on the Lexical structure
of the shell's input, and including some refinements to how quoting is
described.


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

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

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.259 src/bin/sh/sh.1:1.260
--- src/bin/sh/sh.1:1.259	Tue Jan 16 14:30:22 2024
+++ src/bin/sh/sh.1	Fri Apr 12 19:09:50 2024
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.259 2024/01/16 14:30:22 kre Exp $
+.\"	$NetBSD: sh.1,v 1.260 2024/04/12 19:09:50 kre Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)sh.1	8.6 (Berkeley) 5/4/95
 .\"
-.Dd December 9, 2022
+.Dd April 12, 2024
 .Dt SH 1
 .\" everything except c o and s (keep them ordered)
 .ds flags abCEeFfhIiLlmnpquVvXx
@@ -650,10 +650,14 @@ or
 must be enabled for this to work.
 .El
 .Ss Lexical Structure
-The shell reads input in terms of lines from a file and breaks it up into
-words at whitespace (blanks and tabs), and at certain sequences of
-characters that are special to the shell called
+The shell reads input in terms of lines from a file
+(or its standard input, or an argument string),
+removes comments,
+and then breaks it up into words at whitespace (blanks and tabs), and at
+certain sequences of characters that are special to the shell called
 .Dq operators .
+Unquoted whitespace is removed as part of this, after serving to
+separate words or operators.
 There are two types of operators: control operators and redirection
 operators (their meaning is discussed later).
 The following is a list of operators:
@@ -663,9 +667,76 @@ The following is a list of operators:
 .It "Redirection operators:"
 .Dl <  >  >|  <<  >>  <&  >&  <<-  <>
 .El
+.Pp
+The shell will detect an operator, which must be entirely unquoted,
+at any point in the input line (other than in comments, which have
+already been removed),
+and sometimes other than immediately after an unquoted dollar
+.Pq Sq \&$
+character, see
+.Sx Word Expansions
+below for defined sequences starting with
+.Pq Sq \&$
+which always form (part of) a word, even if some of the
+following characters would otherwise appear to be operators.
+.Pp
+For future proofing, it is advisable to precede and
+follow all operators with either line endings or whitespace.
+When recognizing an operator the longest sequence of characters
+present which form a valid operator are detected as that operator
+rather than shorter alternative sequences, so, for example,
+the sequence
+.Dl >&
+is always recognized as the two character redirection operator
+.Dq Li \&>&
+rather than the
+.Dq Li \&>
+redirection operator followed by control operator
+.Dq Li \&& .
+So while currently the sequence
+.Dl ;)
+is recognized as the two control operators
+.Dq Li \&;
+followed by
+.Dq Li \&) ,
+a future extension could create a new operator
+.Dq Li \&;)
+in which case that would be detected instead.
+Writing the sequence as
+.Dl ;\ )
+(note the space between the semicolon and parenthesis)
+guarantees that it will be recognized as two operators.
+Note that this does happen, the
+.Dq Li ;&
+control operator shown above is relatively new (by shell standards)
+and would once have been parsed as two operators.
+.Pp
+Also note that any of the redirection operators listed above may be
+immediately preceded by a digit sequence, with no intervening
+whitespace.
+Those digits form part of the redirection operator.
+See
+.Sx Redirections
+below for more details.
+.Ss Comments
+A shell comment begins with a
+.Sq Li 

CVS commit: src/bin/sh

2024-04-12 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri Apr 12 19:09:50 UTC 2024

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

Log Message:
Edgar Fuß pointed out that sh(1) did not mention comments (at all).
This has been true forever, and no-one else (including me) ever seems
to have noticed this ommission.

Correct that.

While in the area, improve the general sections on the Lexical structure
of the shell's input, and including some refinements to how quoting is
described.


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

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



CVS commit: src/external/bsd/ntp/lib/libntp

2024-04-12 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Fri Apr 12 19:06:45 UTC 2024

Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile

Log Message:
remove now-unused assignment


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/ntp/lib/libntp/Makefile

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

Modified files:

Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.29 src/external/bsd/ntp/lib/libntp/Makefile:1.30
--- src/external/bsd/ntp/lib/libntp/Makefile:1.29	Wed Apr  3 00:38:36 2024
+++ src/external/bsd/ntp/lib/libntp/Makefile	Fri Apr 12 19:06:45 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.29 2024/04/03 00:38:36 christos Exp $
+#	$NetBSD: Makefile,v 1.30 2024/04/12 19:06:45 jakllsch Exp $
 
 LIBISPRIVATE=yes
 
@@ -88,7 +88,6 @@ CPPFLAGS+= -I${IDIST}/sntp/libopts
 # For MKREPRO, avoid using __DATE__ and __TIME__.
 # Instead, use the date and time from ${MKREPRO_TIMESTAMP}
 .if ${MKREPRO:Uno} == "yes"
-IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate
 MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%F"
 MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T"
 CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"



CVS commit: src/external/bsd/ntp/lib/libntp

2024-04-12 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Fri Apr 12 19:06:45 UTC 2024

Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile

Log Message:
remove now-unused assignment


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/ntp/lib/libntp/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/usb

2024-04-12 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Fri Apr 12 16:54:37 UTC 2024

Modified Files:
src/sys/dev/usb: ucom.c

Log Message:
include opt_ntp.h for PPS_SYNC


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/dev/usb/ucom.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/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.138 src/sys/dev/usb/ucom.c:1.139
--- src/sys/dev/usb/ucom.c:1.138	Sun Mar  5 23:28:54 2023
+++ src/sys/dev/usb/ucom.c	Fri Apr 12 16:54:37 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: ucom.c,v 1.138 2023/03/05 23:28:54 riastradh Exp $	*/
+/*	$NetBSD: ucom.c,v 1.139 2024/04/12 16:54:37 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,9 +34,10 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.138 2023/03/05 23:28:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.139 2024/04/12 16:54:37 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
+#include "opt_ntp.h"
 #include "opt_usb.h"
 #endif
 



CVS commit: src/sys/dev/usb

2024-04-12 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Fri Apr 12 16:54:37 UTC 2024

Modified Files:
src/sys/dev/usb: ucom.c

Log Message:
include opt_ntp.h for PPS_SYNC


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/sys/dev/usb/ucom.c

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



CVS commit: src/share/mk

2024-04-12 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Fri Apr 12 16:28:43 UTC 2024

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

Log Message:
Filter out -Wp,-iremap,* from CPPFLAGS as is done in hostprog.mk

Seems to fix build of libnbcompat in reproducible mode on host toolchains w/o 
-iremap


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.hostlib.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.hostlib.mk
diff -u src/share/mk/bsd.hostlib.mk:1.20 src/share/mk/bsd.hostlib.mk:1.21
--- src/share/mk/bsd.hostlib.mk:1.20	Fri May  4 14:50:40 2018
+++ src/share/mk/bsd.hostlib.mk	Fri Apr 12 16:28:43 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostlib.mk,v 1.20 2018/05/04 14:50:40 christos Exp $
+#	$NetBSD: bsd.hostlib.mk,v 1.21 2024/04/12 16:28:43 jakllsch Exp $
 
 .include 
 .include 
@@ -47,7 +47,7 @@ CLEANFILES+= a.out [Ee]rrs mklog core *.
 
 beforedepend:
 CFLAGS:=	${HOST_CFLAGS}
-CPPFLAGS:=	${HOST_CPPFLAGS}
+CPPFLAGS:=	${HOST_CPPFLAGS:N-Wp,-iremap,*}
 
 # Pull in related .mk logic
 .include 



CVS commit: src/share/mk

2024-04-12 Thread Jonathan A. Kollasch
Module Name:src
Committed By:   jakllsch
Date:   Fri Apr 12 16:28:43 UTC 2024

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

Log Message:
Filter out -Wp,-iremap,* from CPPFLAGS as is done in hostprog.mk

Seems to fix build of libnbcompat in reproducible mode on host toolchains w/o 
-iremap


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.hostlib.mk

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/debug32

2024-04-12 Thread Juergen Hannken-Illjes
Module Name:src
Committed By:   hannken
Date:   Fri Apr 12 14:22:51 UTC 2024

Modified Files:
src/distrib/sets/lists/debug32: md.amd64

Log Message:
Files libgcc_eh_g.a and libgcc_s_g.a are debuglib, not debug.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/md.amd64

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/debug32

2024-04-12 Thread Juergen Hannken-Illjes
Module Name:src
Committed By:   hannken
Date:   Fri Apr 12 14:22:51 UTC 2024

Modified Files:
src/distrib/sets/lists/debug32: md.amd64

Log Message:
Files libgcc_eh_g.a and libgcc_s_g.a are debuglib, not debug.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/debug32/md.amd64

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/debug32/md.amd64
diff -u src/distrib/sets/lists/debug32/md.amd64:1.5 src/distrib/sets/lists/debug32/md.amd64:1.6
--- src/distrib/sets/lists/debug32/md.amd64:1.5	Fri Apr 12 11:40:09 2024
+++ src/distrib/sets/lists/debug32/md.amd64	Fri Apr 12 14:22:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.5 2024/04/12 11:40:09 wiz Exp $
+# $NetBSD: md.amd64,v 1.6 2024/04/12 14:22:51 hannken Exp $
 ./usr/lib/i386/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -63,9 +63,9 @@
 ./usr/lib/i386/libfido2_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libfl_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libform_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/i386/libgcc_eh_g.a 			comp-sys-debug	debug,compat,gcc
+./usr/lib/i386/libgcc_eh_g.a 			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/i386/libgcc_g.a			comp-c-debuglib	debuglib,compat,gcc
-./usr/lib/i386/libgcc_s_g.a			comp-sys-debug	debug,compat,gcc
+./usr/lib/i386/libgcc_s_g.a			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/i386/libgcov_g.a			comp-c-debuglib	debuglib,compat,gcc
 ./usr/lib/i386/libgnuctf_g.a			comp-c-debuglib	debuglib,compat,binutils
 ./usr/lib/i386/libgnumalloc_g.a			comp-c-debuglib	debuglib,compat



CVS commit: src/distrib/sets/lists

2024-04-12 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Fri Apr 12 11:40:10 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64
src/distrib/sets/lists/debug32: md.amd64

Log Message:
mark *32 libc++ with libcxx


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/md.amd64

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/base32/md.amd64
diff -u src/distrib/sets/lists/base32/md.amd64:1.2 src/distrib/sets/lists/base32/md.amd64:1.3
--- src/distrib/sets/lists/base32/md.amd64:1.2	Thu Apr 11 15:29:16 2024
+++ src/distrib/sets/lists/base32/md.amd64	Fri Apr 12 11:40:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.2 2024/04/11 15:29:16 wiz Exp $
+# $NetBSD: md.amd64,v 1.3 2024/04/12 11:40:09 wiz Exp $
 ./lib/i386	base-compat-shlib	compat
 ./lib/i386/npf	base-compat-shlib	compat,npf
 ./lib/i386/npf/ext_log.so			base-compat-shlib	compat,npf
@@ -122,9 +122,9 @@
 ./usr/lib/i386/libbz2.so			base-compat-shlib	compat
 ./usr/lib/i386/libbz2.so.1			base-compat-shlib	compat
 ./usr/lib/i386/libbz2.so.1.1			base-compat-shlib	compat
-./usr/lib/i386/libc++.so			base-compat-shlib	compat
-./usr/lib/i386/libc++.so.1			base-compat-shlib	compat
-./usr/lib/i386/libc++.so.1.0			base-compat-shlib	compat
+./usr/lib/i386/libc++.so			base-compat-shlib	compat,libcxx
+./usr/lib/i386/libc++.so.1			base-compat-shlib	compat,libcxx
+./usr/lib/i386/libc++.so.1.0			base-compat-shlib	compat,libcxx
 ./usr/lib/i386/libc.sobase-compat-shlib	compat
 ./usr/lib/i386/libc.so.12			base-compat-shlib	compat
 ./usr/lib/i386/libc.so.12.221			base-compat-shlib	compat

Index: src/distrib/sets/lists/debug32/md.amd64
diff -u src/distrib/sets/lists/debug32/md.amd64:1.4 src/distrib/sets/lists/debug32/md.amd64:1.5
--- src/distrib/sets/lists/debug32/md.amd64:1.4	Thu Apr 11 15:29:16 2024
+++ src/distrib/sets/lists/debug32/md.amd64	Fri Apr 12 11:40:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.4 2024/04/11 15:29:16 wiz Exp $
+# $NetBSD: md.amd64,v 1.5 2024/04/12 11:40:09 wiz Exp $
 ./usr/lib/i386/i18n/libBIG5_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libDECHanyu_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/i18n/libEUCTW_g.a			comp-c-debuglib	debuglib,compat
@@ -36,7 +36,7 @@
 ./usr/lib/i386/libbozohttpd_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libbsdmalloc_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libbz2_g.a			comp-c-debuglib	debuglib,compat
-./usr/lib/i386/libc++_g.a		comp-c-debuglib	debuglib,compat
+./usr/lib/i386/libc++_g.a		comp-c-debuglib	debuglib,compat,libcxx
 ./usr/lib/i386/libc_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libcbor_g.a			comp-c-debuglib	debuglib,compat
 ./usr/lib/i386/libcom_err_g.a			comp-c-debuglib	debuglib,compat
@@ -205,7 +205,7 @@
 ./usr/libdata/debug/usr/lib/i386/libbozohttpd.so.1.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libbsdmalloc.so.0.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libbz2.so.1.1.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/i386/libc++.so.1.0.debug	comp-sys-debug	debug,compat
+./usr/libdata/debug/usr/lib/i386/libc++.so.1.0.debug	comp-sys-debug	debug,compat,libcxx
 ./usr/libdata/debug/usr/lib/i386/libc.so.12.221.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libcbor.so.0.5.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/i386/libcom_err.so.8.0.debug	comp-sys-debug	debug,compat,kerberos



CVS commit: src/distrib/sets/lists

2024-04-12 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Fri Apr 12 11:40:10 UTC 2024

Modified Files:
src/distrib/sets/lists/base32: md.amd64
src/distrib/sets/lists/debug32: md.amd64

Log Message:
mark *32 libc++ with libcxx


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug32/md.amd64

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



CVS commit: src/tests/lib/libc/sys

2024-04-12 Thread Andreas Gustafsson
Module Name:src
Committed By:   gson
Date:   Fri Apr 12 07:16:50 UTC 2024

Modified Files:
src/tests/lib/libc/sys: t_getrusage.c

Log Message:
Require at least 64 MB RAM to run the getrusage_maxrss test case as it
allocates 40 MB and we should leave some for the system, too.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/sys/t_getrusage.c

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

Modified files:

Index: src/tests/lib/libc/sys/t_getrusage.c
diff -u src/tests/lib/libc/sys/t_getrusage.c:1.8 src/tests/lib/libc/sys/t_getrusage.c:1.9
--- src/tests/lib/libc/sys/t_getrusage.c:1.8	Wed May  9 08:45:03 2018
+++ src/tests/lib/libc/sys/t_getrusage.c	Fri Apr 12 07:16:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_getrusage.c,v 1.8 2018/05/09 08:45:03 mrg Exp $ */
+/* $NetBSD: t_getrusage.c,v 1.9 2024/04/12 07:16:50 gson Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: t_getrusage.c,v 1.8 2018/05/09 08:45:03 mrg Exp $");
+__RCSID("$NetBSD: t_getrusage.c,v 1.9 2024/04/12 07:16:50 gson Exp $");
 
 #include 
 #include 
@@ -126,6 +126,7 @@ ATF_TC(getrusage_maxrss);
 ATF_TC_HEAD(getrusage_maxrss, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Test maxrss growing with getrusage(2)");
+	atf_tc_set_md_var(tc, "require.memory", "64M");
 }
 
 ATF_TC_BODY(getrusage_maxrss, tc)



CVS commit: src/tests/lib/libc/sys

2024-04-12 Thread Andreas Gustafsson
Module Name:src
Committed By:   gson
Date:   Fri Apr 12 07:16:50 UTC 2024

Modified Files:
src/tests/lib/libc/sys: t_getrusage.c

Log Message:
Require at least 64 MB RAM to run the getrusage_maxrss test case as it
allocates 40 MB and we should leave some for the system, too.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libc/sys/t_getrusage.c

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



  1   2   3   4   5   6   7   8   9   10   >