CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: mrg
Date: Tue Aug 16 22:44:06 UTC 2022
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
Log Message:
fix the man page generation, noted by uwe@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xdm/Makefile.xdm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.17 src/external/mit/xorg/bin/xdm/Makefile:1.18
--- src/external/mit/xorg/bin/xdm/Makefile:1.17 Wed Mar 6 12:40:23 2019
+++ src/external/mit/xorg/bin/xdm/Makefile Tue Aug 16 22:44:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $
+# $NetBSD: Makefile,v 1.18 2022/08/16 22:44:06 mrg Exp $
.include
@@ -13,6 +13,9 @@ SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
.endif
+DEF_USER_PATH= /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}
+DEF_SYSTEM_PATH=/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}
+
CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c+= -DBSD44SOCKETS
CPPFLAGS.socket.c+= -DBSD44SOCKETS
@@ -22,8 +25,8 @@ CPPFLAGS.resource.c+= \
-DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \
-DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \
-DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \
- -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \
- -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \
+ -DDEF_USER_PATH=\"${DEF_USER_PATH}\" \
+ -DDEF_SYSTEM_PATH=\"${DEF_SYSTEM_PATH}\" \
-DDEF_SYSTEM_SHELL=\"/bin/sh\" \
-DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
-DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \
@@ -52,14 +55,17 @@ CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${
.include "../../xorg-pkg-ver.mk"
X11EXTRAMANDEFS+= \
- -e 's,ARC4_RANDOM,1,' \
- -e 's,BINDIR,$(X11BINDIR),' \
- -e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \
- -e 's,DGREETERLIBPATH,$(XDMGREETERLIB),' \
- -e 's,XDMDIR,$(XDMDIR),' \
- -e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
- -e 's,XDMLOGDIR,$(XDMLOGDIR),' \
- -e 's,XDMPIDDIR,$(XDMPIDDIR),'
+ -e 's,CHOOSERPATH,${XDMCHOOSERPATH},' \
+ -e 's,XDMLOGDIR,${XDMLOGDIR},' \
+ -e 's,XDMDIR,${XDMDIR},' \
+ -e 's,BINDIR,${X11BINDIR},' \
+ -e 's,XDMPIDDIR,${XDMPIDDIR},' \
+ -e 's,XDMXAUTHDIR,${XDMVARDIR},' \
+ -e 's,DEF_USER_PATH,${DEF_USER_PATH},' \
+ -e 's,DEF_SYSTEM_PATH,${DEF_SYSTEM_PATH},' \
+ -e 's,DEF_GREETER_LIB,${XDMGREETERLIB},' \
+ -e 's,DEV_RANDOM,${DEV_RANDOM},' \
+ -e 's,ARC4_RANDOM,1,'
.include
.include
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.10 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.11
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.10 Wed Mar 6 12:40:23 2019
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Tue Aug 16 22:44:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.10 2019/03/06 12:40:23 nakayama Exp $
+# $NetBSD: Makefile.xdm,v 1.11 2022/08/16 22:44:06 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -6,12 +6,13 @@ XDMCHOOSERPATH= ${X11ROOTDIR}/libexec/ch
XDMGREETERLIB= ${X11ROOTDIR}/lib/libXdmGreet.so
XDMLOGDIR= /var/log
XDMPIDDIR= /var/run
+DEV_RANDOM= /dev/urandom
CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
-DHASXDMAUTH ${X11FLAGS.CONNECTION} \
-DBSD44SOCKETS \
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
- -DDEV_RANDOM=\"dev/urandom\" \
+ -DDEV_RANDOM=\"${DEV_RANDOM}\" \
-DXPM -DUSE_XFT \
-DHAVE_GETIFADDRS \
-DHAVE_MKSTEMP \
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src Committed By: mrg Date: Tue Aug 16 22:44:06 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm Log Message: fix the man page generation, noted by uwe@ To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/bin/xdm/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xdm/Makefile.xdm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: nat
Date: Tue Aug 16 22:31:24 UTC 2022
Modified Files:
src/sbin/ifconfig: af_inetany.c
Log Message:
Revert to previous as atf tests were failing.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/ifconfig/af_inetany.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_inetany.c
diff -u src/sbin/ifconfig/af_inetany.c:1.20 src/sbin/ifconfig/af_inetany.c:1.21
--- src/sbin/ifconfig/af_inetany.c:1.20 Tue Aug 16 10:47:10 2022
+++ src/sbin/ifconfig/af_inetany.c Tue Aug 16 22:31:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inetany.c,v 1.20 2022/08/16 10:47:10 nat Exp $ */
+/* $NetBSD: af_inetany.c,v 1.21 2022/08/16 22:31:24 nat Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_inetany.c,v 1.20 2022/08/16 10:47:10 nat Exp $");
+__RCSID("$NetBSD: af_inetany.c,v 1.21 2022/08/16 22:31:24 nat Exp $");
#endif /* not lint */
#include
@@ -68,15 +68,12 @@ commit_address(prop_dictionary_t env, pr
const struct afparam *param)
{
const char *ifname;
- struct ifreq ifr;
int af, rc, s;
bool alias, delete, replace;
prop_data_t d;
const struct paddr_prefix *addr, *brd, *dst, *mask;
unsigned short flags;
- addr = NULL;
-
if ((af = getaf(env)) == -1)
af = AF_INET;
@@ -92,23 +89,8 @@ commit_address(prop_dictionary_t env, pr
if ((d = (prop_data_t)prop_dictionary_get(env, "address")) != NULL)
addr = prop_data_value(d);
else if (!prop_dictionary_get_bool(env, "alias", ) || alias ||
- param->gifaddr.cmd == 0) {
- if (addr == NULL) {
- static struct paddr_prefix existingaddr;
-
- memset(, 0, sizeof(ifr));
- estrlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- if (prog_ioctl(s, SIOCGIFADDR, ) == -1) {
-if (errno == EADDRNOTAVAIL ||
-errno == EAFNOSUPPORT)
- return;
-err(EXIT_FAILURE,"SIOCGIFADDR");
- }
-
- existingaddr.pfx_addr = ifr.ifr_addr;
- addr =
- }
- }
+ param->gifaddr.cmd == 0)
+ return;
else if (prog_ioctl(s, param->gifaddr.cmd, param->dgreq.buf) == -1)
err(EXIT_FAILURE, "%s", param->gifaddr.desc);
else if (prog_ioctl(s, param->difaddr.cmd, param->dgreq.buf) == -1)
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: nat Date: Tue Aug 16 22:31:24 UTC 2022 Modified Files: src/sbin/ifconfig: af_inetany.c Log Message: Revert to previous as atf tests were failing. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sbin/ifconfig/af_inetany.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc
Committed By: macallan
Date: Tue Aug 16 21:52:00 UTC 2022
Modified Files:
xsrc/local/programs/bdfload: bdfload.c
Log Message:
move \n where it's supposed to be
now fonts wider than 8 are dumped correctly
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/local/programs/bdfload/bdfload.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/local/programs/bdfload/bdfload.c
diff -u xsrc/local/programs/bdfload/bdfload.c:1.6 xsrc/local/programs/bdfload/bdfload.c:1.7
--- xsrc/local/programs/bdfload/bdfload.c:1.6 Tue Aug 16 21:32:21 2022
+++ xsrc/local/programs/bdfload/bdfload.c Tue Aug 16 21:52:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bdfload.c,v 1.6 2022/08/16 21:32:21 macallan Exp $ */
+/* $NetBSD: bdfload.c,v 1.7 2022/08/16 21:52:00 macallan Exp $ */
/*
* Copyright (c) 2018 Michael Lorenz
@@ -112,8 +112,8 @@ dump_line(char *gptr, int stride)
putchar((c & msk) != 0 ? '#' : ' ');
msk = msk >> 1;
}
- printf("\n");
}
+ printf("\n");
}
void
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: macallan Date: Tue Aug 16 21:52:00 UTC 2022 Modified Files: xsrc/local/programs/bdfload: bdfload.c Log Message: move \n where it's supposed to be now fonts wider than 8 are dumped correctly To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/local/programs/bdfload/bdfload.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: macallan Date: Tue Aug 16 21:32:21 UTC 2022 Modified Files: xsrc/local/programs/bdfload: bdfload.c Log Message: fix tpyo - now we draw characters with a smaller bounding box than the character cell correctly, like term14.bdf To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/local/programs/bdfload/bdfload.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc
Committed By: macallan
Date: Tue Aug 16 21:32:21 UTC 2022
Modified Files:
xsrc/local/programs/bdfload: bdfload.c
Log Message:
fix tpyo - now we draw characters with a smaller bounding box than the
character cell correctly, like term14.bdf
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/local/programs/bdfload/bdfload.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/local/programs/bdfload/bdfload.c
diff -u xsrc/local/programs/bdfload/bdfload.c:1.5 xsrc/local/programs/bdfload/bdfload.c:1.6
--- xsrc/local/programs/bdfload/bdfload.c:1.5 Tue Aug 16 21:28:53 2022
+++ xsrc/local/programs/bdfload/bdfload.c Tue Aug 16 21:32:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bdfload.c,v 1.5 2022/08/16 21:28:53 macallan Exp $ */
+/* $NetBSD: bdfload.c,v 1.6 2022/08/16 21:32:21 macallan Exp $ */
/*
* Copyright (c) 2018 Michael Lorenz
@@ -213,8 +213,8 @@ interpret(FILE *foo)
l = l << 8;
l = l >> left;
if (stride == 1) {
- *gptr = l;
- gptr++;
+ *bptr = l;
+ bptr++;
} else {
*bptr16 = htobe16(l);
bptr16++;
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc
Committed By: macallan
Date: Tue Aug 16 21:28:53 UTC 2022
Modified Files:
xsrc/local/programs/bdfload: bdfload.c
Log Message:
add -d option to dump rendered characters to the console
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/local/programs/bdfload/bdfload.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/local/programs/bdfload/bdfload.c
diff -u xsrc/local/programs/bdfload/bdfload.c:1.4 xsrc/local/programs/bdfload/bdfload.c:1.5
--- xsrc/local/programs/bdfload/bdfload.c:1.4 Tue Aug 16 20:27:33 2022
+++ xsrc/local/programs/bdfload/bdfload.c Tue Aug 16 21:28:53 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bdfload.c,v 1.4 2022/08/16 20:27:33 macallan Exp $ */
+/* $NetBSD: bdfload.c,v 1.5 2022/08/16 21:28:53 macallan Exp $ */
/*
* Copyright (c) 2018 Michael Lorenz
@@ -98,8 +98,24 @@ const char * const encname[] = {
const char *ofile = NULL;
int encoding = -1;
int verbose = 0;
+int dump = 0;
+void
+dump_line(char *gptr, int stride)
+{
+ int i, j, msk, c;
+ for (i = 0; i < stride; i++) {
+ c = gptr[i];
+ msk = 0x80;
+ for (j = 0; j < 8; j++) {
+ putchar((c & msk) != 0 ? '#' : ' ');
+ msk = msk >> 1;
+ }
+ printf("\n");
+ }
+}
+
void
interpret(FILE *foo)
{
@@ -164,6 +180,7 @@ interpret(FILE *foo)
if (current >= 0 && current < 256) {
if (current < first) first = current;
if (current > last) last = current;
+ if (dump) printf("glyph %d\n", current);
}
}
} else if (strcmp(line, "BBX") == 0) {
@@ -177,6 +194,7 @@ interpret(FILE *foo)
if (top < bt) bt = top;
if ((left + cwi) > br) br = left + cwi;
if ((top + che) > bb) bb = top + che;
+if(dump && verbose) printf("top %d left %d\n", top, left);
}
} else if (strcmp(line, "BITMAP") == 0) {
int i, j, k, l;
@@ -202,6 +220,13 @@ interpret(FILE *foo)
bptr16++;
}
}
+ if (dump) {
+gptr = [charsize * current];
+for (i = 0; i < height; i++) {
+ dump_line(gptr, stride);
+ gptr += stride;
+}
+ }
}
}
if (verbose) {
@@ -270,7 +295,7 @@ interpret(FILE *foo)
__dead void
usage()
{
- fprintf(stderr, "usage: bdfload [-v] [-e encoding] [-o ofile.wsf] font.bdf\n");
+ fprintf(stderr, "usage: bdfload [-vd] [-e encoding] [-o ofile.wsf] font.bdf\n");
exit(EXIT_FAILURE);
}
@@ -281,7 +306,7 @@ main(int argc, char *argv[])
const char *encname = NULL;
int c;
- while ((c = getopt(argc, argv, "e:o:v")) != -1) {
+ while ((c = getopt(argc, argv, "e:o:vd")) != -1) {
switch (c) {
/* font encoding */
@@ -302,6 +327,10 @@ main(int argc, char *argv[])
verbose = 1;
break;
+ case 'd':
+ dump = 1;
+ break;
+
case '?': /* FALLTHROUGH */
default:
usage();
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: macallan Date: Tue Aug 16 21:28:53 UTC 2022 Modified Files: xsrc/local/programs/bdfload: bdfload.c Log Message: add -d option to dump rendered characters to the console To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/local/programs/bdfload/bdfload.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Tue Aug 16 21:23:37 UTC 2022
Modified Files:
src/sys/kern: kern_lock.c
Log Message:
KERNEL_LOCK(9): Fix previous for non-LOCKDEBUG builds.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/kern/kern_lock.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/kern/kern_lock.c
diff -u src/sys/kern/kern_lock.c:1.176 src/sys/kern/kern_lock.c:1.177
--- src/sys/kern/kern_lock.c:1.176 Tue Aug 16 18:13:09 2022
+++ src/sys/kern/kern_lock.c Tue Aug 16 21:23:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lock.c,v 1.176 2022/08/16 18:13:09 riastradh Exp $ */
+/* $NetBSD: kern_lock.c,v 1.177 2022/08/16 21:23:37 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.176 2022/08/16 18:13:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.177 2022/08/16 21:23:37 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_lockdebug.h"
@@ -216,7 +216,9 @@ _kernel_lock(int nlocks)
0);
if (__predict_true(__cpu_simple_lock_try(kernel_lock))) {
+#ifdef LOCKDEBUG
kernel_lock_holder = curcpu();
+#endif
ci->ci_biglock_count = nlocks;
l->l_blcnt = nlocks;
LOCKDEBUG_LOCKED(kernel_lock_dodebug, kernel_lock, NULL,
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Tue Aug 16 21:23:37 UTC 2022 Modified Files: src/sys/kern: kern_lock.c Log Message: KERNEL_LOCK(9): Fix previous for non-LOCKDEBUG builds. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/kern/kern_lock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc
Committed By: macallan
Date: Tue Aug 16 20:27:33 UTC 2022
Modified Files:
xsrc/local/programs/bdfload: bdfload.c
Log Message:
- convert remaining error output to err()
- suppress console output unless -v is specified
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/local/programs/bdfload/bdfload.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/local/programs/bdfload/bdfload.c
diff -u xsrc/local/programs/bdfload/bdfload.c:1.3 xsrc/local/programs/bdfload/bdfload.c:1.4
--- xsrc/local/programs/bdfload/bdfload.c:1.3 Wed Jun 8 19:19:42 2022
+++ xsrc/local/programs/bdfload/bdfload.c Tue Aug 16 20:27:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bdfload.c,v 1.3 2022/06/08 19:19:42 uwe Exp $ */
+/* $NetBSD: bdfload.c,v 1.4 2022/08/16 20:27:33 macallan Exp $ */
/*
* Copyright (c) 2018 Michael Lorenz
@@ -97,6 +97,7 @@ const char * const encname[] = {
const char *ofile = NULL;
int encoding = -1;
+int verbose = 0;
void
@@ -130,28 +131,29 @@ interpret(FILE *foo)
/* cut off quotation marks */
strncpy(name, arg + 1, 64);
name[strlen(name) - 1] = 0;
- printf("name: %s\n", name);
+ if (verbose) printf("name: %s\n", name);
} else if (strcmp(line, "FONTBOUNDINGBOX") == 0) {
int res;
res = sscanf(arg, "%d %d %d %d",
, , , );
stride = (width + 7) >> 3;
- printf("box %d x %d\n", width, height);
+ if (verbose) printf("box %d x %d\n", width, height);
if (stride > 2) {
-printf("no fonts wider than 16 work for now\n");
-exit(1);
+err(EXIT_FAILURE,
+"no fonts wider than 16 work for now\n");
}
charsize = height * stride;
buflen = 256 * charsize;
buffer = calloc(1, buflen);
if (buffer == NULL) {
-printf("failed to allocate %dKB for glyphs\n",
+err(EXIT_FAILURE,
+"failed to allocate %dKB for glyphs\n",
buflen);
-exit(1);
}
} else if (strcmp(line, "CHARS") == 0) {
if (sscanf(arg, "%d", ) == 1)
-printf("number of characters: %d\n", num);
+if (verbose)
+printf("number of characters: %d\n", num);
} else if (strcmp(line, "STARTCHAR") == 0) {
in_char = 1;
} else if (strcmp(line, "ENDCHAR") == 0) {
@@ -202,9 +204,11 @@ interpret(FILE *foo)
}
}
}
- printf("range %d to %d\n", first, last);
- printf("encoding: %s\n", encname[encoding]);
- printf("actual box: %d %d %d %d\n", bl, bt, br, bb);
+ if (verbose) {
+ printf("range %d to %d\n", first, last);
+ printf("encoding: %s\n", encname[encoding]);
+ printf("actual box: %d %d %d %d\n", bl, bt, br, bb);
+ }
/* now stuff it into a something wsfont understands */
f.fontwidth = width /*(width + 3) & ~3*/;
@@ -266,7 +270,7 @@ interpret(FILE *foo)
__dead void
usage()
{
- fprintf(stderr, "usage: bdfload [-e encoding] [-o ofile.wsf] font.bdf\n");
+ fprintf(stderr, "usage: bdfload [-v] [-e encoding] [-o ofile.wsf] font.bdf\n");
exit(EXIT_FAILURE);
}
@@ -277,7 +281,7 @@ main(int argc, char *argv[])
const char *encname = NULL;
int c;
- while ((c = getopt(argc, argv, "e:o:")) != -1) {
+ while ((c = getopt(argc, argv, "e:o:v")) != -1) {
switch (c) {
/* font encoding */
@@ -294,6 +298,10 @@ main(int argc, char *argv[])
ofile = optarg;
break;
+ case 'v':
+ verbose = 1;
+ break;
+
case '?': /* FALLTHROUGH */
default:
usage();
CVS commit: xsrc/local/programs/bdfload
Module Name:xsrc Committed By: macallan Date: Tue Aug 16 20:27:33 UTC 2022 Modified Files: xsrc/local/programs/bdfload: bdfload.c Log Message: - convert remaining error output to err() - suppress console output unless -v is specified To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/local/programs/bdfload/bdfload.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Tue Aug 16 18:13:09 UTC 2022
Modified Files:
src/sys/kern: kern_lock.c
Log Message:
KERNEL_LOCK(9): Record kernel lock holder in fast path too.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/kern/kern_lock.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/kern/kern_lock.c
diff -u src/sys/kern/kern_lock.c:1.175 src/sys/kern/kern_lock.c:1.176
--- src/sys/kern/kern_lock.c:1.175 Tue Aug 16 16:25:16 2022
+++ src/sys/kern/kern_lock.c Tue Aug 16 18:13:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lock.c,v 1.175 2022/08/16 16:25:16 riastradh Exp $ */
+/* $NetBSD: kern_lock.c,v 1.176 2022/08/16 18:13:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.175 2022/08/16 16:25:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.176 2022/08/16 18:13:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_lockdebug.h"
@@ -216,6 +216,7 @@ _kernel_lock(int nlocks)
0);
if (__predict_true(__cpu_simple_lock_try(kernel_lock))) {
+ kernel_lock_holder = curcpu();
ci->ci_biglock_count = nlocks;
l->l_blcnt = nlocks;
LOCKDEBUG_LOCKED(kernel_lock_dodebug, kernel_lock, NULL,
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Tue Aug 16 18:13:09 UTC 2022 Modified Files: src/sys/kern: kern_lock.c Log Message: KERNEL_LOCK(9): Record kernel lock holder in fast path too. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/sys/kern/kern_lock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Tue Aug 16 16:25:17 UTC 2022
Modified Files:
src/sys/kern: kern_lock.c
Log Message:
KERNEL_LOCK(9): Need kpreempt_disable to ipi_send, oops.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/kern/kern_lock.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/kern/kern_lock.c
diff -u src/sys/kern/kern_lock.c:1.174 src/sys/kern/kern_lock.c:1.175
--- src/sys/kern/kern_lock.c:1.174 Tue Aug 16 00:26:39 2022
+++ src/sys/kern/kern_lock.c Tue Aug 16 16:25:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lock.c,v 1.174 2022/08/16 00:26:39 riastradh Exp $ */
+/* $NetBSD: kern_lock.c,v 1.175 2022/08/16 16:25:16 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.174 2022/08/16 00:26:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.175 2022/08/16 16:25:16 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_lockdebug.h"
@@ -255,8 +255,10 @@ _kernel_lock(int nlocks)
ipi_msg_t msg = {
.func = kernel_lock_trace_ipi,
};
+kpreempt_disable();
ipi_unicast(, kernel_lock_holder);
ipi_wait();
+kpreempt_enable();
if (start_init_exec)
_KERNEL_LOCK_ABORT("spinout");
}
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Tue Aug 16 16:25:17 UTC 2022 Modified Files: src/sys/kern: kern_lock.c Log Message: KERNEL_LOCK(9): Need kpreempt_disable to ipi_send, oops. To generate a diff of this commit: cvs rdiff -u -r1.174 -r1.175 src/sys/kern/kern_lock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 14:09:27 UTC 2022
Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h
Log Message:
Remove commits to wrong branch.
To generate a diff of this commit:
cvs rdiff -u -r1.9.10.2 -r1.9.10.3 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.9.10.2 src/sys/arch/arc/include/pci_machdep.h:1.9.10.3
--- src/sys/arch/arc/include/pci_machdep.h:1.9.10.2 Tue Aug 16 13:55:15 2022
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 14:09:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9.10.2 2022/08/16 13:55:15 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9.10.3 2022/08/16 14:09:27 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -28,9 +28,6 @@
* rights to redistribute these changes.
*/
-#ifndef _MACHINE_PCI_MACHDEP_H_
-#define _MACHINE_PCI_MACHDEP_H_
-
/*
* Machine-specific definitions for PCI autoconfiguration.
*/
@@ -103,7 +100,5 @@ struct arc_pci_chipset {
(*(c)->pc_intr_disestablish)((c), (iv))
#define pci_conf_interrupt(c, b, d, f, s, i)\
(*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
-#define pci_conf_hook(c, b, d, f, i) \
+#define pci_conf_hook(c, b, d, f, i)\
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
-
-#endif /* _MACHINE_PCI_MACHDEP_H_ */
CVS commit: [netbsd-6] src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 14:09:27 UTC 2022 Modified Files: src/sys/arch/arc/include [netbsd-6]: pci_machdep.h Log Message: Remove commits to wrong branch. To generate a diff of this commit: cvs rdiff -u -r1.9.10.2 -r1.9.10.3 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 14:00:03 UTC 2022
Modified Files:
src/sys/arch/arc/include: pci_machdep.h
Log Message:
PRovide pci_intr_setattr
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.14 src/sys/arch/arc/include/pci_machdep.h:1.15
--- src/sys/arch/arc/include/pci_machdep.h:1.14 Tue Aug 16 13:59:18 2022
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 14:00:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.14 2022/08/16 13:59:18 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.15 2022/08/16 14:00:03 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -66,6 +66,8 @@ struct arc_pci_chipset {
pci_intr_handle_t *);
const char *(*pc_intr_string)(pci_chipset_tag_t,
pci_intr_handle_t, char *, size_t);
+ int (*pc_intr_setattr)(void *, pci_intr_handle_t *,
+ int, uint64_t);
void *(*pc_intr_establish)(pci_chipset_tag_t,
pci_intr_handle_t, int, int (*)(void *), void *);
void (*pc_intr_disestablish)(pci_chipset_tag_t, void *);
@@ -103,4 +105,13 @@ struct arc_pci_chipset {
#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
+static inline int
+pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ihp,
+int attr, uint64_t data)
+{
+ if (!pc->pc_intr_setattr)
+ return ENODEV;
+ return pc->pc_intr_setattr(pc, ihp, attr, data);
+}
+
#endif /* _MACHINE_PCI_MACHDEP_H_ */
CVS commit: src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 14:00:03 UTC 2022 Modified Files: src/sys/arch/arc/include: pci_machdep.h Log Message: PRovide pci_intr_setattr To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 13:59:18 UTC 2022
Modified Files:
src/sys/arch/arc/include: pci_machdep.h
Log Message:
Multiple inclusion protection.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.13 src/sys/arch/arc/include/pci_machdep.h:1.14
--- src/sys/arch/arc/include/pci_machdep.h:1.13 Tue Aug 16 13:57:29 2022
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 13:59:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.13 2022/08/16 13:57:29 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.14 2022/08/16 13:59:18 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -28,6 +28,9 @@
* rights to redistribute these changes.
*/
+#ifndef _MACHINE_PCI_MACHDEP_H_
+#define _MACHINE_PCI_MACHDEP_H_
+
/*
* Machine-specific definitions for PCI autoconfiguration.
*/
@@ -99,3 +102,5 @@ struct arc_pci_chipset {
(*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
+
+#endif /* _MACHINE_PCI_MACHDEP_H_ */
CVS commit: src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 13:59:18 UTC 2022 Modified Files: src/sys/arch/arc/include: pci_machdep.h Log Message: Multiple inclusion protection. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 13:57:29 UTC 2022
Modified Files:
src/sys/arch/arc/include: pci_machdep.h
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.12 src/sys/arch/arc/include/pci_machdep.h:1.13
--- src/sys/arch/arc/include/pci_machdep.h:1.12 Tue Jul 7 03:38:45 2020
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 13:57:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.12 2020/07/07 03:38:45 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.13 2022/08/16 13:57:29 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -97,5 +97,5 @@ struct arc_pci_chipset {
(*(c)->pc_intr_disestablish)((c), (iv))
#define pci_conf_interrupt(c, b, d, f, s, i)\
(*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
-#define pci_conf_hook(c, b, d, f, i)\
+#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
CVS commit: src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 13:57:29 UTC 2022 Modified Files: src/sys/arch/arc/include: pci_machdep.h Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 13:55:15 UTC 2022
Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h
Log Message:
Multiple inclusion protection.
To generate a diff of this commit:
cvs rdiff -u -r1.9.10.1 -r1.9.10.2 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.9.10.1 src/sys/arch/arc/include/pci_machdep.h:1.9.10.2
--- src/sys/arch/arc/include/pci_machdep.h:1.9.10.1 Tue Aug 16 13:52:58 2022
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 13:55:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9.10.1 2022/08/16 13:52:58 skrll Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9.10.2 2022/08/16 13:55:15 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -28,6 +28,9 @@
* rights to redistribute these changes.
*/
+#ifndef _MACHINE_PCI_MACHDEP_H_
+#define _MACHINE_PCI_MACHDEP_H_
+
/*
* Machine-specific definitions for PCI autoconfiguration.
*/
@@ -102,3 +105,5 @@ struct arc_pci_chipset {
(*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
+
+#endif /* _MACHINE_PCI_MACHDEP_H_ */
CVS commit: [netbsd-6] src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 13:55:15 UTC 2022 Modified Files: src/sys/arch/arc/include [netbsd-6]: pci_machdep.h Log Message: Multiple inclusion protection. To generate a diff of this commit: cvs rdiff -u -r1.9.10.1 -r1.9.10.2 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/sys/arch/arc/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 13:52:58 UTC 2022
Modified Files:
src/sys/arch/arc/include [netbsd-6]: pci_machdep.h
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/arch/arc/include/pci_machdep.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/arc/include/pci_machdep.h
diff -u src/sys/arch/arc/include/pci_machdep.h:1.9 src/sys/arch/arc/include/pci_machdep.h:1.9.10.1
--- src/sys/arch/arc/include/pci_machdep.h:1.9 Mon Apr 4 20:37:45 2011
+++ src/sys/arch/arc/include/pci_machdep.h Tue Aug 16 13:52:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9 2011/04/04 20:37:45 dyoung Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.9.10.1 2022/08/16 13:52:58 skrll Exp $ */
/* NetBSD: pci_machdep.h,v 1.3 1999/03/19 03:40:46 cgd Exp */
/*
@@ -100,5 +100,5 @@ struct arc_pci_chipset {
(*(c)->pc_intr_disestablish)((c), (iv))
#define pci_conf_interrupt(c, b, d, f, s, i)\
(*(c)->pc_conf_interrupt)((c), (b), (d), (f), (s), (i))
-#define pci_conf_hook(c, b, d, f, i)\
+#define pci_conf_hook(c, b, d, f, i) \
(*(c)->pc_conf_hook)((c), (b), (d), (f), (i))
CVS commit: [netbsd-6] src/sys/arch/arc/include
Module Name:src Committed By: skrll Date: Tue Aug 16 13:52:58 UTC 2022 Modified Files: src/sys/arch/arc/include [netbsd-6]: pci_machdep.h Log Message: Whitespace To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/arch/arc/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 13:50:55 UTC 2022
Modified Files:
src/sys/arch/mips/include: pci_machdep.h
Log Message:
Provide pci_intr_setattr
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/include/pci_machdep.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/mips/include/pci_machdep.h
diff -u src/sys/arch/mips/include/pci_machdep.h:1.9 src/sys/arch/mips/include/pci_machdep.h:1.10
--- src/sys/arch/mips/include/pci_machdep.h:1.9 Sun Jul 26 08:08:41 2020
+++ src/sys/arch/mips/include/pci_machdep.h Tue Aug 16 13:50:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.9 2020/07/26 08:08:41 simonb Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.10 2022/08/16 13:50:54 skrll Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -68,6 +68,8 @@ struct mips_pci_chipset {
const char *(*pc_intr_string)(void *, pci_intr_handle_t,
char *, size_t);
const struct evcnt *(*pc_intr_evcnt)(void *, pci_intr_handle_t);
+ int (*pc_intr_setattr)(void *, pci_intr_handle_t *,
+ int, uint64_t);
void *(*pc_intr_establish)(void *, pci_intr_handle_t,
int, int (*)(void *), void *);
void (*pc_intr_disestablish)(void *, void *);
@@ -110,6 +112,15 @@ struct mips_pci_chipset {
#define pci_conf_interrupt(c, b, d, p, s, lp)\
(*(c)->pc_conf_interrupt)((c)->pc_intr_v, (b), (d), (p), (s), (lp))
+static inline int
+pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ihp,
+int attr, uint64_t data)
+{
+ if (!pc->pc_intr_setattr)
+ return ENODEV;
+ return pc->pc_intr_setattr(pc, ihp, attr, data);
+}
+
/*
* mips-specific PCI functions.
* NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: skrll Date: Tue Aug 16 13:50:55 UTC 2022 Modified Files: src/sys/arch/mips/include: pci_machdep.h Log Message: Provide pci_intr_setattr To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz
Module Name:src Committed By: kre Date: Tue Aug 16 13:23:12 UTC 2022 Modified Files: src/external/public-domain/tz: tzdata2netbsd Log Message: Change the NEWS parser to handle the more recent (as in going back several years now) format (wording) that is used there, rather than that which preceded it. With this we get the intended "what changed" in the generated CVS commit message, rather than lots of emptiness. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/public-domain/tz/tzdata2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: kre
Date: Tue Aug 16 13:23:12 UTC 2022
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Change the NEWS parser to handle the more recent (as in going back several
years now) format (wording) that is used there, rather than that which
preceded it. With this we get the intended "what changed" in the generated
CVS commit message, rather than lots of emptiness.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.13 src/external/public-domain/tz/tzdata2netbsd:1.14
--- src/external/public-domain/tz/tzdata2netbsd:1.13 Tue Aug 16 13:19:41 2022
+++ src/external/public-domain/tz/tzdata2netbsd Tue Aug 16 13:23:12 2022
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.13 2022/08/16 13:19:41 kre Exp $
+# $NetBSD: tzdata2netbsd,v 1.14 2022/08/16 13:23:12 kre Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -467,11 +467,11 @@ EOF
" ("date"):";
}
/^$/ { blankline = 1; havesentence = 0; }
- /^ Changes affecting/ { goodsection = 0; }
- /^ Changes affecting.*time/ { goodsection = 1; }
- /^ Changes affecting.*data/ { goodsection = 1; }
- /^ Changes affecting.*documentation/ || \
- /^ Changes affecting.*commentary/ {
+ /^ Changes / { goodsection = 0; }
+ /^ Changes to future timestamps/ { goodsection = 1; }
+ /^ Changes to past timestamps/ { goodsection = 1; }
+ /^ Changes to documentation/ || \
+ /^ Changes to commentary/ {
t = gensub("^ *", "", 1, $0);
t = gensub("\\.*$", ".", 1, t);
print bullet t;
CVS commit: src/external/public-domain/tz
Module Name:src
Committed By: kre
Date: Tue Aug 16 13:19:42 UTC 2022
Modified Files:
src/external/public-domain/tz: tzdata2netbsd
Log Message:
Correct a typo in a comment. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/public-domain/tz/tzdata2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/tz/tzdata2netbsd
diff -u src/external/public-domain/tz/tzdata2netbsd:1.12 src/external/public-domain/tz/tzdata2netbsd:1.13
--- src/external/public-domain/tz/tzdata2netbsd:1.12 Sat Mar 24 01:54:48 2018
+++ src/external/public-domain/tz/tzdata2netbsd Tue Aug 16 13:19:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: tzdata2netbsd,v 1.12 2018/03/24 01:54:48 kre Exp $
+# $NetBSD: tzdata2netbsd,v 1.13 2022/08/16 13:19:41 kre Exp $
# For use by NetBSD developers when updating to new versions of tzdata.
#
@@ -288,7 +288,7 @@ shell_quote()
# Finally, elide unnecessary '' pairs at the
# beginning and end of the result and as part of
# '\'''\'' sequences that result from multiple
- # adjacent quotes in he input.
+ # adjacent quotes in the input.
qarg="$(printf '%s\n' "$arg" | \
${SED:-sed} -e "s/'/'''/g" \
-e "1s/^/'/" -e "\$s/\$/'/" \
CVS commit: src/external/public-domain/tz
Module Name:src Committed By: kre Date: Tue Aug 16 13:19:42 UTC 2022 Modified Files: src/external/public-domain/tz: tzdata2netbsd Log Message: Correct a typo in a comment. NFC. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/public-domain/tz/tzdata2netbsd 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: Tue Aug 16 11:09:08 UTC 2022 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1867 -r1.1868 src/doc/3RDPARTY cvs rdiff -u -r1.2897 -r1.2898 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.1867 src/doc/3RDPARTY:1.1868 --- src/doc/3RDPARTY:1.1867 Sat Aug 6 05:39:50 2022 +++ src/doc/3RDPARTY Tue Aug 16 07:09:08 2022 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1867 2022/08/06 09:39:50 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1868 2022/08/16 11:09:08 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1410,14 +1410,14 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2022a / tzdata2022agtz -Current Vers: tzcode2022a / tzdata2022a +Version: tzcode2022c / tzdata2022agtz +Current Vers: tzcode2022c / tzdata2022c 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: 2021-10-22 +Date: 2022-08-16 Mailing List: t...@iana.org Responsible: kleink, christos, kre License: Public domain Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2897 src/doc/CHANGES:1.2898 --- src/doc/CHANGES:1.2897 Sun Aug 14 06:07:58 2022 +++ src/doc/CHANGES Tue Aug 16 07:09:08 2022 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2897 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2898 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -654,3 +654,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: resource assignment. [jmcneill 20220813] bge(4): Allow the driver to work without the big kernel lock (support for NET_MPSAFE). [skrll 20220814] + tzcode: Updated to 2022c. [christos 20220816]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Aug 16 11:09:08 UTC 2022 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode To generate a diff of this commit: cvs rdiff -u -r1.1867 -r1.1868 src/doc/3RDPARTY cvs rdiff -u -r1.2897 -r1.2898 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/lib/libc/time
Module Name:src Committed By: christos Date: Tue Aug 16 11:07:40 UTC 2022 Modified Files: src/lib/libc/time: Makefile NEWS ctime.3 private.h theory.html tz-art.html tz-link.html tzfile.5 tzselect.8 tzselect.ksh version zic.c Log Message: Welcome to tzcode-2022c Work around a bug in onetrueawk that broke commands like 'make traditional_tarballs' on FreeBSD, macOS, etc. (Problem reported by Deborah Goldsmith.) Add code to tzselect that uses experimental structured comments in zone1970.tab to clarify whether Zones like Africa/Abidjan and Europe/Istanbul cross continent or ocean boundaries. (Inspired by a problem reported by Peter Krefting.) Fix bug with 'zic -d /a/b/c' when /a is unwritable but the directory /a/b already exists. Remove zoneinfo2tdf.pl, as it was unused and triggered false malware alarms on some email servers. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/lib/libc/time/Makefile cvs rdiff -u -r1.36 -r1.37 src/lib/libc/time/NEWS cvs rdiff -u -r1.62 -r1.63 src/lib/libc/time/ctime.3 cvs rdiff -u -r1.59 -r1.60 src/lib/libc/time/private.h cvs rdiff -u -r1.14 -r1.15 src/lib/libc/time/theory.html cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/tz-art.html cvs rdiff -u -r1.12 -r1.13 src/lib/libc/time/tz-link.html cvs rdiff -u -r1.31 -r1.32 src/lib/libc/time/tzfile.5 cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/tzselect.8 cvs rdiff -u -r1.19 -r1.20 src/lib/libc/time/tzselect.ksh \ src/lib/libc/time/version cvs rdiff -u -r1.82 -r1.83 src/lib/libc/time/zic.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/time
Module Name:src Committed By: christos Date: Tue Aug 16 11:07:40 UTC 2022 Modified Files: src/lib/libc/time: Makefile NEWS ctime.3 private.h theory.html tz-art.html tz-link.html tzfile.5 tzselect.8 tzselect.ksh version zic.c Log Message: Welcome to tzcode-2022c Work around a bug in onetrueawk that broke commands like 'make traditional_tarballs' on FreeBSD, macOS, etc. (Problem reported by Deborah Goldsmith.) Add code to tzselect that uses experimental structured comments in zone1970.tab to clarify whether Zones like Africa/Abidjan and Europe/Istanbul cross continent or ocean boundaries. (Inspired by a problem reported by Peter Krefting.) Fix bug with 'zic -d /a/b/c' when /a is unwritable but the directory /a/b already exists. Remove zoneinfo2tdf.pl, as it was unused and triggered false malware alarms on some email servers. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/lib/libc/time/Makefile cvs rdiff -u -r1.36 -r1.37 src/lib/libc/time/NEWS cvs rdiff -u -r1.62 -r1.63 src/lib/libc/time/ctime.3 cvs rdiff -u -r1.59 -r1.60 src/lib/libc/time/private.h cvs rdiff -u -r1.14 -r1.15 src/lib/libc/time/theory.html cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/tz-art.html cvs rdiff -u -r1.12 -r1.13 src/lib/libc/time/tz-link.html cvs rdiff -u -r1.31 -r1.32 src/lib/libc/time/tzfile.5 cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/tzselect.8 cvs rdiff -u -r1.19 -r1.20 src/lib/libc/time/tzselect.ksh \ src/lib/libc/time/version cvs rdiff -u -r1.82 -r1.83 src/lib/libc/time/zic.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/time/Makefile diff -u src/lib/libc/time/Makefile:1.51 src/lib/libc/time/Makefile:1.52 --- src/lib/libc/time/Makefile:1.51 Tue Aug 16 06:56:21 2022 +++ src/lib/libc/time/Makefile Tue Aug 16 07:07:40 2022 @@ -298,8 +298,9 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn # guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. # Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone -# and define NO_TM_ZONE to suppress any guessing. These two fields are not -# required by POSIX, but are widely available on GNU/Linux and BSD systems. +# and define NO_TM_ZONE to suppress any guessing. Although these two fields +# not required by POSIX, a future version of POSIX is planned to require them +# and they are widely available on GNU/Linux and BSD systems. # # The next batch of options control support for external variables # exported by tzcode. In practice these variables are less useful @@ -538,7 +539,7 @@ DATA= $(TDATA_TO_CHECK) backzone iso316 leapseconds $(ZONETABLES) AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk \ ziguard.awk zishrink.awk -MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl +MISC= $(AWK_SCRIPTS) TZS_YEAR= 2050 TZS_CUTOFF_FLAG= -c $(TZS_YEAR) TZS= to$(TZS_YEAR).tzs @@ -567,7 +568,7 @@ VERSION_DEPS= \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh zdump.8 zdump.c zic.8 zic.c \ ziguard.awk zishrink.awk \ - zone.tab zone1970.tab zoneinfo2tdf.pl + zone.tab zone1970.tab # And for the benefit of csh users on systems that assume the user # shell should be used to handle commands in Makefiles. . . Index: src/lib/libc/time/NEWS diff -u src/lib/libc/time/NEWS:1.36 src/lib/libc/time/NEWS:1.37 --- src/lib/libc/time/NEWS:1.36 Tue Aug 16 06:56:21 2022 +++ src/lib/libc/time/NEWS Tue Aug 16 07:07:40 2022 @@ -1,5 +1,29 @@ News for the tz database +Release 2022c - 2022-08-15 17:47:18 -0700 + + Briefly: +Work around awk bug in FreeBSD, macOS, etc. +Improve tzselect on intercontinental Zones. + + Changes to code + +Work around a bug in onetrueawk that broke commands like +'make traditional_tarballs' on FreeBSD, macOS, etc. +(Problem reported by Deborah Goldsmith.) + +Add code to tzselect that uses experimental structured comments in +zone1970.tab to clarify whether Zones like Africa/Abidjan and +Europe/Istanbul cross continent or ocean boundaries. +(Inspired by a problem reported by Peter Krefting.) + +Fix bug with 'zic -d /a/b/c' when /a is unwritable but the +directory /a/b already exists. + +Remove zoneinfo2tdf.pl, as it was unused and triggered false +malware alarms on some email servers. + + Release 2022b - 2022-08-10 15:38:32 -0700 Briefly: @@ -83,7 +107,7 @@ Release 2022b - 2022-08-10 15:38:32 -070 zic no longer complains "can't determine time zone abbreviation to use just after until time" when a transition to a new standard -time occurs simultanously with the first DST fallback transition. +time occurs simultaneously with the first DST fallback transition. Changes to build procedure Index: src/lib/libc/time/ctime.3 diff -u src/lib/libc/time/ctime.3:1.62 src/lib/libc/time/ctime.3:1.63 --- src/lib/libc/time/ctime.3:1.62 Tue Sep 28 02:45:08 2021 +++
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Tue Aug 16 10:56:22 UTC 2022 Modified Files: src/lib/libc/time: Makefile NEWS asctime.c calendars localtime.c private.h strftime.c theory.html tz-how-to.html tz-link.html tzselect.8 version zdump.c zic.8 zic.c Log Message: Welcome to 2022b: zic has a new option '-R @N' to output explicit transitions < N. (Need suggested by Almaz Mingaleev.) 'zic -r @N' no longer outputs bad data when N < first transition. (Problem introduced in 2021d and reported by Peter Krefting.) zic now checks its input for NUL bytes and unterminated lines, and now supports input line lengths up to 2048 (not 512) bytes. gmtime and related code now use the abbreviation "UTC" not "GMT". POSIX is being revised to require this. When tzset and related functions set vestigial static variables like tzname, they now prefer specified timestamps to unspecified ones. (Problem reported by Almaz Mingaleev.) zic no longer complains "can't determine time zone abbreviation to use just after until time" when a transition to a new standard time occurs simultanously with the first DST fallback transition. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/lib/libc/time/Makefile cvs rdiff -u -r1.35 -r1.36 src/lib/libc/time/NEWS cvs rdiff -u -r1.27 -r1.28 src/lib/libc/time/asctime.c cvs rdiff -u -r1.1 -r1.2 src/lib/libc/time/calendars cvs rdiff -u -r1.133 -r1.134 src/lib/libc/time/localtime.c cvs rdiff -u -r1.58 -r1.59 src/lib/libc/time/private.h cvs rdiff -u -r1.49 -r1.50 src/lib/libc/time/strftime.c cvs rdiff -u -r1.13 -r1.14 src/lib/libc/time/theory.html cvs rdiff -u -r1.8 -r1.9 src/lib/libc/time/tz-how-to.html cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/tz-link.html cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/tzselect.8 cvs rdiff -u -r1.18 -r1.19 src/lib/libc/time/version cvs rdiff -u -r1.56 -r1.57 src/lib/libc/time/zdump.c cvs rdiff -u -r1.37 -r1.38 src/lib/libc/time/zic.8 cvs rdiff -u -r1.81 -r1.82 src/lib/libc/time/zic.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/time/Makefile diff -u src/lib/libc/time/Makefile:1.50 src/lib/libc/time/Makefile:1.51 --- src/lib/libc/time/Makefile:1.50 Tue Mar 22 13:48:39 2022 +++ src/lib/libc/time/Makefile Tue Aug 16 06:56:21 2022 @@ -33,7 +33,7 @@ DATAFORM= main # make zonenames # to get a list of the values you can use for LOCALTIME. -LOCALTIME= GMT +LOCALTIME= Factory # The POSIXRULES macro controls interpretation of nonstandard and obsolete # POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules. @@ -176,12 +176,19 @@ TZDATA_TEXT= leapseconds tzdata.zi BACKWARD= backward -# If you want out-of-scope and often-wrong data from the file 'backzone', use +# If you want out-of-scope and often-wrong data from the file 'backzone', +# but only for entries listed in the backward-compatibility file zone.tab, use # PACKRATDATA= backzone +# PACKRATLIST= zone.tab +# If you want all the 'backzone' data, use +# PACKRATDATA= backzone +# PACKRATLIST= # To omit this data, use # PACKRATDATA= +# PACKRATLIST= PACKRATDATA= +PACKRATLIST= # The name of a locale using the UTF-8 encoding, used during self-tests. # The tests are skipped if the name does not appear to work on this system. @@ -264,7 +271,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn $(GCC_INSTRUMENT) \ -Wall -Wextra \ -Walloc-size-larger-than=10 -Warray-bounds=2 \ - -Wbad-function-cast -Wcast-align=strict -Wdate-time \ + -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \ -Wdeclaration-after-statement -Wdouble-promotion \ -Wduplicated-branches -Wduplicated-cond \ -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ @@ -278,7 +285,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn -Wsuggest-attribute=const -Wsuggest-attribute=format \ -Wsuggest-attribute=malloc \ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ - -Wtrampolines -Wundef -Wuninitialized -Wunused-macros \ + -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \ -Wvariadic-macros -Wvla -Wwrite-strings \ -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ -Wno-type-limits -Wno-unused-parameter @@ -448,6 +455,9 @@ UNUSUAL_OK_IPA = u̯ # useful in commentary. UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)$(UNUSUAL_OK_IPA) +# Put this in a bracket expression to match spaces. +s = [:space:] + # OK_CHAR matches any character allowed in the distributed files. # This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and # multibyte letters are also allowed so that commentary can contain a @@ -521,8 +531,9 @@ TDATA= $(YDATA) $(NDATA) $(BACKWARD) ZONETABLES= zone1970.tab zone.tab TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA)
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Tue Aug 16 10:56:22 UTC 2022 Modified Files: src/lib/libc/time: Makefile NEWS asctime.c calendars localtime.c private.h strftime.c theory.html tz-how-to.html tz-link.html tzselect.8 version zdump.c zic.8 zic.c Log Message: Welcome to 2022b: zic has a new option '-R @N' to output explicit transitions < N. (Need suggested by Almaz Mingaleev.) 'zic -r @N' no longer outputs bad data when N < first transition. (Problem introduced in 2021d and reported by Peter Krefting.) zic now checks its input for NUL bytes and unterminated lines, and now supports input line lengths up to 2048 (not 512) bytes. gmtime and related code now use the abbreviation "UTC" not "GMT". POSIX is being revised to require this. When tzset and related functions set vestigial static variables like tzname, they now prefer specified timestamps to unspecified ones. (Problem reported by Almaz Mingaleev.) zic no longer complains "can't determine time zone abbreviation to use just after until time" when a transition to a new standard time occurs simultanously with the first DST fallback transition. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/lib/libc/time/Makefile cvs rdiff -u -r1.35 -r1.36 src/lib/libc/time/NEWS cvs rdiff -u -r1.27 -r1.28 src/lib/libc/time/asctime.c cvs rdiff -u -r1.1 -r1.2 src/lib/libc/time/calendars cvs rdiff -u -r1.133 -r1.134 src/lib/libc/time/localtime.c cvs rdiff -u -r1.58 -r1.59 src/lib/libc/time/private.h cvs rdiff -u -r1.49 -r1.50 src/lib/libc/time/strftime.c cvs rdiff -u -r1.13 -r1.14 src/lib/libc/time/theory.html cvs rdiff -u -r1.8 -r1.9 src/lib/libc/time/tz-how-to.html cvs rdiff -u -r1.11 -r1.12 src/lib/libc/time/tz-link.html cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/tzselect.8 cvs rdiff -u -r1.18 -r1.19 src/lib/libc/time/version cvs rdiff -u -r1.56 -r1.57 src/lib/libc/time/zdump.c cvs rdiff -u -r1.37 -r1.38 src/lib/libc/time/zic.8 cvs rdiff -u -r1.81 -r1.82 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: nat
Date: Tue Aug 16 10:47:11 UTC 2022
Modified Files:
src/sbin/ifconfig: af_inetany.c
Log Message:
No need address every time to specify broadcast and netmask.
Previously ifconfig would fail silently.
Addresses PR bin/10911.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/af_inetany.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_inetany.c
diff -u src/sbin/ifconfig/af_inetany.c:1.19 src/sbin/ifconfig/af_inetany.c:1.20
--- src/sbin/ifconfig/af_inetany.c:1.19 Sun Jun 7 06:02:58 2020
+++ src/sbin/ifconfig/af_inetany.c Tue Aug 16 10:47:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: af_inetany.c,v 1.19 2020/06/07 06:02:58 thorpej Exp $ */
+/* $NetBSD: af_inetany.c,v 1.20 2022/08/16 10:47:10 nat Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_inetany.c,v 1.19 2020/06/07 06:02:58 thorpej Exp $");
+__RCSID("$NetBSD: af_inetany.c,v 1.20 2022/08/16 10:47:10 nat Exp $");
#endif /* not lint */
#include
@@ -68,12 +68,15 @@ commit_address(prop_dictionary_t env, pr
const struct afparam *param)
{
const char *ifname;
+ struct ifreq ifr;
int af, rc, s;
bool alias, delete, replace;
prop_data_t d;
const struct paddr_prefix *addr, *brd, *dst, *mask;
unsigned short flags;
+ addr = NULL;
+
if ((af = getaf(env)) == -1)
af = AF_INET;
@@ -89,8 +92,23 @@ commit_address(prop_dictionary_t env, pr
if ((d = (prop_data_t)prop_dictionary_get(env, "address")) != NULL)
addr = prop_data_value(d);
else if (!prop_dictionary_get_bool(env, "alias", ) || alias ||
- param->gifaddr.cmd == 0)
- return;
+ param->gifaddr.cmd == 0) {
+ if (addr == NULL) {
+ static struct paddr_prefix existingaddr;
+
+ memset(, 0, sizeof(ifr));
+ estrlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+ if (prog_ioctl(s, SIOCGIFADDR, ) == -1) {
+if (errno == EADDRNOTAVAIL ||
+errno == EAFNOSUPPORT)
+ return;
+err(EXIT_FAILURE,"SIOCGIFADDR");
+ }
+
+ existingaddr.pfx_addr = ifr.ifr_addr;
+ addr =
+ }
+ }
else if (prog_ioctl(s, param->gifaddr.cmd, param->dgreq.buf) == -1)
err(EXIT_FAILURE, "%s", param->gifaddr.desc);
else if (prog_ioctl(s, param->difaddr.cmd, param->dgreq.buf) == -1)
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: nat Date: Tue Aug 16 10:47:11 UTC 2022 Modified Files: src/sbin/ifconfig: af_inetany.c Log Message: No need address every time to specify broadcast and netmask. Previously ifconfig would fail silently. Addresses PR bin/10911. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/af_inetany.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Tue Aug 16 10:24:17 UTC 2022
Modified Files:
src/sys/kern: kern_crashme.c
Log Message:
crashme(9): New kernel_lock_spinout crasher.
This assumes that something will eventually try to take the kernel
lock and, after spinning for a while, spin out and crash -- so for
now it's only enabled under LOCKDEBUG, without which the kernel lock
spins forever.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/kern_crashme.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/kern/kern_crashme.c
diff -u src/sys/kern/kern_crashme.c:1.5 src/sys/kern/kern_crashme.c:1.6
--- src/sys/kern/kern_crashme.c:1.5 Sat Nov 27 14:11:14 2021
+++ src/sys/kern/kern_crashme.c Tue Aug 16 10:24:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_crashme.c,v 1.5 2021/11/27 14:11:14 riastradh Exp $ */
+/* $NetBSD: kern_crashme.c,v 1.6 2022/08/16 10:24:17 riastradh Exp $ */
/*
* Copyright (c) 2018, 2019 Matthew R. Green
@@ -63,6 +63,9 @@ static int crashme_null_jump(int);
#ifdef DDB
static int crashme_ddb(int);
#endif
+#ifdef LOCKDEBUG
+static int crashme_kernel_lock_spinout(int);
+#endif
#define CMNODE(name, lname, func) \
{ \
@@ -78,6 +81,10 @@ static crashme_node nodes[] = {
#ifdef DDB
CMNODE("ddb", "enter ddb directly", crashme_ddb),
#endif
+#ifdef LOCKDEBUG
+CMNODE("kernel_lock_spinout", "infinite kernel lock",
+ crashme_kernel_lock_spinout),
+#endif
};
static crashme_node *first_node;
static kmutex_t crashme_lock;
@@ -270,3 +277,16 @@ crashme_ddb(int flags)
return 0;
}
#endif
+
+#ifdef LOCKDEBUG
+static int
+crashme_kernel_lock_spinout(int flags)
+{
+
+ KERNEL_LOCK(1, NULL);
+ for (;;)
+ __insn_barrier();
+ KERNEL_UNLOCK_ONE(NULL);
+ return 0;
+}
+#endif
CVS commit: src/sys/kern
Module Name:src Committed By: riastradh Date: Tue Aug 16 10:24:17 UTC 2022 Modified Files: src/sys/kern: kern_crashme.c Log Message: crashme(9): New kernel_lock_spinout crasher. This assumes that something will eventually try to take the kernel lock and, after spinning for a while, spin out and crash -- so for now it's only enabled under LOCKDEBUG, without which the kernel lock spins forever. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/kern/kern_crashme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src Committed By: christos Date: Tue Aug 16 09:03:04 UTC 2022 Modified Files: src/include: tzfile.h Log Message: whitespace changes from tzcode2022a->tzcode2022b To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/include/tzfile.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/include
Module Name:src
Committed By: christos
Date: Tue Aug 16 09:03:04 UTC 2022
Modified Files:
src/include: tzfile.h
Log Message:
whitespace changes from tzcode2022a->tzcode2022b
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/include/tzfile.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/tzfile.h
diff -u src/include/tzfile.h:1.10 src/include/tzfile.h:1.11
--- src/include/tzfile.h:1.10 Wed Jul 3 11:49:21 2019
+++ src/include/tzfile.h Tue Aug 16 05:03:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: tzfile.h,v 1.10 2019/07/03 15:49:21 christos Exp $ */
+/* $NetBSD: tzfile.h,v 1.11 2022/08/16 09:03:04 christos Exp $ */
#ifndef _TZFILE_H_
#define _TZFILE_H_
@@ -21,15 +21,15 @@
*/
#ifndef TZDIR /* Time zone object file directory */
-#define TZDIR "/usr/share/zoneinfo"
+# define TZDIR "/usr/share/zoneinfo"
#endif /* !defined TZDIR */
#ifndef TZDEFAULT
-#define TZDEFAULT "/etc/localtime"
+# define TZDEFAULT "/etc/localtime"
#endif /* !defined TZDEFAULT */
#ifndef TZDEFRULES
-#define TZDEFRULES "posixrules"
+# define TZDEFRULES "posixrules"
#endif /* !defined TZDEFRULES */
@@ -102,21 +102,21 @@ struct tzhead {
*/
#ifndef TZ_MAX_TIMES
-#define TZ_MAX_TIMES 2000
+# define TZ_MAX_TIMES 2000
#endif /* !defined TZ_MAX_TIMES */
#ifndef TZ_MAX_TYPES
/* This must be at least 17 for Europe/Samara and Europe/Vilnius. */
-#define TZ_MAX_TYPES 256 /* Limited by what (unsigned char)'s can hold */
+# define TZ_MAX_TYPES 256 /* Limited by what (unsigned char)'s can hold */
#endif /* !defined TZ_MAX_TYPES */
#ifndef TZ_MAX_CHARS
-#define TZ_MAX_CHARS 50 /* Maximum number of abbreviation characters */
+# define TZ_MAX_CHARS 50 /* Maximum number of abbreviation characters */
/* (limited by what unsigned chars can hold) */
#endif /* !defined TZ_MAX_CHARS */
#ifndef TZ_MAX_LEAPS
-#define TZ_MAX_LEAPS 50 /* Maximum number of leap second corrections */
+# define TZ_MAX_LEAPS 50 /* Maximum number of leap second corrections */
#endif /* !defined TZ_MAX_LEAPS */
#define SECSPERMIN 60
CVS commit: src/sys/arch/hppa/include
Module Name:src
Committed By: skrll
Date: Tue Aug 16 08:42:25 UTC 2022
Modified Files:
src/sys/arch/hppa/include: pci_machdep.h
Log Message:
Provide pci_intr_setattr (which does nothing atm)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/pci_machdep.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/hppa/include/pci_machdep.h
diff -u src/sys/arch/hppa/include/pci_machdep.h:1.2 src/sys/arch/hppa/include/pci_machdep.h:1.3
--- src/sys/arch/hppa/include/pci_machdep.h:1.2 Sat Mar 29 19:28:28 2014
+++ src/sys/arch/hppa/include/pci_machdep.h Tue Aug 16 08:42:25 2022
@@ -53,6 +53,8 @@ struct hppa_pci_chipset_tag {
pci_intr_handle_t *);
const char *(*pc_intr_string)(void *, pci_intr_handle_t,
char *, size_t);
+ int (*pc_intr_setattr)(void *, pci_intr_handle_t *,
+ int, uint64_t);
void *(*pc_intr_establish)(void *, pci_intr_handle_t,
int, int (*)(void *), void *);
void (*pc_intr_disestablish)(void *, void *);
@@ -86,6 +88,15 @@ struct hppa_pci_chipset_tag {
#define pci_intr_disestablish(c, iv) \
(*(c)->pc_intr_disestablish)((c)->_cookie, (iv))
+static inline int
+pci_intr_setattr(pci_chipset_tag_t pc, pci_intr_handle_t *ihp,
+int attr, uint64_t data)
+{
+ if (!pc->pc_intr_setattr)
+ return ENODEV;
+ return pc->pc_intr_setattr(pc, ihp, attr, data);
+}
+
#define pciide_machdep_compat_intr_establish(a, b, c, d, e) (NULL)
#define pciide_machdep_compat_intr_disestablish(a, b) ((void)(a), (void)(b))
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Tue Aug 16 08:42:25 UTC 2022 Modified Files: src/sys/arch/hppa/include: pci_machdep.h Log Message: Provide pci_intr_setattr (which does nothing atm) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/dev
Module Name:src
Committed By: skrll
Date: Tue Aug 16 08:40:34 UTC 2022
Modified Files:
src/sys/arch/hppa/dev: dino.c elroy.c
Log Message:
Use designated initializers for hppa_pci_chipset_tag structs.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/dev/elroy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.14 src/sys/arch/hppa/dev/dino.c:1.15
--- src/sys/arch/hppa/dev/dino.c:1.14 Tue Aug 16 08:35:38 2022
+++ src/sys/arch/hppa/dev/dino.c Tue Aug 16 08:40:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.14 2022/08/16 08:35:38 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.15 2022/08/16 08:40:33 skrll Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.14 2022/08/16 08:35:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.15 2022/08/16 08:40:33 skrll Exp $");
/* #include "cardbus.h" */
@@ -1597,15 +1597,18 @@ const struct hppa_bus_dma_tag dino_dmat
};
const struct hppa_pci_chipset_tag dino_pc = {
- NULL,
- dino_attach_hook, dino_maxdevs, dino_make_tag, dino_decompose_tag,
- dino_conf_read, dino_conf_write,
- dino_intr_map, dino_intr_string,
- dino_intr_establish, dino_intr_disestablish,
+ .pc_attach_hook = dino_attach_hook,
+ .pc_bus_maxdevs = dino_maxdevs,
+ .pc_make_tag = dino_make_tag,
+ .pc_decompose_tag = dino_decompose_tag,
+ .pc_conf_read = dino_conf_read,
+ .pc_conf_write = dino_conf_write,
+ .pc_intr_map = dino_intr_map,
+ .pc_intr_string = dino_intr_string,
+ .pc_intr_establish = dino_intr_establish,
+ .pc_intr_disestablish = dino_intr_disestablish,
#if NCARDBUS > 0
- dino_alloc_parent
-#else
- NULL
+ .pc_alloc_parent = dino_alloc_parent,
#endif
};
Index: src/sys/arch/hppa/dev/elroy.c
diff -u src/sys/arch/hppa/dev/elroy.c:1.4 src/sys/arch/hppa/dev/elroy.c:1.5
--- src/sys/arch/hppa/dev/elroy.c:1.4 Sat Aug 7 16:18:55 2021
+++ src/sys/arch/hppa/dev/elroy.c Tue Aug 16 08:40:33 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.4 2021/08/07 16:18:55 thorpej Exp $ */
+/* $NetBSD: elroy.c,v 1.5 2022/08/16 08:40:33 skrll Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -1190,15 +1190,18 @@ const struct hppa_bus_dma_tag elroy_dmat
};
const struct hppa_pci_chipset_tag elroy_pc = {
- NULL,
- elroy_attach_hook, elroy_maxdevs, elroy_make_tag, elroy_decompose_tag,
- elroy_conf_read, elroy_conf_write,
- apic_intr_map, apic_intr_string,
- apic_intr_establish, apic_intr_disestablish,
+ .pc_attach_hook = elroy_attach_hook,
+ .pc_bus_maxdevs = elroy_maxdevs,
+ .pc_make_tag = elroy_make_tag,
+ .pc_decompose_tag = elroy_decompose_tag,
+ .pc_conf_read = elroy_conf_read,
+ .pc_conf_write = elroy_conf_write,
+ .pc_intr_map = apic_intr_map,
+ .pc_intr_string = apic_intr_string,
+ .pc_intr_establish = apic_intr_establish,
+ .pc_intr_disestablish = apic_intr_disestablish,
#if NCARDBUS > 0
- elroy_alloc_parent
-#else
- NULL
+ .pc_alloc_parent = elroy_alloc_parent
#endif
};
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: skrll Date: Tue Aug 16 08:40:34 UTC 2022 Modified Files: src/sys/arch/hppa/dev: dino.c elroy.c Log Message: Use designated initializers for hppa_pci_chipset_tag structs. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/dev/dino.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/dev/elroy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: skrll Date: Tue Aug 16 08:35:38 UTC 2022 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/dev/dino.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/dev
Module Name:src Committed By: skrll Date: Tue Aug 16 08:35:38 UTC 2022 Modified Files: src/sys/arch/hppa/dev: dino.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/dev/dino.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/dev/dino.c diff -u src/sys/arch/hppa/dev/dino.c:1.13 src/sys/arch/hppa/dev/dino.c:1.14 --- src/sys/arch/hppa/dev/dino.c:1.13 Sat Sep 18 23:54:13 2021 +++ src/sys/arch/hppa/dev/dino.c Tue Aug 16 08:35:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.13 2021/09/18 23:54:13 macallan Exp $ */ +/* $NetBSD: dino.c,v 1.14 2022/08/16 08:35:38 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.13 2021/09/18 23:54:13 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.14 2022/08/16 08:35:38 skrll Exp $"); /* #include "cardbus.h" */ @@ -1652,7 +1652,7 @@ dinoattach(device_t parent, device_t sel return; } - sc->sc_regs = r = (volatile struct dino_regs *)sc->sc_bh; + sc->sc_regs = r = (volatile struct dino_regs *)sc->sc_bh; #ifdef trust_the_firmware_to_proper_initialize_everything r->io_addr_en = 0; r->io_control = 0x80;
