CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: christos
Date: Mon Jan 15 17:35:48 UTC 2024
Modified Files:
src/usr.bin/gzip: gzip.c
Log Message:
PR/57858: Ricardo Branco: Print the full pathname on errors.
from FreeBSD https://github.com/NetBSD/src/pull/25
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/usr.bin/gzip/gzip.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/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.120 src/usr.bin/gzip/gzip.c:1.121
--- src/usr.bin/gzip/gzip.c:1.120 Sun Jan 14 13:12:59 2024
+++ src/usr.bin/gzip/gzip.c Mon Jan 15 12:35:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.120 2024/01/14 18:12:59 mrg Exp $ */
+/* $NetBSD: gzip.c,v 1.121 2024/01/15 17:35:48 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
@@ -31,7 +31,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.120 2024/01/14 18:12:59 mrg Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.121 2024/01/15 17:35:48 christos Exp $");
#endif /* not lint */
/*
@@ -2037,7 +2037,7 @@ handle_dir(char *dir)
path_argv[0] = dir;
path_argv[1] = 0;
- fts = fts_open(path_argv, FTS_PHYSICAL, NULL);
+ fts = fts_open(path_argv, FTS_PHYSICAL | FTS_NOCHDIR, NULL);
if (fts == NULL) {
warn("couldn't fts_open %s", dir);
return;
@@ -2055,7 +2055,7 @@ handle_dir(char *dir)
maybe_warn("%s", entry->fts_path);
continue;
case FTS_F:
- handle_file(entry->fts_name, entry->fts_statp);
+ handle_file(entry->fts_path, entry->fts_statp);
}
}
(void)fts_close(fts);
CVS commit: src/usr.bin/hexdump
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:40:17 UTC 2024
Modified Files:
src/usr.bin/hexdump: display.c
Log Message:
better check st_size == 0, than st_dev == -1
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/hexdump/display.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/hexdump/display.c
diff -u src/usr.bin/hexdump/display.c:1.26 src/usr.bin/hexdump/display.c:1.27
--- src/usr.bin/hexdump/display.c:1.26 Sun Jan 14 11:42:58 2024
+++ src/usr.bin/hexdump/display.c Sun Jan 14 12:40:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $ */
+/* $NetBSD: display.c,v 1.27 2024/01/14 17:40:17 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $");
+__RCSID("$NetBSD: display.c,v 1.27 2024/01/14 17:40:17 christos Exp $");
#endif
#endif /* not lint */
@@ -365,8 +365,7 @@ doskip(const char *fname, int statok)
if (statok) {
if (fstat(fileno(stdin), ))
err(EXIT_FAILURE, "fstat %s", fname);
- /* kernfs/procfs files have dev_t == -1 */
- if (sb.st_dev != (dev_t)-1 &&
+ if (sb.st_size != 0 &&
S_ISREG(sb.st_mode) && skip >= sb.st_size) {
address += sb.st_size;
skip -= sb.st_size;
CVS commit: src/usr.bin/hexdump
Module Name:src Committed By: christos Date: Sun Jan 14 17:40:17 UTC 2024 Modified Files: src/usr.bin/hexdump: display.c Log Message: better check st_size == 0, than st_dev == -1 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/hexdump/display.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/wc
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:39:19 UTC 2024
Modified Files:
src/usr.bin/wc: wc.c
Log Message:
Better check against st_size == 0 instead of st_dev == -1
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/wc/wc.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/wc/wc.c
diff -u src/usr.bin/wc/wc.c:1.36 src/usr.bin/wc/wc.c:1.37
--- src/usr.bin/wc/wc.c:1.36 Sun Jan 14 12:16:10 2024
+++ src/usr.bin/wc/wc.c Sun Jan 14 12:39:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $ */
+/* $NetBSD: wc.c,v 1.37 2024/01/14 17:39:19 christos Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $");
+__RCSID("$NetBSD: wc.c,v 1.37 2024/01/14 17:39:19 christos Exp $");
#endif
#endif /* not lint */
@@ -239,8 +239,7 @@ cnt(const char *file)
warn("%s", name);
rval = 1;
} else {
-/* st_dev == -1 for kernfs/procfs files */
-if (sb.st_dev != (dev_t)-1 &&
+if (sb.st_size != 0 &&
(S_ISREG(sb.st_mode) ||
S_ISLNK(sb.st_mode) ||
S_ISDIR(sb.st_mode))) {
CVS commit: src/usr.bin/wc
Module Name:src Committed By: christos Date: Sun Jan 14 17:39:19 UTC 2024 Modified Files: src/usr.bin/wc: wc.c Log Message: Better check against st_size == 0 instead of st_dev == -1 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.bin/wc/wc.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/tail
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:37:32 UTC 2024
Modified Files:
src/usr.bin/tail: forward.c
Log Message:
PR/57850: Ricardo Branco: tail does not work in some pseudo-filesystems
>From FreeBSD: https://github.com/NetBSD/src/pull/20
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/tail/forward.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/tail/forward.c
diff -u src/usr.bin/tail/forward.c:1.33 src/usr.bin/tail/forward.c:1.34
--- src/usr.bin/tail/forward.c:1.33 Fri Oct 9 13:51:26 2015
+++ src/usr.bin/tail/forward.c Sun Jan 14 12:37:32 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: forward.c,v 1.33 2015/10/09 17:51:26 christos Exp $ */
+/* $NetBSD: forward.c,v 1.34 2024/01/14 17:37:32 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: forward.c,v 1.33 2015/10/09 17:51:26 christos Exp $");
+__RCSID("$NetBSD: forward.c,v 1.34 2024/01/14 17:37:32 christos Exp $");
#endif /* not lint */
#include
@@ -96,7 +96,7 @@ forward(FILE *fp, enum STYLE style, off_
case FBYTES:
if (off == 0)
break;
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (sbp->st_size < off)
off = sbp->st_size;
if (fseeko(fp, off, SEEK_SET) == -1) {
@@ -128,7 +128,7 @@ forward(FILE *fp, enum STYLE style, off_
}
break;
case RBYTES:
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (sbp->st_size >= off &&
fseeko(fp, -off, SEEK_END) == -1) {
ierr();
@@ -146,7 +146,7 @@ forward(FILE *fp, enum STYLE style, off_
}
break;
case RLINES:
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (!off) {
if (fseek(fp, 0L, SEEK_END) == -1) {
ierr();
CVS commit: src/usr.bin/tail
Module Name:src Committed By: christos Date: Sun Jan 14 17:37:32 UTC 2024 Modified Files: src/usr.bin/tail: forward.c Log Message: PR/57850: Ricardo Branco: tail does not work in some pseudo-filesystems >From FreeBSD: https://github.com/NetBSD/src/pull/20 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/usr.bin/tail/forward.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/wc
Module Name:src Committed By: christos Date: Sun Jan 14 17:16:10 UTC 2024 Modified Files: src/usr.bin/wc: wc.c Log Message: PR/57854: Richardo Branco: wc -c does not work on procfs/kernfs To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/usr.bin/wc/wc.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/wc
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:16:10 UTC 2024
Modified Files:
src/usr.bin/wc: wc.c
Log Message:
PR/57854: Richardo Branco: wc -c does not work on procfs/kernfs
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/wc/wc.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/wc/wc.c
diff -u src/usr.bin/wc/wc.c:1.35 src/usr.bin/wc/wc.c:1.36
--- src/usr.bin/wc/wc.c:1.35 Fri Sep 16 11:39:30 2011
+++ src/usr.bin/wc/wc.c Sun Jan 14 12:16:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wc.c,v 1.35 2011/09/16 15:39:30 joerg Exp $ */
+/* $NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: wc.c,v 1.35 2011/09/16 15:39:30 joerg Exp $");
+__RCSID("$NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $");
#endif
#endif /* not lint */
@@ -239,9 +239,11 @@ cnt(const char *file)
warn("%s", name);
rval = 1;
} else {
-if (S_ISREG(sb.st_mode) ||
+/* st_dev == -1 for kernfs/procfs files */
+if (sb.st_dev != (dev_t)-1 &&
+(S_ISREG(sb.st_mode) ||
S_ISLNK(sb.st_mode) ||
-S_ISDIR(sb.st_mode)) {
+S_ISDIR(sb.st_mode))) {
charct = sb.st_size;
} else {
while ((len =
CVS commit: src/usr.bin/hexdump
Module Name:src
Committed By: christos
Date: Sun Jan 14 16:42:58 UTC 2024
Modified Files:
src/usr.bin/hexdump: display.c
Log Message:
PR/57851: Ricardo Branco: stat(2) does not return correct size information
for kernfs/procfs files. Minor KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/hexdump/display.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/hexdump/display.c
diff -u src/usr.bin/hexdump/display.c:1.25 src/usr.bin/hexdump/display.c:1.26
--- src/usr.bin/hexdump/display.c:1.25 Thu Mar 3 22:02:52 2016
+++ src/usr.bin/hexdump/display.c Sun Jan 14 11:42:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: display.c,v 1.25 2016/03/04 03:02:52 dholland Exp $ */
+/* $NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: display.c,v 1.25 2016/03/04 03:02:52 dholland Exp $");
+__RCSID("$NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $");
#endif
#endif /* not lint */
@@ -256,16 +256,16 @@ get(void)
*/
if (!length || (ateof && !next())) {
if (need == blocksize)
-return(NULL);
+return NULL ;
if (!need && vflag != ALL &&
!memcmp(curp, savp, nread)) {
if (vflag != DUP)
(void)printf("*\n");
-return(NULL);
+return NULL ;
}
memset((char *)curp + nread, 0, need);
eaddress = address + nread;
- return(curp);
+ return curp ;
}
n = fread((char *)curp + nread, sizeof(u_char),
length == -1 ? need : MIN(length, need), stdin);
@@ -283,7 +283,7 @@ get(void)
memcmp(curp, savp, blocksize)) {
if (vflag == DUP || vflag == FIRST)
vflag = WAIT;
-return(curp);
+return curp ;
}
if (vflag == WAIT)
(void)printf("*\n");
@@ -313,9 +313,11 @@ stashargv(char **argv)
* The "done" flag doesn't mean "we are done", it means "we are done
* once we run out of filenames".
*
- * XXX: is there any reason not to remove the logic that inhibits
+ * Is there any reason not to remove the logic that inhibits
* calling fstat if using stdin and not a filename? It should be safe
- * to call fstat on any fd.
+ * to call fstat on any fd. Yes, because on stdin it st_size will not
+ * convey useful information. In addition on kernfs/procfs stat might
+ * not return proper size info.
*
* Note: I have ruled that if there is one file on the command line
* and it doesn't open, we should exit after complaining about it and
@@ -341,7 +343,7 @@ next(void)
statok = 1;
} else {
if (done++)
-return(0);
+return 0 ;
statok = 0;
}
if (skip)
@@ -349,7 +351,7 @@ next(void)
if (*_argv)
++_argv;
if (!skip)
- return(1);
+ return 1 ;
}
/* NOTREACHED */
}
@@ -362,8 +364,10 @@ doskip(const char *fname, int statok)
if (statok) {
if (fstat(fileno(stdin), ))
- err(1, "fstat %s", fname);
- if (S_ISREG(sb.st_mode) && skip >= sb.st_size) {
+ err(EXIT_FAILURE, "fstat %s", fname);
+ /* kernfs/procfs files have dev_t == -1 */
+ if (sb.st_dev != (dev_t)-1 &&
+ S_ISREG(sb.st_mode) && skip >= sb.st_size) {
address += sb.st_size;
skip -= sb.st_size;
return;
CVS commit: src/usr.bin/hexdump
Module Name:src Committed By: christos Date: Sun Jan 14 16:42:58 UTC 2024 Modified Files: src/usr.bin/hexdump: display.c Log Message: PR/57851: Ricardo Branco: stat(2) does not return correct size information for kernfs/procfs files. Minor KNF. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/hexdump/display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/sys
In article <2017973.usquhbg...@britannica.bec.de>, Joerg Sonnenberger wrote: >On Tuesday, January 2, 2024 8:27:57 PM CET Christos Zoulas wrote: >> Module Name: src >> Committed By:christos >> Date:Tue Jan 2 19:27:57 UTC 2024 >> >> Modified Files: >> src/sys/sys: rbtree.h >> >> Log Message: >> This uses size_t, so it always needs , remove ifdefs. > >sys/types.h is one of the most polluting headers we have. This is a huge >step backwards... You realize of course that it was working before because it was getting sys/types.h from sys/endian.h which had an include cycle before which I was trying to fix. Now sys/endian.h does not include sys/types.h which is a step forward. Yes, our headers are messy but we are trying to clean them. Happy New Year, christos
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Wed Jan 3 18:43:52 UTC 2024 Modified Files: src/sys/sys: endian.h Log Message: break the cycle: this does not need it only needs To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/sys/endian.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/endian.h diff -u src/sys/sys/endian.h:1.31 src/sys/sys/endian.h:1.32 --- src/sys/sys/endian.h:1.31 Mon Aug 8 14:55:18 2022 +++ src/sys/sys/endian.h Wed Jan 3 13:43:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: endian.h,v 1.31 2022/08/08 18:55:18 rillig Exp $ */ +/* $NetBSD: endian.h,v 1.32 2024/01/03 18:43:52 christos Exp $ */ /* * Copyright (c) 1987, 1991, 1993 @@ -52,7 +52,7 @@ #include #include -#include +#include #ifndef in_addr_t typedef __in_addr_t in_addr_t;
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Wed Jan 3 18:43:52 UTC 2024 Modified Files: src/sys/sys: endian.h Log Message: break the cycle: this does not need it only needs To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/sys/endian.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Wed Jan 3 18:41:53 UTC 2024 Modified Files: src/lib/libc/gen: siginterrupt.c signal.c src/lib/libc/include: extern.h src/lib/libc/yp: local.h yp_all.c yp_first.c yp_maplist.c yp_master.c yp_match.c yp_order.c Log Message: tidy up some extern declarations To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/gen/siginterrupt.c cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/signal.c cvs rdiff -u -r1.27 -r1.28 src/lib/libc/include/extern.h cvs rdiff -u -r1.4 -r1.5 src/lib/libc/yp/local.h cvs rdiff -u -r1.13 -r1.14 src/lib/libc/yp/yp_all.c \ src/lib/libc/yp/yp_maplist.c cvs rdiff -u -r1.16 -r1.17 src/lib/libc/yp/yp_first.c cvs rdiff -u -r1.15 -r1.16 src/lib/libc/yp/yp_master.c cvs rdiff -u -r1.19 -r1.20 src/lib/libc/yp/yp_match.c cvs rdiff -u -r1.14 -r1.15 src/lib/libc/yp/yp_order.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src
Committed By: christos
Date: Wed Jan 3 18:41:53 UTC 2024
Modified Files:
src/lib/libc/gen: siginterrupt.c signal.c
src/lib/libc/include: extern.h
src/lib/libc/yp: local.h yp_all.c yp_first.c yp_maplist.c yp_master.c
yp_match.c yp_order.c
Log Message:
tidy up some extern declarations
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/gen/siginterrupt.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/signal.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/include/extern.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/yp/local.h
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/yp/yp_all.c \
src/lib/libc/yp/yp_maplist.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/yp/yp_first.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/yp/yp_master.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/yp/yp_match.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/yp/yp_order.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/siginterrupt.c
diff -u src/lib/libc/gen/siginterrupt.c:1.13 src/lib/libc/gen/siginterrupt.c:1.14
--- src/lib/libc/gen/siginterrupt.c:1.13 Mon Jun 25 18:32:43 2012
+++ src/lib/libc/gen/siginterrupt.c Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: siginterrupt.c,v 1.13 2012/06/25 22:32:43 abs Exp $ */
+/* $NetBSD: siginterrupt.c,v 1.14 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,18 +34,18 @@
#if 0
static char sccsid[] = "@(#)siginterrupt.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: siginterrupt.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
+__RCSID("$NetBSD: siginterrupt.c,v 1.14 2024/01/03 18:41:53 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include "extern.h"
#include
#ifdef __weak_alias
__weak_alias(siginterrupt,_siginterrupt)
#endif
-extern sigset_t __sigintr;
/*
* Set signal state to prevent restart of system calls
* after an instance of the indicated signal.
Index: src/lib/libc/gen/signal.c
diff -u src/lib/libc/gen/signal.c:1.15 src/lib/libc/gen/signal.c:1.16
--- src/lib/libc/gen/signal.c:1.15 Tue Jan 2 14:27:26 2024
+++ src/lib/libc/gen/signal.c Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.c,v 1.15 2024/01/02 19:27:26 christos Exp $ */
+/* $NetBSD: signal.c,v 1.16 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)signal.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: signal.c,v 1.15 2024/01/02 19:27:26 christos Exp $");
+__RCSID("$NetBSD: signal.c,v 1.16 2024/01/03 18:41:53 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -42,13 +42,13 @@ __RCSID("$NetBSD: signal.c,v 1.15 2024/0
* Almost backwards compatible signal.
*/
#include "namespace.h"
+#include "extern.h"
#include
#ifdef __weak_alias
__weak_alias(signal,_signal)
#endif
-extern sigset_t __sigintr;
sigset_t __sigintr; /* shared with siginterrupt */
sig_t
Index: src/lib/libc/include/extern.h
diff -u src/lib/libc/include/extern.h:1.27 src/lib/libc/include/extern.h:1.28
--- src/lib/libc/include/extern.h:1.27 Tue Apr 4 15:26:06 2023
+++ src/lib/libc/include/extern.h Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.27 2023/04/04 19:26:06 christos Exp $ */
+/* $NetBSD: extern.h,v 1.28 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -34,6 +34,7 @@ typedef struct _locale *locale_t;
__BEGIN_DECLS
extern char *__minbrk;
+extern sigset_t __sigintr;
int __getcwd(char *, size_t);
int __getlogin(char *, size_t);
int __setlogin(const char *);
Index: src/lib/libc/yp/local.h
diff -u src/lib/libc/yp/local.h:1.4 src/lib/libc/yp/local.h:1.5
--- src/lib/libc/yp/local.h:1.4 Tue Mar 20 12:30:26 2012
+++ src/lib/libc/yp/local.h Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: local.h,v 1.4 2012/03/20 16:30:26 matt Exp $ */
+/* $NetBSD: local.h,v 1.5 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -27,4 +27,10 @@
__BEGIN_DECLS
void __yp_unbind(struct dom_binding *);
int _yp_invalid_domain(const char *);
+
+extern struct timeval _yplib_timeout;
+extern int _yplib_nerrs;
+extern int _yplib_bindtries;
+extern char _yp_domain[];
+
__END_DECLS
Index: src/lib/libc/yp/yp_all.c
diff -u src/lib/libc/yp/yp_all.c:1.13 src/lib/libc/yp/yp_all.c:1.14
--- src/lib/libc/yp/yp_all.c:1.13 Mon Jun 25 18:32:46 2012
+++ src/lib/libc/yp/yp_all.c Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_all.c,v 1.13 2012/06/25 22:32:46 abs Exp $ */
+/* $NetBSD: yp_all.c,v 1.14 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(
CVS commit: src/sys/arch/x86/include
Module Name:src
Committed By: christos
Date: Tue Jan 2 19:28:25 UTC 2024
Modified Files:
src/sys/arch/x86/include: ieee.h
Log Message:
use sized types
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/include/ieee.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/ieee.h
diff -u src/sys/arch/x86/include/ieee.h:1.12 src/sys/arch/x86/include/ieee.h:1.13
--- src/sys/arch/x86/include/ieee.h:1.12 Sat Sep 16 09:37:10 2023
+++ src/sys/arch/x86/include/ieee.h Tue Jan 2 14:28:25 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee.h,v 1.12 2023/09/16 13:37:10 christos Exp $ */
+/* $NetBSD: ieee.h,v 1.13 2024/01/02 19:28:25 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -69,13 +69,13 @@
* i386: 16 bits.
*/
struct ieee_ext {
- u_int ext_fracl:EXT_FRACLBITS;
- u_int ext_frach:EXT_FRACHBITS;
+ uint32_t ext_fracl:EXT_FRACLBITS;
+ uint32_t ext_frach:EXT_FRACHBITS;
#if 0
- u_int ext_int:1;
+ uint32_t ext_int:1;
#endif
- u_int ext_exp:EXT_EXPBITS;
- u_int ext_sign:1;
+ uint32_t ext_exp:EXT_EXPBITS;
+ uint32_t ext_sign:1;
};
/*
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: christos Date: Tue Jan 2 19:28:25 UTC 2024 Modified Files: src/sys/arch/x86/include: ieee.h Log Message: use sized types To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/include/ieee.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Jan 2 19:27:57 UTC 2024 Modified Files: src/sys/sys: rbtree.h Log Message: This uses size_t, so it always needs , remove ifdefs. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/sys/rbtree.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/rbtree.h diff -u src/sys/sys/rbtree.h:1.8 src/sys/sys/rbtree.h:1.9 --- src/sys/sys/rbtree.h:1.8 Fri Jul 21 07:26:23 2023 +++ src/sys/sys/rbtree.h Tue Jan 2 14:27:57 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: rbtree.h,v 1.8 2023/07/21 11:26:23 riastradh Exp $ */ +/* $NetBSD: rbtree.h,v 1.9 2024/01/02 19:27:57 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -32,12 +32,7 @@ #ifndef _SYS_RBTREE_H_ #define _SYS_RBTREE_H_ -#if defined(_KERNEL) || defined(_STANDALONE) #include -#else -#include -#include -#endif #include #include
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Jan 2 19:27:57 UTC 2024 Modified Files: src/sys/sys: rbtree.h Log Message: This uses size_t, so it always needs , remove ifdefs. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/sys/rbtree.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src
Committed By: christos
Date: Tue Jan 2 19:27:27 UTC 2024
Modified Files:
src/lib/libc/gdtoa: gdtoa.c
src/lib/libc/gen: signal.c
src/lib/libc/stdlib: _env.c
Log Message:
pass lint.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gdtoa/gdtoa.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/gen/signal.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdlib/_env.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gdtoa/gdtoa.c
diff -u src/lib/libc/gdtoa/gdtoa.c:1.9 src/lib/libc/gdtoa/gdtoa.c:1.10
--- src/lib/libc/gdtoa/gdtoa.c:1.9 Sat Apr 1 19:44:11 2023
+++ src/lib/libc/gdtoa/gdtoa.c Tue Jan 2 14:27:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gdtoa.c,v 1.9 2023/04/01 23:44:11 dholland Exp $ */
+/* $NetBSD: gdtoa.c,v 1.10 2024/01/02 19:27:26 christos Exp $ */
/
@@ -372,7 +372,7 @@ gdtoa
ds = 1.;
if ( (jj1 = -k) !=0) {
dval() *= tens[jj1 & 0xf];
-for(j = jj1 >> 4; j; j >>= 1, i++)
+for(j = (unsigned int)jj1 >> 4; j; j >>= 1, i++)
if (j & 1) {
ieps++;
dval() *= bigtens[i];
Index: src/lib/libc/gen/signal.c
diff -u src/lib/libc/gen/signal.c:1.14 src/lib/libc/gen/signal.c:1.15
--- src/lib/libc/gen/signal.c:1.14 Fri Jun 3 19:57:37 2016
+++ src/lib/libc/gen/signal.c Tue Jan 2 14:27:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.c,v 1.14 2016/06/03 23:57:37 christos Exp $ */
+/* $NetBSD: signal.c,v 1.15 2024/01/02 19:27:26 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)signal.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: signal.c,v 1.14 2016/06/03 23:57:37 christos Exp $");
+__RCSID("$NetBSD: signal.c,v 1.15 2024/01/02 19:27:26 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -48,6 +48,7 @@ __RCSID("$NetBSD: signal.c,v 1.14 2016/0
__weak_alias(signal,_signal)
#endif
+extern sigset_t __sigintr;
sigset_t __sigintr; /* shared with siginterrupt */
sig_t
Index: src/lib/libc/stdlib/_env.c
diff -u src/lib/libc/stdlib/_env.c:1.14 src/lib/libc/stdlib/_env.c:1.15
--- src/lib/libc/stdlib/_env.c:1.14 Tue Jul 18 07:44:32 2023
+++ src/lib/libc/stdlib/_env.c Tue Jan 2 14:27:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: _env.c,v 1.14 2023/07/18 11:44:32 riastradh Exp $ */
+/* $NetBSD: _env.c,v 1.15 2024/01/02 19:27:26 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _env.c,v 1.14 2023/07/18 11:44:32 riastradh Exp $");
+__RCSID("$NetBSD: _env.c,v 1.15 2024/01/02 19:27:26 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -88,7 +88,7 @@ static rwlock_t env_lock = RWLOCK_INITIA
#endif
/* Compatibility function. */
-char *__findenv(const char *name, int *offsetp);
+extern char *__findenv(const char *name, int *offsetp);
__warn_references(__findenv,
"warning: __findenv is an internal obsolete function.")
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Tue Jan 2 19:27:27 UTC 2024 Modified Files: src/lib/libc/gdtoa: gdtoa.c src/lib/libc/gen: signal.c src/lib/libc/stdlib: _env.c Log Message: pass lint. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gdtoa/gdtoa.c cvs rdiff -u -r1.14 -r1.15 src/lib/libc/gen/signal.c cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdlib/_env.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Fri Dec 29 00:55:46 UTC 2023
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.c
Log Message:
PR/57179: Christof Meerwald: Fix bugs in fetch_cache_{get,put}.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/fetch/dist/libfetch/common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/fetch/dist/libfetch/common.c
diff -u src/external/bsd/fetch/dist/libfetch/common.c:1.4 src/external/bsd/fetch/dist/libfetch/common.c:1.5
--- src/external/bsd/fetch/dist/libfetch/common.c:1.4 Tue Jan 24 03:02:57 2023
+++ src/external/bsd/fetch/dist/libfetch/common.c Thu Dec 28 19:55:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.4 2023/01/24 08:02:57 mlelstv Exp $ */
+/* $NetBSD: common.c,v 1.5 2023/12/29 00:55:46 christos Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2010 Joerg Sonnenberger
@@ -368,7 +368,9 @@ fetch_cache_get(const struct url *url, i
{
conn_t *conn, *last_conn = NULL;
- for (conn = connection_cache; conn; conn = conn->next_cached) {
+ for (conn = connection_cache; conn; last_conn = conn,
+ conn = conn->next_cached)
+ {
if (conn->cache_url->port == url->port &&
strcmp(conn->cache_url->scheme, url->scheme) == 0 &&
strcmp(conn->cache_url->host, url->host) == 0 &&
@@ -395,7 +397,7 @@ fetch_cache_get(const struct url *url, i
void
fetch_cache_put(conn_t *conn, int (*closecb)(conn_t *))
{
- conn_t *iter, *last;
+ conn_t *iter, *last, *oiter;
int global_count, host_count;
if (conn->cache_url == NULL || cache_global_limit == 0) {
@@ -405,20 +407,25 @@ fetch_cache_put(conn_t *conn, int (*clos
global_count = host_count = 0;
last = NULL;
- for (iter = connection_cache; iter;
- last = iter, iter = iter->next_cached) {
+ for (iter = connection_cache; iter; ) {
++global_count;
if (strcmp(conn->cache_url->host, iter->cache_url->host) == 0)
++host_count;
if (global_count < cache_global_limit &&
host_count < cache_per_host_limit)
- continue;
- --global_count;
- if (last != NULL)
- last->next_cached = iter->next_cached;
- else
- connection_cache = iter->next_cached;
- (*iter->cache_close)(iter);
+ oiter = NULL;
+ else {
+ --global_count;
+ if (last != NULL)
+last->next_cached = iter->next_cached;
+ else
+connection_cache = iter->next_cached;
+ oiter = iter;
+ }
+ last = iter;
+ iter = iter->next_cached;
+ if (oiter)
+ (*oiter->cache_close)(oiter);
}
conn->cache_close = closecb;
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: christos
Date: Fri Dec 29 00:55:46 UTC 2023
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.c
Log Message:
PR/57179: Christof Meerwald: Fix bugs in fetch_cache_{get,put}.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/fetch/dist/libfetch/common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/bsd/blocklist/bin
Module Name:src
Committed By: christos
Date: Sat Dec 23 21:53:54 UTC 2023
Modified Files:
src/external/bsd/blocklist/bin: blocklistd.c
Log Message:
PR/57767: Yoshitaka Tokugawa: When restoring, do so from a readonly copy
of the database and update the read-write copy with the new firewall ids.
Before we did not update the state file so it contained the old firewall ids.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blocklist/bin/blocklistd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blocklist/bin/blocklistd.c
diff -u src/external/bsd/blocklist/bin/blocklistd.c:1.3 src/external/bsd/blocklist/bin/blocklistd.c:1.4
--- src/external/bsd/blocklist/bin/blocklistd.c:1.3 Wed Oct 12 14:36:02 2022
+++ src/external/bsd/blocklist/bin/blocklistd.c Sat Dec 23 16:53:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklistd.c,v 1.3 2022/10/12 18:36:02 christos Exp $ */
+/* $NetBSD: blocklistd.c,v 1.4 2023/12/23 21:53:54 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "config.h"
#endif
#include
-__RCSID("$NetBSD: blocklistd.c,v 1.3 2022/10/12 18:36:02 christos Exp $");
+__RCSID("$NetBSD: blocklistd.c,v 1.4 2023/12/23 21:53:54 christos Exp $");
#include
#include
@@ -395,15 +395,25 @@ rules_flush(void)
static void
rules_restore(void)
{
+ DB *db;
struct conf c;
struct dbinfo dbi;
unsigned int f;
- for (f = 1; state_iterate(state, , , f) == 1; f = 0) {
+ db = state_open(dbfile, O_RDONLY, 0);
+ if (db == NULL) {
+ (*lfun)(LOG_ERR, "Can't open `%s' to restore state (%m)",
+ dbfile);
+ return;
+ }
+ for (f = 1; state_iterate(db, , , f) == 1; f = 0) {
if (dbi.id[0] == '\0')
continue;
(void)run_change("add", , dbi.id, sizeof(dbi.id));
+ state_put(state, , );
}
+ state_close(db);
+ state_sync(state);
}
int
CVS commit: src/external/bsd/blocklist/bin
Module Name:src Committed By: christos Date: Sat Dec 23 21:53:54 UTC 2023 Modified Files: src/external/bsd/blocklist/bin: blocklistd.c Log Message: PR/57767: Yoshitaka Tokugawa: When restoring, do so from a readonly copy of the database and update the read-write copy with the new firewall ids. Before we did not update the state file so it contained the old firewall ids. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blocklist/bin/blocklistd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 23 20:49:22 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1973 -r1.1974 src/doc/3RDPARTY cvs rdiff -u -r1.3026 -r1.3027 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 23 20:49:22 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1973 -r1.1974 src/doc/3RDPARTY cvs rdiff -u -r1.3026 -r1.3027 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1973 src/doc/3RDPARTY:1.1974 --- src/doc/3RDPARTY:1.1973 Sat Dec 23 15:32:30 2023 +++ src/doc/3RDPARTY Sat Dec 23 15:49:22 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1973 2023/12/23 20:32:30 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1974 2023/12/23 20:49:22 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1429,14 +1429,14 @@ Location: external/bsd/tradcpp Notes: Package: tz -Version: tzcode2023c / tzdata2023dgtz +Version: tzcode2023d / tzdata2023dgtz Current Vers: tzcode2023d / tzdata2023d Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Home Page: http://www.iana.org/time-zones -Date: 2023-09-16 +Date: 2023-12-23 Mailing List: t...@iana.org Responsible: kleink, christos, kre License: Public domain Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3026 src/doc/CHANGES:1.3027 --- src/doc/CHANGES:1.3026 Sat Dec 23 15:32:30 2023 +++ src/doc/CHANGES Sat Dec 23 15:49:22 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3026 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3027 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -245,3 +245,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: OpenSSH: Import 9.6. [christos 20231220] tzdata: Updated to 2023d (via 2023dgtz) [kre 20231223] postfix(1): Import version 3.8.4. [christos 20231223] + tzcode: Updated to 2023d. [christos 20231223]
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Sat Dec 23 20:48:38 UTC 2023
Modified Files:
src/lib/libc/time: Makefile NEWS README localtime.c private.h
tz-art.html tz-link.html
Log Message:
Import tzcode 2023d:
localtime.c no longer mishandles TZif files that contain a single
transition into a DST regime. Previously, it incorrectly assumed
DST was in effect before the transition too. (Thanks to Alois
Treindl for debugging help.)
localtime.c's timeoff no longer collides with OpenBSD 7.4.
The C code now uses _Generic only if __STDC_VERSION__ says the
compiler is C11 or later.
tzselect now optionally reads zonenow.tab, to simplify when
configuring only for timestamps dated from now on.
tzselect no longer creates temporary files.
tzselect no longer mishandles the following:
Spaces and most other special characters in BUGEMAIL, PACKAGE,
TZDIR, and VERSION.
TZ strings when using mawk 1.4.3, which mishandles regular
expressions of the form /X{2,}/.
ISO 6709 coordinates when using an awk that lacks the GNU
extension of newlines in -v option-arguments.
Non UTF-8 locales when using an iconv command that lacks the GNU
//TRANSLIT extension.
zic no longer mishandles data for Palestine after the year 2075.
Previously, it incorrectly omitted post-2075 transitions that are
predicted for just before and just after Ramadan. (Thanks to Ken
Murchison for debugging help.)
zic now works again on Linux 2.6.16 and 2.6.17 (2006).
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/lib/libc/time/Makefile
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/time/NEWS
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/time/README
cvs rdiff -u -r1.138 -r1.139 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.66 -r1.67 src/lib/libc/time/private.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/tz-art.html
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/time/tz-link.html
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/Makefile
diff -u src/lib/libc/time/Makefile:1.55 src/lib/libc/time/Makefile:1.56
--- src/lib/libc/time/Makefile:1.55 Sat Sep 16 14:40:26 2023
+++ src/lib/libc/time/Makefile Sat Dec 23 15:48:38 2023
@@ -1,7 +1,25 @@
# Make and install tzdb code and data.
-
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
+# Request POSIX conformance; this must be the first non-comment line.
+.POSIX:
+# On older platforms you may need to scrounge for a POSIX-conforming 'make'.
+# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or
+# /usr/xpg4/bin/make, not /usr/ccs/bin/make.
+
+# To affect how this Makefile works, you can run a shell script like this:
+#
+# #!/bin/sh
+# make CC='gcc -std=gnu11' "$@"
+#
+# This example script is appropriate for a pre-2017 GNU/Linux system
+# where a non-default setting is needed to support this package's use of C99.
+#
+# Alternatively, you can simply edit this Makefile to tailor the following
+# macro definitions.
+
+###
+# Start of macros that one plausibly might want to tailor.
# Package name for the code distribution.
PACKAGE= tzcode
@@ -191,8 +209,9 @@ UTF8_LOCALE= en_US.utf8
# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0.
LDLIBS=
-# Add the following to the end of the "CFLAGS=" line as needed to override
-# defaults specified in the source code. "-DFOO" is equivalent to "-DFOO=1".
+# Add the following to an uncommented "CFLAGS=" line as needed
+# to override defaults specified in the source code or by the system.
+# "-DFOO" is equivalent to "-DFOO=1".
# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime
# formats that generate only the last two digits of year numbers
# -DEPOCH_LOCAL if the 'time' function returns local time not UT
@@ -234,11 +253,16 @@ LDLIBS=
# -DHAVE_UNISTD_H=0 if does not work*
# -DHAVE_UTMPX_H=0 if does not work*
# -Dlocale_t=XXX if your system uses XXX instead of locale_t
-# -DPORT_TO_C89 if tzcode should also run on C89 platforms+
+# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+
+# Typically it is better to use a later standard. For example,
+# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'.
+# Even with -DPORT_TO_C89, the code needs at least one C99
+# feature (integers at least 64 bits wide) and maybe more.
# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers
# with external linkage, e.g., applications cannot define 'localtime'.
# -Dssize_t=long on hosts like MS-Windows that lack ssize_t
# -DSUPPORT_C89 if the tzcode library should support C89 callers+
+# However, this might trigger latent bugs in C99-or-later callers.
# -DSUPPRESS_TZDIR to not prepend TZDIR to file
CVS commit: src/lib/libc/time
Module Name:src
Committed By: christos
Date: Sat Dec 23 20:48:38 UTC 2023
Modified Files:
src/lib/libc/time: Makefile NEWS README localtime.c private.h
tz-art.html tz-link.html
Log Message:
Import tzcode 2023d:
localtime.c no longer mishandles TZif files that contain a single
transition into a DST regime. Previously, it incorrectly assumed
DST was in effect before the transition too. (Thanks to Alois
Treindl for debugging help.)
localtime.c's timeoff no longer collides with OpenBSD 7.4.
The C code now uses _Generic only if __STDC_VERSION__ says the
compiler is C11 or later.
tzselect now optionally reads zonenow.tab, to simplify when
configuring only for timestamps dated from now on.
tzselect no longer creates temporary files.
tzselect no longer mishandles the following:
Spaces and most other special characters in BUGEMAIL, PACKAGE,
TZDIR, and VERSION.
TZ strings when using mawk 1.4.3, which mishandles regular
expressions of the form /X{2,}/.
ISO 6709 coordinates when using an awk that lacks the GNU
extension of newlines in -v option-arguments.
Non UTF-8 locales when using an iconv command that lacks the GNU
//TRANSLIT extension.
zic no longer mishandles data for Palestine after the year 2075.
Previously, it incorrectly omitted post-2075 transitions that are
predicted for just before and just after Ramadan. (Thanks to Ken
Murchison for debugging help.)
zic now works again on Linux 2.6.16 and 2.6.17 (2006).
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/lib/libc/time/Makefile
cvs rdiff -u -r1.42 -r1.43 src/lib/libc/time/NEWS
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/time/README
cvs rdiff -u -r1.138 -r1.139 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.66 -r1.67 src/lib/libc/time/private.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/tz-art.html
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/time/tz-link.html
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 23 20:32:30 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new postfix To generate a diff of this commit: cvs rdiff -u -r1.1972 -r1.1973 src/doc/3RDPARTY cvs rdiff -u -r1.3025 -r1.3026 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1972 src/doc/3RDPARTY:1.1973 --- src/doc/3RDPARTY:1.1972 Sat Dec 23 10:52:11 2023 +++ src/doc/3RDPARTY Sat Dec 23 15:32:30 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1972 2023/12/23 15:52:11 kre Exp $ +# $NetBSD: 3RDPARTY,v 1.1973 2023/12/23 20:32:30 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1229,12 +1229,12 @@ and more. Vern's ping is gone. We are to now to do a new import. Package: Postfix -Version: 3.7.3 -Current Vers: 3.7.9/3.8.4 +Version: 3.8.4 +Current Vers: 3.8.4 Maintainer: Wietse Venema Archive Site: Home Page: http://www.postfix.org/ -Date: 2022-10-08 +Date: 2023-12-23 Mailing List: postfix-us...@postfix.org Responsible: christos License: IBM Public License. See also src/external/ibm-public/postfix/dist. Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3025 src/doc/CHANGES:1.3026 --- src/doc/CHANGES:1.3025 Sat Dec 23 10:52:11 2023 +++ src/doc/CHANGES Sat Dec 23 15:32:30 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3025 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3026 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -244,3 +244,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: dhcpcd: Import version 10.0.6. [roy 20231218] OpenSSH: Import 9.6. [christos 20231220] tzdata: Updated to 2023d (via 2023dgtz) [kre 20231223] + postfix(1): Import version 3.8.4. [christos 20231223]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 23 20:32:30 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new postfix To generate a diff of this commit: cvs rdiff -u -r1.1972 -r1.1973 src/doc/3RDPARTY cvs rdiff -u -r1.3025 -r1.3026 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/ibm-public/postfix
Module Name:src Committed By: christos Date: Sat Dec 23 20:30:46 UTC 2023 Modified Files: src/external/ibm-public/postfix/dist: makedefs src/external/ibm-public/postfix/dist/README_FILES: INSTALL TLS_README src/external/ibm-public/postfix/dist/conf: main.cf master.cf postfix-files postfix-script postfix-tls-script src/external/ibm-public/postfix/dist/html: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.5.html src/external/ibm-public/postfix/dist/man/man1: postfix-tls.1 postfix.1 postlog.1 postqueue.1 posttls-finger.1 src/external/ibm-public/postfix/dist/man/man5: aliases.5 cidr_table.5 ldap_table.5 mysql_table.5 pcre_table.5 pgsql_table.5 postconf.5 regexp_table.5 virtual.5 src/external/ibm-public/postfix/dist/man/man8: postscreen.8 smtp.8 smtpd.8 tlsproxy.8 src/external/ibm-public/postfix/dist/proto: ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html postconf.proto src/external/ibm-public/postfix/dist/src/cleanup: cleanup_map1n.c cleanup_milter.c src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c dns_rr.c dns_rr_eq_sa.c dns_sa_to_rr.c dns_str_resflags.c dns_strrecord.c dns_strtype.c src/external/ibm-public/postfix/dist/src/global: compat_level.c compat_level.h dict_ldap.c dict_memcache.c dict_mysql.c dict_pgsql.c dict_proxy.h dict_sqlite.c dynamicmaps.c header_body_checks.h mail_dict.c mail_params.h mail_proto.h mail_version.h map_search.c maps.c mkmap_proxy.c smtp_stream.c smtp_stream.h src/external/ibm-public/postfix/dist/src/local: local_expand.c src/external/ibm-public/postfix/dist/src/milter: milter8.c src/external/ibm-public/postfix/dist/src/postalias: postalias.c src/external/ibm-public/postfix/dist/src/postconf: postconf.h postconf_dbms.c postconf_edit.c postconf_main.c postconf_master.c postconf_misc.c src/external/ibm-public/postfix/dist/src/postfix: postfix.c src/external/ibm-public/postfix/dist/src/postlog: postlog.c src/external/ibm-public/postfix/dist/src/postmap: postmap.c src/external/ibm-public/postfix/dist/src/postqueue: postqueue.c src/external/ibm-public/postfix/dist/src/postscreen: postscreen.c postscreen_smtpd.c src/external/ibm-public/postfix/dist/src/posttls-finger: posttls-finger.c src/external/ibm-public/postfix/dist/src/showq: showq.c src/external/ibm-public/postfix/dist/src/smtp: lmtp_params.c smtp.c smtp.h smtp_addr.c smtp_addr.h smtp_connect.c smtp_params.c smtp_proto.c smtp_reuse.c smtp_session.c src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c smtpd.h smtpd_check.c smtpd_peer.c smtpd_proxy.c smtpd_sasl_glue.c src/external/ibm-public/postfix/dist/src/tls: tls.h tls_client.c tls_dane.c tls_dh.c tls_fprint.c tls_misc.c tls_proxy.h tls_proxy_client_misc.c tls_proxy_client_print.c tls_proxy_client_scan.c tls_server.c src/external/ibm-public/postfix/dist/src/tlsproxy: tlsproxy.c src/external/ibm-public/postfix/dist/src/util: argv.c argv.h attr.h clean_env.c dict.c dict.h dict_cache.c dict_cdb.h dict_cidr.c dict_db.h dict_dbm.h dict_fail.h dict_lmdb.h dict_open.c dict_pcre.c dict_regexp.c dict_sdbm.h hash_fnv.c hash_fnv.h htable.c inet_addr_sizes.c inet_addr_sizes.h inet_connect.c inet_prefix_top.c inet_prefix_top.h make_dirs.c match_list.c mkmap.h mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_fail.c mkmap_lmdb.c mkmap_open.c mkmap_sdbm.c mystrtok.c sock_addr.c sock_addr.h split_nameval.c stringops.h sys_defs.h unix_send_fd.c valid_hostname.c valid_hostname.h src/external/ibm-public/postfix/dist/src/xsasl: xsasl_cyrus_server.c src/external/ibm-public/postfix/lib/global: Makefile src/external/ibm-public/postfix/lib/util: Makefile Removed Files: src/external/ibm-public/postfix/dist/src/global: mkmap.h mkmap_cdb.c mkmap_db.c mkmap_dbm.c mkmap_fail.c mkmap_lmdb.c mkmap_open.c mkmap_sdbm.c Log Message: merge conflicts between 3.7.3 and 3.8.4 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.9 -r1.10 \ src/external/ibm-public/postfix/dist/README_FILES/INSTALL cvs rdiff -u -r1.13 -r1.14 \ src/external/ibm-public/postfix/dist/README_FILES/TLS_README cvs rdiff -u -r1.9 -r1.10 src/external/ibm-public/postfix/dist/conf/main.cf cvs rdiff -u -r1.10 -r1.11 \ src/external/ibm-public/postfix/dist/conf/master.cf cvs rdiff -u -r1.8 -r1.9 \
CVS import: src/external/ibm-public/postfix/dist
Module Name:src
Committed By: christos
Date: Sat Dec 23 20:25:08 UTC 2023
Update of /cvsroot/src/external/ibm-public/postfix/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv631
Log Message:
Import Postfix 3.8.4 (last was 3.7.3)
December 22, 2023: 3.8.4/3.7.9
==
Security: this release adds support to defend against an email
spoofing attack (SMTP smuggling) on recipients at a Postfix server.
For background, see https://www.postfix.org/smtp-smuggling.html.
Sites concerned about SMTP smuggling attacks should enable this
feature on Internet-facing Postfix servers. For compatibility with
non-standard clients, Postfix by default excludes clients in
mynetworks from this countermeasure.
The recommended settings are:
# Optionally disconnect remote SMTP clients that send bare newlines,
# but allow local clients with non-standard SMTP implementations
# such as netcat, fax machines, or load balancer health checks.
#
smtpd_forbid_bare_newline = yes
smtpd_forbid_bare_newline_exclusions = $mynetworks
The smtpd_forbid_bare_newline feature is disabled by default.
November 1, 2023: 3.8.3/3.7.8
=
Bugfix (defect introduced Postfix 2.5, date 20080104): the Postfix
SMTP server was waiting for a client command instead of replying
immediately, after a client certificate verification error in TLS
wrappermode. Reported by Andreas Kinzler.
Usability: the Postfix SMTP server (finally) attempts to log the
SASL username after authentication failure. In Postfix logging,
this appends ", sasl_username=xxx" after the reason for SASL
authentication failure. The logging replaces an unavailable reason
with "(reason unavailable)", and replaces an unavailable sasl_username
with "(unavailable)". Based on code by Jozsef Kadlecsik.
Compatibility bugfix (defect introduced: Postfix 2.11, date 20130405):
in forward_path, the expression ${recipient_delimiter} would expand
to an empty string when a recipient address had no recipient
delimiter. The compatibility fix is to use a configured recipient
delimiter value instead. Reported by Tod A. Sandman.
September 1, 2023: 3.8.2/3.7.7
==
Bugfix (defect introduced: Postfix alpha, 19980207): the valid_hostname()
check in the Postfix DNS client library was blocking unusual but
legitimate wildcard names (*.name) in some DNS lookup results and
lookup requests. Examples:
name class/type result
*.one.example IN CNAME *.other.example
*.other.example IN A 10.0.0.1
*.other.example IN TLSA ..certificate info...
Such syntax is blesed in RFC 1034 section 4.3.3.
Bugfix (defect introduced: Postfix 3.0, 20140218): when an address
verification probe fails during or after an opportunistic TLS
handshake, don't enforce a minimum time-in-queue before falling
back to plaintext. Problem reported by Serg.
June 5, 2023: 3.8.1/3.7.6
=
Optional: harden a Postfix SMTP server against remote SMTP clients
that violate RFC 2920 (or 5321) command pipelining constraints.
With "smtpd_forbid_unauth_pipelining = yes", the server disconnects
a client immediately, after responding with "554 5.5.0 Error: SMTP
protocol synchronization" and after logging "improper command
pipelining" with the unexpected remote SMTP client input. This
feature is disabled by default in Postfix 3.5-3.8 to avoid breaking
home-grown utilities, but it is enabled by default in Postfix 3.9.
A similar feature is enabled by default in the Exim SMTP server.
Optional: some OS distributions crank up TLS security to 11, and
in doing so increase the number of plaintext email deliveries. This
introduces basic OpenSSL configuration file support that may be
used to override OS-level settings. Details are in the postconf(5)
manpage under tls_config_file and tls_config_name.
Bugfix (defect introduced: Postfix 1.0): the command "postconf ..
name=v1 .. name=v2 .." (multiple instances of the same parameter
name) created multiple main.cf name=value entries with the same
parameter name. It now logs a warning and skips the earlier name(s)
and value(s). Found during code maintenance.
Bugfix (defect introduced: Postfix 3.3): the command "postconf -M
name1/type1='name2 type2 ...'" died with a segmentation violation
when the request matched multiple master.cf entries. The master.cf
file was not damaged. Problem reported by SATOH Fumiyasu.
Bugfix (defect introduced: Postfix 2.11): the command "postconf -M
name1/type1='name2 type2 ...'" could add a service definition to
master.cf that conflicted with an already existing service definition.
It now replaces all existing service definitions that match the
service pattern 'name1/type1' or the service name and type in 'name2
type2 ...' with a single service definition 'name2 type2 ...'.
Problem reported by SATOH Fumiyasu.
Bugfix (defect introduced: Postfix 3.8) the posttls-finger command
could access uninitialized memory when reconnecting. This also
fixes a malformed warning message when a
CVS import: src/external/ibm-public/postfix/dist
Module Name:src
Committed By: christos
Date: Sat Dec 23 20:25:08 UTC 2023
Update of /cvsroot/src/external/ibm-public/postfix/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv631
Log Message:
Import Postfix 3.8.4 (last was 3.7.3)
December 22, 2023: 3.8.4/3.7.9
==
Security: this release adds support to defend against an email
spoofing attack (SMTP smuggling) on recipients at a Postfix server.
For background, see https://www.postfix.org/smtp-smuggling.html.
Sites concerned about SMTP smuggling attacks should enable this
feature on Internet-facing Postfix servers. For compatibility with
non-standard clients, Postfix by default excludes clients in
mynetworks from this countermeasure.
The recommended settings are:
# Optionally disconnect remote SMTP clients that send bare newlines,
# but allow local clients with non-standard SMTP implementations
# such as netcat, fax machines, or load balancer health checks.
#
smtpd_forbid_bare_newline = yes
smtpd_forbid_bare_newline_exclusions = $mynetworks
The smtpd_forbid_bare_newline feature is disabled by default.
November 1, 2023: 3.8.3/3.7.8
=
Bugfix (defect introduced Postfix 2.5, date 20080104): the Postfix
SMTP server was waiting for a client command instead of replying
immediately, after a client certificate verification error in TLS
wrappermode. Reported by Andreas Kinzler.
Usability: the Postfix SMTP server (finally) attempts to log the
SASL username after authentication failure. In Postfix logging,
this appends ", sasl_username=xxx" after the reason for SASL
authentication failure. The logging replaces an unavailable reason
with "(reason unavailable)", and replaces an unavailable sasl_username
with "(unavailable)". Based on code by Jozsef Kadlecsik.
Compatibility bugfix (defect introduced: Postfix 2.11, date 20130405):
in forward_path, the expression ${recipient_delimiter} would expand
to an empty string when a recipient address had no recipient
delimiter. The compatibility fix is to use a configured recipient
delimiter value instead. Reported by Tod A. Sandman.
September 1, 2023: 3.8.2/3.7.7
==
Bugfix (defect introduced: Postfix alpha, 19980207): the valid_hostname()
check in the Postfix DNS client library was blocking unusual but
legitimate wildcard names (*.name) in some DNS lookup results and
lookup requests. Examples:
name class/type result
*.one.example IN CNAME *.other.example
*.other.example IN A 10.0.0.1
*.other.example IN TLSA ..certificate info...
Such syntax is blesed in RFC 1034 section 4.3.3.
Bugfix (defect introduced: Postfix 3.0, 20140218): when an address
verification probe fails during or after an opportunistic TLS
handshake, don't enforce a minimum time-in-queue before falling
back to plaintext. Problem reported by Serg.
June 5, 2023: 3.8.1/3.7.6
=
Optional: harden a Postfix SMTP server against remote SMTP clients
that violate RFC 2920 (or 5321) command pipelining constraints.
With "smtpd_forbid_unauth_pipelining = yes", the server disconnects
a client immediately, after responding with "554 5.5.0 Error: SMTP
protocol synchronization" and after logging "improper command
pipelining" with the unexpected remote SMTP client input. This
feature is disabled by default in Postfix 3.5-3.8 to avoid breaking
home-grown utilities, but it is enabled by default in Postfix 3.9.
A similar feature is enabled by default in the Exim SMTP server.
Optional: some OS distributions crank up TLS security to 11, and
in doing so increase the number of plaintext email deliveries. This
introduces basic OpenSSL configuration file support that may be
used to override OS-level settings. Details are in the postconf(5)
manpage under tls_config_file and tls_config_name.
Bugfix (defect introduced: Postfix 1.0): the command "postconf ..
name=v1 .. name=v2 .." (multiple instances of the same parameter
name) created multiple main.cf name=value entries with the same
parameter name. It now logs a warning and skips the earlier name(s)
and value(s). Found during code maintenance.
Bugfix (defect introduced: Postfix 3.3): the command "postconf -M
name1/type1='name2 type2 ...'" died with a segmentation violation
when the request matched multiple master.cf entries. The master.cf
file was not damaged. Problem reported by SATOH Fumiyasu.
Bugfix (defect introduced: Postfix 2.11): the command "postconf -M
name1/type1='name2 type2 ...'" could add a service definition to
master.cf that conflicted with an already existing service definition.
It now replaces all existing service definitions that match the
service pattern 'name1/type1' or the service name and type in 'name2
type2 ...' with a single service definition 'name2 type2 ...'.
Problem reported by SATOH Fumiyasu.
Bugfix (defect introduced: Postfix 3.8) the posttls-finger command
could access uninitialized memory when reconnecting. This also
fixes a malformed warning message when a
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Dec 20 17:19:16 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1968 -r1.1969 src/doc/3RDPARTY cvs rdiff -u -r1.3023 -r1.3024 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1968 src/doc/3RDPARTY:1.1969 --- src/doc/3RDPARTY:1.1968 Mon Dec 18 10:52:37 2023 +++ src/doc/3RDPARTY Wed Dec 20 12:19:15 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1968 2023/12/18 15:52:37 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1969 2023/12/20 17:19:15 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1076,7 +1076,7 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 9.5 +Version: 9.6 Current Vers: 9.6 / portable 9.6p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3023 src/doc/CHANGES:1.3024 --- src/doc/CHANGES:1.3023 Mon Dec 18 10:52:37 2023 +++ src/doc/CHANGES Wed Dec 20 12:19:16 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3023 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3024 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -242,4 +242,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: kernel: Modularize compat90. [pgoyette 20231209] libsa: Add NFSv3 support. [mlelstv 20231212] dhcpcd: Import version 10.0.6. [roy 20231218] - + OpenSSH: Import 9.6. [christos 20231220]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Dec 20 17:19:16 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1968 -r1.1969 src/doc/3RDPARTY cvs rdiff -u -r1.3023 -r1.3024 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Dec 20 17:17:21 UTC 2023 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.972 -r1.973 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.333 -r1.334 src/distrib/sets/lists/debug/shl.mi 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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.972 src/distrib/sets/lists/base/shl.mi:1.973 --- src/distrib/sets/lists/base/shl.mi:1.972 Wed Oct 25 16:22:00 2023 +++ src/distrib/sets/lists/base/shl.mi Wed Dec 20 12:17:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.972 2023/10/25 20:22:00 christos Exp $ +# $NetBSD: shl.mi,v 1.973 2023/12/20 17:17:21 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -876,9 +876,8 @@ ./usr/lib/libsqlite3.so.1.5 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile -./usr/lib/libssh.so.45base-secsh-shlib compatfile -./usr/lib/libssh.so.45.0 base-obsolete obsolete -./usr/lib/libssh.so.45.1 base-secsh-shlib compatfile +./usr/lib/libssh.so.46base-secsh-shlib compatfile +./usr/lib/libssh.so.46.1 base-secsh-shlib compatfile ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.333 src/distrib/sets/lists/debug/shl.mi:1.334 --- src/distrib/sets/lists/debug/shl.mi:1.333 Wed Oct 25 16:22:00 2023 +++ src/distrib/sets/lists/debug/shl.mi Wed Dec 20 12:17:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.333 2023/10/25 20:22:00 christos Exp $ +# $NetBSD: shl.mi,v 1.334 2023/12/20 17:17:21 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -288,8 +288,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.7.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.5.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.45.0.debug comp-obsolete obsolete -./usr/libdata/debug/usr/lib/libssh.so.45.1.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.46.1.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libssl.so.15.0.debug comp-crypto-debug debug,compatfile,openssl=30
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Wed Dec 20 17:17:21 UTC 2023 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.972 -r1.973 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.333 -r1.334 src/distrib/sets/lists/debug/shl.mi 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
Module Name:src Committed By: christos Date: Wed Dec 20 17:15:21 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/bin: Makefile.inc src/crypto/external/bsd/openssh/bin/ssh: Makefile src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent auth2.c authfd.c authfd.h channels.c channels.h cipher.c cipher.h clientloop.c kex.c kex.h log.c misc.c misc.h monitor_wrap.c mux.c packet.c packet.h readconf.c readconf.h scp.c servconf.c sftp-client.c ssh-add.1 ssh-add.c ssh-agent.c ssh-pkcs11-client.c ssh-pkcs11.h ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c sshconnect.h sshconnect2.c sshd.c sshkey.c sshsig.c version.h xmalloc.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: shlib_version Log Message: Merge conflicts between 9.5 and 9.6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/Makefile.inc cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/bin/ssh/Makefile cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/PROTOCOL cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \ src/crypto/external/bsd/openssh/dist/ssh2.h cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/auth2.c cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/log.c \ src/crypto/external/bsd/openssh/dist/misc.h cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/cipher.h \ src/crypto/external/bsd/openssh/dist/sshconnect.h cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/channels.c cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/channels.h \ src/crypto/external/bsd/openssh/dist/packet.h cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/cipher.c cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/ssh.1 cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/readconf.h cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/kex.h cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/sftp-client.c cvs rdiff -u -r1.49 -r1.50 src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/scp.c cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-add.1 cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/ssh-agent.c \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/ssh.c cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/ssh_config.5 cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sshsig.c cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: christos Date: Wed Dec 20 17:15:21 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/bin: Makefile.inc src/crypto/external/bsd/openssh/bin/ssh: Makefile src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.agent auth2.c authfd.c authfd.h channels.c channels.h cipher.c cipher.h clientloop.c kex.c kex.h log.c misc.c misc.h monitor_wrap.c mux.c packet.c packet.h readconf.c readconf.h scp.c servconf.c sftp-client.c ssh-add.1 ssh-add.c ssh-agent.c ssh-pkcs11-client.c ssh-pkcs11.h ssh.1 ssh.c ssh2.h ssh_config.5 sshconnect.c sshconnect.h sshconnect2.c sshd.c sshkey.c sshsig.c version.h xmalloc.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: shlib_version Log Message: Merge conflicts between 9.5 and 9.6 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/Makefile.inc cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/bin/ssh/Makefile cvs rdiff -u -r1.22 -r1.23 src/crypto/external/bsd/openssh/dist/PROTOCOL cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssh/dist/PROTOCOL.agent \ src/crypto/external/bsd/openssh/dist/ssh2.h cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/auth2.c cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/log.c \ src/crypto/external/bsd/openssh/dist/misc.h cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/cipher.h \ src/crypto/external/bsd/openssh/dist/sshconnect.h cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/openssh/dist/channels.c cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/channels.h \ src/crypto/external/bsd/openssh/dist/packet.h cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/cipher.c cvs rdiff -u -r1.38 -r1.39 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/ssh.1 cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/readconf.h cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/kex.h cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/sftp-client.c cvs rdiff -u -r1.49 -r1.50 src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/sshd.c cvs rdiff -u -r1.43 -r1.44 src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/scp.c cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/ssh-add.1 cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/ssh-agent.c \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/ssh-pkcs11.h cvs rdiff -u -r1.44 -r1.45 src/crypto/external/bsd/openssh/dist/ssh.c cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/ssh_config.5 cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/sshconnect2.c cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/sshsig.c cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/xmalloc.h cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.2048 cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.3072 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.4096 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.6144 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.7680 \ src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.8192 cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Wed Dec 20 17:11:31 UTC 2023 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13410 Log Message: Import OpenSSH 9.6/9.6p1 (2023-12-18) Last was 9.5 Changes since OpenSSH 9.5 = This release contains a number of security fixes, some small features and bugfixes. Security This release contains fixes for a newly-discovered weakness in the SSH transport protocol, a logic error relating to constrained PKCS#11 keys in ssh-agent(1) and countermeasures for programs that invoke ssh(1) with user or hostnames containing invalid characters. * ssh(1), sshd(8): implement protocol extensions to thwart the so-called "Terrapin attack" discovered by Fabian B�umer, Marcus Brinkmann and J�rg Schwenk. This attack allows a MITM to effect a limited break of the integrity of the early encrypted SSH transport protocol by sending extra messages prior to the commencement of encryption, and deleting an equal number of consecutive messages immediately after encryption starts. A peer SSH client/server would not be able to detect that messages were deleted. While cryptographically novel, the security impact of this attack is fortunately very limited as it only allows deletion of consecutive messages, and deleting most messages at this stage of the protocol prevents user user authentication from proceeding and results in a stuck connection. The most serious identified impact is that it lets a MITM to delete the SSH2_MSG_EXT_INFO message sent before authentication starts, allowing the attacker to disable a subset of the keystroke timing obfuscation features introduced in OpenSSH 9.5. There is no other discernable impact to session secrecy or session integrity. OpenSSH 9.6 addresses this protocol weakness through a new "strict KEX" protocol extension that will be automatically enabled when both the client and server support it. This extension makes two changes to the SSH transport protocol to improve the integrity of the initial key exchange. Firstly, it requires endpoints to terminate the connection if any unnecessary or unexpected message is received during key exchange (including messages that were previously legal but not strictly required like SSH2_MSG_DEBUG). This removes most malleability from the early protocol. Secondly, it resets the Message Authentication Code counter at the conclusion of each key exchange, preventing previously inserted messages from being able to make persistent changes to the sequence number across completion of a key exchange. Either of these changes should be sufficient to thwart the Terrapin Attack. More details of these changes are in the PROTOCOL file in the OpenSSH source distribition. * ssh-agent(1): when adding PKCS#11-hosted private keys while specifying destination constraints, if the PKCS#11 token returned multiple keys then only the first key had the constraints applied. Use of regular private keys, FIDO tokens and unconstrained keys are unaffected. * ssh(1): if an invalid user or hostname that contained shell metacharacters was passed to ssh(1), and a ProxyCommand, LocalCommand directive or "match exec" predicate referenced the user or hostname via %u, %h or similar expansion token, then an attacker who could supply arbitrary user/hostnames to ssh(1) could potentially perform command injection depending on what quoting was present in the user-supplied ssh_config(5) directive. This situation could arise in the case of git submodules, where a repository could contain a submodule with shell characters in its user/hostname. Git does not ban shell metacharacters in user or host names when checking out repositories from untrusted sources. Although we believe it is the user's responsibility to ensure validity of arguments passed to ssh(1), especially across a security boundary such as the git example above, OpenSSH 9.6 now bans most shell metacharacters from user and hostnames supplied via the command-line. This countermeasure is not guaranteed to be effective in all situations, as it is infeasible for ssh(1) to universally filter shell metacharacters potentially relevant to user-supplied commands. User/hostnames provided via ssh_config(5) are not subject to these restrictions, allowing configurations that use strange names to continue to be used, under the assumption that the user knows what they are doing in their own configuration files. Potentially incompatible changes * ssh(1), sshd(8): the RFC4254 connection/channels protocol provides a TCP-like window mechanism that limits the amount of data that can be sent without acceptance from the peer. In cases where this limit was exceeded by a non-conforming peer SSH
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Wed Dec 20 17:11:31 UTC 2023 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13410 Log Message: Import OpenSSH 9.6/9.6p1 (2023-12-18) Last was 9.5 Changes since OpenSSH 9.5 = This release contains a number of security fixes, some small features and bugfixes. Security This release contains fixes for a newly-discovered weakness in the SSH transport protocol, a logic error relating to constrained PKCS#11 keys in ssh-agent(1) and countermeasures for programs that invoke ssh(1) with user or hostnames containing invalid characters. * ssh(1), sshd(8): implement protocol extensions to thwart the so-called "Terrapin attack" discovered by Fabian B�umer, Marcus Brinkmann and J�rg Schwenk. This attack allows a MITM to effect a limited break of the integrity of the early encrypted SSH transport protocol by sending extra messages prior to the commencement of encryption, and deleting an equal number of consecutive messages immediately after encryption starts. A peer SSH client/server would not be able to detect that messages were deleted. While cryptographically novel, the security impact of this attack is fortunately very limited as it only allows deletion of consecutive messages, and deleting most messages at this stage of the protocol prevents user user authentication from proceeding and results in a stuck connection. The most serious identified impact is that it lets a MITM to delete the SSH2_MSG_EXT_INFO message sent before authentication starts, allowing the attacker to disable a subset of the keystroke timing obfuscation features introduced in OpenSSH 9.5. There is no other discernable impact to session secrecy or session integrity. OpenSSH 9.6 addresses this protocol weakness through a new "strict KEX" protocol extension that will be automatically enabled when both the client and server support it. This extension makes two changes to the SSH transport protocol to improve the integrity of the initial key exchange. Firstly, it requires endpoints to terminate the connection if any unnecessary or unexpected message is received during key exchange (including messages that were previously legal but not strictly required like SSH2_MSG_DEBUG). This removes most malleability from the early protocol. Secondly, it resets the Message Authentication Code counter at the conclusion of each key exchange, preventing previously inserted messages from being able to make persistent changes to the sequence number across completion of a key exchange. Either of these changes should be sufficient to thwart the Terrapin Attack. More details of these changes are in the PROTOCOL file in the OpenSSH source distribition. * ssh-agent(1): when adding PKCS#11-hosted private keys while specifying destination constraints, if the PKCS#11 token returned multiple keys then only the first key had the constraints applied. Use of regular private keys, FIDO tokens and unconstrained keys are unaffected. * ssh(1): if an invalid user or hostname that contained shell metacharacters was passed to ssh(1), and a ProxyCommand, LocalCommand directive or "match exec" predicate referenced the user or hostname via %u, %h or similar expansion token, then an attacker who could supply arbitrary user/hostnames to ssh(1) could potentially perform command injection depending on what quoting was present in the user-supplied ssh_config(5) directive. This situation could arise in the case of git submodules, where a repository could contain a submodule with shell characters in its user/hostname. Git does not ban shell metacharacters in user or host names when checking out repositories from untrusted sources. Although we believe it is the user's responsibility to ensure validity of arguments passed to ssh(1), especially across a security boundary such as the git example above, OpenSSH 9.6 now bans most shell metacharacters from user and hostnames supplied via the command-line. This countermeasure is not guaranteed to be effective in all situations, as it is infeasible for ssh(1) to universally filter shell metacharacters potentially relevant to user-supplied commands. User/hostnames provided via ssh_config(5) are not subject to these restrictions, allowing configurations that use strange names to continue to be used, under the assumption that the user knows what they are doing in their own configuration files. Potentially incompatible changes * ssh(1), sshd(8): the RFC4254 connection/channels protocol provides a TCP-like window mechanism that limits the amount of data that can be sent without acceptance from the peer. In cases where this limit was exceeded by a non-conforming peer SSH
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sat Dec 9 16:18:48 UTC 2023 Modified Files: src/etc: services Log Message: PR/57759: Hauke Fath: Restore local additions, lost in revision 1.104 To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/services diff -u src/etc/services:1.105 src/etc/services:1.106 --- src/etc/services:1.105 Sun Jul 30 05:09:38 2023 +++ src/etc/services Sat Dec 9 11:18:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: services,v 1.105 2023/07/30 09:09:38 tron Exp $ +# $NetBSD: services,v 1.106 2023/12/09 16:18:48 christos Exp $ # See also: services(5), https://www.iana.org/assignments/service-names-port-numbers/ # # Service Name and Transport Protocol Port Number Registry @@ -24818,4 +24818,98 @@ inspider 49150/tcp# InSpid # configured experiments; they MUST NOT be shipped as defaults in # implementations. See RFC 3692 for details. # + +# Local NetBSD additions [aliases or missing stuff] +sink 9/tcp null +sink 9/udp null +users 11/tcp +quote 17/tcp +quote 17/udp +ttytst 19/tcp source +ttytst 19/udp source +mail 25/tcp +mail 25/udp +timserver 37/tcp +timserver 37/udp +resource 39/tcp +resource 39/udp +netrjs 77/tcp +netrjs 77/udp +krb5 88/tcp +krb5 88/udp +hostnames 101/tcp +hostnames 101/udp +tsap 102/tcp +tsap 102/udp +cso-ns 105/tcp +cso-ns 105/udp +poppass 106/tcp poppassd +postoffice 109/tcp +rpcbind 111/tcp +rpcbind 111/udp +authentications 113/tcp +readnews 119/tcp untp +imap2 143/tcp imap4 +imap2 143/udp imap4 +z3950 210/tcp wais +z3950 210/udp wais +krcmd 544/tcp +ekshell 545/tcp +whod 513/udp +cmd 514/tcp +spooler 515/tcp +spooler 515/udp +route 520/udp routed +timeserver 525/tcp +timeserver 525/udp +newdate 526/tcp +newdate 526/udp +rpc 530/tcp +rpc 530/udp +chat 531/tcp +chat 531/udp +uucpd 540/tcp +uucpd 540/udp +rdist 541/tcp rdistd +rfs_server 556/tcp rfs # Brunhoff remote filesystem +smtps 465/tcp # smtp protocol over TLS/SSL +smtps 465/udp # smtp protocol over TLS/SSL +kdc 750/tcp kerberos4 +kdc 750/udp kerberos4 +kerberos-master 751/udp # Kerberos admin server udp +kerberos-master 751/tcp # Kerberos admin server tcp +hprop 754/tcp # Heimdal KDC database propagation +krbupdate 760/tcp kreg # BSD Kerberos registration +kpwd 761/tcp # old BSD Kerberos `passwd' +supfilesrv 871/tcp # SUP server +swat 901/tcp # Samba Web Administration Tool +kpop 1109/tcp # Kerberos POP server +supfiledbg 1127/tcp # SUP debugging +radacct 1813/tcp +radacct 1813/udp +lmtp 2003/tcp # Local Mail Transfer Protocol +nfsd 2049/udp # Sun NFS +nfsd 2049/tcp # Sun NFS +eklogin 2105/tcp # Kerberos encrypted `rlogin' +zephyr-hm-srv 2105/udp # Zephyr hm-serv connection +ekshell2 2106/tcp # Encrypted kshell - UColorado, Boulder +iscsi 3260/tcp +fud 4201/udp # Cyrus IMAP finger-like service +ttcp 5037/tcp +X11 6000/tcp # X Window System +ircd 6667/tcp # Often used IRC port (also see 194) +kamanda 10081/udp # Amanda with Kerberos +amandaidx 10082/tcp # Amanda index server +amidxtape 10083/tcp # Amanda dump image server +hunt 26740/udp # multi-player/multi-host maze-wars +# +# Netatalk (in-kernel Appletalk) services +# Note: The running kernel must be configured with "options NETATALK" +# and software not included in NetBSD, such as Netatalk version 1.4b2 +# or later, must be used to take advantage of these services. +# +rtmp 1/ddp # Routing Table Maintenance Protocol +nbp 2/ddp # Name Binding Protocol +echo 4/ddp # AppleTalk Echo Protocol +zip 6/ddp # Zone Information Protocol # Licensing Terms
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sat Dec 9 16:18:48 UTC 2023 Modified Files: src/etc: services Log Message: PR/57759: Hauke Fath: Restore local additions, lost in revision 1.104 To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/etc/services Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Wed Dec 6 20:01:44 UTC 2023 Modified Files: src/lib/libc/time: zdump.8 zic.8 Log Message: PR/57757: Izumi Tsutsui: Fix markup errors To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libc/time/zdump.8 cvs rdiff -u -r1.43 -r1.44 src/lib/libc/time/zic.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/zdump.8 diff -u src/lib/libc/time/zdump.8:1.23 src/lib/libc/time/zdump.8:1.24 --- src/lib/libc/time/zdump.8:1.23 Wed Jul 26 05:17:20 2023 +++ src/lib/libc/time/zdump.8 Wed Dec 6 15:01:44 2023 @@ -1,9 +1,9 @@ -.\" $NetBSD: zdump.8,v 1.23 2023/07/26 09:17:20 rin Exp $ +.\" $NetBSD: zdump.8,v 1.24 2023/12/06 20:01:44 christos Exp $ .\" @(#)zdump.8 8.2 .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. .\" .TH zdump 8 -.Dd October 22, 2021 +.Dd December 6, 2023 .Dt ZDUMP 8 .Os .Sh NAME @@ -26,7 +26,7 @@ The program prints the current time in each .Ar timezone named on the command line. -.SH OPTIONS +.Sh OPTIONS .Bl -tag -width X -compact .It Fl \-version Output version information and exit. Index: src/lib/libc/time/zic.8 diff -u src/lib/libc/time/zic.8:1.43 src/lib/libc/time/zic.8:1.44 --- src/lib/libc/time/zic.8:1.43 Sat Sep 16 14:40:26 2023 +++ src/lib/libc/time/zic.8 Wed Dec 6 15:01:44 2023 @@ -1,9 +1,9 @@ -.\" $NetBSD: zic.8,v 1.43 2023/09/16 18:40:26 christos Exp $ +.\" $NetBSD: zic.8,v 1.44 2023/12/06 20:01:44 christos Exp $ .\" @(#)zic.8 8.6 .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. .\" .TH zic 8 -.Dd September 16, 2023 +.Dd December 6, 2023 .Dt ZIC 8 .Os .Sh NAME @@ -313,11 +313,15 @@ abbreviation must be unambiguous in cont .Pp A rule line has the form .Pp -.Dl Rule NAME FROM TO \&- IN ON AT SAVE LETTER/S +.Bl -column -compact -offset indent "Rule" "NAME" "FROM" "1995" "\&*" "Apr" "lastSun" "2:00w" "1:00d" "LETTER/S" +.It Rule NAME FROM TO \&- IN ON AT SAVE LETTER/S +.El .Pp For example: .Pp -.Dl Rule US 1967 1973 \&- Apr lastSun 2:00w 1:00d D +.Bl -column -compact -offset indent "Rule" "NAME" "FROM" "1995" "\&*" "Apr" "lastSun" "2:00w" "1:00d" "LETTER/S" +.It Rule US 1967 1973 \&- Apr lastSun 2:00w 1:00d D +.El .Pp The fields that make up a rule line are: .Bl -tag -width "LETTER/S" @@ -507,13 +511,17 @@ If this field is the variable part is null. .El .Pp -A zone line has the form +A zone line has the form: .Pp -.Dl Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL] +.Bl -column -compact -offset indent "Zone" "Asia/Amman" "STDOFF" "RULES/SAVE" "FORMAT" "[UNTIL]" +Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL] +.El .Pp For example: .Pp -.Dl Zone Asia/Amman 2:00 Jordan EE%sT 2017 Oct 27 1:00 +.Bl -column -compact -offset indent "Zone" "Asia/Amman" "STDOFF" "RULES/SAVE" "FORMAT" "[UNTIL"] +Zone Asia/Amman 2:00 Jordan EE%sT 2017 Oct 27 1:00 +.El .Pp The fields that make up a zone line are: .Bl -tag -width "RULES/SAVE" @@ -632,13 +640,15 @@ that would otherwise take effect in the seconds is instead assumed to take effect simultaneously. For example: .Pp -.Bl -column -compact -offset indent "# Rule" "Swiss" "FROM" "1995" "\&*" "Oct" "lastSun" "1:00u" "SAVE" "LETTER/S" +.Bl -column -compact -offset indent "# Rule" "NAME" "FROM" "2006" "\&-" "Oct" "lastSun" "1:00" "SAVE" "LETTER/S" .It # Rule NAME FROM TO \&- IN ON AT SAVE LETTER/S .It Rule US 1967 2006 \&- Oct lastSun 2:00 0 S .It Rule US 1967 1973 \&- Apr lastSun 2:00 1:00 D -.It # Zone NAMESTDOFF RULES FORMAT [UNTIL] +.El +.Bl -column -compact -offset indent "# Zone" "America/Menominee" "STDOFF" "RULES" "FORMAT" "[UNTIL]" +.It # Zone NAME STDOFF RULES FORMAT [UNTIL] .It Zone America/Menominee \&-5:00 \&- EST 1973 Apr 29 2:00 -.It \&-6:00 US C%sT +.It \& \& \&-6:00 US C%sT .El .Pp Here, an incorrect reading would be there were two clock changes on 1973-04-29, @@ -651,11 +661,15 @@ interprets this more sensibly as a singl .Pp A link line has the form .Pp -.Dl Link TARGET LINK-NAME +.Bl -column -compact -offset indent "Link" "Europe/Istanbul" "Asia/Istanbul" +.It Link TARGET LINK-NAME +.El .Pp For example: .Pp -.Dl Link Europe/Istanbul Asia/Istanbul +.Bl -column -compact -offset indent "Link" "Europe/Istanbul" "Asia/Istanbul" +.It Link Europe/Istanbul Asia/Istanbul +.El .Pp The .Em TARGET @@ -675,12 +689,12 @@ Links can chain together, although the b chain of one or more links does not terminate in a Zone name. A link line can appear before the line that defines the link target. For example: -.Bl -column -offset indent ".Sy Link" ".Sy Greenwich" ".Sy G_M_T" -.It Sy Link Ta Sy Greenwich Ta Sy G_M_T -.It -.It Link Ta Sy Etc/GMT Ta Sy Greenwich -.It Zone Ta Sy Etc/GMT 0 Ta Sy Ta Sy \*- GMT +.Bl -column -offset indent "Link" "Greenwich" "Greenwich" +.It Link Greenwich G_M_T +.It Link Etc/GMT
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Wed Dec 6 20:01:44 UTC 2023 Modified Files: src/lib/libc/time: zdump.8 zic.8 Log Message: PR/57757: Izumi Tsutsui: Fix markup errors To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libc/time/zdump.8 cvs rdiff -u -r1.43 -r1.44 src/lib/libc/time/zic.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.sbin/mtree
Module Name:src
Committed By: christos
Date: Sat Dec 2 16:18:17 UTC 2023
Modified Files:
src/tests/usr.sbin/mtree: t_mtree.sh
Log Message:
remove dup copy.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/usr.sbin/mtree/t_mtree.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/mtree/t_mtree.sh
diff -u src/tests/usr.sbin/mtree/t_mtree.sh:1.9 src/tests/usr.sbin/mtree/t_mtree.sh:1.10
--- src/tests/usr.sbin/mtree/t_mtree.sh:1.9 Sat Dec 2 08:23:59 2023
+++ src/tests/usr.sbin/mtree/t_mtree.sh Sat Dec 2 11:18:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtree.sh,v 1.9 2023/12/02 13:23:59 christos Exp $
+# $NetBSD: t_mtree.sh,v 1.10 2023/12/02 16:18:17 christos Exp $
#
# Copyright (c) 2009, 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -447,42 +447,6 @@ mtree_specspec_type_body()
fi
}
-atf_test_case mtree_specspec_type
-mtree_specspec_type_head()
-{
- atf_set "descr" "Test that spec comparisons detect type changes"
-}
-
-mtree_specspec_type_body()
-{
- mkdir testdir
-
- touch testdir/bar
- mtree -c -p testdir > mtree1.spec
-
- if [ ! -f mtree1.spec ]; then
- atf_fail "mtree failed"
- fi
-
- rm -f testdir/bar
- ln -s foo testdir/bar
- # uid change is expected to be ignored as done in -C
- chown -h operator testdir/bar
- mtree -c -p testdir > mtree2.spec
-
- if [ ! -f mtree2.spec ]; then
- atf_fail "mtree failed"
- fi
-
- atf_check -s ignore -o save:output \
- -x "mtree -f mtree1.spec -f mtree2.spec"
-
- if ! cut -f 3 output | egrep -q "bar file" || \
- ! cut -f 3 output | egrep -q "bar link"; then
- atf_fail "mtree did not detect type change"
- fi
-}
-
atf_test_case mtree_onlyfile
atf_test_case netbsd6_onlyfile
onlyfile_head()
CVS commit: src/tests/usr.sbin/mtree
Module Name:src Committed By: christos Date: Sat Dec 2 16:18:17 UTC 2023 Modified Files: src/tests/usr.sbin/mtree: t_mtree.sh Log Message: remove dup copy. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/usr.sbin/mtree/t_mtree.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/mtree
Module Name:src
Committed By: christos
Date: Sat Dec 2 13:34:48 UTC 2023
Modified Files:
src/usr.sbin/mtree: create.c verify.c
Log Message:
PR/57735: Jose Louis Duran: check if fts_read(3) had an error.
(FreeBSD commit https://github.com/freebsd/freebsd-src/commit/\
2dfa4b66b3d0ce6ce2df476b5615f8415a19)
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/usr.sbin/mtree/create.c
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/mtree/verify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.76 src/usr.sbin/mtree/create.c:1.77
--- src/usr.sbin/mtree/create.c:1.76 Sun Nov 18 18:03:36 2018
+++ src/usr.sbin/mtree/create.c Sat Dec 2 08:34:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.76 2018/11/18 23:03:36 sevan Exp $ */
+/* $NetBSD: create.c,v 1.77 2023/12/02 13:34:48 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: create.c,v 1.76 2018/11/18 23:03:36 sevan Exp $");
+__RCSID("$NetBSD: create.c,v 1.77 2023/12/02 13:34:48 christos Exp $");
#endif
#endif /* not lint */
@@ -173,6 +173,8 @@ cwalk(FILE *fp)
}
}
+ if (errno != 0)
+ mtree_err("fts_read: %s", strerror(errno));
fts_close(t);
if (sflag && keys & F_CKSUM)
mtree_err("%s checksum: %u", fullpath, crc_total);
Index: src/usr.sbin/mtree/verify.c
diff -u src/usr.sbin/mtree/verify.c:1.47 src/usr.sbin/mtree/verify.c:1.48
--- src/usr.sbin/mtree/verify.c:1.47 Thu Mar 18 16:02:18 2021
+++ src/usr.sbin/mtree/verify.c Sat Dec 2 08:34:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: verify.c,v 1.47 2021/03/18 20:02:18 cheusov Exp $ */
+/* $NetBSD: verify.c,v 1.48 2023/12/02 13:34:48 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: verify.c,v 1.47 2021/03/18 20:02:18 cheusov Exp $");
+__RCSID("$NetBSD: verify.c,v 1.48 2023/12/02 13:34:48 christos Exp $");
#endif
#endif /* not lint */
@@ -166,6 +166,8 @@ vwalk(void)
}
fts_set(t, p, FTS_SKIP);
}
+ if (errno != 0)
+ mtree_err("fts_read: %s", strerror(errno));
fts_close(t);
if (sflag)
warnx("%s checksum: %u", fullpath, crc_total);
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: christos Date: Sat Dec 2 13:34:48 UTC 2023 Modified Files: src/usr.sbin/mtree: create.c verify.c Log Message: PR/57735: Jose Louis Duran: check if fts_read(3) had an error. (FreeBSD commit https://github.com/freebsd/freebsd-src/commit/\ 2dfa4b66b3d0ce6ce2df476b5615f8415a19) To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/usr.sbin/mtree/create.c cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/mtree/verify.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: christos Date: Sat Dec 2 13:26:09 UTC 2023 Modified Files: src/usr.sbin/mtree: mtree.8 Log Message: PR/57735: Jose Louis Duran: Add missing xref to mtree.5 (FreeBSD commit https://github.com/freebsd/freebsd-src/commit/\ da232c04ab9eba3d3a7fc73881daff847071e9fd) To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/mtree/mtree.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/mtree/mtree.8 diff -u src/usr.sbin/mtree/mtree.8:1.77 src/usr.sbin/mtree/mtree.8:1.78 --- src/usr.sbin/mtree/mtree.8:1.77 Thu Jun 1 09:04:47 2023 +++ src/usr.sbin/mtree/mtree.8 Sat Dec 2 08:26:09 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: mtree.8,v 1.77 2023/06/01 13:04:47 uwe Exp $ +.\" $NetBSD: mtree.8,v 1.78 2023/12/02 13:26:09 christos Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -56,7 +56,7 @@ .\" .\" @(#)mtree.8 8.2 (Berkeley) 12/11/93 .\" -.Dd June 16, 2020 +.Dd December 2, 2023 .Dt MTREE 8 .Os .Sh NAME @@ -825,6 +825,7 @@ seconds.nanoseconds without zero padding .Xr fnmatch 3 , .Xr fts 3 , .Xr strsvis 3 , +.Xr mtree 5 , .Xr chown 8 , .Xr mknod 8 .Sh HISTORY
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: christos Date: Sat Dec 2 13:26:09 UTC 2023 Modified Files: src/usr.sbin/mtree: mtree.8 Log Message: PR/57735: Jose Louis Duran: Add missing xref to mtree.5 (FreeBSD commit https://github.com/freebsd/freebsd-src/commit/\ da232c04ab9eba3d3a7fc73881daff847071e9fd) To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/mtree/mtree.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Sat Dec 2 13:24:00 UTC 2023 Modified Files: src/tests/usr.sbin/mtree: t_mtree.sh src/usr.sbin/mtree: specspec.c Log Message: PR/57735: Jose Louis Duran: mtree -f file1 -f file2 does not consider type changes. (FreeBSD https://github.com/freebsd/freebsd-src/commit/\ 4f4b548b1d21ae16955b09f9b717524167a7d97e) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/usr.sbin/mtree/t_mtree.sh cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mtree/specspec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: christos
Date: Sat Dec 2 13:24:00 UTC 2023
Modified Files:
src/tests/usr.sbin/mtree: t_mtree.sh
src/usr.sbin/mtree: specspec.c
Log Message:
PR/57735: Jose Louis Duran: mtree -f file1 -f file2 does not consider type
changes.
(FreeBSD https://github.com/freebsd/freebsd-src/commit/\
4f4b548b1d21ae16955b09f9b717524167a7d97e)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.sbin/mtree/t_mtree.sh
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mtree/specspec.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/usr.sbin/mtree/t_mtree.sh
diff -u src/tests/usr.sbin/mtree/t_mtree.sh:1.8 src/tests/usr.sbin/mtree/t_mtree.sh:1.9
--- src/tests/usr.sbin/mtree/t_mtree.sh:1.8 Thu Sep 7 00:05:21 2017
+++ src/tests/usr.sbin/mtree/t_mtree.sh Sat Dec 2 08:23:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_mtree.sh,v 1.8 2017/09/07 04:05:21 nakayama Exp $
+# $NetBSD: t_mtree.sh,v 1.9 2023/12/02 13:23:59 christos Exp $
#
# Copyright (c) 2009, 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -411,6 +411,77 @@ netbsd6_nonemptydir_body()
FLAVOR=netbsd6 nonemptydir_body
}
+atf_test_case mtree_specspec_type
+mtree_specspec_type_head()
+{
+ atf_set "descr" "Test that spec comparisons detect type changes"
+}
+
+mtree_specspec_type_body()
+{
+ mkdir testdir
+
+ touch testdir/bar
+ mtree -c -p testdir > mtree1.spec
+
+ if [ ! -f mtree1.spec ]; then
+ atf_fail "mtree failed"
+ fi
+
+ rm -f testdir/bar
+ ln -s foo testdir/bar
+ # uid change is expected to be ignored as done in -C
+ chown -h operator testdir/bar
+ mtree -c -p testdir > mtree2.spec
+
+ if [ ! -f mtree2.spec ]; then
+ atf_fail "mtree failed"
+ fi
+
+ atf_check -s ignore -o save:output \
+ -x "mtree -f mtree1.spec -f mtree2.spec"
+
+ if ! cut -f 3 output | egrep -q "bar file" || \
+ ! cut -f 3 output | egrep -q "bar link"; then
+ atf_fail "mtree did not detect type change"
+ fi
+}
+
+atf_test_case mtree_specspec_type
+mtree_specspec_type_head()
+{
+ atf_set "descr" "Test that spec comparisons detect type changes"
+}
+
+mtree_specspec_type_body()
+{
+ mkdir testdir
+
+ touch testdir/bar
+ mtree -c -p testdir > mtree1.spec
+
+ if [ ! -f mtree1.spec ]; then
+ atf_fail "mtree failed"
+ fi
+
+ rm -f testdir/bar
+ ln -s foo testdir/bar
+ # uid change is expected to be ignored as done in -C
+ chown -h operator testdir/bar
+ mtree -c -p testdir > mtree2.spec
+
+ if [ ! -f mtree2.spec ]; then
+ atf_fail "mtree failed"
+ fi
+
+ atf_check -s ignore -o save:output \
+ -x "mtree -f mtree1.spec -f mtree2.spec"
+
+ if ! cut -f 3 output | egrep -q "bar file" || \
+ ! cut -f 3 output | egrep -q "bar link"; then
+ atf_fail "mtree did not detect type change"
+ fi
+}
atf_test_case mtree_onlyfile
atf_test_case netbsd6_onlyfile
@@ -459,6 +530,7 @@ atf_init_test_cases()
atf_add_test_case mtree_ignore
atf_add_test_case mtree_merge
atf_add_test_case mtree_nonemptydir
+ atf_add_test_case mtree_specspec_type
atf_add_test_case mtree_onlyfile
atf_add_test_case netbsd6_create
Index: src/usr.sbin/mtree/specspec.c
diff -u src/usr.sbin/mtree/specspec.c:1.4 src/usr.sbin/mtree/specspec.c:1.5
--- src/usr.sbin/mtree/specspec.c:1.4 Thu Dec 14 13:34:41 2017
+++ src/usr.sbin/mtree/specspec.c Sat Dec 2 08:24:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: specspec.c,v 1.4 2017/12/14 18:34:41 christos Exp $ */
+/* $NetBSD: specspec.c,v 1.5 2023/12/02 13:24:00 christos Exp $ */
/*-
* Copyright (c) 2003 Poul-Henning Kamp
@@ -31,7 +31,7 @@
#endif
#include
-__RCSID("$NetBSD: specspec.c,v 1.4 2017/12/14 18:34:41 christos Exp $");
+__RCSID("$NetBSD: specspec.c,v 1.5 2023/12/02 13:24:00 christos Exp $");
#include
#include
@@ -145,7 +145,7 @@ compare_nodes(NODE *n1, NODE *n2, char c
return (1);
}
if (n1->type != n2->type) {
- differs = 0;
+ differs = F_TYPE;
mismatch(n1, n2, differs, path);
return (1);
}
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Mon Nov 27 19:46:14 UTC 2023
Modified Files:
src/lib/libc/stdlib: strfmon.c
Log Message:
Restore original code now that the broken test has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/stdlib/strfmon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/strfmon.c
diff -u src/lib/libc/stdlib/strfmon.c:1.20 src/lib/libc/stdlib/strfmon.c:1.21
--- src/lib/libc/stdlib/strfmon.c:1.20 Sun Nov 19 13:57:11 2023
+++ src/lib/libc/stdlib/strfmon.c Mon Nov 27 14:46:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: strfmon.c,v 1.20 2023/11/19 18:57:11 christos Exp $ */
+/* $NetBSD: strfmon.c,v 1.21 2023/11/27 19:46:14 christos Exp $ */
/*-
* Copyright (c) 2001 Alexey Zelkin
@@ -32,7 +32,7 @@
#if 0
__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14 2003/03/20 08:18:55 ache Exp $");
#else
-__RCSID("$NetBSD: strfmon.c,v 1.20 2023/11/19 18:57:11 christos Exp $");
+__RCSID("$NetBSD: strfmon.c,v 1.21 2023/11/27 19:46:14 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -387,10 +387,8 @@ vstrfmon_l(char * __restrict s, size_t m
if (sign_posn == 0) {
if (flags & IS_NEGATIVE)
PRINT(')');
-#if 0
else if (left_prec >= 0)
PRINT(' ');
-#endif
}
if (dst - tmpptr < width) {
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: christos Date: Mon Nov 27 19:46:14 UTC 2023 Modified Files: src/lib/libc/stdlib: strfmon.c Log Message: Restore original code now that the broken test has been fixed. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/stdlib/strfmon.c 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/locale
Module Name:src
Committed By: christos
Date: Mon Nov 27 19:45:36 UTC 2023
Modified Files:
src/tests/lib/libc/locale: Makefile t_strfmon.c
Log Message:
Don't use fmtcheck for strfmon format strings. It does not work. Fix a broken
test.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/lib/libc/locale/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/locale/t_strfmon.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/locale/Makefile
diff -u src/tests/lib/libc/locale/Makefile:1.13 src/tests/lib/libc/locale/Makefile:1.14
--- src/tests/lib/libc/locale/Makefile:1.13 Sun Jul 28 09:46:45 2019
+++ src/tests/lib/libc/locale/Makefile Mon Nov 27 14:45:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/07/28 13:46:45 christos Exp $
+# $NetBSD: Makefile,v 1.14 2023/11/27 19:45:36 christos Exp $
.include
@@ -27,5 +27,6 @@ TESTS_C+= t_strfmon
COPTS.t_wctomb.c += -Wno-stack-protector
COPTS.t_digittoint.c += -Wno-unused-variable
COPTS.t_btowc.c += -Wno-unused-variable
+COPTS.t_strfmon.c += -Wno-format-nonliteral
.include
Index: src/tests/lib/libc/locale/t_strfmon.c
diff -u src/tests/lib/libc/locale/t_strfmon.c:1.5 src/tests/lib/libc/locale/t_strfmon.c:1.6
--- src/tests/lib/libc/locale/t_strfmon.c:1.5 Sat Oct 14 16:19:31 2023
+++ src/tests/lib/libc/locale/t_strfmon.c Mon Nov 27 14:45:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strfmon.c,v 1.5 2023/10/14 20:19:31 christos Exp $ */
+/* $NetBSD: t_strfmon.c,v 1.6 2023/11/27 19:45:36 christos Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: t_strfmon.c,v 1.5 2023/10/14 20:19:31 christos Exp $");
+__RCSID("$NetBSD: t_strfmon.c,v 1.6 2023/11/27 19:45:36 christos Exp $");
#include
#include
@@ -52,7 +52,7 @@ ATF_TC_BODY(strfmon_locale, tc)
const char *locale;
const char *expected;
} tests[] = {
- { "C", "[ **1234.57] [ **1234.57]" },
+ { "C", "[ **1234.57 ] [ **1234.57 ]" },
{ "de_DE.UTF-8", "[ **1234,57 €] [ **1.234,57 EUR]" },
{ "en_GB.UTF-8", "[ £**1234.57] [ GBP**1,234.57]" },
};
@@ -157,8 +157,7 @@ ATF_TC_BODY(strfmon_examples, tc)
for (i = 0; i < __arraycount(tests); ++i) {
snprintf(format, sizeof(format), "[%s] [%s] [%s]",
tests[i].format, tests[i].format, tests[i].format);
- strfmon(actual, sizeof(actual) - 1,
- fmtcheck(format, "%n %n %n"),
+ strfmon(actual, sizeof(actual) - 1, format,
123.45, -123.45, 3456.781);
ATF_CHECK_STREQ_MSG(tests[i].expected, actual,
"[%s]", tests[i].format);
CVS commit: src/tests/lib/libc/locale
Module Name:src Committed By: christos Date: Mon Nov 27 19:45:36 UTC 2023 Modified Files: src/tests/lib/libc/locale: Makefile t_strfmon.c Log Message: Don't use fmtcheck for strfmon format strings. It does not work. Fix a broken test. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/tests/lib/libc/locale/Makefile cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/locale/t_strfmon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/man/man7
In article <20231123211614.011a1f...@cvs.netbsd.org>, Taylor R Campbell wrote: >-=-=-=-=-=- > >Module Name: src >Committed By: riastradh >Date: Thu Nov 23 21:16:13 UTC 2023 > >Modified Files: > src/share/man/man7: Makefile > >Log Message: >share/man/man7/Makefile: Split MAN on separate lines, and sort. > >Makes sorting and merging changes easier. > >No functional change intended. > >Preparing for a new stack(7) in the service of PR pkg/57708. Yes, this is indeed a lot better. I prefer though: MAN+= \ bar.7 \ foo.7 It is faster to parse, involves less typing, whitespace is cleaner. christos
CVS commit: src/crypto/external/bsd/libsaslc/lib
Module Name:src
Committed By: christos
Date: Fri Nov 24 18:45:46 UTC 2023
Modified Files:
src/crypto/external/bsd/libsaslc/lib: Makefile
Log Message:
move line to avoid deprecated declaration errors outside of the kerberos block.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/libsaslc/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/libsaslc/lib/Makefile
diff -u src/crypto/external/bsd/libsaslc/lib/Makefile:1.10 src/crypto/external/bsd/libsaslc/lib/Makefile:1.11
--- src/crypto/external/bsd/libsaslc/lib/Makefile:1.10 Mon May 8 22:19:32 2023
+++ src/crypto/external/bsd/libsaslc/lib/Makefile Fri Nov 24 13:45:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/05/09 02:19:32 christos Exp $
+# $NetBSD: Makefile,v 1.11 2023/11/24 18:45:46 christos Exp $
.include
@@ -59,7 +59,8 @@ LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/e
.if (${MKKERBEROS} != "no")
LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
-COPTS.crypto.c+=-Wno-error=deprecated-declarations
.endif
+COPTS.crypto.c+=-Wno-error=deprecated-declarations
+
.include
CVS commit: src/crypto/external/bsd/libsaslc/lib
Module Name:src Committed By: christos Date: Fri Nov 24 18:45:46 UTC 2023 Modified Files: src/crypto/external/bsd/libsaslc/lib: Makefile Log Message: move line to avoid deprecated declaration errors outside of the kerberos block. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/libsaslc/lib/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/prep/prep
Module Name:src
Committed By: christos
Date: Fri Nov 24 16:49:59 UTC 2023
Modified Files:
src/sys/arch/prep/prep: residual.c
Log Message:
Make this compile again with options RESIDUAL_DATA_DUMP (Andrius V)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/prep/prep/residual.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/prep/prep/residual.c
diff -u src/sys/arch/prep/prep/residual.c:1.18 src/sys/arch/prep/prep/residual.c:1.19
--- src/sys/arch/prep/prep/residual.c:1.18 Thu Mar 27 14:22:56 2014
+++ src/sys/arch/prep/prep/residual.c Fri Nov 24 11:49:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: residual.c,v 1.18 2014/03/27 18:22:56 christos Exp $ */
+/* $NetBSD: residual.c,v 1.19 2023/11/24 16:49:59 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: residual.c,v 1.18 2014/03/27 18:22:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: residual.c,v 1.19 2023/11/24 16:49:59 christos Exp $");
#include
#include
@@ -935,6 +935,7 @@ large_vendor_pcibridge_subr(struct _L4_P
printf("PCI Bridge Slot Data\n");
for (i = 0; i < numslots; i++) {
int j, first, l;
+ char *t;
if (pi->map[i].slotnum)
printf(" PCI Slot %d", pi->map[i].slotnum);
CVS commit: src/sys/arch/prep/prep
Module Name:src Committed By: christos Date: Fri Nov 24 16:49:59 UTC 2023 Modified Files: src/sys/arch/prep/prep: residual.c Log Message: Make this compile again with options RESIDUAL_DATA_DUMP (Andrius V) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/prep/prep/residual.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Sun Nov 19 18:57:11 UTC 2023
Modified Files:
src/lib/libc/stdlib: strfmon.c
Log Message:
minimize diffs with FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/stdlib/strfmon.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/strfmon.c
diff -u src/lib/libc/stdlib/strfmon.c:1.19 src/lib/libc/stdlib/strfmon.c:1.20
--- src/lib/libc/stdlib/strfmon.c:1.19 Thu Sep 28 06:03:41 2023
+++ src/lib/libc/stdlib/strfmon.c Sun Nov 19 13:57:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: strfmon.c,v 1.19 2023/09/28 10:03:41 martin Exp $ */
+/* $NetBSD: strfmon.c,v 1.20 2023/11/19 18:57:11 christos Exp $ */
/*-
* Copyright (c) 2001 Alexey Zelkin
@@ -32,7 +32,7 @@
#if 0
__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14 2003/03/20 08:18:55 ache Exp $");
#else
-__RCSID("$NetBSD: strfmon.c,v 1.19 2023/09/28 10:03:41 martin Exp $");
+__RCSID("$NetBSD: strfmon.c,v 1.20 2023/11/19 18:57:11 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,53 +61,53 @@ __RCSID("$NetBSD: strfmon.c,v 1.19 2023/
#define SUPPRESS_CURR_SYMBOL 0x10 /* suppress the currency from output */
#define LEFT_JUSTIFY 0x20 /* left justify */
#define USE_INTL_CURRENCY 0x40 /* use international currency symbol */
-#define IS_NEGATIVE 0x80 /* is argument value negative ? */
-
-#ifndef NBCHAR_MAX
-#define NBCHAR_MAX ((unsigned char)CHAR_MAX)
-#endif
+#define IS_NEGATIVE 0x80 /* is argument value negative ? */
/* internal macros */
-#define PRINT(CH) do { \
+#define PRINT(CH) do { \
if (dst >= s + maxsize) \
goto e2big_error;\
*dst++ = CH; \
} while (0)
-#define PRINTS(STR) do { \
+#define PRINTS(STR) do { \
const char *tmps = STR; \
while (*tmps != '\0') \
PRINT(*tmps++); \
} while (0)
-#define GET_NUMBER(VAR) do { \
+#define GET_NUMBER(VAR, LOC) do {\
VAR = 0; \
- while (isdigit((unsigned char)*fmt)) { \
+ while (isdigit_l((unsigned char)*fmt, LOC)) { \
+ if (VAR > INT_MAX / 10)\
+ goto e2big_error; \
VAR *= 10; \
VAR += *fmt - '0';\
- if (VAR > 0x00ff)\
+ if (VAR < 0) \
goto e2big_error; \
fmt++; \
} \
} while (0)
-#define GRPCPY(howmany) do { \
+#define GRPCPY(howmany) do { \
int i = howmany; \
while (i-- > 0) { \
avalue_size--; \
- *--bufend = *(avalue+avalue_size+padded); \
+ *--bufend = *(avalue + avalue_size + padded); \
} \
} while (0)
-#define GRPSEP do { \
+#define GRPSEP do { \
bufend -= thousands_sep_size;\
memcpy(bufend, thousands_sep, thousands_sep_size); \
groups++; \
} while (0)
-static void __setup_vars(struct lconv *, int, char *, char *, char *, const char **);
-static int __calc_left_pad(struct lconv *, int, char *);
-static char *__format_grouped_double(struct lconv *, double, int *, int, int, int);
+static void __setup_vars(int, char *, char *, char *, const char **,
+struct lconv *);
+static int __calc_left_pad(int, char *, struct lconv *);
+static char *__format_grouped_double(double, int *, int, int, int,
+struct lconv *, locale_t loc);
static ssize_t
vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc,
@@ -150,7 +150,7 @@ vstrfmon_l(char * __restrict s, size_t m
/* '%' found ! */
/* "%%" mean just '%' */
- if (*(fmt+1) == '%') {
+ if (*(fmt + 1) == '%') {
fmt++;
literal:
PRINT(*fmt++);
@@ -200,9 +200,9 @@ vstrfmon_l(char * __restrict s, size_t m
}
/* field Width */
- if (isdigit((unsigned char)*fmt)) {
+ if (isdigit_l((unsigned char)*fmt, loc)) {
ptrdiff_t d = dst - s;
- GET_NUMBER(width);
+ GET_NUMBER(width, loc);
/* Do we have enough space to put number with
* required width ?
*/
@@ -213,18 +213,18 @@ vstrfmon_l(char * __restrict s, size_t m
/* Left precision */
if (*fmt == '#') {
- if (!isdigit((unsigned char)*++fmt))
+ if (!isdigit_l((unsigned char)*++fmt, loc))
goto format_error;
- GET_NUMBER(left_prec);
+ GET_NUMBER(left_prec, loc);
if ((unsigned int)left_prec >= maxsize - (dst - s))
goto e2big_error;
}
/* Right precision */
if (*fmt == '.') {
- if (!isdigit((unsigned char)*++fmt))
+ if (!isdigit_l((unsigned char)*++fmt, loc))
goto format_error;
- GET_NUMBER(right_prec);
+ GET_NUMBER(right_prec, loc);
if ((unsigned int)right_prec >= maxsize - (dst - s) -
left_prec)
goto e2big_error;
@@ -243,7 +243,7 @@ vstrfmon_l(char * __restrict s, size_t m
goto format_error;
}
- if (currency_symbol)
+ if (currency_symbol != NULL)
free(currency_symbol);
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
@@ -252,7 +252,6 @@ vstrfmon_l(char * __restrict s, size_t m
space_char = currency_symbol[3];
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: christos Date: Sun Nov 19 18:57:11 UTC 2023 Modified Files: src/lib/libc/stdlib: strfmon.c Log Message: minimize diffs with FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/stdlib/strfmon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src Committed By: christos Date: Thu Nov 16 18:06:05 UTC 2023 Modified Files: src/distrib/notes: Makefile.inc Log Message: Set the timezone too when invoking date with a timestamp because it can be affected too: $ env TZ=UTC date -r 1700157305 Thu Nov 16 17:55:05 UTC 2023 $ env TZ=UTC24:24:24 date -r 1700157305 Wed Nov 15 17:30:41 UTC 2023 To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src
Committed By: christos
Date: Thu Nov 16 18:06:05 UTC 2023
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
Set the timezone too when invoking date with a timestamp because it can
be affected too:
$ env TZ=UTC date -r 1700157305
Thu Nov 16 17:55:05 UTC 2023
$ env TZ=UTC24:24:24 date -r 1700157305
Wed Nov 15 17:30:41 UTC 2023
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/notes/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/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.58 src/distrib/notes/Makefile.inc:1.59
--- src/distrib/notes/Makefile.inc:1.58 Mon Nov 13 16:01:51 2023
+++ src/distrib/notes/Makefile.inc Thu Nov 16 13:06:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.58 2023/11/13 21:01:51 christos Exp $
+# $NetBSD: Makefile.inc,v 1.59 2023/11/16 18:06:05 christos Exp $
#
# Ross Harvey
@@ -59,12 +59,12 @@ PRESET+= -rnextminor=${nextmin}
.endif
.endif
.if defined(BUILDID) && "${BUILDID:M20*Z}" != ""
-curdate!= env LANG="C" ${TOOL_DATE} -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
+curdate!= env LANG="C" TZ="UTC" ${TOOL_DATE} -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
.else
.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
.error "No release date could be derived from BUILDID"
.else
-curdate!= env LANG="C" ${TOOL_DATE} ${DATE_TIMESTAMP} "+%b %d, %Y"
+curdate!= env LANG="C" TZ="UTC" ${TOOL_DATE} ${DATE_TIMESTAMP} "+%b %d, %Y"
.endif
.endif
PRESET+= -dcur_date="${curdate}"
CVS commit: src/external/bsd/ppp/usr.sbin/plugins
Module Name:src
Committed By: christos
Date: Wed Nov 15 22:11:38 UTC 2023
Added Files:
src/external/bsd/ppp/usr.sbin/plugins: Makefile.inc
Log Message:
Centralize the location of pppd
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/ppp/usr.sbin/plugins/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/ppp/usr.sbin/plugins/Makefile.inc
diff -u /dev/null src/external/bsd/ppp/usr.sbin/plugins/Makefile.inc:1.1
--- /dev/null Wed Nov 15 17:11:38 2023
+++ src/external/bsd/ppp/usr.sbin/plugins/Makefile.inc Wed Nov 15 17:11:38 2023
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2023/11/15 22:11:38 christos Exp $
+PPPD=${NETBSDSRCDIR}/external/bsd/ppp/dist/pppd
CVS commit: src/external/bsd/ppp/usr.sbin/plugins
Module Name:src Committed By: christos Date: Wed Nov 15 22:11:38 UTC 2023 Added Files: src/external/bsd/ppp/usr.sbin/plugins: Makefile.inc Log Message: Centralize the location of pppd To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/ppp/usr.sbin/plugins/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/bsd/ppp/usr.sbin/plugins
Module Name:src
Committed By: christos
Date: Wed Nov 15 22:11:17 UTC 2023
Modified Files:
src/external/bsd/ppp/usr.sbin/plugins/minconn: Makefile
src/external/bsd/ppp/usr.sbin/plugins/passwordfd: Makefile
src/external/bsd/ppp/usr.sbin/plugins/status: Makefile
Log Message:
simplify
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/ppp/usr.sbin/plugins/minconn/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/ppp/usr.sbin/plugins/status/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/ppp/usr.sbin/plugins/minconn/Makefile
diff -u src/external/bsd/ppp/usr.sbin/plugins/minconn/Makefile:1.1 src/external/bsd/ppp/usr.sbin/plugins/minconn/Makefile:1.2
--- src/external/bsd/ppp/usr.sbin/plugins/minconn/Makefile:1.1 Thu Nov 28 17:33:43 2013
+++ src/external/bsd/ppp/usr.sbin/plugins/minconn/Makefile Wed Nov 15 17:11:16 2023
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2013/11/28 22:33:43 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/11/15 22:11:16 christos Exp $
NOLINT= # defined
.include
-.PATH: ${NETBSDSRCDIR}/dist/pppd/pppd/plugins
+.PATH: ${PPPD}/plugins
LIB=minconn
SRCS=minconn.c
-CPPFLAGS+=-I${NETBSDSRCDIR}/dist/pppd/pppd
+CPPFLAGS+=-I${PPPD}
LIBPREFIX=
SHLIB_FULLVERSION=
Index: src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile
diff -u src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile:1.1 src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile:1.2
--- src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile:1.1 Thu Nov 28 17:33:43 2013
+++ src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile Wed Nov 15 17:11:17 2023
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2013/11/28 22:33:43 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/11/15 22:11:17 christos Exp $
NOLINT= # defined
.include
-.PATH: ${NETBSDSRCDIR}/dist/pppd/pppd/plugins
+.PATH: ${PPPD}/plugins
LIB=passwordfd
SRCS=passwordfd.c
-CPPFLAGS+=-I${NETBSDSRCDIR}/dist/pppd/pppd
+CPPFLAGS+=-I${PPPD}
LIBPREFIX=
SHLIB_FULLVERSION=
Index: src/external/bsd/ppp/usr.sbin/plugins/status/Makefile
diff -u src/external/bsd/ppp/usr.sbin/plugins/status/Makefile:1.1 src/external/bsd/ppp/usr.sbin/plugins/status/Makefile:1.2
--- src/external/bsd/ppp/usr.sbin/plugins/status/Makefile:1.1 Thu Nov 28 17:33:43 2013
+++ src/external/bsd/ppp/usr.sbin/plugins/status/Makefile Wed Nov 15 17:11:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/28 22:33:43 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/11/15 22:11:17 christos Exp $
NOLINT= # defined
@@ -6,7 +6,7 @@ NOLINT= # defined
LIB=status
SRCS=status.c
-CPPFLAGS+=-I${NETBSDSRCDIR}/dist/pppd/pppd
+CPPFLAGS+=-I${PPPD}
LIBPREFIX=
SHLIB_FULLVERSION=
CVS commit: src/external/bsd/ppp/usr.sbin/plugins
Module Name:src Committed By: christos Date: Wed Nov 15 22:11:17 UTC 2023 Modified Files: src/external/bsd/ppp/usr.sbin/plugins/minconn: Makefile src/external/bsd/ppp/usr.sbin/plugins/passwordfd: Makefile src/external/bsd/ppp/usr.sbin/plugins/status: Makefile Log Message: simplify To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/ppp/usr.sbin/plugins/minconn/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/ppp/usr.sbin/plugins/passwordfd/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/ppp/usr.sbin/plugins/status/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/ssp
Module Name:src
Committed By: christos
Date: Wed Nov 15 03:35:04 UTC 2023
Modified Files:
src/lib/libc/ssp: ssp_redirect.c
Log Message:
don't expose extra symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/ssp/ssp_redirect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/ssp/ssp_redirect.c
diff -u src/lib/libc/ssp/ssp_redirect.c:1.1 src/lib/libc/ssp/ssp_redirect.c:1.2
--- src/lib/libc/ssp/ssp_redirect.c:1.1 Tue Nov 14 22:15:28 2023
+++ src/lib/libc/ssp/ssp_redirect.c Tue Nov 14 22:35:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ssp_redirect.c,v 1.1 2023/11/15 03:15:28 christos Exp $ */
+/* $NetBSD: ssp_redirect.c,v 1.2 2023/11/15 03:35:04 christos Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -34,17 +34,16 @@
#define __ssp_inline
#include
-__RCSID("$NetBSD: ssp_redirect.c,v 1.1 2023/11/15 03:15:28 christos Exp $");
+__RCSID("$NetBSD: ssp_redirect.c,v 1.2 2023/11/15 03:35:04 christos Exp $");
#include
-int ssp_use(void);
/*
* Provide definitions of the redirect functions in libc.
*/
-int
-ssp_use(void)
+static int __used
+__ssp_use(void)
{
if (getcwd(NULL, 0) == NULL)
return -1;
CVS commit: src/lib/libc/ssp
Module Name:src Committed By: christos Date: Wed Nov 15 03:35:04 UTC 2023 Modified Files: src/lib/libc/ssp: ssp_redirect.c Log Message: don't expose extra symbols. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/ssp/ssp_redirect.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/ssp
Module Name:src
Committed By: christos
Date: Wed Nov 15 03:15:28 UTC 2023
Modified Files:
src/lib/libc/ssp: Makefile.inc
Added Files:
src/lib/libc/ssp: ssp_redirect.c
Log Message:
provide materialized functions for the ssp overriden inlines
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/ssp/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/ssp/ssp_redirect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/ssp/Makefile.inc
diff -u src/lib/libc/ssp/Makefile.inc:1.5 src/lib/libc/ssp/Makefile.inc:1.6
--- src/lib/libc/ssp/Makefile.inc:1.5 Sun Apr 6 15:29:37 2014
+++ src/lib/libc/ssp/Makefile.inc Tue Nov 14 22:15:28 2023
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.5 2014/04/06 19:29:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2023/11/15 03:15:28 christos Exp $
.PATH: ${.CURDIR}/ssp
SSP_SRCS= gets_chk.c fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
strcat_chk.c strcpy_chk.c strncat_chk.c strncpy_chk.c \
- vsnprintf_chk.c vsprintf_chk.c
+ vsnprintf_chk.c vsprintf_chk.c ssp_redirect.c
.for i in ${SSP_SRCS}
SRCS+=${i}
Added files:
Index: src/lib/libc/ssp/ssp_redirect.c
diff -u /dev/null src/lib/libc/ssp/ssp_redirect.c:1.1
--- /dev/null Tue Nov 14 22:15:28 2023
+++ src/lib/libc/ssp/ssp_redirect.c Tue Nov 14 22:15:28 2023
@@ -0,0 +1,56 @@
+/* $NetBSD: ssp_redirect.c,v 1.1 2023/11/15 03:15:28 christos Exp $ */
+
+/*-
+ * Copyright (c) 2023 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#undef _FORTIFY_SOURCE
+#define _FORTIFY_SOURCE 2
+#define __ssp_inline
+
+#include
+__RCSID("$NetBSD: ssp_redirect.c,v 1.1 2023/11/15 03:15:28 christos Exp $");
+
+#include
+
+int ssp_use(void);
+
+/*
+ * Provide definitions of the redirect functions in libc.
+ */
+int
+ssp_use(void)
+{
+ if (getcwd(NULL, 0) == NULL)
+ return -1;
+ if (read(-1, NULL, 0) == -1)
+ return -1;
+ if (readlink(NULL, NULL, 0) == -1)
+ return -1;
+ return 0;
+}
CVS commit: src/lib/libc/ssp
Module Name:src Committed By: christos Date: Wed Nov 15 03:15:28 UTC 2023 Modified Files: src/lib/libc/ssp: Makefile.inc Added Files: src/lib/libc/ssp: ssp_redirect.c Log Message: provide materialized functions for the ssp overriden inlines To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/ssp/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/ssp/ssp_redirect.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include/ssp
Module Name:src Committed By: christos Date: Wed Nov 15 03:14:16 UTC 2023 Modified Files: src/include/ssp: ssp.h Log Message: Allow __ssp_inline to be overriden To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/include/ssp/ssp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include/ssp
Module Name:src Committed By: christos Date: Wed Nov 15 03:14:16 UTC 2023 Modified Files: src/include/ssp: ssp.h Log Message: Allow __ssp_inline to be overriden To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/include/ssp/ssp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/ssp/ssp.h diff -u src/include/ssp/ssp.h:1.15 src/include/ssp/ssp.h:1.16 --- src/include/ssp/ssp.h:1.15 Fri Nov 10 18:03:37 2023 +++ src/include/ssp/ssp.h Tue Nov 14 22:14:16 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ssp.h,v 1.15 2023/11/10 23:03:37 christos Exp $ */ +/* $NetBSD: ssp.h,v 1.16 2023/11/15 03:14:16 christos Exp $ */ /*- * Copyright (c) 2006, 2011, 2023 The NetBSD Foundation, Inc. @@ -58,8 +58,10 @@ #endif #define __ssp_real(fun) __ssp_real_(fun) +#ifndef __ssp_inline #define __ssp_inline extern __inline \ __attribute__((__always_inline__, __gnu_inline__)) +#endif #if __SSP_FORTIFY_LEVEL > 2 # define __ssp_bos(ptr) __builtin_dynamic_object_size(ptr, 1)
CVS commit: src/distrib/notes
Module Name:src
Committed By: christos
Date: Mon Nov 13 21:01:51 UTC 2023
Modified Files:
src/distrib/notes: Makefile.inc
Log Message:
Use TOOL_DATE (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/notes/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/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.57 src/distrib/notes/Makefile.inc:1.58
--- src/distrib/notes/Makefile.inc:1.57 Wed Dec 8 08:06:44 2021
+++ src/distrib/notes/Makefile.inc Mon Nov 13 16:01:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.57 2021/12/08 13:06:44 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.58 2023/11/13 21:01:51 christos Exp $
#
# Ross Harvey
@@ -59,12 +59,12 @@ PRESET+= -rnextminor=${nextmin}
.endif
.endif
.if defined(BUILDID) && "${BUILDID:M20*Z}" != ""
-curdate!= env LANG="C" date -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
+curdate!= env LANG="C" ${TOOL_DATE} -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
.else
.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
.error "No release date could be derived from BUILDID"
.else
-curdate!= env LANG="C" date ${DATE_TIMESTAMP} "+%b %d, %Y"
+curdate!= env LANG="C" ${TOOL_DATE} ${DATE_TIMESTAMP} "+%b %d, %Y"
.endif
.endif
PRESET+= -dcur_date="${curdate}"
CVS commit: src/distrib/notes
Module Name:src Committed By: christos Date: Mon Nov 13 21:01:51 UTC 2023 Modified Files: src/distrib/notes: Makefile.inc Log Message: Use TOOL_DATE (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/distrib/notes/Makefile.inc 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: christos Date: Fri Nov 10 23:04:50 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: Add test for: PR/57689: RVP: getcwd() not overridable with -D_FORTIFY_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.422 -r1.423 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1295 -r1.1296 src/distrib/sets/lists/tests/mi 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: christos Date: Fri Nov 10 23:04:50 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: Add test for: PR/57689: RVP: getcwd() not overridable with -D_FORTIFY_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.422 -r1.423 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1295 -r1.1296 src/distrib/sets/lists/tests/mi 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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.422 src/distrib/sets/lists/debug/mi:1.423 --- src/distrib/sets/lists/debug/mi:1.422 Mon Nov 6 03:56:12 2023 +++ src/distrib/sets/lists/debug/mi Fri Nov 10 18:04:50 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.422 2023/11/06 08:56:12 rin Exp $ +# $NetBSD: mi,v 1.423 2023/11/10 23:04:50 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2095,6 +2095,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_threadjmp.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_fgets.debug tests-lib-debug debug,atf,ssp,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_getcwd.debug tests-lib-debug debug,atf,ssp,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/ssp/h_getcwd2.debug tests-lib-debug debug,atf,ssp,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_gets.debug tests-lib-debug debug,atf,ssp,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memcpy.debug tests-lib-debug debug,atf,ssp,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_memmove.debug tests-lib-debug debug,atf,ssp,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1295 src/distrib/sets/lists/tests/mi:1.1296 --- src/distrib/sets/lists/tests/mi:1.1295 Tue Oct 17 09:51:52 2023 +++ src/distrib/sets/lists/tests/mi Fri Nov 10 18:04:50 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1295 2023/10/17 13:51:52 rjs Exp $ +# $NetBSD: mi,v 1.1296 2023/11/10 23:04:50 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3166,6 +3166,7 @@ ./usr/tests/lib/libc/ssp/Kyuafile tests-lib-tests compattestfile,atf,ssp,kyua ./usr/tests/lib/libc/ssp/h_fgets tests-lib-tests compattestfile,atf,ssp ./usr/tests/lib/libc/ssp/h_getcwd tests-lib-tests compattestfile,atf,ssp +./usr/tests/lib/libc/ssp/h_getcwd2 tests-lib-tests compattestfile,atf,ssp ./usr/tests/lib/libc/ssp/h_getstests-lib-tests compattestfile,atf,ssp ./usr/tests/lib/libc/ssp/h_memcpy tests-lib-tests compattestfile,atf,ssp ./usr/tests/lib/libc/ssp/h_memmove tests-lib-tests compattestfile,atf,ssp
CVS commit: src/include/ssp
Module Name:src Committed By: christos Date: Fri Nov 10 23:03:37 UTC 2023 Modified Files: src/include/ssp: ssp.h Log Message: PR/57689: RVP: getcwd() not overridable with -D_FORTIFY_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/include/ssp/ssp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/ssp/ssp.h diff -u src/include/ssp/ssp.h:1.14 src/include/ssp/ssp.h:1.15 --- src/include/ssp/ssp.h:1.14 Wed Mar 29 09:37:10 2023 +++ src/include/ssp/ssp.h Fri Nov 10 18:03:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ssp.h,v 1.14 2023/03/29 13:37:10 christos Exp $ */ +/* $NetBSD: ssp.h,v 1.15 2023/11/10 23:03:37 christos Exp $ */ /*- * Copyright (c) 2006, 2011, 2023 The NetBSD Foundation, Inc. @@ -58,7 +58,8 @@ #endif #define __ssp_real(fun) __ssp_real_(fun) -#define __ssp_inline static __inline __attribute__((__always_inline__)) +#define __ssp_inline extern __inline \ +__attribute__((__always_inline__, __gnu_inline__)) #if __SSP_FORTIFY_LEVEL > 2 # define __ssp_bos(ptr) __builtin_dynamic_object_size(ptr, 1)
CVS commit: src/include/ssp
Module Name:src Committed By: christos Date: Fri Nov 10 23:03:37 UTC 2023 Modified Files: src/include/ssp: ssp.h Log Message: PR/57689: RVP: getcwd() not overridable with -D_FORTIFY_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/include/ssp/ssp.h 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/ssp
Module Name:src
Committed By: christos
Date: Fri Nov 10 23:03:25 UTC 2023
Modified Files:
src/tests/lib/libc/ssp: Makefile t_ssp.sh
Added Files:
src/tests/lib/libc/ssp: h_getcwd2.c
Log Message:
PR/57689: RVP: getcwd() not overridable with -D_FORTIFY_SOURCE
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libc/ssp/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/ssp/h_getcwd2.c
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/ssp/t_ssp.sh
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/ssp/Makefile
diff -u src/tests/lib/libc/ssp/Makefile:1.11 src/tests/lib/libc/ssp/Makefile:1.12
--- src/tests/lib/libc/ssp/Makefile:1.11 Sat Jun 3 05:09:15 2023
+++ src/tests/lib/libc/ssp/Makefile Fri Nov 10 18:03:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/06/03 09:09:15 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2023/11/10 23:03:25 christos Exp $
NOMAN= # defined
@@ -31,6 +31,7 @@ BINDIR= ${TESTSDIR}
PROGS= h_fgets
PROGS+= h_gets
PROGS+= h_getcwd
+PROGS+= h_getcwd2
PROGS+= h_memcpy
PROGS+= h_memmove
PROGS+= h_memset
Index: src/tests/lib/libc/ssp/t_ssp.sh
diff -u src/tests/lib/libc/ssp/t_ssp.sh:1.7 src/tests/lib/libc/ssp/t_ssp.sh:1.8
--- src/tests/lib/libc/ssp/t_ssp.sh:1.7 Sun Apr 6 15:28:59 2014
+++ src/tests/lib/libc/ssp/t_ssp.sh Fri Nov 10 18:03:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_ssp.sh,v 1.7 2014/04/06 19:28:59 christos Exp $
+# $NetBSD: t_ssp.sh,v 1.8 2023/11/10 23:03:25 christos Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -284,6 +284,19 @@ getcwd_body()
h_fail "$prog 1025"
}
+atf_test_case getcwd2
+getcwd2_head()
+{
+ atf_set "descr" "Checks getcwd(3) override"
+}
+getcwd2_body()
+{
+ prog="$(atf_get_srcdir)/h_getcwd2"
+
+ atf_check -s exit:1 -o ignore \
+ -e 'match:.*getcwd failed: Function not implemented$' $prog
+}
+
atf_init_test_cases()
{
atf_add_test_case sprintf
@@ -305,4 +318,5 @@ atf_init_test_cases()
atf_add_test_case read
atf_add_test_case readlink
atf_add_test_case getcwd
+ atf_add_test_case getcwd2
}
Added files:
Index: src/tests/lib/libc/ssp/h_getcwd2.c
diff -u /dev/null src/tests/lib/libc/ssp/h_getcwd2.c:1.1
--- /dev/null Fri Nov 10 18:03:25 2023
+++ src/tests/lib/libc/ssp/h_getcwd2.c Fri Nov 10 18:03:25 2023
@@ -0,0 +1,18 @@
+#include
+#include
+#include
+
+char*
+getcwd(char* buf, size_t buflen)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+int
+main(void)
+{
+ char buf[256];
+ if (getcwd(buf, sizeof buf) == NULL)
+ err(1, "getcwd failed");
+ return 0;
+}
CVS commit: src/tests/lib/libc/ssp
Module Name:src Committed By: christos Date: Fri Nov 10 23:03:25 UTC 2023 Modified Files: src/tests/lib/libc/ssp: Makefile t_ssp.sh Added Files: src/tests/lib/libc/ssp: h_getcwd2.c Log Message: PR/57689: RVP: getcwd() not overridable with -D_FORTIFY_SOURCE To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libc/ssp/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/ssp/h_getcwd2.c cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/ssp/t_ssp.sh 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: christos
Date: Fri Nov 10 21:05:23 UTC 2023
Modified Files:
src/distrib/sets: Makefile
Log Message:
Set the file creation mask
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/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/Makefile
diff -u src/distrib/sets/Makefile:1.109 src/distrib/sets/Makefile:1.110
--- src/distrib/sets/Makefile:1.109 Sat Jun 10 12:08:41 2023
+++ src/distrib/sets/Makefile Fri Nov 10 16:05:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2023/06/10 16:08:41 lukem Exp $
+# $NetBSD: Makefile,v 1.110 2023/11/10 21:05:23 christos Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -19,6 +19,7 @@ COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!
TAR_SUFF=${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
XZ_OPT= -9
GZIP_FLAGS= ${GZIP_N_FLAG}
+UMASK= umask 022
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
@@ -252,7 +253,7 @@ makesrctars: .PRECIOUS .PHONY check_RELE
makesums: .PRECIOUS .PHONY check_RELEASEDIR .WAIT \
${MAKETARSETS:@.TARS.@do-sum-${.TARS.}@}
- for i in MD5 SHA512; do \
+ ${UMASK} && for i in MD5 SHA512; do \
mv ${TARDIR}/$$i.tmp ${TARDIR}/$$i; \
done
@@ -260,7 +261,7 @@ makesums: .PRECIOUS .PHONY check_RELEASE
do-sum-${tar}: .PHONY do-${tar}
${_MKMSG_CREATE} "${tar} checksums"
${MAKESUMS} -t ${TARDIR} ${tar}.${TAR_SUFF}
- for i in MD5 SHA512; do \
+ ${UMASK} && for i in MD5 SHA512; do \
${TOOL_CAT} ${TARDIR}/$$i >> ${TARDIR}/$$i.tmp; \
done
.endfor
@@ -325,6 +326,7 @@ makedeps: .PHONY
# sorted together.
#
sortlists: .PHONY
+ ${UMASK} && \
find ${.CURDIR}/lists \! \( -name CVS -prune \) \! -name .#\* \
-type f -print \
| while read f ; do \
CVS commit: src/distrib/sets
Module Name:src Committed By: christos Date: Fri Nov 10 21:05:23 UTC 2023 Modified Files: src/distrib/sets: Makefile Log Message: Set the file creation mask To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Fri Nov 10 20:44:58 UTC 2023
Modified Files:
src/etc: Makefile
Log Message:
Add missing backslash (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.468 -r1.469 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.468 src/etc/Makefile:1.469
--- src/etc/Makefile:1.468 Wed Nov 8 08:02:03 2023
+++ src/etc/Makefile Fri Nov 10 15:44:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.468 2023/11/08 13:02:03 christos Exp $
+# $NetBSD: Makefile,v 1.469 2023/11/10 20:44:58 christos Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -589,7 +589,7 @@ build_kernels: .PHONY
.for configfile in ${ALL_KERNELS:O:u} # {
build_kernels: kern-${configfile}
kern-${configfile}: .PHONY .MAKE
- umask 022
+ umask 022 && \
cd ${KERNCONFDIR} && ${TOOL_CONFIG} ${CONFIGOPTS} -s ${KERNSRCDIR} \
${MKDEBUGKERNEL == "yes" :? -DDEBUG=-g :} \
-b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
@@ -616,7 +616,7 @@ kernset-${configfile}: .PHONY build_kern
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.${TAR_SUFF}; \
pax_cmd="GZIP=${GZIP_FLAGS:Q} XZ_OPT=${XZ_OPT:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${COMPRESS_PROGRAM:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
- umask 022;
+ umask 022 && \
cd $${kerndir} && { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
@@ -679,7 +679,7 @@ releasekern-${configfile}: .PHONY build_
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
dest="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel"; \
- umask 022; \
+ umask 022 && \
cd $${kerndir} && { \
for kernel in $${kernlist}; do \
for s in "" $${kernsuffixes}; do \
CVS commit: src/etc
Module Name:src Committed By: christos Date: Fri Nov 10 20:44:58 UTC 2023 Modified Files: src/etc: Makefile Log Message: Add missing backslash (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.468 -r1.469 src/etc/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: christos Date: Wed Nov 8 13:02:47 UTC 2023 Modified Files: src/distrib/sets: makeflist makeobsolete makeplist makesrctars makesums maketars Log Message: More conservative umask To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/makeflist cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/makeobsolete cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/makeplist cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/makesrctars cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/makesums cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/maketars 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: christos
Date: Wed Nov 8 13:02:47 UTC 2023
Modified Files:
src/distrib/sets: makeflist makeobsolete makeplist makesrctars makesums
maketars
Log Message:
More conservative umask
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/makeflist
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/makeobsolete
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/makeplist
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/makesrctars
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/makesums
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/maketars
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/makeflist
diff -u src/distrib/sets/makeflist:1.79 src/distrib/sets/makeflist:1.80
--- src/distrib/sets/makeflist:1.79 Wed Nov 8 07:58:04 2023
+++ src/distrib/sets/makeflist Wed Nov 8 08:02:47 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makeflist,v 1.79 2023/11/08 12:58:04 christos Exp $
+# $NetBSD: makeflist,v 1.80 2023/11/08 13:02:47 christos Exp $
#
# Print out the files in some or all lists.
# Usage: makeflist [-bxlo] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -27,7 +27,7 @@ USAGE
exit 1
}
-umask 002
+umask 022
# handle args
while getopts L:bxloa:m:s: ch; do
case ${ch} in
Index: src/distrib/sets/makeobsolete
diff -u src/distrib/sets/makeobsolete:1.33 src/distrib/sets/makeobsolete:1.34
--- src/distrib/sets/makeobsolete:1.33 Wed Nov 8 07:58:04 2023
+++ src/distrib/sets/makeobsolete Wed Nov 8 08:02:47 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makeobsolete,v 1.33 2023/11/08 12:58:04 christos Exp $
+# $NetBSD: makeobsolete,v 1.34 2023/11/08 13:02:47 christos Exp $
#
# Print out the obsolete files for a set
# Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -29,7 +29,7 @@ USAGE
exit 1
}
-umask 002
+umask 022
while getopts L:bxa:m:s:t: ch; do
case ${ch} in
L)
Index: src/distrib/sets/makeplist
diff -u src/distrib/sets/makeplist:1.22 src/distrib/sets/makeplist:1.23
--- src/distrib/sets/makeplist:1.22 Wed Nov 8 07:58:04 2023
+++ src/distrib/sets/makeplist Wed Nov 8 08:02:47 2023
@@ -31,7 +31,7 @@ USAGE
exit 1
}
-umask 002
+umask 022
# handle args
while getopts a:I:m:p:s: ch; do
case ${ch} in
Index: src/distrib/sets/makesrctars
diff -u src/distrib/sets/makesrctars:1.45 src/distrib/sets/makesrctars:1.46
--- src/distrib/sets/makesrctars:1.45 Wed Nov 8 07:58:04 2023
+++ src/distrib/sets/makesrctars Wed Nov 8 08:02:47 2023
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makesrctars,v 1.45 2023/11/08 12:58:04 christos Exp $
+# $NetBSD: makesrctars,v 1.46 2023/11/08 13:02:47 christos Exp $
#
# makesrctars srcdir setdir
# Create source tarballs in setdir from the source under srcdir.
@@ -37,7 +37,7 @@ msg()
}
-umask 002
+umask 022
# handle args
while getopts N:qx: ch; do
case ${ch} in
Index: src/distrib/sets/makesums
diff -u src/distrib/sets/makesums:1.18 src/distrib/sets/makesums:1.19
--- src/distrib/sets/makesums:1.18 Wed Nov 8 07:58:04 2023
+++ src/distrib/sets/makesums Wed Nov 8 08:02:47 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makesums,v 1.18 2023/11/08 12:58:04 christos Exp $
+# $NetBSD: makesums,v 1.19 2023/11/08 13:02:47 christos Exp $
#
# Make checksum files for files in ``tardir''. Usage:
# makesums [-a] [-t tardir] [setname [...]]
@@ -40,7 +40,7 @@ USAGE
exit 1
}
-umask 002
+umask 022
# handle args
while getopts aAt: ch; do
case ${ch} in
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.97 src/distrib/sets/maketars:1.98
--- src/distrib/sets/maketars:1.97 Wed Nov 8 07:58:04 2023
+++ src/distrib/sets/maketars Wed Nov 8 08:02:47 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.97 2023/11/08 12:58:04 christos Exp $
+# $NetBSD: maketars,v 1.98 2023/11/08 13:02:47 christos Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -69,7 +69,7 @@ msg()
$quiet || echo $*
}
-umask 002
+umask 022
# handle args
while getopts L:bxi:a:m:qs:F:SM:N:Ud:t:T: ch; do
case ${ch} in
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Wed Nov 8 13:02:03 UTC 2023
Modified Files:
src/etc: Makefile
Log Message:
add umask for kernel creation consistency
To generate a diff of this commit:
cvs rdiff -u -r1.467 -r1.468 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.467 src/etc/Makefile:1.468
--- src/etc/Makefile:1.467 Sat Aug 26 01:27:14 2023
+++ src/etc/Makefile Wed Nov 8 08:02:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.467 2023/08/26 05:27:14 riastradh Exp $
+# $NetBSD: Makefile,v 1.468 2023/11/08 13:02:03 christos Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -589,6 +589,7 @@ build_kernels: .PHONY
.for configfile in ${ALL_KERNELS:O:u} # {
build_kernels: kern-${configfile}
kern-${configfile}: .PHONY .MAKE
+ umask 022
cd ${KERNCONFDIR} && ${TOOL_CONFIG} ${CONFIGOPTS} -s ${KERNSRCDIR} \
${MKDEBUGKERNEL == "yes" :? -DDEBUG=-g :} \
-b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
@@ -615,6 +616,7 @@ kernset-${configfile}: .PHONY build_kern
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.${TAR_SUFF}; \
pax_cmd="GZIP=${GZIP_FLAGS:Q} XZ_OPT=${XZ_OPT:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${COMPRESS_PROGRAM:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+ umask 022;
cd $${kerndir} && { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
@@ -677,6 +679,7 @@ releasekern-${configfile}: .PHONY build_
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
dest="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel"; \
+ umask 022; \
cd $${kerndir} && { \
for kernel in $${kernlist}; do \
for s in "" $${kernsuffixes}; do \
CVS commit: src/etc
Module Name:src Committed By: christos Date: Wed Nov 8 13:02:03 UTC 2023 Modified Files: src/etc: Makefile Log Message: add umask for kernel creation consistency To generate a diff of this commit: cvs rdiff -u -r1.467 -r1.468 src/etc/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: christos
Date: Wed Nov 8 12:58:04 UTC 2023
Modified Files:
src/distrib/sets: makeflist makeobsolete makeplist makesrctars makesums
maketars
Log Message:
Set the file creation mask consistently because the files these scripts
create can become part of an iso image.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/makeflist
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/makeobsolete
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/makeplist
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/makesrctars
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/makesums
cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/maketars
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/makeflist
diff -u src/distrib/sets/makeflist:1.78 src/distrib/sets/makeflist:1.79
--- src/distrib/sets/makeflist:1.78 Sun Aug 21 03:10:03 2022
+++ src/distrib/sets/makeflist Wed Nov 8 07:58:04 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makeflist,v 1.78 2022/08/21 07:10:03 lukem Exp $
+# $NetBSD: makeflist,v 1.79 2023/11/08 12:58:04 christos Exp $
#
# Print out the files in some or all lists.
# Usage: makeflist [-bxlo] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -27,6 +27,7 @@ USAGE
exit 1
}
+umask 002
# handle args
while getopts L:bxloa:m:s: ch; do
case ${ch} in
Index: src/distrib/sets/makeobsolete
diff -u src/distrib/sets/makeobsolete:1.32 src/distrib/sets/makeobsolete:1.33
--- src/distrib/sets/makeobsolete:1.32 Sun Aug 21 03:10:03 2022
+++ src/distrib/sets/makeobsolete Wed Nov 8 07:58:04 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makeobsolete,v 1.32 2022/08/21 07:10:03 lukem Exp $
+# $NetBSD: makeobsolete,v 1.33 2023/11/08 12:58:04 christos Exp $
#
# Print out the obsolete files for a set
# Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -29,6 +29,7 @@ USAGE
exit 1
}
+umask 002
while getopts L:bxa:m:s:t: ch; do
case ${ch} in
L)
Index: src/distrib/sets/makeplist
diff -u src/distrib/sets/makeplist:1.21 src/distrib/sets/makeplist:1.22
--- src/distrib/sets/makeplist:1.21 Mon Oct 18 06:47:44 2021
+++ src/distrib/sets/makeplist Wed Nov 8 07:58:04 2023
@@ -31,6 +31,7 @@ USAGE
exit 1
}
+umask 002
# handle args
while getopts a:I:m:p:s: ch; do
case ${ch} in
Index: src/distrib/sets/makesrctars
diff -u src/distrib/sets/makesrctars:1.44 src/distrib/sets/makesrctars:1.45
--- src/distrib/sets/makesrctars:1.44 Sun Aug 21 03:10:03 2022
+++ src/distrib/sets/makesrctars Wed Nov 8 07:58:04 2023
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makesrctars,v 1.44 2022/08/21 07:10:03 lukem Exp $
+# $NetBSD: makesrctars,v 1.45 2023/11/08 12:58:04 christos Exp $
#
# makesrctars srcdir setdir
# Create source tarballs in setdir from the source under srcdir.
@@ -37,6 +37,7 @@ msg()
}
+umask 002
# handle args
while getopts N:qx: ch; do
case ${ch} in
Index: src/distrib/sets/makesums
diff -u src/distrib/sets/makesums:1.17 src/distrib/sets/makesums:1.18
--- src/distrib/sets/makesums:1.17 Fri Sep 28 11:04:20 2018
+++ src/distrib/sets/makesums Wed Nov 8 07:58:04 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: makesums,v 1.17 2018/09/28 15:04:20 martin Exp $
+# $NetBSD: makesums,v 1.18 2023/11/08 12:58:04 christos Exp $
#
# Make checksum files for files in ``tardir''. Usage:
# makesums [-a] [-t tardir] [setname [...]]
@@ -40,6 +40,7 @@ USAGE
exit 1
}
+umask 002
# handle args
while getopts aAt: ch; do
case ${ch} in
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.96 src/distrib/sets/maketars:1.97
--- src/distrib/sets/maketars:1.96 Sat Jun 10 12:08:41 2023
+++ src/distrib/sets/maketars Wed Nov 8 07:58:04 2023
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.96 2023/06/10 16:08:41 lukem Exp $
+# $NetBSD: maketars,v 1.97 2023/11/08 12:58:04 christos Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -69,6 +69,7 @@ msg()
$quiet || echo $*
}
+umask 002
# handle args
while getopts L:bxi:a:m:qs:F:SM:N:Ud:t:T: ch; do
case ${ch} in
CVS commit: src/distrib/sets
Module Name:src Committed By: christos Date: Wed Nov 8 12:58:04 UTC 2023 Modified Files: src/distrib/sets: makeflist makeobsolete makeplist makesrctars makesums maketars Log Message: Set the file creation mask consistently because the files these scripts create can become part of an iso image. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/makeflist cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/makeobsolete cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/makeplist cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/makesrctars cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/makesums cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/maketars Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Mon Nov 6 22:35:48 UTC 2023 Modified Files: src/share/mk: bsd.sys.mk Log Message: Add -fmacro-prefix-map set like -fdebug-prefix-map (Jan-Benedict Glaw) See: https://gcc.gnu.org/onlinedocs/gcc/Preprocessor-Options.html\ #index-fmacro-prefix-map https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html\ #index-fdebug-prefix-map To generate a diff of this commit: cvs rdiff -u -r1.314 -r1.315 src/share/mk/bsd.sys.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Nov 6 22:35:48 UTC 2023
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Add -fmacro-prefix-map set like -fdebug-prefix-map (Jan-Benedict Glaw)
See:
https://gcc.gnu.org/onlinedocs/gcc/Preprocessor-Options.html\
#index-fmacro-prefix-map
https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html\
#index-fdebug-prefix-map
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/share/mk/bsd.sys.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.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.314 src/share/mk/bsd.sys.mk:1.315
--- src/share/mk/bsd.sys.mk:1.314 Sat Jun 3 17:24:57 2023
+++ src/share/mk/bsd.sys.mk Mon Nov 6 17:35:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.314 2023/06/03 21:24:57 lukem Exp $
+# $NetBSD: bsd.sys.mk,v 1.315 2023/11/06 22:35:48 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -21,6 +21,7 @@ error2:
.if !empty(DESTDIR)
CPPFLAGS+= -Wp,-iremap,${DESTDIR}:
REPROFLAGS+= -fdebug-prefix-map=\$$DESTDIR=
+REPROFLAGS+= -fmacro-prefix-map=\$$DESTDIR=
.endif
CPPFLAGS+= -Wp,-fno-canonical-system-headers
@@ -28,7 +29,9 @@ CPPFLAGS+= -Wp,-iremap,${NETBSDSRCDIR}:/
CPPFLAGS+= -Wp,-iremap,${X11SRCDIR}:/usr/xsrc
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
+REPROFLAGS+= -fmacro-prefix-map=\$$NETBSDSRCDIR=/usr/src
REPROFLAGS+= -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
+REPROFLAGS+= -fmacro-prefix-map=\$$X11SRCDIR=/usr/xsrc
.if defined(MAKEOBJDIRPREFIX)
NETBSDOBJDIR= ${MAKEOBJDIRPREFIX}${NETBSDSRCDIR}
.endif
@@ -36,6 +39,7 @@ NETBSDOBJDIR= ${MAKEOBJDIRPREFIX}${NETBS
.if defined(NETBSDOBJDIR)
.export NETBSDOBJDIR
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDOBJDIR=/usr/obj
+REPROFLAGS+= -fmacro-prefix-map=\$$NETBSDOBJDIR=/usr/obj
.endif
LINTFLAGS+= -R${NETBSDSRCDIR}=/usr/src -R${X11SRCDIR}=/usr/xsrc
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Thu Oct 26 15:10:14 UTC 2023 Added Files: src/crypto/external/bsd/openssh/dist: moduli Log Message: Put back module from 9.5p1 To generate a diff of this commit: cvs rdiff -u -r0 -r1.10 src/crypto/external/bsd/openssh/dist/moduli Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Oct 25 20:23:26 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSH To generate a diff of this commit: cvs rdiff -u -r1.1961 -r1.1962 src/doc/3RDPARTY cvs rdiff -u -r1.3012 -r1.3013 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1961 src/doc/3RDPARTY:1.1962 --- src/doc/3RDPARTY:1.1961 Wed Oct 25 13:18:53 2023 +++ src/doc/3RDPARTY Wed Oct 25 16:23:26 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1961 2023/10/25 17:18:53 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1962 2023/10/25 20:23:26 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1076,7 +1076,7 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 9.3 +Version: 9.5 Current Vers: 9.5 / portable 9.5p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.3012 src/doc/CHANGES:1.3013 --- src/doc/CHANGES:1.3012 Wed Oct 25 13:18:53 2023 +++ src/doc/CHANGES Wed Oct 25 16:23:26 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3012 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3013 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -253,3 +253,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: [msaitoh 20231019] top(1): Add network in & out bytes to the top display. [mrg 20231021] OpenSSL: Imported 3.0.12. [christos 20231025] + OpenSSH: Import 9.5. [christos 20231025]
