CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Fri Jul 12 04:45:13 UTC 2024
Modified Files:
src/bin/sh: show.c
Log Message:
Meaningless gcc inspired change.
This is in code only compiled in DEBUG builds (so not part of any
normal NetBSD build).
NFC
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/bin/sh/show.c
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/show.c
diff -u src/bin/sh/show.c:1.55 src/bin/sh/show.c:1.56
--- src/bin/sh/show.c:1.55 Fri Apr 7 10:34:13 2023
+++ src/bin/sh/show.c Fri Jul 12 04:45:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: show.c,v 1.55 2023/04/07 10:34:13 kre Exp $ */
+/* $NetBSD: show.c,v 1.56 2024/07/12 04:45:12 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: show.c,v 1.55 2023/04/07 10:34:13 kre Exp $");
+__RCSID("$NetBSD: show.c,v 1.56 2024/07/12 04:45:12 kre Exp $");
#endif
#endif /* not lint */
@@ -645,7 +645,7 @@ sharg(union node *arg, TFILE *fp)
for (p = arg->narg.text ; *p ; p++) {
switch (*p) {
case CTLESC:
- if (BASESYNTAX[p[1]] != CCTL)
+ if (BASESYNTAX[(int)p[1]] != CCTL)
trace_putc('\\', fp);
trace_putc(*++p, fp);
break;
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Fri Jul 12 04:45:13 UTC 2024 Modified Files: src/bin/sh: show.c Log Message: Meaningless gcc inspired change. This is in code only compiled in DEBUG builds (so not part of any normal NetBSD build). NFC To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/bin/sh/show.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
Module Name:src Committed By: riastradh Date: Thu Jul 11 20:41:11 UTC 2024 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm.shl ad.m68000 ad.m68k ad.m68k.shl ad.powerpc ad.riscv md.acorn32 md.algor md.alpha md.amd64 md.amiga md.amigappc md.arc md.atari md.bebox md.cats md.cesfic md.cobalt md.dreamcast md.epoc32 md.evbarm md.evbmips md.evbppc md.evbsh3 md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.hppa md.i386 md.ibmnws md.iyonix md.landisk md.luna68k md.mac68k md.macppc md.mipsco md.mmeye md.mvme68k md.mvmeppc md.netwinder md.news68k md.newsmips md.next68k md.ofppc md.playstation2 md.pmax md.prep md.riscv md.rs6000 md.sandpoint md.sbmips md.sgimips md.shark md.sparc md.sparc64 md.sun2 md.sun3 md.vax md.virt68k md.x68k md.zaurus module.mi src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.arm.shl ad.hppa ad.m68k ad.m68k.shl ad.mips ad.powerpc ad.riscv ad.sh3 md.algor md.alpha md.amd64 md.amiga md.amigappc md.arc md.atari md.bebox md.cesfic md.cobalt md.dreamcast md.emips md.evbcf md.evbmips md.evbppc md.evbsh3 md.ews4800mips md.hp300 md.hpcmips md.hpcsh md.hppa md.i386 md.ia64 md.ibmnws md.landisk md.luna68k md.mac68k md.macppc md.mipsco md.mmeye md.mvme68k md.mvmeppc md.news68k md.newsmips md.next68k md.ofppc md.or1k md.playstation2 md.pmax md.prep md.rs6000 md.sandpoint md.sbmips md.sgimips md.sparc md.sparc64 md.sun2 md.sun3 md.vax md.virt68k md.x68k stl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.m68k ad.m68k.shl ad.mips ad.mipseb ad.mipsel md.alpha md.amd64 md.amiga md.atari md.bebox md.dreamcast md.emips md.evbmips md.evbppc md.ews4800mips md.hp300 md.hpcmips md.hpcsh md.hppa md.i386 md.luna68k md.mac68k md.macppc md.mipsco md.mmeye md.mvme68k md.newsmips md.ofppc md.pmax md.prep md.rs6000 md.sgimips md.sparc md.sparc64 md.sun2 md.sun3 md.vax md.virt68k md.x68k module.ad.aarch64 module.ad.arm module.ad.m68k module.ad.mips module.ad.powerpc module.ad.riscv32 module.ad.riscv64 module.ad.sh3 module.md.alpha module.md.amd64 module.md.evbarm module.md.hppa module.md.i386 module.md.ia64 module.md.prep module.md.sgimips module.md.sparc module.md.sparc64 module.md.vax module.mi src/distrib/sets/lists/etc: md.amd64 md.evbarm md.evbppc md.i386 md.sparc md.sun2 md.sun3 src/distrib/sets/lists/modules: ad.aarch64 ad.arm ad.m68k ad.mips ad.powerpc ad.riscv32 ad.riscv64 ad.sh3 md.alpha md.hppa md.ia64 md.prep md.sgimips md.sparc md.sparc64 md.vax src/distrib/sets/lists/tests: md.amd64 md.i386 src/distrib/sets/lists/xbase: md.amd64 md.evbarm md.i386 src/distrib/sets/lists/xcomp: md.acorn32 md.alpha md.amd64 md.amiga md.dreamcast md.evbarm md.evbmips md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.i386 md.luna68k md.mac68k md.macppc md.newsmips md.ofppc md.pmax md.sparc md.sparc64 md.sun3 md.vax md.x68k md.zaurus src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.amiga md.bebox md.cats md.dreamcast md.evbarm md.evbarm.armeb md.evbmips md.evbppc md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.hppa md.i386 md.ibmnws md.iyonix md.luna68k md.mac68k md.macppc md.netwinder md.newsmips md.ofppc md.pmax md.prep md.sgimips md.shark md.sparc md.sparc64 md.sun3 md.vax md.x68k md.zaurus mi shl.mi src/distrib/sets/lists/xetc: md.x68k src/distrib/sets/lists/xserver: ad.arm ad.mipseb ad.mipsel ad.powerpc ad.x86_64 md.alpha md.amd64 md.amiga md.bebox md.cats md.evbarm md.evbmips md.evbppc md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.hppa md.i386 md.ibmnws md.iyonix md.luna68k md.mac68k md.macppc md.netwinder md.newsmips md.ofppc md.pmax md.prep md.sgimips md.shark md.sparc md.sparc64 md.sun3 md.vax md.x68k md.zaurus Log Message: distrib/sets/lists: Add a blank comment line between RCS id and body. This serves as a buffer between RCS id changes and other changes to the set lists, in an attempt to reduce the pain of merge conflicts around mass set list changes. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/base/ad.aarch64 \ src/distrib/sets/lists/base/md.mac68k src/distrib/sets/lists/base/md.x68k cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base/ad.arm.shl cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/ad.m68000 \ src/distrib/sets/lists/base/md.algor \ src/distrib/sets/lists/base/md.cesfic \ sr
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Thu Jul 11 20:09:16 UTC 2024
Modified Files:
src/usr.bin/make: compat.c main.c make.h
src/usr.bin/make/unit-tests: var-op-shell.mk
Log Message:
Compat_RunCommand use tempfile if cmd too big
Extract the logic recently added to Cmd_Exec to handle
long commands via temp file to Cmd_Argv,
so it can also be leveraged by Compat_RunCommand
Reviewed by: christos
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/usr.bin/make/compat.c
cvs rdiff -u -r1.631 -r1.632 src/usr.bin/make/main.c
cvs rdiff -u -r1.343 -r1.344 src/usr.bin/make/make.h
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/var-op-shell.mk
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/compat.c
diff -u src/usr.bin/make/compat.c:1.259 src/usr.bin/make/compat.c:1.260
--- src/usr.bin/make/compat.c:1.259 Sat Jun 15 20:02:45 2024
+++ src/usr.bin/make/compat.c Thu Jul 11 20:09:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.259 2024/06/15 20:02:45 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.260 2024/07/11 20:09:16 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.259 2024/06/15 20:02:45 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.260 2024/07/11 20:09:16 sjg Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -246,6 +246,8 @@ Compat_RunCommand(const char *cmdp, GNod
bool useShell; /* True if command should be executed using a
* shell */
const char *cmd = cmdp;
+ char cmd_file[MAXPATHLEN];
+ size_t cmd_len;
silent = (gn->type & OP_SILENT) != OP_NONE;
errCheck = !(gn->type & OP_IGNORE);
@@ -316,20 +318,20 @@ Compat_RunCommand(const char *cmdp, GNod
DEBUG1(JOB, "Execute: '%s'\n", cmd);
- if (useShell && shellPath == NULL)
- Shell_Init(); /* we need shellPath */
+ cmd_len = strlen(cmd);
+ if (cmd_len > MAKE_CMDLEN_LIMIT)
+ useShell = true;
+ else
+ cmd_file[0] = '\0';
if (useShell) {
static const char *shargv[5];
- /* The following work for any of the builtin shell specs. */
- int shargc = 0;
- shargv[shargc++] = shellPath;
- if (errCheck && shellErrFlag != NULL)
- shargv[shargc++] = shellErrFlag;
- shargv[shargc++] = DEBUG(SHELL) ? "-xc" : "-c";
- shargv[shargc++] = cmd;
- shargv[shargc] = NULL;
+ if (Cmd_Argv(cmd, cmd_len, shargv, 5,
+ cmd_file, sizeof(cmd_file),
+ (errCheck && shellErrFlag != NULL),
+ DEBUG(SHELL)) < 0)
+ Fatal("cannot run \"%s\"", cmd);
av = shargv;
bp = NULL;
mav = NULL;
@@ -422,6 +424,8 @@ Compat_RunCommand(const char *cmdp, GNod
}
free(cmdStart);
+ if (cmd_file[0] != '\0')
+ unlink(cmd_file);
compatChild = 0;
if (compatSigno != 0) {
bmake_signal(compatSigno, SIG_DFL);
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.631 src/usr.bin/make/main.c:1.632
--- src/usr.bin/make/main.c:1.631 Tue Jul 9 19:43:01 2024
+++ src/usr.bin/make/main.c Thu Jul 11 20:09:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.631 2024/07/09 19:43:01 rillig Exp $ */
+/* $NetBSD: main.c,v 1.632 2024/07/11 20:09:16 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.631 2024/07/09 19:43:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.632 2024/07/11 20:09:16 sjg Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1685,6 +1685,56 @@ found:
return true;
}
+/* populate av for Cmd_Exec and Compat_RunCommand */
+int
+Cmd_Argv(const char *cmd, size_t cmd_len, const char **av, size_t avsz,
+char *cmd_file, size_t cmd_filesz, bool eflag, bool xflag)
+{
+ int ac = 0;
+ int cmd_fd = -1;
+
+ if (shellPath == NULL)
+ Shell_Init();
+
+ if (cmd_file != NULL) {
+ if (cmd_len == 0)
+ cmd_len = strlen(cmd);
+
+ if (cmd_len > MAKE_CMDLEN_LIMIT) {
+ cmd_fd = mkTempFile(NULL, cmd_file, cmd_filesz);
+ if (cmd_fd >= 0) {
+ssize_t n;
+
+n = write(cmd_fd, cmd, cmd_len);
+close(cmd_fd);
+if (n < (ssize_t)cmd_len) {
+ unlink(cmd_file);
+ cmd_fd = -1;
+}
+ }
+ } else
+ cmd_file[0] = '\0';
+ }
+
+ if (avsz < 4 || (eflag && avsz < 5))
+ return -1;
+
+ /* The following works for any of the builtin shell specs. */
+ av[ac++] = shellPath;
+ if (eflag)
+ av[ac++] = shellErrFlag;
+ if (cmd_fd >= 0) {
+ if (xflag)
+ av[ac++] = "-x";
+ av[ac++] = cmd_file;
+ } else {
+ av[ac++] = xflag ? "-xc" : "-c";
+ av[ac++] = cmd;
+ }
+ av[ac] = NULL;
+ return ac;
+}
+
/*
* Execute the command in cmd, and return its output (only stdout, not
* stderr, possibly empty). In the output, replace newlines with spaces.
@@ -1703,40 +1753,11 @@ Cm
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Thu Jul 11 20:09:16 UTC 2024 Modified Files: src/usr.bin/make: compat.c main.c make.h src/usr.bin/make/unit-tests: var-op-shell.mk Log Message: Compat_RunCommand use tempfile if cmd too big Extract the logic recently added to Cmd_Exec to handle long commands via temp file to Cmd_Argv, so it can also be leveraged by Compat_RunCommand Reviewed by: christos To generate a diff of this commit: cvs rdiff -u -r1.259 -r1.260 src/usr.bin/make/compat.c cvs rdiff -u -r1.631 -r1.632 src/usr.bin/make/main.c cvs rdiff -u -r1.343 -r1.344 src/usr.bin/make/make.h cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/var-op-shell.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
Module Name:src
Committed By: riastradh
Date: Thu Jul 11 17:27:25 UTC 2024
Modified Files:
src/distrib/sets: sets.subr
Log Message:
sets.subr: Ensure compat32arches is defined too.
We don't run with `set -eu', but maybe we should and this will reduce
the effort to flip that on.
To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.208 src/distrib/sets/sets.subr:1.209
--- src/distrib/sets/sets.subr:1.208 Thu Jul 11 17:27:04 2024
+++ src/distrib/sets/sets.subr Thu Jul 11 17:27:25 2024
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.208 2024/07/11 17:27:04 riastradh Exp $
+# $NetBSD: sets.subr,v 1.209 2024/07/11 17:27:25 riastradh Exp $
#
#
@@ -222,6 +222,7 @@ sparc64)
x86_64) compat32arches=i386
;;
esac
+: ${compat32arches:=}
: ${compat64arches:=}
@@ -256,7 +257,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.208 2024/07/11 17:27:04 riastradh Exp $
+# # $NetBSD: sets.subr,v 1.209 2024/07/11 17:27:25 riastradh Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
CVS commit: src/distrib/sets
Module Name:src Committed By: riastradh Date: Thu Jul 11 17:27:25 UTC 2024 Modified Files: src/distrib/sets: sets.subr Log Message: sets.subr: Ensure compat32arches is defined too. We don't run with `set -eu', but maybe we should and this will reduce the effort to flip that on. To generate a diff of this commit: cvs rdiff -u -r1.208 -r1.209 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src
Committed By: riastradh
Date: Thu Jul 11 17:27:04 UTC 2024
Modified Files:
src/distrib/sets: sets.subr
Log Message:
sets.subr: riscv 32-bit ABI is called `rv32', not `riscv32'.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.207 src/distrib/sets/sets.subr:1.208
--- src/distrib/sets/sets.subr:1.207 Thu Jul 11 08:13:50 2024
+++ src/distrib/sets/sets.subr Thu Jul 11 17:27:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.207 2024/07/11 08:13:50 riastradh Exp $
+# $NetBSD: sets.subr,v 1.208 2024/07/11 17:27:04 riastradh Exp $
#
#
@@ -214,7 +214,7 @@ powerpc64)
compat32arches=powerpc
;;
riscv64)
- compat32arches=riscv32
+ compat32arches=rv32
;;
sparc64)
compat32arches=sparc
@@ -256,7 +256,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.207 2024/07/11 08:13:50 riastradh Exp $
+# # $NetBSD: sets.subr,v 1.208 2024/07/11 17:27:04 riastradh Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
CVS commit: src/distrib/sets
Module Name:src Committed By: riastradh Date: Thu Jul 11 17:27:04 UTC 2024 Modified Files: src/distrib/sets: sets.subr Log Message: sets.subr: riscv 32-bit ABI is called `rv32', not `riscv32'. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: riastradh
Date: Thu Jul 11 17:26:53 UTC 2024
Modified Files:
src/crypto/external/bsd/openssh/dist: auth-pam.c clientloop.c
sshd-session.c sshd.c
Log Message:
openssh: Appease clang.
- Sprinke __dead on functions that don't return.
- Suppress -Wformat-nonliteral for a safely-constructed format string
in clientloop.c quit_message.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/auth-pam.c
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/clientloop.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/sshd-session.c
cvs rdiff -u -r1.52 -r1.53 src/crypto/external/bsd/openssh/dist/sshd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/auth-pam.c
diff -u src/crypto/external/bsd/openssh/dist/auth-pam.c:1.22 src/crypto/external/bsd/openssh/dist/auth-pam.c:1.23
--- src/crypto/external/bsd/openssh/dist/auth-pam.c:1.22 Mon Jul 8 22:33:43 2024
+++ src/crypto/external/bsd/openssh/dist/auth-pam.c Thu Jul 11 17:26:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-pam.c,v 1.22 2024/07/08 22:33:43 christos Exp $ */
+/* $NetBSD: auth-pam.c,v 1.23 2024/07/11 17:26:53 riastradh Exp $ */
/*-
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -53,7 +53,7 @@
/*
* NetBSD local changes
*/
-__RCSID("$NetBSD: auth-pam.c,v 1.22 2024/07/08 22:33:43 christos Exp $");
+__RCSID("$NetBSD: auth-pam.c,v 1.23 2024/07/11 17:26:53 riastradh Exp $");
#define _LIB_PTHREAD_H
#undef USE_POSIX_THREADS /* Not yet */
#define HAVE_SECURITY_PAM_APPL_H
@@ -1206,6 +1206,7 @@ static struct pam_conv tty_conv = { sshp
* XXX this should be done in the authentication phase, but ssh1 doesn't
* support that
*/
+__dead/* fatal is __dead */
void
do_pam_chauthtok(void)
{
Index: src/crypto/external/bsd/openssh/dist/clientloop.c
diff -u src/crypto/external/bsd/openssh/dist/clientloop.c:1.41 src/crypto/external/bsd/openssh/dist/clientloop.c:1.42
--- src/crypto/external/bsd/openssh/dist/clientloop.c:1.41 Mon Jul 8 22:33:43 2024
+++ src/crypto/external/bsd/openssh/dist/clientloop.c Thu Jul 11 17:26:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: clientloop.c,v 1.41 2024/07/08 22:33:43 christos Exp $ */
+/* $NetBSD: clientloop.c,v 1.42 2024/07/11 17:26:53 riastradh Exp $ */
/* $OpenBSD: clientloop.c,v 1.408 2024/07/01 04:31:17 djm Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: clientloop.c,v 1.41 2024/07/08 22:33:43 christos Exp $");
+__RCSID("$NetBSD: clientloop.c,v 1.42 2024/07/11 17:26:53 riastradh Exp $");
#include
#include
@@ -200,7 +200,10 @@ quit_message(const char *fmt, ...)
xasprintf(&fmt2, "%s\r\n", fmt);
va_start(args, fmt);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
xvasprintf(&msg, fmt2, args);
+#pragma GCC diagnostic pop
va_end(args);
(void)atomicio(vwrite, STDERR_FILENO, msg, strlen(msg));
Index: src/crypto/external/bsd/openssh/dist/sshd-session.c
diff -u src/crypto/external/bsd/openssh/dist/sshd-session.c:1.2 src/crypto/external/bsd/openssh/dist/sshd-session.c:1.3
--- src/crypto/external/bsd/openssh/dist/sshd-session.c:1.2 Mon Jul 8 22:33:44 2024
+++ src/crypto/external/bsd/openssh/dist/sshd-session.c Thu Jul 11 17:26:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sshd-session.c,v 1.2 2024/07/08 22:33:44 christos Exp $ */
+/* $NetBSD: sshd-session.c,v 1.3 2024/07/11 17:26:53 riastradh Exp $ */
/* $OpenBSD: sshd-session.c,v 1.4 2024/06/26 23:16:52 deraadt Exp $ */
/*
@@ -30,7 +30,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshd-session.c,v 1.2 2024/07/08 22:33:44 christos Exp $");
+__RCSID("$NetBSD: sshd-session.c,v 1.3 2024/07/11 17:26:53 riastradh Exp $");
#include
#include
@@ -204,6 +204,7 @@ static void do_ssh2_kex(struct ssh *);
* As usual, this may only take signal-safe actions, even though it is
* terminal.
*/
+__dead
static void
grace_alarm_handler(int sig)
{
Index: src/crypto/external/bsd/openssh/dist/sshd.c
diff -u src/crypto/external/bsd/openssh/dist/sshd.c:1.52 src/crypto/external/bsd/openssh/dist/sshd.c:1.53
--- src/crypto/external/bsd/openssh/dist/sshd.c:1.52 Mon Jul 8 22:33:44 2024
+++ src/crypto/external/bsd/openssh/dist/sshd.c Thu Jul 11 17:26:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sshd.c,v 1.52 2024/07/08 22:33:44 christos Exp $ */
+/* $NetBSD: sshd.c,v 1.53 2024/07/11 17:26:53 riastradh Exp $ */
/* $OpenBSD: sshd.c,v 1.609 2024/06/27 23:01:15 djm Exp $ */
/*
@@ -27,7 +27,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshd.c,v 1.52 2024/07/08 22:33:44 christos Exp $");
+__RCSID("$NetBSD: sshd.c,v 1.53 2024/07/11 17:26:53 riastradh Exp $");
#include
#include
#include
@@ -480,6 +480,7 @@ sighup_handler(int sig)
* Called from the main program after receiving SIGHUP.
* Restarts the server.
*/
+__dead
static void
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: riastradh Date: Thu Jul 11 17:26:53 UTC 2024 Modified Files: src/crypto/external/bsd/openssh/dist: auth-pam.c clientloop.c sshd-session.c sshd.c Log Message: openssh: Appease clang. - Sprinke __dead on functions that don't return. - Suppress -Wformat-nonliteral for a safely-constructed format string in clientloop.c quit_message. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/auth-pam.c cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/clientloop.c cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/sshd-session.c cvs rdiff -u -r1.52 -r1.53 src/crypto/external/bsd/openssh/dist/sshd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/ld
Module Name:src Committed By: christos Date: Thu Jul 11 13:48:47 UTC 2024 Modified Files: src/external/gpl3/binutils/dist/ld: Makefile.am Makefile.in Log Message: disable ldint.1 build, like we did with ld.1 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/binutils/dist/ld/Makefile.am cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/binutils/dist/ld/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/ld
Module Name:src Committed By: christos Date: Thu Jul 11 13:48:47 UTC 2024 Modified Files: src/external/gpl3/binutils/dist/ld: Makefile.am Makefile.in Log Message: disable ldint.1 build, like we did with ld.1 To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/binutils/dist/ld/Makefile.am cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/binutils/dist/ld/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/ld/Makefile.am diff -u src/external/gpl3/binutils/dist/ld/Makefile.am:1.20 src/external/gpl3/binutils/dist/ld/Makefile.am:1.21 --- src/external/gpl3/binutils/dist/ld/Makefile.am:1.20 Wed Jul 3 21:06:07 2024 +++ src/external/gpl3/binutils/dist/ld/Makefile.am Thu Jul 11 09:48:47 2024 @@ -776,6 +776,8 @@ NetBSD_DISABLED_ld.1: # The sed command removes the no-adjust Nroff command so that # the man output looks standard. ldint.1: $(srcdir)/ldint.texi configdoc.texi + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_ldint.1: $(AM_V_GEN)touch $@ $(AM_V_at)-$(TEXI2POD) $(MANCONF) < $(srcdir)/ldint.texi > ldint.pod $(AM_V_at)-($(POD2MAN) ldint.pod | \ Index: src/external/gpl3/binutils/dist/ld/Makefile.in diff -u src/external/gpl3/binutils/dist/ld/Makefile.in:1.21 src/external/gpl3/binutils/dist/ld/Makefile.in:1.22 --- src/external/gpl3/binutils/dist/ld/Makefile.in:1.21 Wed Jul 3 21:06:07 2024 +++ src/external/gpl3/binutils/dist/ld/Makefile.in Thu Jul 11 09:48:47 2024 @@ -1738,6 +1738,8 @@ ld.html: ld.texi $(ld_TEXINFOS) fi ldint.info: ldint.texi + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_ldint.info: $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am" && \ rm -rf $$backupdir && mkdir $$backupdir && \ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ @@ -2473,6 +2475,8 @@ NetBSD_DISABLED_ld.1: # The sed command removes the no-adjust Nroff command so that # the man output looks standard. ldint.1: $(srcdir)/ldint.texi configdoc.texi + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_ldint.1: $(AM_V_GEN)touch $@ $(AM_V_at)-$(TEXI2POD) $(MANCONF) < $(srcdir)/ldint.texi > ldint.pod $(AM_V_at)-($(POD2MAN) ldint.pod | \
CVS commit: src/etc/etc.evbmips
Module Name:src Committed By: rin Date: Thu Jul 11 13:46:45 UTC 2024 Modified Files: src/etc/etc.evbmips: Makefile.inc Log Message: etc.evbmips: Try to make `.if` labyrinth less confusing, NFCI To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/etc/etc.evbmips/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.evbmips
Module Name:src
Committed By: rin
Date: Thu Jul 11 13:46:45 UTC 2024
Modified Files:
src/etc/etc.evbmips: Makefile.inc
Log Message:
etc.evbmips: Try to make `.if` labyrinth less confusing, NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/etc/etc.evbmips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.28 src/etc/etc.evbmips/Makefile.inc:1.29
--- src/etc/etc.evbmips/Makefile.inc:1.28 Thu Jul 11 13:40:19 2024
+++ src/etc/etc.evbmips/Makefile.inc Thu Jul 11 13:46:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2024/07/11 13:40:19 rin Exp $
+# $NetBSD: Makefile.inc,v 1.29 2024/07/11 13:46:45 rin Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -8,15 +8,20 @@
KERNEL_SUFFIXES= srec ub elf32
-.if ${MACHINE_ARCH} == "mipsel"
-KERNEL_SETS= ALCHEMY CI20 CPMBR1400 DBAU1500 DBAU1550 GDIUM
-KERNEL_SETS+= MALTA MTX-1 OMSAL400
-BUILD_KERNELS= INSTALL_CI20 INSTALL_OMSAL400 INSTALL_MALTA
+.if !${MACHINE_MIPS64}
+# 32-bit common
+KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA MIPSSIM
+BUILD_KERNELS= INSTALL_MALTA
-KERNEL_SETS+= P4032 P5064 P6032
-KERNEL_SETS+= MIPSSIM
+. if ${MACHINE_ARCH} == "mipsel"
+KERNEL_SETS+= CI20 CPMBR1400 GDIUM MTX-1 OMSAL400 P4032 P5064 P6032
+BUILD_KERNELS+= INSTALL_CI20 INSTALL_OMSAL400
+. else
+KERNEL_SETS+= DB120 RB433UAH
+. endif
-.elif ${MACHINE_MIPS64}
+.else
+# 64-bit common
KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
@@ -31,11 +36,6 @@ KERNEL_SETS+= GDIUM64
KERNEL_SETS+= OCTEON
BUILD_KERNELS+= INSTALL_OCTEON
. endif
-.else
-KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH
-BUILD_KERNELS= INSTALL_MALTA
-
-KERNEL_SETS+= MIPSSIM
.endif
# SBMIPS has a kernel for all targets
CVS commit: src/etc/etc.evbmips
Module Name:src Committed By: rin Date: Thu Jul 11 13:40:19 UTC 2024 Modified Files: src/etc/etc.evbmips: Makefile.inc Log Message: etc.evbmips: Build MIPSSIM for evbmips-eb It builds, and runs on qemu-system-mips. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/etc.evbmips/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.evbmips/Makefile.inc diff -u src/etc/etc.evbmips/Makefile.inc:1.27 src/etc/etc.evbmips/Makefile.inc:1.28 --- src/etc/etc.evbmips/Makefile.inc:1.27 Wed Nov 3 08:05:39 2021 +++ src/etc/etc.evbmips/Makefile.inc Thu Jul 11 13:40:19 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.27 2021/11/03 08:05:39 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.28 2024/07/11 13:40:19 rin Exp $ # # etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets # @@ -35,6 +35,7 @@ BUILD_KERNELS+= INSTALL_OCTEON KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH BUILD_KERNELS= INSTALL_MALTA +KERNEL_SETS+= MIPSSIM .endif # SBMIPS has a kernel for all targets
CVS commit: src/etc/etc.evbmips
Module Name:src Committed By: rin Date: Thu Jul 11 13:40:19 UTC 2024 Modified Files: src/etc/etc.evbmips: Makefile.inc Log Message: etc.evbmips: Build MIPSSIM for evbmips-eb It builds, and runs on qemu-system-mips. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/etc/etc.evbmips/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/usr.bin/host-libcpp
Module Name:src
Committed By: bad
Date: Thu Jul 11 13:00:38 UTC 2024
Modified Files:
src/external/gpl3/gcc/usr.bin/host-libcpp: Makefile
Log Message:
external/gpl3/gcc/usr.bin/host-libcpp/Makefile: force std=c++11
GCC >= 11 now requires C++11 to build. In particular libcpp requires C++11.
c.f tools/gcc/Makefile r1.113.
Noticed by compiling with clang as host compiler on macOS >= 12.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/host-libcpp/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/gpl3/gcc/usr.bin/host-libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.6 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.6 Fri May 19 10:42:34 2023
+++ src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile Thu Jul 11 13:00:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/05/19 10:42:34 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2024/07/11 13:00:37 bad Exp $
BUILD_ENV= \
AR=${HOST_AR:Q} \
@@ -19,6 +19,9 @@ BUILD_ENV= \
RANLIB=${HOST_RANLIB:Q} \
YACC=${YACC:Q}
+# libcpp needs a C++11 compiler
+HOST_CXXFLAGS+= -std=c++11
+
GMAKE_J_ARGS?= ${MAKEFLAGS:[*]:M*-j*:C/(^|.* )(-j ?[0-9][0-9]*).*/\2/W}
BUILD_COMMAND= /usr/bin/env -i ${BUILD_ENV} ${TOOL_GMAKE} ${GMAKE_J_ARGS} -e
CVS commit: src/external/gpl3/gcc/usr.bin/host-libcpp
Module Name:src Committed By: bad Date: Thu Jul 11 13:00:38 UTC 2024 Modified Files: src/external/gpl3/gcc/usr.bin/host-libcpp: Makefile Log Message: external/gpl3/gcc/usr.bin/host-libcpp/Makefile: force std=c++11 GCC >= 11 now requires C++11 to build. In particular libcpp requires C++11. c.f tools/gcc/Makefile r1.113. Noticed by compiling with clang as host compiler on macOS >= 12. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src
Committed By: riastradh
Date: Thu Jul 11 08:13:50 UTC 2024
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: ad.arm ad.mips mi shl.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/base64: ad.mips64eb ad.mips64el
src/distrib/sets/lists/debug: ad.aarch64 ad.powerpc ad.riscv md.amd64
md.sparc64 mi shl.mi
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64 mi
src/distrib/sets/lists/debug64: ad.mips64eb ad.mips64el mi
Log Message:
Revert the duplication of compat set lists; do it another way.
1. Restore the compatdir and compatfile tags in base and debug.
=> compatdir marks directories that should have per-ABI compat
subdirectories, like /usr/lib having /usr/lib/o32 and
/usr/lib/64 on mips64.
=> compatfile marks files that have per-ABI versions in the
nearest compatdir, like /usr/lib/o32/libc.so.12.221.
This is the mechanism we use to avoid duplicating every library
that has a compat version in multiple set lists.
2. Teach sets.subr to split the compatdir and compatfile entries out
into separate sets for base and debug.
The mechanism is to internally use:
- a new tag `omitcompat' when processing base and debug, so we
don't generate the per-ABI compat directories or per-ABI compat
files under them;
- a new tag `takecompat=${ABI}' when processing base32/64 and
debug32/64, so we _do_ generate the per-ABI compat directories
for ${ABI}.
=> On, e.g., mips64, base32 uses `takecompat=o32' and base64
uses `takecompat=64'.
=> On, e.g., aarch64, base32 uses
`takecompat=eabi,takecompat=eabihf', and there is no base64.
3. Record in sets.subr the list of `32' and `64' architectures for
each port.
This is maybe not the right place to put it, but it's also not
clear that we want to keep exactly this division -- maybe it would
be more sensible to just have per-ABI , e.g.:
(aarch64) base-eabi, base-eabihf
(amd64) base-i386
(mips64) base-o32, base-64
(mipsn64) base-o32, base-n32
But I'll leave cleaning that up for another day.
4. Adjust some sets. Mostly this commit shouldn't change what file
go in what sets, but, e.g., on mips64, the following move from
base32 to base64 as part of this change, which I think is
appropriate:
- /lib/64
- /libexec/ld.elf_so-64
- /usr/lib/64
- /usr/libdata/debug/lib/64
- /usr/libdata/debug/usr/lib/64
- /usr/libexec/ld.elf_so-64
TBD: Remove ./lib and ./usr/lib from debug/mi; they're already in
base/mi. Maybe move ./usr/libdata/debug to from base/mi to debug/mi.
This reverts most of the set list changes in:
https://mail-index.netbsd.org/source-changes/2024/04/09/msg150763.html
PR misc/58365
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/distrib/sets/sets.subr
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.1346 -r1.1347 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.985 -r1.986 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.mips64eb \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/base32/ad.mips64el
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base32/ad.powerpc64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base64/ad.mips64eb \
src/distrib/sets/lists/base64/ad.mips64el
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/debug/ad.riscv
cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.439 -r1.440 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.345 -r1.346 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug32/ad.aarch64
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.sparc
CVS commit: src/distrib/sets
Module Name:src
Committed By: riastradh
Date: Thu Jul 11 08:13:50 UTC 2024
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: ad.arm ad.mips mi shl.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/base64: ad.mips64eb ad.mips64el
src/distrib/sets/lists/debug: ad.aarch64 ad.powerpc ad.riscv md.amd64
md.sparc64 mi shl.mi
src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el
ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64
md.sparc64 mi
src/distrib/sets/lists/debug64: ad.mips64eb ad.mips64el mi
Log Message:
Revert the duplication of compat set lists; do it another way.
1. Restore the compatdir and compatfile tags in base and debug.
=> compatdir marks directories that should have per-ABI compat
subdirectories, like /usr/lib having /usr/lib/o32 and
/usr/lib/64 on mips64.
=> compatfile marks files that have per-ABI versions in the
nearest compatdir, like /usr/lib/o32/libc.so.12.221.
This is the mechanism we use to avoid duplicating every library
that has a compat version in multiple set lists.
2. Teach sets.subr to split the compatdir and compatfile entries out
into separate sets for base and debug.
The mechanism is to internally use:
- a new tag `omitcompat' when processing base and debug, so we
don't generate the per-ABI compat directories or per-ABI compat
files under them;
- a new tag `takecompat=${ABI}' when processing base32/64 and
debug32/64, so we _do_ generate the per-ABI compat directories
for ${ABI}.
=> On, e.g., mips64, base32 uses `takecompat=o32' and base64
uses `takecompat=64'.
=> On, e.g., aarch64, base32 uses
`takecompat=eabi,takecompat=eabihf', and there is no base64.
3. Record in sets.subr the list of `32' and `64' architectures for
each port.
This is maybe not the right place to put it, but it's also not
clear that we want to keep exactly this division -- maybe it would
be more sensible to just have per-ABI , e.g.:
(aarch64) base-eabi, base-eabihf
(amd64) base-i386
(mips64) base-o32, base-64
(mipsn64) base-o32, base-n32
But I'll leave cleaning that up for another day.
4. Adjust some sets. Mostly this commit shouldn't change what file
go in what sets, but, e.g., on mips64, the following move from
base32 to base64 as part of this change, which I think is
appropriate:
- /lib/64
- /libexec/ld.elf_so-64
- /usr/lib/64
- /usr/libdata/debug/lib/64
- /usr/libdata/debug/usr/lib/64
- /usr/libexec/ld.elf_so-64
TBD: Remove ./lib and ./usr/lib from debug/mi; they're already in
base/mi. Maybe move ./usr/libdata/debug to from base/mi to debug/mi.
This reverts most of the set list changes in:
https://mail-index.netbsd.org/source-changes/2024/04/09/msg150763.html
PR misc/58365
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 src/distrib/sets/sets.subr
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.1346 -r1.1347 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.985 -r1.986 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base32/ad.aarch64 \
src/distrib/sets/lists/base32/ad.mips64eb \
src/distrib/sets/lists/base32/ad.riscv64 \
src/distrib/sets/lists/base32/md.sparc64
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/base32/ad.mips64el
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/base32/ad.mipsn64eb \
src/distrib/sets/lists/base32/md.amd64
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base32/ad.mipsn64el
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base32/ad.powerpc64
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base64/ad.mips64eb \
src/distrib/sets/lists/base64/ad.mips64el
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/debug/ad.riscv
cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.439 -r1.440 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.345 -r1.346 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug32/ad.aarch64
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/debug32/ad.mips64eb \
src/distrib/sets/lists/debug32/ad.mips64el
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/debug32/ad.mipsn64eb \
src/distrib/sets/lists/debug32/ad.mipsn64el
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/debug32/ad.powerpc64 \
src/distrib/sets/lists/debug32/ad.riscv64 \
src/distrib/sets/lists/debug32/md.sparc
CVS commit: src/tests/lib/libcurses/check_files
Module Name:src Committed By: blymn Date: Thu Jul 11 07:14:20 UTC 2024 Modified Files: src/tests/lib/libcurses/check_files: color_blank_draw.chk slk6.chk Log Message: Fix the check files to account for new colour setting behaviour. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/tests/lib/libcurses/check_files/color_blank_draw.chk cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libcurses/check_files/slk6.chk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses/check_files
Module Name:src Committed By: blymn Date: Thu Jul 11 07:14:20 UTC 2024 Modified Files: src/tests/lib/libcurses/check_files: color_blank_draw.chk slk6.chk Log Message: Fix the check files to account for new colour setting behaviour. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/tests/lib/libcurses/check_files/color_blank_draw.chk cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libcurses/check_files/slk6.chk 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/libcurses/check_files/color_blank_draw.chk diff -u src/tests/lib/libcurses/check_files/color_blank_draw.chk:1.2 src/tests/lib/libcurses/check_files/color_blank_draw.chk:1.3 --- src/tests/lib/libcurses/check_files/color_blank_draw.chk:1.2 Tue Apr 12 07:04:19 2022 +++ src/tests/lib/libcurses/check_files/color_blank_draw.chk Thu Jul 11 07:14:20 2024 @@ -1,24 +1,24 @@ setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xel -setaf7Xsetab0Xelhomeop \ No newline at end of file +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +el +elhomeop \ No newline at end of file Index: src/tests/lib/libcurses/check_files/slk6.chk diff -u src/tests/lib/libcurses/check_files/slk6.chk:1.4 src/tests/lib/libcurses/check_files/slk6.chk:1.5 --- src/tests/lib/libcurses/check_files/slk6.chk:1.4 Tue Apr 12 07:04:19 2022 +++ src/tests/lib/libcurses/check_files/slk6.chk Thu Jul 11 07:14:20 2024 @@ -1 +1 @@ -opsetaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0Xosetaf7Xsetab0Xnsetaf7Xsetab0Xesgr0setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0Xtsetaf7Xsetab0Xwsetaf7Xsetab0Xosetaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf1Xsetab2Xsmulrev setaf1Xsetab2X setaf1Xsetab2X setaf1Xsetab2X setaf1Xsetab2Xfsetaf1Xsetab2Xosetaf1Xsetab2Xusetaf1Xsetab2Xrsgr0setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0Xfsetaf7Xsetab0Xisetaf7Xsetab0Xvsetaf7Xsetab0Xesetaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sg r0setaf7Xsetab0X setaf7Xsetab0Xsmulrev setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X setaf7Xsetab0X sgr0setaf7Xsetab0X setaf7Xsetab0Xsmulrevesetaf7Xsetab0Xisetaf7Xsetab0Xgsetaf7Xsetab0Xhsetaf7Xsetab0Xtsetaf7Xsetab0X!setaf7Xsetab0X!rmamsetaf7Xsetab0X!smamcup24;40Xrmulsgr0op \ No newline at end of file +opsetaf7Xsetab0Xsmulrev onesgr0 smulrev two sgr0 smulrevsgr0 setaf1Xsetab2Xsmulrevfoursgr0setaf7Xsetab0X smulrev five sgr0 smulrevsgr0 smulrevsgr0 smulreveight!!rmam!smamcup24;40Xrmulsgr0op \ No newline at end of file
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Thu Jul 11 07:13:41 UTC 2024
Modified Files:
src/lib/libcurses: color.c curses_private.h screen.c
Log Message:
PR lib/58282
This is a partial fix for the issues raised. This change will
reduce the output by preventing the foreground and background
colours being set on each cell. The current colour pair applied
is tracked and requests to set the colour to the same pair is now
a no-op.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/lib/libcurses/color.c
cvs rdiff -u -r1.81 -r1.82 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.39 -r1.40 src/lib/libcurses/screen.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/libcurses/color.c
diff -u src/lib/libcurses/color.c:1.47 src/lib/libcurses/color.c:1.48
--- src/lib/libcurses/color.c:1.47 Wed Oct 19 06:09:27 2022
+++ src/lib/libcurses/color.c Thu Jul 11 07:13:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: color.c,v 1.47 2022/10/19 06:09:27 blymn Exp $ */
+/* $NetBSD: color.c,v 1.48 2024/07/11 07:13:41 blymn Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: color.c,v 1.47 2022/10/19 06:09:27 blymn Exp $");
+__RCSID("$NetBSD: color.c,v 1.48 2024/07/11 07:13:41 blymn Exp $");
#endif/* not lint */
#include "curses.h"
@@ -123,6 +123,7 @@ start_color(void)
_cursesi_screen->COLORS = COLORS;
_cursesi_screen->COLOR_PAIRS = COLOR_PAIRS;
+ _cursesi_screen->curpair = -1;
/* Reset terminal colour and colour pairs. */
if (orig_colors != NULL)
@@ -540,6 +541,10 @@ __set_color( /*ARGSUSED*/ WINDOW *win, a
return;
pair = PAIR_NUMBER((uint32_t)attr);
+
+ if (pair == _cursesi_screen->curpair)
+ return;
+
__CTRACE(__CTRACE_COLOR, "__set_color: %d, %d, %d\n", pair,
_cursesi_screen->colour_pairs[pair].fore,
_cursesi_screen->colour_pairs[pair].back);
@@ -578,6 +583,8 @@ __set_color( /*ARGSUSED*/ WINDOW *win, a
0, __cputchar);
break;
}
+
+ _cursesi_screen->curpair = pair;
curscr->wattr &= ~__COLOR;
curscr->wattr |= attr & __COLOR;
}
@@ -611,6 +618,8 @@ __unset_color(WINDOW *win)
}
break;
}
+
+ _cursesi_screen->curpair = -1;
}
/*
@@ -620,6 +629,12 @@ __unset_color(WINDOW *win)
void
__restore_colors(void)
{
+ /*
+ * forget foreground/background colour just in case it was
+ * changed. We will reset them if required.
+ */
+ _cursesi_screen->curpair = -1;
+
if (can_change != 0)
switch (_cursesi_screen->color_type) {
case COLOR_HP:
Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.81 src/lib/libcurses/curses_private.h:1.82
--- src/lib/libcurses/curses_private.h:1.81 Fri May 17 23:32:50 2024
+++ src/lib/libcurses/curses_private.h Thu Jul 11 07:13:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_private.h,v 1.81 2024/05/17 23:32:50 uwe Exp $ */
+/* $NetBSD: curses_private.h,v 1.82 2024/07/11 07:13:41 blymn Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -226,6 +226,7 @@ struct __screen {
#define TABSIZE_DEFAULT 8 /* spaces. */
int COLORS; /* Maximum colors on the screen */
int COLOR_PAIRS; /* Maximum color pairs on the screen */
+ short curpair; /* current colour pair set on the terminal */
int My_term; /* Use Def_term regardless. */
char GT; /* Gtty indicates tabs. */
char NONL; /* Term can't hack LF doing a CR. */
Index: src/lib/libcurses/screen.c
diff -u src/lib/libcurses/screen.c:1.39 src/lib/libcurses/screen.c:1.40
--- src/lib/libcurses/screen.c:1.39 Mon May 27 14:30:43 2024
+++ src/lib/libcurses/screen.c Thu Jul 11 07:13:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: screen.c,v 1.39 2024/05/27 14:30:43 uwe Exp $ */
+/* $NetBSD: screen.c,v 1.40 2024/07/11 07:13:41 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)screen.c 8.2 (blymn) 11/27/2001";
#else
-__RCSID("$NetBSD: screen.c,v 1.39 2024/05/27 14:30:43 uwe Exp $");
+__RCSID("$NetBSD: screen.c,v 1.40 2024/07/11 07:13:41 blymn Exp $");
#endif
#endif /* not lint */
@@ -156,6 +156,7 @@ newterm(const char *type, FILE *outfd, F
new_screen->nca = A_NORMAL;
new_screen->color_type = COLOR_NONE;
new_screen->COLOR_PAIRS = 0;
+ new_screen->curpair = -1;
new_screen->old_mode = 1;
new_screen->stdbuf = NULL;
new_screen->stdscr = NULL;
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Thu Jul 11 07:13:41 UTC 2024 Modified Files: src/lib/libcurses: color.c curses_private.h screen.c Log Message: PR lib/58282 This is a partial fix for the issues raised. This change will reduce the output by preventing the foreground and background colours being set on each cell. The current colour pair applied is tracked and requests to set the colour to the same pair is now a no-op. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/lib/libcurses/color.c cvs rdiff -u -r1.81 -r1.82 src/lib/libcurses/curses_private.h cvs rdiff -u -r1.39 -r1.40 src/lib/libcurses/screen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
