CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Fri Sep 23 22:58:15 UTC 2022 Modified Files: src/usr.bin/make: cond.c make.h parse.c Log Message: Cond_reset_depth just use cond_min_depth To avoid errors from unclosed conditionals on .break it is sufficient to just set cond_depth = cond_min_depth. Patch from rillig To generate a diff of this commit: cvs rdiff -u -r1.337 -r1.338 src/usr.bin/make/cond.c cvs rdiff -u -r1.304 -r1.305 src/usr.bin/make/make.h cvs rdiff -u -r1.683 -r1.684 src/usr.bin/make/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Fri Sep 23 22:58:15 UTC 2022
Modified Files:
src/usr.bin/make: cond.c make.h parse.c
Log Message:
Cond_reset_depth just use cond_min_depth
To avoid errors from unclosed conditionals on .break
it is sufficient to just set cond_depth = cond_min_depth.
Patch from rillig
To generate a diff of this commit:
cvs rdiff -u -r1.337 -r1.338 src/usr.bin/make/cond.c
cvs rdiff -u -r1.304 -r1.305 src/usr.bin/make/make.h
cvs rdiff -u -r1.683 -r1.684 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.337 src/usr.bin/make/cond.c:1.338
--- src/usr.bin/make/cond.c:1.337 Thu Sep 8 05:52:56 2022
+++ src/usr.bin/make/cond.c Fri Sep 23 22:58:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.337 2022/09/08 05:52:56 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.338 2022/09/23 22:58:15 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.337 2022/09/08 05:52:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.338 2022/09/23 22:58:15 sjg Exp $");
/*
* Conditional expressions conform to this grammar:
@@ -1284,7 +1284,7 @@ Cond_save_depth(void)
* when the loop started.
*/
void
-Cond_reset_depth(unsigned int depth)
+Cond_reset_depth(void)
{
-cond_depth = depth;
+cond_depth = cond_min_depth;
}
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.304 src/usr.bin/make/make.h:1.305
--- src/usr.bin/make/make.h:1.304 Fri Sep 2 16:24:31 2022
+++ src/usr.bin/make/make.h Fri Sep 23 22:58:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.304 2022/09/02 16:24:31 sjg Exp $ */
+/* $NetBSD: make.h,v 1.305 2022/09/23 22:58:15 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -800,7 +800,7 @@ void Compat_Make(GNode *, GNode *);
CondResult Cond_EvalCondition(const char *) MAKE_ATTR_USE;
CondResult Cond_EvalLine(const char *) MAKE_ATTR_USE;
void Cond_restore_depth(unsigned int);
-void Cond_reset_depth(unsigned int);
+void Cond_reset_depth(void);
unsigned int Cond_save_depth(void) MAKE_ATTR_USE;
/* dir.c; see also dir.h */
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.683 src/usr.bin/make/parse.c:1.684
--- src/usr.bin/make/parse.c:1.683 Sat Sep 3 00:50:07 2022
+++ src/usr.bin/make/parse.c Fri Sep 23 22:58:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.683 2022/09/03 00:50:07 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.684 2022/09/23 22:58:15 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.683 2022/09/03 00:50:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.684 2022/09/23 22:58:15 sjg Exp $");
/*
* A file being read.
@@ -2669,7 +2669,7 @@ HandleBreak(void)
if (curFile->forLoop != NULL) {
/* pretend we reached EOF */
For_Break(curFile->forLoop);
- Cond_reset_depth(curFile->cond_depth);
+ Cond_reset_depth();
ParseEOF();
} else
Parse_Error(PARSE_FATAL, "break outside of for loop");
CVS commit: src/sys/dev/wscons
Module Name:src Committed By: riastradh Date: Fri Sep 23 19:04:04 UTC 2022 Modified Files: src/sys/dev/wscons: wskbdvar.h Log Message: wskbd(4): Add include guards. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/wscons/wskbdvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/wscons/wskbdvar.h diff -u src/sys/dev/wscons/wskbdvar.h:1.19 src/sys/dev/wscons/wskbdvar.h:1.20 --- src/sys/dev/wscons/wskbdvar.h:1.19 Sun Sep 2 21:14:56 2012 +++ src/sys/dev/wscons/wskbdvar.h Fri Sep 23 19:04:04 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: wskbdvar.h,v 1.19 2012/09/02 21:14:56 he Exp $ */ +/* $NetBSD: wskbdvar.h,v 1.20 2022/09/23 19:04:04 riastradh Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -30,6 +30,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _DEV_WSCONS_WSKBDVAR_H_ +#define _DEV_WSCONS_WSKBDVAR_H_ + /* * WSKBD interfaces. */ @@ -116,3 +119,5 @@ void wskbd_set_evtrans(device_t, keysym_ int wskbd_cngetc(dev_t); void wskbd_cnpollc(dev_t, int); void wskbd_cnbell(dev_t, u_int, u_int, u_int); + +#endif /* _DEV_WSCONS_WSKBDVAR_H_ */
CVS commit: src/sys/dev/wscons
Module Name:src Committed By: riastradh Date: Fri Sep 23 19:04:04 UTC 2022 Modified Files: src/sys/dev/wscons: wskbdvar.h Log Message: wskbd(4): Add include guards. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/wscons/wskbdvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: riastradh Date: Fri Sep 23 12:35:00 UTC 2022 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: wdogctl(8): Minor tweak suggested by a passing umarell. Plus another wording improvement. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.27 src/sbin/wdogctl/wdogctl.8:1.28 --- src/sbin/wdogctl/wdogctl.8:1.27 Thu Sep 22 21:40:42 2022 +++ src/sbin/wdogctl/wdogctl.8 Fri Sep 23 12:35:00 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: wdogctl.8,v 1.27 2022/09/22 21:40:42 uwe Exp $ +.\" $NetBSD: wdogctl.8,v 1.28 2022/09/23 12:35:00 riastradh Exp $ .\" .\" Copyright (c) 2000 Zembu Labs, Inc. .\" All rights reserved. @@ -79,7 +79,7 @@ The .Nx kernel provides three modes in which watchdog timers may operate: kernel tickle mode, user tickle mode, and external tickle mode. -.Bl -tag -width "external tickle mode" +.Bl -tag .It kernel tickle mode A timer in the kernel refreshes the watchdog timer. This ensures kernel threads can make progress within the period of the @@ -100,9 +100,8 @@ unless the timer is activated with the option. .It external tickle mode Similar to user tickle mode, except that the tickle must be done -explicitly by a separate invocation of the program with the -.Fl t -option. +explicitly by a separate invocation of +.Nm Fl t . This allows users to determine the activity whose progress the watchdog timer checks. .El
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: riastradh Date: Fri Sep 23 12:35:00 UTC 2022 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: wdogctl(8): Minor tweak suggested by a passing umarell. Plus another wording improvement. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mpl/dhcp/dist/server
Module Name:src
Committed By: christos
Date: Fri Sep 23 12:30:52 UTC 2022
Modified Files:
src/external/mpl/dhcp/dist/server: mdb6.c
Log Message:
Adjust to new bind libraries
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mpl/dhcp/dist/server/mdb6.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/mpl/dhcp/dist/server/mdb6.c
diff -u src/external/mpl/dhcp/dist/server/mdb6.c:1.6 src/external/mpl/dhcp/dist/server/mdb6.c:1.7
--- src/external/mpl/dhcp/dist/server/mdb6.c:1.6 Sat Apr 2 21:11:00 2022
+++ src/external/mpl/dhcp/dist/server/mdb6.c Fri Sep 23 08:30:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mdb6.c,v 1.6 2022/04/03 01:11:00 christos Exp $ */
+/* $NetBSD: mdb6.c,v 1.7 2022/09/23 12:30:52 christos Exp $ */
/*
* Copyright (C) 2007-2017 by Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
*/
#include
-__RCSID("$NetBSD: mdb6.c,v 1.6 2022/04/03 01:11:00 christos Exp $");
+__RCSID("$NetBSD: mdb6.c,v 1.7 2022/09/23 12:30:52 christos Exp $");
/*!
@@ -671,19 +671,10 @@ ipv6_pool_allocate(struct ipv6_pool **po
dfree(tmp, file, line);
return ISC_R_NOMEMORY;
}
- if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, active_changed,
- 0, &(tmp->active_timeouts)) != ISC_R_SUCCESS) {
- iasubopt_free_hash_table(&(tmp->leases), file, line);
- dfree(tmp, file, line);
- return ISC_R_NOMEMORY;
- }
- if (isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, inactive_changed,
- 0, &(tmp->inactive_timeouts)) != ISC_R_SUCCESS) {
- isc_heap_destroy(&(tmp->active_timeouts));
- iasubopt_free_hash_table(&(tmp->leases), file, line);
- dfree(tmp, file, line);
- return ISC_R_NOMEMORY;
- }
+ isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, active_changed,
+ 0, &(tmp->active_timeouts));
+ isc_heap_create(dhcp_gbl_ctx.mctx, lease_older, inactive_changed,
+ 0, &(tmp->inactive_timeouts));
*pool = tmp;
return ISC_R_SUCCESS;
@@ -1411,7 +1402,6 @@ cleanup_lease6(ia_hash_t *ia_table,
isc_result_t
add_lease6(struct ipv6_pool *pool, struct iasubopt *lease,
time_t valid_lifetime_end_time) {
- isc_result_t insert_result;
struct iasubopt *test_iasubopt;
struct iasubopt *tmp_iasubopt;
@@ -1479,34 +1469,25 @@ add_lease6(struct ipv6_pool *pool, struc
tmp_iasubopt->hard_lifetime_end_time = valid_lifetime_end_time;
iasubopt_hash_add(pool->leases, _iasubopt->addr,
sizeof(tmp_iasubopt->addr), lease, MDL);
- insert_result = isc_heap_insert(pool->active_timeouts,
- tmp_iasubopt);
- if (insert_result == ISC_R_SUCCESS) {
- pool->num_active++;
- if (pool->ipv6_pond)
-pool->ipv6_pond->num_active++;
+ isc_heap_insert(pool->active_timeouts, tmp_iasubopt);
+ pool->num_active++;
+ if (pool->ipv6_pond)
+ pool->ipv6_pond->num_active++;
- if (tmp_iasubopt->state == FTS_ABANDONED) {
-pool->num_abandoned++;
-if (pool->ipv6_pond)
- pool->ipv6_pond->num_abandoned++;
- }
+ if (tmp_iasubopt->state == FTS_ABANDONED) {
+ pool->num_abandoned++;
+ if (pool->ipv6_pond)
+pool->ipv6_pond->num_abandoned++;
}
} else {
tmp_iasubopt->soft_lifetime_end_time = valid_lifetime_end_time;
- insert_result = isc_heap_insert(pool->inactive_timeouts,
- tmp_iasubopt);
- if (insert_result == ISC_R_SUCCESS)
- pool->num_inactive++;
- }
- if (insert_result != ISC_R_SUCCESS) {
- iasubopt_hash_delete(pool->leases, >addr,
- sizeof(lease->addr), MDL);
- iasubopt_dereference(_iasubopt, MDL);
- return insert_result;
+ isc_heap_insert(pool->inactive_timeouts, tmp_iasubopt);
+ pool->num_inactive++;
}
-
+ iasubopt_hash_delete(pool->leases, >addr,
+ sizeof(lease->addr), MDL);
+ iasubopt_dereference(_iasubopt, MDL);
/*
* Note: we intentionally leave tmp_iasubopt referenced; there
* is a reference in the heap/hash, after all.
@@ -1569,22 +1550,18 @@ lease6_usable(struct iasubopt *lease) {
*/
static isc_result_t
move_lease_to_active(struct ipv6_pool *pool, struct iasubopt *lease) {
- isc_result_t insert_result;
-
- insert_result = isc_heap_insert(pool->active_timeouts, lease);
- if (insert_result == ISC_R_SUCCESS) {
- iasubopt_hash_add(pool->leases, >addr,
- sizeof(lease->addr), lease, MDL);
- isc_heap_delete(pool->inactive_timeouts,
-lease->inactive_index);
- pool->num_active++;
- pool->num_inactive--;
- lease->state = FTS_ACTIVE;
- if (pool->ipv6_pond)
- pool->ipv6_pond->num_active++;
+ isc_heap_insert(pool->active_timeouts, lease);
+ iasubopt_hash_add(pool->leases, >addr,
+ sizeof(lease->addr), lease, MDL);
+ isc_heap_delete(pool->inactive_timeouts,
+ lease->inactive_index);
+ pool->num_active++;
+ pool->num_inactive--;
+ lease->state = FTS_ACTIVE;
+ if (pool->ipv6_pond)
+ pool->ipv6_pond->num_active++;
- }
- return insert_result;
+ return ISC_R_SUCCESS;
}
/*!
@@ -1656,72 +1633,69 @@ renew_lease6(struct ipv6_pool *pool, str
static
CVS commit: src/external/mpl/dhcp/dist/server
Module Name:src Committed By: christos Date: Fri Sep 23 12:30:52 UTC 2022 Modified Files: src/external/mpl/dhcp/dist/server: mdb6.c Log Message: Adjust to new bind libraries To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mpl/dhcp/dist/server/mdb6.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: wiz Date: Fri Sep 23 12:22:49 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: doc: update bind entry To generate a diff of this commit: cvs rdiff -u -r1.1877 -r1.1878 src/doc/3RDPARTY 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: wiz Date: Fri Sep 23 12:22:49 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: doc: update bind entry To generate a diff of this commit: cvs rdiff -u -r1.1877 -r1.1878 src/doc/3RDPARTY 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.1877 src/doc/3RDPARTY:1.1878 --- src/doc/3RDPARTY:1.1877 Fri Sep 23 12:20:47 2022 +++ src/doc/3RDPARTY Fri Sep 23 12:22:49 2022 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1877 2022/09/23 12:20:47 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1878 2022/09/23 12:22:49 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -121,7 +121,7 @@ bc includes dc, both of which are in the Package: bind [named and utils] Version: 9.16.33/MPL -Current Vers: 9.16.20/MPL 9.19.5/MPL +Current Vers: 9.16.33/MPL 9.19.5/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Sep 23 12:20:47 UTC 2022 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1876 -r1.1877 src/doc/3RDPARTY cvs rdiff -u -r1.2908 -r1.2909 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.1876 src/doc/3RDPARTY:1.1877 --- src/doc/3RDPARTY:1.1876 Thu Sep 22 17:24:10 2022 +++ src/doc/3RDPARTY Fri Sep 23 08:20:47 2022 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1876 2022/09/22 21:24:10 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1877 2022/09/23 12:20:47 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -120,12 +120,12 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.16.20/MPL -Current Vers: 9.16.20/MPL 9.17.17/MPL +Version: 9.16.33/MPL +Current Vers: 9.16.20/MPL 9.19.5/MPL Maintainer: ISC Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ -Date: 2021-08-19 +Date: 2022-09-23 Mailing List: https://lists.isc.org/mailman/listinfo/bind-announce Mailing List: https://lists.isc.org/mailman/listinfo/bind-users Responsible: christos Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2908 src/doc/CHANGES:1.2909 --- src/doc/CHANGES:1.2908 Thu Sep 22 17:24:10 2022 +++ src/doc/CHANGES Fri Sep 23 08:20:47 2022 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2908 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2909 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -688,3 +688,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: netinet: Remove routes on an address removal if the routes reference the address. [ozaki-r 20220920] libuv: Import version 1.44.2. [christos 20220922] + bind: Import version 9.16.33. [christos 20220923]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Sep 23 12:20:47 UTC 2022 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1876 -r1.1877 src/doc/3RDPARTY cvs rdiff -u -r1.2908 -r1.2909 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: Fri Sep 23 12:19:19 UTC 2022 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump bind libraries To generate a diff of this commit: cvs rdiff -u -r1.938 -r1.939 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.295 -r1.296 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.938 src/distrib/sets/lists/base/shl.mi:1.939 --- src/distrib/sets/lists/base/shl.mi:1.938 Sun Jul 31 08:40:35 2022 +++ src/distrib/sets/lists/base/shl.mi Fri Sep 23 08:19:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.938 2022/07/31 12:40:35 mlelstv Exp $ +# $NetBSD: shl.mi,v 1.939 2022/09/23 12:19:18 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -229,8 +229,8 @@ ./usr/lib/libbfd.so.17base-sys-shlib compatfile,binutils=234 ./usr/lib/libbfd.so.17.0 base-sys-shlib compatfile,binutils=234 ./usr/lib/libbind9.sobase-bind-shlib compatfile -./usr/lib/libbind9.so.18 base-bind-shlib compatfile -./usr/lib/libbind9.so.18.0 base-bind-shlib compatfile +./usr/lib/libbind9.so.19 base-bind-shlib compatfile +./usr/lib/libbind9.so.19.0 base-bind-shlib compatfile ./usr/lib/libblacklist.so base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0 base-obsolete obsolete,compatfile ./usr/lib/libblacklist.so.0.0 base-obsolete obsolete,compatfile @@ -295,8 +295,8 @@ ./usr/lib/libdm.so.0base-sys-shlib compatfile ./usr/lib/libdm.so.0.0base-sys-shlib compatfile ./usr/lib/libdns.sobase-bind-shlib compatfile -./usr/lib/libdns.so.18base-bind-shlib compatfile -./usr/lib/libdns.so.18.0 base-bind-shlib compatfile +./usr/lib/libdns.so.19base-bind-shlib compatfile +./usr/lib/libdns.so.19.0 base-bind-shlib compatfile ./usr/lib/libdns_sd.sobase-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0 base-mdns-shlib compatfile,mdns ./usr/lib/libdns_sd.so.0.0 base-mdns-shlib compatfile,mdns @@ -377,17 +377,17 @@ ./usr/lib/libipsec.so.3base-net-shlib compatfile ./usr/lib/libipsec.so.3.0 base-net-shlib compatfile ./usr/lib/libirs.sobase-bind-shlib compatfile -./usr/lib/libirs.so.18base-bind-shlib compatfile -./usr/lib/libirs.so.18.0 base-bind-shlib compatfile +./usr/lib/libirs.so.19base-bind-shlib compatfile +./usr/lib/libirs.so.19.0 base-bind-shlib compatfile ./usr/lib/libisc.sobase-bind-shlib compatfile -./usr/lib/libisc.so.18base-bind-shlib compatfile -./usr/lib/libisc.so.18.0 base-bind-shlib compatfile +./usr/lib/libisc.so.19base-bind-shlib compatfile +./usr/lib/libisc.so.19.0 base-bind-shlib compatfile ./usr/lib/libisccc.sobase-bind-shlib compatfile -./usr/lib/libisccc.so.18 base-bind-shlib compatfile -./usr/lib/libisccc.so.18.0 base-bind-shlib compatfile +./usr/lib/libisccc.so.19 base-bind-shlib compatfile +./usr/lib/libisccc.so.19.0 base-bind-shlib compatfile ./usr/lib/libisccfg.sobase-bind-shlib compatfile -./usr/lib/libisccfg.so.18 base-bind-shlib compatfile -./usr/lib/libisccfg.so.18.0 base-bind-shlib compatfile +./usr/lib/libisccfg.so.19 base-bind-shlib compatfile +./usr/lib/libisccfg.so.19.0 base-bind-shlib compatfile ./usr/lib/libiscsi.sobase-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2base-iscsi-shlib iscsi,compatfile ./usr/lib/libiscsi.so.2.0 base-iscsi-shlib iscsi,compatfile @@ -472,8 +472,8 @@ ./usr/lib/libnpf.so.0base-npf-shlib npf,compatfile ./usr/lib/libnpf.so.0.1base-npf-shlib npf,compatfile ./usr/lib/libns.sobase-bind-shlib compatfile -./usr/lib/libns.so.18base-bind-shlib compatfile -./usr/lib/libns.so.18.0base-bind-shlib compatfile +./usr/lib/libns.so.19base-bind-shlib compatfile +./usr/lib/libns.so.19.0base-bind-shlib compatfile ./usr/lib/libnvmm.sobase-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0base-sys-shlib nvmm,pic ./usr/lib/libnvmm.so.0.1 base-sys-shlib nvmm,pic Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.295 src/distrib/sets/lists/debug/shl.mi:1.296 --- src/distrib/sets/lists/debug/shl.mi:1.295 Sun Jul 31 08:40:35 2022 +++ src/distrib/sets/lists/debug/shl.mi Fri Sep 23 08:19:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.295 2022/07/31 12:40:35 mlelstv Exp $ +# $NetBSD: shl.mi,v 1.296 2022/09/23 12:19:19 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 @@ -77,7 +77,7 @@ ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Fri Sep 23 12:19:19 UTC 2022 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump bind libraries To generate a diff of this commit: cvs rdiff -u -r1.938 -r1.939 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.295 -r1.296 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/external/mpl/bind
Module Name:src Committed By: christos Date: Fri Sep 23 12:15:38 UTC 2022 Modified Files: src/external/mpl/bind/dist: Makefile.in bind.keys.h config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.c keygen.c keygen.h rndc-confgen.c util.c util.h src/external/mpl/bind/dist/bin/confgen/include/confgen: os.h src/external/mpl/bind/dist/bin/confgen/unix: os.c src/external/mpl/bind/dist/bin/confgen/win32: os.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c dighost.c host.c nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h builtin.c config.c control.c controlconf.c fuzz.c geoip.c log.c logconf.c main.c server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/dlz: dlz_dlopen_driver.h src/external/mpl/bind/dist/bin/named/include/named: builtin.h config.h control.h fuzz.h geoip.h globals.h log.h logconf.h main.h server.h smf_globals.h statschannel.h tkeyconf.h tsigconf.h types.h zoneconf.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/unix/include/named: os.h src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: ntservice.h os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.c pkcs11-keygen.c pkcs11-list.c pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.c util.c util.h src/external/mpl/bind/dist/bin/rndc/include/rndc: os.h src/external/mpl/bind/dist/bin/tests: cfg_test.c makejournal.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c backtrace_test.c byaddr_test.c byname_test.c db_test.c fsaccess_test.c gsstest.c inter_test.c lex_test.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c ratelimiter_test.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c resolve.c src/external/mpl/bind/dist/bin/tests/system/addzone/ns1: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns2: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns3: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/checkconf: dnssec.1 dnssec.2 dnssec.3 src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c driver.h src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c db.h driver.c instance.c instance.h lock.c lock.h log.c log.h syncptr.c syncptr.h util.h zone.c zone.h src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/rndc: gencheck.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.c named-journalprint.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: AccountInfo.h BINDInstall.h BINDInstallDlg.h DirBrowse.h StdAfx.h VersionInfo.h resource.h src/external/mpl/bind/dist/contrib/dlz/bin/dlzbdb: dlzbdb.c src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_bdb_driver.c dlz_bdbhpt_driver.c dlz_drivers.c dlz_filesystem_driver.c dlz_ldap_driver.c dlz_mysql_driver.c dlz_odbc_driver.c dlz_postgres_driver.c dlz_stub_driver.c sdlz_helper.c src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz:
CVS commit: src/external/mpl/bind
Module Name:src Committed By: christos Date: Fri Sep 23 12:15:38 UTC 2022 Modified Files: src/external/mpl/bind/dist: Makefile.in bind.keys.h config.h.in configure src/external/mpl/bind/dist/bin/check: check-tool.c check-tool.h named-checkconf.c named-checkzone.c src/external/mpl/bind/dist/bin/confgen: ddns-confgen.c keygen.c keygen.h rndc-confgen.c util.c util.h src/external/mpl/bind/dist/bin/confgen/include/confgen: os.h src/external/mpl/bind/dist/bin/confgen/unix: os.c src/external/mpl/bind/dist/bin/confgen/win32: os.c src/external/mpl/bind/dist/bin/delv: delv.c src/external/mpl/bind/dist/bin/dig: dig.c dighost.c host.c nslookup.c src/external/mpl/bind/dist/bin/dig/include/dig: dig.h src/external/mpl/bind/dist/bin/dnssec: dnssec-cds.c dnssec-dsfromkey.c dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.c dnssec-revoke.c dnssec-settime.c dnssec-signzone.c dnssec-verify.c dnssectool.c dnssectool.h src/external/mpl/bind/dist/bin/named: bind9.xsl.h builtin.c config.c control.c controlconf.c fuzz.c geoip.c log.c logconf.c main.c server.c statschannel.c tkeyconf.c tsigconf.c zoneconf.c src/external/mpl/bind/dist/bin/named/include/dlz: dlz_dlopen_driver.h src/external/mpl/bind/dist/bin/named/include/named: builtin.h config.h control.h fuzz.h geoip.h globals.h log.h logconf.h main.h server.h smf_globals.h statschannel.h tkeyconf.h tsigconf.h types.h zoneconf.h src/external/mpl/bind/dist/bin/named/unix: dlz_dlopen_driver.c os.c src/external/mpl/bind/dist/bin/named/unix/include/named: os.h src/external/mpl/bind/dist/bin/named/win32: dlz_dlopen_driver.c ntservice.c os.c src/external/mpl/bind/dist/bin/named/win32/include/named: ntservice.h os.h src/external/mpl/bind/dist/bin/nsupdate: nsupdate.c src/external/mpl/bind/dist/bin/pkcs11: pkcs11-destroy.c pkcs11-keygen.c pkcs11-list.c pkcs11-tokens.c src/external/mpl/bind/dist/bin/plugins: filter-.c src/external/mpl/bind/dist/bin/rndc: rndc.c util.c util.h src/external/mpl/bind/dist/bin/rndc/include/rndc: os.h src/external/mpl/bind/dist/bin/tests: cfg_test.c makejournal.c wire_test.c src/external/mpl/bind/dist/bin/tests/optional: adb_test.c backtrace_test.c byaddr_test.c byname_test.c db_test.c fsaccess_test.c gsstest.c inter_test.c lex_test.c lfsr_test.c log_test.c master_test.c mempool_test.c name_test.c nsecify.c ratelimiter_test.c rbt_test.c rwlock_test.c serial_test.c shutdown_test.c sig0_test.c sock_test.c sym_test.c task_test.c timer_test.c zone_test.c src/external/mpl/bind/dist/bin/tests/pkcs11/benchmarks: create.c find.c genrsa.c login.c privrsa.c pubrsa.c session.c sha1.c sign.c verify.c src/external/mpl/bind/dist/bin/tests/system: feature-test.c resolve.c src/external/mpl/bind/dist/bin/tests/system/addzone/ns1: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns2: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/addzone/ns3: redirect.db.1 redirect.db.2 src/external/mpl/bind/dist/bin/tests/system/checkconf: dnssec.1 dnssec.2 dnssec.3 src/external/mpl/bind/dist/bin/tests/system/dlzexternal: driver.c driver.h src/external/mpl/bind/dist/bin/tests/system/dyndb/driver: db.c db.h driver.c instance.c instance.h lock.c lock.h log.c log.h syncptr.c syncptr.h util.h zone.c zone.h src/external/mpl/bind/dist/bin/tests/system/pipelined: pipequeries.c src/external/mpl/bind/dist/bin/tests/system/rndc: gencheck.c src/external/mpl/bind/dist/bin/tests/system/rpz: dnsrps.c src/external/mpl/bind/dist/bin/tests/system/rsabigexponent: bigkey.c src/external/mpl/bind/dist/bin/tests/system/tkey: keycreate.c keydelete.c src/external/mpl/bind/dist/bin/tools: arpaname.c dnstap-read.c mdig.c named-journalprint.c named-nzd2nzf.c named-rrchecker.c nsec3hash.c src/external/mpl/bind/dist/bin/win32/BINDInstall: AccountInfo.h BINDInstall.h BINDInstallDlg.h DirBrowse.h StdAfx.h VersionInfo.h resource.h src/external/mpl/bind/dist/contrib/dlz/bin/dlzbdb: dlzbdb.c src/external/mpl/bind/dist/contrib/dlz/drivers: dlz_bdb_driver.c dlz_bdbhpt_driver.c dlz_drivers.c dlz_filesystem_driver.c dlz_ldap_driver.c dlz_mysql_driver.c dlz_odbc_driver.c dlz_postgres_driver.c dlz_stub_driver.c sdlz_helper.c src/external/mpl/bind/dist/contrib/dlz/drivers/include/dlz:
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Sep 23 10:07:36 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1532 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.18 src/doc/CHANGES-9.4:1.1.2.19 --- src/doc/CHANGES-9.4:1.1.2.18 Sun Sep 18 13:37:42 2022 +++ src/doc/CHANGES-9.4 Fri Sep 23 10:07:36 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.18 2022/09/18 13:37:42 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.19 2022/09/23 10:07:36 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -279,3 +279,10 @@ sys/crypto/nist_hash_drbg/nist_hash_drbg Fix negative-length variable-length array. [msaitoh, ticket #1530] +external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c (apply patch) + + Fix mounting of wapbl volumes when the block device node is on + a zfs volume. Fixed differently as part of a bigger change in + -current in rev 1.73. + [dholland, ticket #1532] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Sep 23 10:07:36 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1532 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: martin
Date: Fri Sep 23 10:05:13 UTC 2022
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: zfs_vnops.c
Log Message:
Apply patch, requested by dholland in ticket #1532:
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c (apply patch)
Fix mounting of wapbl volumes when the block device node is on a zfs volume.
Fixed differently as part of a bigger change in -current in rev 1.73.
To generate a diff of this commit:
cvs rdiff -u -r1.50.2.10 -r1.50.2.11 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.10 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.11
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.10 Tue Jul 6 04:22:34 2021
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Fri Sep 23 10:05:13 2022
@@ -6394,6 +6394,7 @@ const struct vnodeopv_entry_desc zfs_spe
{ _bwrite_desc, spec_bwrite },
{ _print_desc, zfs_netbsd_print },
{ _fcntl_desc, zfs_netbsd_fcntl },
+ { _bmap_desc, spec_bmap },
{ NULL, NULL }
};
CVS commit: [netbsd-9] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Fri Sep 23 10:05:13 UTC 2022 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: zfs_vnops.c Log Message: Apply patch, requested by dholland in ticket #1532: external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c (apply patch) Fix mounting of wapbl volumes when the block device node is on a zfs volume. Fixed differently as part of a bigger change in -current in rev 1.73. To generate a diff of this commit: cvs rdiff -u -r1.50.2.10 -r1.50.2.11 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
