svn commit: r368734 - head/usr.sbin/unbound
Author: cy Date: Thu Dec 17 19:50:41 2020 New Revision: 368734 URL: https://svnweb.freebsd.org/changeset/base/368734 Log: Update the unbound version number from r368478. Updating the version number is an extra manual step. Pointy hat to:cy Reported by: Herbert J. Skuhra MFC after:3 days Modified: head/usr.sbin/unbound/config.h Modified: head/usr.sbin/unbound/config.h == --- head/usr.sbin/unbound/config.h Thu Dec 17 19:49:17 2020 (r368733) +++ head/usr.sbin/unbound/config.h Thu Dec 17 19:50:41 2020 (r368734) @@ -731,7 +731,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.12.0" +#define PACKAGE_STRING "unbound 1.13.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -740,7 +740,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.12.0" +#define PACKAGE_VERSION "1.13.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -762,7 +762,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,12,0,0 +#define RSRC_PACKAGE_VERSION 1,13,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368693 - in stable: 11/contrib/unbound 11/contrib/unbound/contrib 11/contrib/unbound/daemon 11/contrib/unbound/dnstap 11/contrib/unbound/doc 11/contrib/unbound/libunbound 11/contrib/un...
Author: cy Date: Wed Dec 16 09:21:40 2020 New Revision: 368693 URL: https://svnweb.freebsd.org/changeset/base/368693 Log: MFC r368478: MFV r368464: Update unbound from 1.12.0 to 1.13.0 Security: CVE-2020-28935 Added: stable/12/contrib/unbound/contrib/metrics.awk - copied unchanged from r368478, head/contrib/unbound/contrib/metrics.awk Modified: stable/12/contrib/unbound/config.guess stable/12/contrib/unbound/config.sub stable/12/contrib/unbound/configure stable/12/contrib/unbound/configure.ac stable/12/contrib/unbound/contrib/README stable/12/contrib/unbound/contrib/unbound.service.in stable/12/contrib/unbound/contrib/unbound_portable.service.in stable/12/contrib/unbound/daemon/daemon.c stable/12/contrib/unbound/daemon/unbound.c stable/12/contrib/unbound/daemon/worker.c stable/12/contrib/unbound/dnstap/dnstap.c stable/12/contrib/unbound/dnstap/dtstream.c stable/12/contrib/unbound/doc/Changelog stable/12/contrib/unbound/doc/README stable/12/contrib/unbound/doc/example.conf.in stable/12/contrib/unbound/doc/libunbound.3.in stable/12/contrib/unbound/doc/unbound-anchor.8.in stable/12/contrib/unbound/doc/unbound-checkconf.8.in stable/12/contrib/unbound/doc/unbound-control.8.in stable/12/contrib/unbound/doc/unbound-host.1.in stable/12/contrib/unbound/doc/unbound.8.in stable/12/contrib/unbound/doc/unbound.conf.5.in stable/12/contrib/unbound/libunbound/context.c stable/12/contrib/unbound/libunbound/libunbound.c stable/12/contrib/unbound/libunbound/libworker.c stable/12/contrib/unbound/respip/respip.c stable/12/contrib/unbound/services/authzone.c stable/12/contrib/unbound/services/cache/infra.c stable/12/contrib/unbound/services/cache/infra.h stable/12/contrib/unbound/services/listen_dnsport.c stable/12/contrib/unbound/services/listen_dnsport.h stable/12/contrib/unbound/services/localzone.c stable/12/contrib/unbound/services/mesh.c stable/12/contrib/unbound/services/outside_network.c stable/12/contrib/unbound/services/outside_network.h stable/12/contrib/unbound/services/rpz.c stable/12/contrib/unbound/smallapp/unbound-control-setup.sh.in stable/12/contrib/unbound/util/config_file.c stable/12/contrib/unbound/util/config_file.h stable/12/contrib/unbound/util/configlexer.lex stable/12/contrib/unbound/util/configparser.y stable/12/contrib/unbound/util/data/msgencode.c stable/12/contrib/unbound/util/data/msgreply.h stable/12/contrib/unbound/util/edns.c stable/12/contrib/unbound/util/edns.h stable/12/contrib/unbound/util/fptr_wlist.c stable/12/contrib/unbound/util/iana_ports.inc stable/12/contrib/unbound/util/module.h stable/12/contrib/unbound/util/netevent.c stable/12/contrib/unbound/util/netevent.h stable/12/contrib/unbound/util/regional.c stable/12/contrib/unbound/util/regional.h stable/12/contrib/unbound/validator/val_secalgo.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Added: stable/11/contrib/unbound/contrib/metrics.awk - copied unchanged from r368478, head/contrib/unbound/contrib/metrics.awk Modified: stable/11/contrib/unbound/config.guess stable/11/contrib/unbound/config.sub stable/11/contrib/unbound/configure stable/11/contrib/unbound/configure.ac stable/11/contrib/unbound/contrib/README stable/11/contrib/unbound/contrib/unbound.service.in stable/11/contrib/unbound/contrib/unbound_portable.service.in stable/11/contrib/unbound/daemon/daemon.c stable/11/contrib/unbound/daemon/unbound.c stable/11/contrib/unbound/daemon/worker.c stable/11/contrib/unbound/dnstap/dnstap.c stable/11/contrib/unbound/dnstap/dtstream.c stable/11/contrib/unbound/doc/Changelog stable/11/contrib/unbound/doc/README stable/11/contrib/unbound/doc/example.conf.in stable/11/contrib/unbound/doc/libunbound.3.in stable/11/contrib/unbound/doc/unbound-anchor.8.in stable/11/contrib/unbound/doc/unbound-checkconf.8.in stable/11/contrib/unbound/doc/unbound-control.8.in stable/11/contrib/unbound/doc/unbound-host.1.in stable/11/contrib/unbound/doc/unbound.8.in stable/11/contrib/unbound/doc/unbound.conf.5.in stable/11/contrib/unbound/libunbound/context.c stable/11/contrib/unbound/libunbound/libunbound.c stable/11/contrib/unbound/libunbound/libworker.c stable/11/contrib/unbound/respip/respip.c stable/11/contrib/unbound/services/authzone.c stable/11/contrib/unbound/services/cache/infra.c stable/11/contrib/unbound/services/cache/infra.h stable/11/contrib/unbound/services/listen_dnsport.c stable/11/contrib/unbound/services/listen_dnsport.h stable/11/contrib/unbound/services/localzone.c stable/11/contrib/unbound/services/mesh.c stable/11/contrib/unbound/services/outside_network.c stable/11/contrib/unbound/services/outside_network.h stable/11/contrib/unbound/services/rpz.c stable/11/contrib/unbound/smallapp/unbound-control-setup.sh.in stable/11/contrib/unbound/util/config_file.c
svn commit: r368693 - in stable: 11/contrib/unbound 11/contrib/unbound/contrib 11/contrib/unbound/daemon 11/contrib/unbound/dnstap 11/contrib/unbound/doc 11/contrib/unbound/libunbound 11/contrib/un...
Author: cy Date: Wed Dec 16 09:21:40 2020 New Revision: 368693 URL: https://svnweb.freebsd.org/changeset/base/368693 Log: MFC r368478: MFV r368464: Update unbound from 1.12.0 to 1.13.0 Security: CVE-2020-28935 Added: stable/11/contrib/unbound/contrib/metrics.awk - copied unchanged from r368478, head/contrib/unbound/contrib/metrics.awk Modified: stable/11/contrib/unbound/config.guess stable/11/contrib/unbound/config.sub stable/11/contrib/unbound/configure stable/11/contrib/unbound/configure.ac stable/11/contrib/unbound/contrib/README stable/11/contrib/unbound/contrib/unbound.service.in stable/11/contrib/unbound/contrib/unbound_portable.service.in stable/11/contrib/unbound/daemon/daemon.c stable/11/contrib/unbound/daemon/unbound.c stable/11/contrib/unbound/daemon/worker.c stable/11/contrib/unbound/dnstap/dnstap.c stable/11/contrib/unbound/dnstap/dtstream.c stable/11/contrib/unbound/doc/Changelog stable/11/contrib/unbound/doc/README stable/11/contrib/unbound/doc/example.conf.in stable/11/contrib/unbound/doc/libunbound.3.in stable/11/contrib/unbound/doc/unbound-anchor.8.in stable/11/contrib/unbound/doc/unbound-checkconf.8.in stable/11/contrib/unbound/doc/unbound-control.8.in stable/11/contrib/unbound/doc/unbound-host.1.in stable/11/contrib/unbound/doc/unbound.8.in stable/11/contrib/unbound/doc/unbound.conf.5.in stable/11/contrib/unbound/libunbound/context.c stable/11/contrib/unbound/libunbound/libunbound.c stable/11/contrib/unbound/libunbound/libworker.c stable/11/contrib/unbound/respip/respip.c stable/11/contrib/unbound/services/authzone.c stable/11/contrib/unbound/services/cache/infra.c stable/11/contrib/unbound/services/cache/infra.h stable/11/contrib/unbound/services/listen_dnsport.c stable/11/contrib/unbound/services/listen_dnsport.h stable/11/contrib/unbound/services/localzone.c stable/11/contrib/unbound/services/mesh.c stable/11/contrib/unbound/services/outside_network.c stable/11/contrib/unbound/services/outside_network.h stable/11/contrib/unbound/services/rpz.c stable/11/contrib/unbound/smallapp/unbound-control-setup.sh.in stable/11/contrib/unbound/util/config_file.c stable/11/contrib/unbound/util/config_file.h stable/11/contrib/unbound/util/configlexer.lex stable/11/contrib/unbound/util/configparser.y stable/11/contrib/unbound/util/data/msgencode.c stable/11/contrib/unbound/util/data/msgreply.h stable/11/contrib/unbound/util/edns.c stable/11/contrib/unbound/util/edns.h stable/11/contrib/unbound/util/fptr_wlist.c stable/11/contrib/unbound/util/iana_ports.inc stable/11/contrib/unbound/util/module.h stable/11/contrib/unbound/util/netevent.c stable/11/contrib/unbound/util/netevent.h stable/11/contrib/unbound/util/regional.c stable/11/contrib/unbound/util/regional.h stable/11/contrib/unbound/validator/val_secalgo.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Added: stable/12/contrib/unbound/contrib/metrics.awk - copied unchanged from r368478, head/contrib/unbound/contrib/metrics.awk Modified: stable/12/contrib/unbound/config.guess stable/12/contrib/unbound/config.sub stable/12/contrib/unbound/configure stable/12/contrib/unbound/configure.ac stable/12/contrib/unbound/contrib/README stable/12/contrib/unbound/contrib/unbound.service.in stable/12/contrib/unbound/contrib/unbound_portable.service.in stable/12/contrib/unbound/daemon/daemon.c stable/12/contrib/unbound/daemon/unbound.c stable/12/contrib/unbound/daemon/worker.c stable/12/contrib/unbound/dnstap/dnstap.c stable/12/contrib/unbound/dnstap/dtstream.c stable/12/contrib/unbound/doc/Changelog stable/12/contrib/unbound/doc/README stable/12/contrib/unbound/doc/example.conf.in stable/12/contrib/unbound/doc/libunbound.3.in stable/12/contrib/unbound/doc/unbound-anchor.8.in stable/12/contrib/unbound/doc/unbound-checkconf.8.in stable/12/contrib/unbound/doc/unbound-control.8.in stable/12/contrib/unbound/doc/unbound-host.1.in stable/12/contrib/unbound/doc/unbound.8.in stable/12/contrib/unbound/doc/unbound.conf.5.in stable/12/contrib/unbound/libunbound/context.c stable/12/contrib/unbound/libunbound/libunbound.c stable/12/contrib/unbound/libunbound/libworker.c stable/12/contrib/unbound/respip/respip.c stable/12/contrib/unbound/services/authzone.c stable/12/contrib/unbound/services/cache/infra.c stable/12/contrib/unbound/services/cache/infra.h stable/12/contrib/unbound/services/listen_dnsport.c stable/12/contrib/unbound/services/listen_dnsport.h stable/12/contrib/unbound/services/localzone.c stable/12/contrib/unbound/services/mesh.c stable/12/contrib/unbound/services/outside_network.c stable/12/contrib/unbound/services/outside_network.h stable/12/contrib/unbound/services/rpz.c stable/12/contrib/unbound/smallapp/unbound-control-setup.sh.in stable/12/contrib/unbound/util/config_file.c
svn commit: r368495 - stable/12/lib/libc/gen
Author: cy
Date: Thu Dec 10 00:43:33 2020
New Revision: 368495
URL: https://svnweb.freebsd.org/changeset/base/368495
Log:
MFC r368294:
Remove trailing whitespace.
Modified:
stable/12/lib/libc/gen/glob-compat11.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/gen/glob-compat11.c
==
--- stable/12/lib/libc/gen/glob-compat11.c Wed Dec 9 22:37:23 2020
(r368494)
+++ stable/12/lib/libc/gen/glob-compat11.c Thu Dec 10 00:43:33 2020
(r368495)
@@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
struct glob_limit {
size_t l_brace_cnt;
size_t l_path_lim;
- size_t l_readdir_cnt;
- size_t l_stat_cnt;
+ size_t l_readdir_cnt;
+ size_t l_stat_cnt;
size_t l_string_cnt;
};
@@ -402,8 +402,8 @@ globtilde(const Char *pattern, Char *patbuf, size_t pa
if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
return (pattern);
- /*
-* Copy up to the end of the string or /
+ /*
+* Copy up to the end of the string or /
*/
eb = [patbuf_len - 1];
for (p = pattern + 1, b = patbuf;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368478 - in head/contrib/unbound: . contrib daemon dnstap doc libunbound respip services services/cache smallapp util util/data validator
Author: cy
Date: Wed Dec 9 02:59:24 2020
New Revision: 368478
URL: https://svnweb.freebsd.org/changeset/base/368478
Log:
MFV r368464:
Update unbound from 1.12.0 to 1.13.0
MFC after:1 week
Security: CVE-2020-28935
Added:
head/contrib/unbound/contrib/metrics.awk
- copied unchanged from r368464, vendor/unbound/dist/contrib/metrics.awk
Modified:
head/contrib/unbound/config.guess
head/contrib/unbound/config.sub
head/contrib/unbound/configure
head/contrib/unbound/configure.ac
head/contrib/unbound/contrib/README
head/contrib/unbound/contrib/unbound.service.in
head/contrib/unbound/contrib/unbound_portable.service.in
head/contrib/unbound/daemon/daemon.c
head/contrib/unbound/daemon/unbound.c
head/contrib/unbound/daemon/worker.c
head/contrib/unbound/dnstap/dnstap.c
head/contrib/unbound/dnstap/dtstream.c
head/contrib/unbound/doc/Changelog
head/contrib/unbound/doc/README
head/contrib/unbound/doc/example.conf.in
head/contrib/unbound/doc/libunbound.3.in
head/contrib/unbound/doc/unbound-anchor.8.in
head/contrib/unbound/doc/unbound-checkconf.8.in
head/contrib/unbound/doc/unbound-control.8.in
head/contrib/unbound/doc/unbound-host.1.in
head/contrib/unbound/doc/unbound.8.in
head/contrib/unbound/doc/unbound.conf.5.in
head/contrib/unbound/libunbound/context.c
head/contrib/unbound/libunbound/libunbound.c
head/contrib/unbound/libunbound/libworker.c
head/contrib/unbound/respip/respip.c
head/contrib/unbound/services/authzone.c
head/contrib/unbound/services/cache/infra.c
head/contrib/unbound/services/cache/infra.h
head/contrib/unbound/services/listen_dnsport.c
head/contrib/unbound/services/listen_dnsport.h
head/contrib/unbound/services/localzone.c
head/contrib/unbound/services/mesh.c
head/contrib/unbound/services/outside_network.c
head/contrib/unbound/services/outside_network.h
head/contrib/unbound/services/rpz.c
head/contrib/unbound/smallapp/unbound-control-setup.sh.in
head/contrib/unbound/util/config_file.c
head/contrib/unbound/util/config_file.h
head/contrib/unbound/util/configlexer.lex
head/contrib/unbound/util/configparser.y
head/contrib/unbound/util/data/msgencode.c
head/contrib/unbound/util/data/msgreply.h
head/contrib/unbound/util/edns.c
head/contrib/unbound/util/edns.h
head/contrib/unbound/util/fptr_wlist.c
head/contrib/unbound/util/iana_ports.inc
head/contrib/unbound/util/module.h
head/contrib/unbound/util/netevent.c
head/contrib/unbound/util/netevent.h
head/contrib/unbound/util/regional.c
head/contrib/unbound/util/regional.h
head/contrib/unbound/validator/val_secalgo.c
Directory Properties:
head/contrib/unbound/ (props changed)
Modified: head/contrib/unbound/config.guess
==
--- head/contrib/unbound/config.guess Wed Dec 9 02:47:39 2020
(r368477)
+++ head/contrib/unbound/config.guess Wed Dec 9 02:59:24 2020
(r368478)
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2020 Free Software Foundation, Inc.
-timestamp='2020-09-19'
+timestamp='2020-11-19'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,12 +27,12 @@ timestamp='2020-09-19'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
#
# Please send patches to .
-me=`echo "$0" | sed -e 's,.*/,,'`
+me=$(echo "$0" | sed -e 's,.*/,,')
usage="\
Usage: $0 [OPTION]
@@ -103,7 +103,7 @@ set_cc_for_build() {
test "$tmp" && return 0
: "${TMPDIR=/tmp}"
# shellcheck disable=SC2039
-{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n
"$tmp" && test -d "$tmp" ; } ||
+{ tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null) && test
-n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir
"$tmp" 2>/dev/null) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo
"Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit
1 ; }
@@ -131,16 +131,14 @@ if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
fi
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown
+UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown
+UNAME_SYSTEM=$( (uname -s) 2>/dev/null) ||
svn commit: r368465 - vendor/unbound/1.13.0
Author: cy Date: Tue Dec 8 21:24:24 2020 New Revision: 368465 URL: https://svnweb.freebsd.org/changeset/base/368465 Log: Tag unbound 1.13.0. Added: vendor/unbound/1.13.0/ - copied from r368464, vendor/unbound/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368464 - in vendor/unbound/dist: . contrib daemon dnstap doc libunbound pythonmod pythonmod/doc/examples pythonmod/doc/modules pythonmod/examples respip services services/cache smallap...
Author: cy Date: Tue Dec 8 21:23:03 2020 New Revision: 368464 URL: https://svnweb.freebsd.org/changeset/base/368464 Log: Vendor import of Unbound 1.13.0. Security: CVE-2020-28935 Added: vendor/unbound/dist/contrib/metrics.awk (contents, props changed) vendor/unbound/dist/testdata/doh_downstream_notls.tdir/ vendor/unbound/dist/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf (contents, props changed) vendor/unbound/dist/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc vendor/unbound/dist/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post vendor/unbound/dist/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre vendor/unbound/dist/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test vendor/unbound/dist/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns vendor/unbound/dist/testdata/doh_downstream_notls.tdir/unbound_server.key vendor/unbound/dist/testdata/doh_downstream_notls.tdir/unbound_server.pem (contents, props changed) vendor/unbound/dist/testdata/edns_client_string.rpl vendor/unbound/dist/testdata/edns_client_string_opcode.rpl vendor/unbound/dist/testdata/tcp_reuse.tdir/ vendor/unbound/dist/testdata/tcp_reuse.tdir/tcp_reuse.conf (contents, props changed) vendor/unbound/dist/testdata/tcp_reuse.tdir/tcp_reuse.conf2 vendor/unbound/dist/testdata/tcp_reuse.tdir/tcp_reuse.dsc vendor/unbound/dist/testdata/tcp_reuse.tdir/tcp_reuse.post vendor/unbound/dist/testdata/tcp_reuse.tdir/tcp_reuse.pre vendor/unbound/dist/testdata/tcp_reuse.tdir/tcp_reuse.test vendor/unbound/dist/testdata/tls_reuse.tdir/ vendor/unbound/dist/testdata/tls_reuse.tdir/tls_reuse.conf (contents, props changed) vendor/unbound/dist/testdata/tls_reuse.tdir/tls_reuse.conf2 vendor/unbound/dist/testdata/tls_reuse.tdir/tls_reuse.dsc vendor/unbound/dist/testdata/tls_reuse.tdir/tls_reuse.post vendor/unbound/dist/testdata/tls_reuse.tdir/tls_reuse.pre vendor/unbound/dist/testdata/tls_reuse.tdir/tls_reuse.test vendor/unbound/dist/testdata/tls_reuse.tdir/unbound_control.key vendor/unbound/dist/testdata/tls_reuse.tdir/unbound_control.pem (contents, props changed) vendor/unbound/dist/testdata/tls_reuse.tdir/unbound_server.key vendor/unbound/dist/testdata/tls_reuse.tdir/unbound_server.pem (contents, props changed) Deleted: vendor/unbound/dist/testdata/edns_client_tag.rpl Modified: vendor/unbound/dist/config.guess vendor/unbound/dist/config.sub vendor/unbound/dist/configure vendor/unbound/dist/configure.ac vendor/unbound/dist/contrib/README vendor/unbound/dist/contrib/unbound.service.in vendor/unbound/dist/contrib/unbound_portable.service.in vendor/unbound/dist/daemon/daemon.c vendor/unbound/dist/daemon/unbound.c vendor/unbound/dist/daemon/worker.c vendor/unbound/dist/dnstap/dnstap.c vendor/unbound/dist/dnstap/dtstream.c vendor/unbound/dist/doc/Changelog vendor/unbound/dist/doc/README vendor/unbound/dist/doc/example.conf.in vendor/unbound/dist/doc/libunbound.3.in vendor/unbound/dist/doc/unbound-anchor.8.in vendor/unbound/dist/doc/unbound-checkconf.8.in vendor/unbound/dist/doc/unbound-control.8.in vendor/unbound/dist/doc/unbound-host.1.in vendor/unbound/dist/doc/unbound.8.in vendor/unbound/dist/doc/unbound.conf.5.in vendor/unbound/dist/libunbound/context.c vendor/unbound/dist/libunbound/libunbound.c vendor/unbound/dist/libunbound/libworker.c vendor/unbound/dist/pythonmod/doc/examples/example6.rst vendor/unbound/dist/pythonmod/doc/modules/functions.rst vendor/unbound/dist/pythonmod/examples/inplace_callbacks.py vendor/unbound/dist/pythonmod/interface.i vendor/unbound/dist/respip/respip.c vendor/unbound/dist/services/authzone.c vendor/unbound/dist/services/cache/infra.c vendor/unbound/dist/services/cache/infra.h vendor/unbound/dist/services/listen_dnsport.c vendor/unbound/dist/services/listen_dnsport.h vendor/unbound/dist/services/localzone.c vendor/unbound/dist/services/mesh.c vendor/unbound/dist/services/outside_network.c vendor/unbound/dist/services/outside_network.h vendor/unbound/dist/services/rpz.c vendor/unbound/dist/smallapp/unbound-control-setup.sh.in vendor/unbound/dist/testcode/do-tests.sh vendor/unbound/dist/testcode/dohclient.c vendor/unbound/dist/testcode/fake_event.c vendor/unbound/dist/testcode/run_vm.sh vendor/unbound/dist/testcode/testbound.c vendor/unbound/dist/testcode/unitmain.c vendor/unbound/dist/testdata/dnstap.tdir/dnstap.pre vendor/unbound/dist/testdata/dnstap.tdir/dnstap.test vendor/unbound/dist/testdata/fwd_oneport.tdir/fwd_oneport.conf vendor/unbound/dist/util/config_file.c vendor/unbound/dist/util/config_file.h vendor/unbound/dist/util/configlexer.c vendor/unbound/dist/util/configlexer.lex vendor/unbound/dist/util/configparser.c vendor/unbound/dist/util/configparser.h vendor/unbound/dist/util/configparser.y vendor/unbound/dist/util/data/msgencode.c
Re: svn commit: r368345 - head/libexec/rc/rc.d
In message , Ed Maste writes: > On Fri, 4 Dec 2020 at 14:31, Cy Schubert wrote: > > > > Author: cy > > Date: Fri Dec 4 19:31:16 2020 > > New Revision: 368345 > > URL: https://svnweb.freebsd.org/changeset/base/368345 > > > > Log: > > Revert r366857. > > HW lab CI is green again with this change: > https://ci.freebsd.org/hwlab/job/FreeBSD-device-head-pinea64-test/8044/ > > (2 of 18 tests after r368345 failed; they timed out waiting for the > login prompt. Perhaps the timeout is just not long enough.) Unfortunately WOL is broken here. A patch to teach lagg(4) about WOL is #2 on my todo list. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368346 - stable/12/libexec/rc/rc.d
Author: cy Date: Fri Dec 4 19:35:43 2020 New Revision: 368346 URL: https://svnweb.freebsd.org/changeset/base/368346 Log: Revert r366857. r366857 created a number of problems, tearing down interfaces too early in shutdown. This resulted in: - hung ssh sessions when shutting down or rebooting remotely using shutdown (I've used exec shutdown, for years, as apposed to simply shutdown). - NFS mounted filesystems "disappear" prior to unmount. - dhclient attached to a VLAN on an interface who's parent interface has already shut down prints errors. The path forward is to teach lagg(4) and vlan(4) about WOL. PR: 251531, 251540 PR: 158734, 109980 are broken again Reported by: jhb, emaste, jtl, Helge Oldach Martin Birgmeier Discussion at:https://reviews.freebsd.org/D27459 Modified: stable/12/libexec/rc/rc.d/netif Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/rc/rc.d/netif == --- stable/12/libexec/rc/rc.d/netif Fri Dec 4 19:31:16 2020 (r368345) +++ stable/12/libexec/rc/rc.d/netif Fri Dec 4 19:35:43 2020 (r368346) @@ -28,7 +28,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: hostid ipfs -# KEYWORD: nojailvnet shutdown +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368345 - head/libexec/rc/rc.d
Author: cy Date: Fri Dec 4 19:31:16 2020 New Revision: 368345 URL: https://svnweb.freebsd.org/changeset/base/368345 Log: Revert r366857. r366857 created a number of problems, tearing down interfaces too early in shutdown. This resulted in: - hung ssh sessions when shutting down or rebooting remotely using shutdown (I've used exec shutdown, for years, as apposed to simply shutdown). - NFS mounted filesystems "disappear" prior to unmount. - dhclient attached to a VLAN on an interface who's parent interface has already shut down prints errors. The path forward is to teach lagg(4) and vlan(4) about WOL. PR: 251531, 251540 PR: 158734, 109980 are broken again Reported by: jhb, emaste, jtl, Helge Oldach Martin Birgmeier MFC after: Immediately Discussion at:https://reviews.freebsd.org/D27459 Modified: head/libexec/rc/rc.d/netif Modified: head/libexec/rc/rc.d/netif == --- head/libexec/rc/rc.d/netif Fri Dec 4 18:58:27 2020(r368344) +++ head/libexec/rc/rc.d/netif Fri Dec 4 19:31:16 2020(r368345) @@ -28,7 +28,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: hostid ipfs -# KEYWORD: nojailvnet shutdown +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368295 - in stable: 11/contrib/ipfilter/lib 12/contrib/ipfilter/lib
Author: cy
Date: Thu Dec 3 05:56:42 2020
New Revision: 368295
URL: https://svnweb.freebsd.org/changeset/base/368295
Log:
MFC r366286:
ipfilter getifname ifdef cleanup.
Modified:
stable/12/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/contrib/ipfilter/lib/getifname.c
==
--- stable/12/contrib/ipfilter/lib/getifname.c Thu Dec 3 05:49:59 2020
(r368294)
+++ stable/12/contrib/ipfilter/lib/getifname.c Thu Dec 3 05:56:42 2020
(r368295)
@@ -19,11 +19,9 @@
char *getifname(ptr)
struct ifnet *ptr;
{
-#if SOLARIS || defined(__hpux)
-# if SOLARIS
+#if SOLARIS
# include
# include
-# endif
# include "../pfil/qif.h"
char *ifname;
qif_t qif;
@@ -42,13 +40,6 @@ char *getifname(ptr)
}
return ifname;
#else
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-defined(__OpenBSD__) || \
-(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
-#else
- char buf[LIFNAMSIZ];
- int len;
-# endif
struct ifnet netif;
if ((void *)ptr == (void *)-1)
@@ -58,24 +49,6 @@ char *getifname(ptr)
if (kmemcpy((char *), (u_long)ptr, sizeof(netif)) == -1)
return "X";
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-defined(__OpenBSD__) || defined(linux) || \
-(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
return strdup(netif.if_xname);
-# else
- if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
- return "X";
- if (netif.if_unit < 10)
- len = 2;
- else if (netif.if_unit < 1000)
- len = 3;
- else if (netif.if_unit < 1)
- len = 4;
- else
- len = 5;
- buf[sizeof(buf) - len] = '\0';
- sprintf(buf + strlen(buf), "%d", netif.if_unit % 1);
- return strdup(buf);
-# endif
#endif
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368295 - in stable: 11/contrib/ipfilter/lib 12/contrib/ipfilter/lib
Author: cy
Date: Thu Dec 3 05:56:42 2020
New Revision: 368295
URL: https://svnweb.freebsd.org/changeset/base/368295
Log:
MFC r366286:
ipfilter getifname ifdef cleanup.
Modified:
stable/11/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/contrib/ipfilter/lib/getifname.c
==
--- stable/11/contrib/ipfilter/lib/getifname.c Thu Dec 3 05:49:59 2020
(r368294)
+++ stable/11/contrib/ipfilter/lib/getifname.c Thu Dec 3 05:56:42 2020
(r368295)
@@ -19,11 +19,9 @@
char *getifname(ptr)
struct ifnet *ptr;
{
-#if SOLARIS || defined(__hpux)
-# if SOLARIS
+#if SOLARIS
# include
# include
-# endif
# include "../pfil/qif.h"
char *ifname;
qif_t qif;
@@ -42,13 +40,6 @@ char *getifname(ptr)
}
return ifname;
#else
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-defined(__OpenBSD__) || \
-(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
-#else
- char buf[LIFNAMSIZ];
- int len;
-# endif
struct ifnet netif;
if ((void *)ptr == (void *)-1)
@@ -58,24 +49,6 @@ char *getifname(ptr)
if (kmemcpy((char *), (u_long)ptr, sizeof(netif)) == -1)
return "X";
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-defined(__OpenBSD__) || defined(linux) || \
-(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
return strdup(netif.if_xname);
-# else
- if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
- return "X";
- if (netif.if_unit < 10)
- len = 2;
- else if (netif.if_unit < 1000)
- len = 3;
- else if (netif.if_unit < 1)
- len = 4;
- else
- len = 5;
- buf[sizeof(buf) - len] = '\0';
- sprintf(buf + strlen(buf), "%d", netif.if_unit % 1);
- return strdup(buf);
-# endif
#endif
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368294 - head/lib/libc/gen
Author: cy
Date: Thu Dec 3 05:49:59 2020
New Revision: 368294
URL: https://svnweb.freebsd.org/changeset/base/368294
Log:
Remove trailing whitespace.
MFC after:1 week
Modified:
head/lib/libc/gen/glob-compat11.c
Modified: head/lib/libc/gen/glob-compat11.c
==
--- head/lib/libc/gen/glob-compat11.c Thu Dec 3 05:39:27 2020
(r368293)
+++ head/lib/libc/gen/glob-compat11.c Thu Dec 3 05:49:59 2020
(r368294)
@@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
struct glob_limit {
size_t l_brace_cnt;
size_t l_path_lim;
- size_t l_readdir_cnt;
- size_t l_stat_cnt;
+ size_t l_readdir_cnt;
+ size_t l_stat_cnt;
size_t l_string_cnt;
};
@@ -402,8 +402,8 @@ globtilde(const Char *pattern, Char *patbuf, size_t pa
if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
return (pattern);
- /*
-* Copy up to the end of the string or /
+ /*
+* Copy up to the end of the string or /
*/
eb = [patbuf_len - 1];
for (p = pattern + 1, b = patbuf;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366857 - head/libexec/rc/rc.d
In message , John Baldwin wri tes: > On 10/19/20 1:37 PM, Cy Schubert wrote: > > Author: cy > > Date: Mon Oct 19 20:37:38 2020 > > New Revision: 366857 > > URL: https://svnweb.freebsd.org/changeset/base/366857 > > > > Log: > > Destroy cloned interfaces at netif stop, netif restart and shutdown. > > This is especially important during shutdown because a child interface > > of lagg with WOL enabled will not enable WOL at interface shutdown and > > thus no WOL to wake up the device (and machine). > > > > PR: 158734, 109980 > > Reported by: Antonio Huete Jimenez > > Marat N.Afanasyev > > reviewed by: kp > > MFC after:1 week > > Differential Revision:https://reviews.freebsd.org/D26797 > > This causes some rather weird breakage for me. Namely, after this > change, if I'm logged into a host via ssh and reboot it (via > shutdown -r now), I no longer get gracefully logged out by the > shutdown process as the network connections are all killed before > users are kicked off the system. Instead, my ssh connection hangs > around forever until either it times out due to keep alives, or the > host in question reboots and send back a RST. > > As I rather frequently use shutdown -r now or poweroff remotely via > ssh, I've found this rather annoying as I have to use ~. to recover > my shell again (and woe to me if it was a nested login and I forgot > to add enough extra ~'s to escape the N levels). > > Probably if you only destroyed cloned interfaces during shutdown and > not all interfaces that would be a happy-enough compromise that > would still satisfy the original PR? I've been looking at this earlier today, a different issue. This reverts r366857 and adds netifdown to run almost prior to shutdown. diff --git a/libexec/rc/rc.d/netif b/libexec/rc/rc.d/netif index b4b8ccb1aede..eb1efc4d6274 100755 --- a/libexec/rc/rc.d/netif +++ b/libexec/rc/rc.d/netif @@ -28,7 +28,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: hostid ipfs -# KEYWORD: nojailvnet shutdown +# KEYWORD: nojailvnet . /etc/rc.subr . /etc/network.subr diff --git a/libexec/rc/rc.d/netifdown b/libexec/rc/rc.d/netifdown new file mode 100755 index ..8d64a1db06a2 --- /dev/null +++ b/libexec/rc/rc.d/netifdown @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Copyright (c) 2003 The FreeBSD Project. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +#notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +#notice, this list of conditions and the following disclaimer in the +#documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE PROJECT ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# $FreeBSD$ +# + +# PROVIDE: netifdown +# REQUIRE: netwait +# KEYWORD: nojailvnet shutdown nostart + +. /etc/rc.subr +. /etc/network.subr +. /etc/rc.d/netif I tested it here. It works better than my original solution. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368201 - in stable: 11/contrib/ipfilter/lib 12/contrib/ipfilter/lib
Author: cy
Date: Mon Nov 30 22:35:30 2020
New Revision: 368201
URL: https://svnweb.freebsd.org/changeset/base/368201
Log:
MFC r366285:
Resurrect ipfilter's getifname, replacing the stub with the real
function.
Modified:
stable/12/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/contrib/ipfilter/lib/getifname.c
==
--- stable/12/contrib/ipfilter/lib/getifname.c Mon Nov 30 22:16:11 2020
(r368200)
+++ stable/12/contrib/ipfilter/lib/getifname.c Mon Nov 30 22:35:30 2020
(r368201)
@@ -16,7 +16,6 @@
* Given a pointer to an interface in the kernel, return a pointer to a
* string which is the interface name.
*/
-#if 0
char *getifname(ptr)
struct ifnet *ptr;
{
@@ -80,13 +79,3 @@ char *getifname(ptr)
# endif
#endif
}
-#else
-char *getifname(ptr)
- struct ifnet *ptr;
-{
-#if 0
- ptr = ptr;
-#endif
- return "X";
-}
-#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368201 - in stable: 11/contrib/ipfilter/lib 12/contrib/ipfilter/lib
Author: cy
Date: Mon Nov 30 22:35:30 2020
New Revision: 368201
URL: https://svnweb.freebsd.org/changeset/base/368201
Log:
MFC r366285:
Resurrect ipfilter's getifname, replacing the stub with the real
function.
Modified:
stable/11/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/contrib/ipfilter/lib/getifname.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/contrib/ipfilter/lib/getifname.c
==
--- stable/11/contrib/ipfilter/lib/getifname.c Mon Nov 30 22:16:11 2020
(r368200)
+++ stable/11/contrib/ipfilter/lib/getifname.c Mon Nov 30 22:35:30 2020
(r368201)
@@ -16,7 +16,6 @@
* Given a pointer to an interface in the kernel, return a pointer to a
* string which is the interface name.
*/
-#if 0
char *getifname(ptr)
struct ifnet *ptr;
{
@@ -80,13 +79,3 @@ char *getifname(ptr)
# endif
#endif
}
-#else
-char *getifname(ptr)
- struct ifnet *ptr;
-{
-#if 0
- ptr = ptr;
-#endif
- return "X";
-}
-#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368129 - in stable: 11/contrib/unbound 11/contrib/unbound/contrib 11/contrib/unbound/daemon 11/contrib/unbound/dnstap 11/contrib/unbound/doc 11/contrib/unbound/dynlibmod 11/contrib/unb...
Author: cy Date: Sat Nov 28 18:09:16 2020 New Revision: 368129 URL: https://svnweb.freebsd.org/changeset/base/368129 Log: MFC r367094: MFV r367082: Update unbound 1.11.0 --> 1.12.0. Modified: stable/12/contrib/unbound/Makefile.in stable/12/contrib/unbound/README.md stable/12/contrib/unbound/acx_nlnetlabs.m4 stable/12/contrib/unbound/config.guess stable/12/contrib/unbound/config.h.in stable/12/contrib/unbound/config.sub stable/12/contrib/unbound/configure stable/12/contrib/unbound/configure.ac stable/12/contrib/unbound/contrib/-filter-iterator.patch stable/12/contrib/unbound/contrib/unbound.service.in stable/12/contrib/unbound/contrib/unbound_munin_ stable/12/contrib/unbound/daemon/daemon.c stable/12/contrib/unbound/daemon/remote.c stable/12/contrib/unbound/daemon/stats.c stable/12/contrib/unbound/daemon/unbound.c stable/12/contrib/unbound/daemon/worker.c stable/12/contrib/unbound/dnstap/dnstap.c stable/12/contrib/unbound/dnstap/dnstap.h stable/12/contrib/unbound/dnstap/dtstream.c stable/12/contrib/unbound/dnstap/dtstream.h stable/12/contrib/unbound/dnstap/unbound-dnstap-socket.c stable/12/contrib/unbound/doc/Changelog stable/12/contrib/unbound/doc/README stable/12/contrib/unbound/doc/example.conf.in stable/12/contrib/unbound/doc/libunbound.3.in stable/12/contrib/unbound/doc/unbound-anchor.8.in stable/12/contrib/unbound/doc/unbound-checkconf.8.in stable/12/contrib/unbound/doc/unbound-control.8.in stable/12/contrib/unbound/doc/unbound-host.1.in stable/12/contrib/unbound/doc/unbound.8.in stable/12/contrib/unbound/doc/unbound.conf.5.in stable/12/contrib/unbound/dynlibmod/dynlibmod.c stable/12/contrib/unbound/iterator/iterator.c stable/12/contrib/unbound/libunbound/context.c stable/12/contrib/unbound/libunbound/libunbound.c stable/12/contrib/unbound/libunbound/libworker.c stable/12/contrib/unbound/libunbound/unbound.h stable/12/contrib/unbound/services/cache/dns.c stable/12/contrib/unbound/services/listen_dnsport.c stable/12/contrib/unbound/services/listen_dnsport.h stable/12/contrib/unbound/services/mesh.c stable/12/contrib/unbound/services/mesh.h stable/12/contrib/unbound/services/outside_network.c stable/12/contrib/unbound/services/rpz.c stable/12/contrib/unbound/sldns/parseutil.c stable/12/contrib/unbound/sldns/parseutil.h stable/12/contrib/unbound/sldns/rrdef.h stable/12/contrib/unbound/smallapp/unbound-checkconf.c stable/12/contrib/unbound/smallapp/unbound-control.c stable/12/contrib/unbound/util/config_file.c stable/12/contrib/unbound/util/config_file.h stable/12/contrib/unbound/util/configlexer.lex stable/12/contrib/unbound/util/configparser.y stable/12/contrib/unbound/util/edns.c stable/12/contrib/unbound/util/edns.h stable/12/contrib/unbound/util/fptr_wlist.c stable/12/contrib/unbound/util/iana_ports.inc stable/12/contrib/unbound/util/mini_event.h stable/12/contrib/unbound/util/module.h stable/12/contrib/unbound/util/net_help.c stable/12/contrib/unbound/util/net_help.h stable/12/contrib/unbound/util/netevent.c stable/12/contrib/unbound/util/netevent.h stable/12/contrib/unbound/validator/val_anchor.c stable/12/contrib/unbound/validator/val_anchor.h stable/12/contrib/unbound/validator/val_neg.c stable/12/contrib/unbound/validator/val_neg.h stable/12/contrib/unbound/validator/val_nsec.c stable/12/contrib/unbound/validator/val_nsec.h stable/12/contrib/unbound/validator/validator.c stable/12/contrib/unbound/validator/validator.h stable/12/usr.sbin/unbound/config.h Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/unbound/Makefile.in stable/11/contrib/unbound/README.md stable/11/contrib/unbound/acx_nlnetlabs.m4 stable/11/contrib/unbound/config.guess stable/11/contrib/unbound/config.h.in stable/11/contrib/unbound/config.sub stable/11/contrib/unbound/configure stable/11/contrib/unbound/configure.ac stable/11/contrib/unbound/contrib/-filter-iterator.patch stable/11/contrib/unbound/contrib/unbound.service.in stable/11/contrib/unbound/contrib/unbound_munin_ stable/11/contrib/unbound/daemon/daemon.c stable/11/contrib/unbound/daemon/remote.c stable/11/contrib/unbound/daemon/stats.c stable/11/contrib/unbound/daemon/unbound.c stable/11/contrib/unbound/daemon/worker.c stable/11/contrib/unbound/dnstap/dnstap.c stable/11/contrib/unbound/dnstap/dnstap.h stable/11/contrib/unbound/dnstap/dtstream.c stable/11/contrib/unbound/dnstap/dtstream.h stable/11/contrib/unbound/dnstap/unbound-dnstap-socket.c stable/11/contrib/unbound/doc/Changelog stable/11/contrib/unbound/doc/README stable/11/contrib/unbound/doc/example.conf.in stable/11/contrib/unbound/doc/libunbound.3.in stable/11/contrib/unbound/doc/unbound-anchor.8.in stable/11/contrib/unbound/doc/unbound-checkconf.8.in stable/11/contrib/unbound/doc/unbound-control.8.in
svn commit: r368129 - in stable: 11/contrib/unbound 11/contrib/unbound/contrib 11/contrib/unbound/daemon 11/contrib/unbound/dnstap 11/contrib/unbound/doc 11/contrib/unbound/dynlibmod 11/contrib/unb...
Author: cy Date: Sat Nov 28 18:09:16 2020 New Revision: 368129 URL: https://svnweb.freebsd.org/changeset/base/368129 Log: MFC r367094: MFV r367082: Update unbound 1.11.0 --> 1.12.0. Modified: stable/11/contrib/unbound/Makefile.in stable/11/contrib/unbound/README.md stable/11/contrib/unbound/acx_nlnetlabs.m4 stable/11/contrib/unbound/config.guess stable/11/contrib/unbound/config.h.in stable/11/contrib/unbound/config.sub stable/11/contrib/unbound/configure stable/11/contrib/unbound/configure.ac stable/11/contrib/unbound/contrib/-filter-iterator.patch stable/11/contrib/unbound/contrib/unbound.service.in stable/11/contrib/unbound/contrib/unbound_munin_ stable/11/contrib/unbound/daemon/daemon.c stable/11/contrib/unbound/daemon/remote.c stable/11/contrib/unbound/daemon/stats.c stable/11/contrib/unbound/daemon/unbound.c stable/11/contrib/unbound/daemon/worker.c stable/11/contrib/unbound/dnstap/dnstap.c stable/11/contrib/unbound/dnstap/dnstap.h stable/11/contrib/unbound/dnstap/dtstream.c stable/11/contrib/unbound/dnstap/dtstream.h stable/11/contrib/unbound/dnstap/unbound-dnstap-socket.c stable/11/contrib/unbound/doc/Changelog stable/11/contrib/unbound/doc/README stable/11/contrib/unbound/doc/example.conf.in stable/11/contrib/unbound/doc/libunbound.3.in stable/11/contrib/unbound/doc/unbound-anchor.8.in stable/11/contrib/unbound/doc/unbound-checkconf.8.in stable/11/contrib/unbound/doc/unbound-control.8.in stable/11/contrib/unbound/doc/unbound-host.1.in stable/11/contrib/unbound/doc/unbound.8.in stable/11/contrib/unbound/doc/unbound.conf.5.in stable/11/contrib/unbound/dynlibmod/dynlibmod.c stable/11/contrib/unbound/iterator/iterator.c stable/11/contrib/unbound/libunbound/context.c stable/11/contrib/unbound/libunbound/libunbound.c stable/11/contrib/unbound/libunbound/libworker.c stable/11/contrib/unbound/libunbound/unbound.h stable/11/contrib/unbound/services/cache/dns.c stable/11/contrib/unbound/services/listen_dnsport.c stable/11/contrib/unbound/services/listen_dnsport.h stable/11/contrib/unbound/services/mesh.c stable/11/contrib/unbound/services/mesh.h stable/11/contrib/unbound/services/outside_network.c stable/11/contrib/unbound/services/rpz.c stable/11/contrib/unbound/sldns/parseutil.c stable/11/contrib/unbound/sldns/parseutil.h stable/11/contrib/unbound/sldns/rrdef.h stable/11/contrib/unbound/smallapp/unbound-checkconf.c stable/11/contrib/unbound/smallapp/unbound-control.c stable/11/contrib/unbound/util/config_file.c stable/11/contrib/unbound/util/config_file.h stable/11/contrib/unbound/util/configlexer.lex stable/11/contrib/unbound/util/configparser.y stable/11/contrib/unbound/util/edns.c stable/11/contrib/unbound/util/edns.h stable/11/contrib/unbound/util/fptr_wlist.c stable/11/contrib/unbound/util/iana_ports.inc stable/11/contrib/unbound/util/mini_event.h stable/11/contrib/unbound/util/module.h stable/11/contrib/unbound/util/net_help.c stable/11/contrib/unbound/util/net_help.h stable/11/contrib/unbound/util/netevent.c stable/11/contrib/unbound/util/netevent.h stable/11/contrib/unbound/validator/val_anchor.c stable/11/contrib/unbound/validator/val_anchor.h stable/11/contrib/unbound/validator/val_neg.c stable/11/contrib/unbound/validator/val_neg.h stable/11/contrib/unbound/validator/val_nsec.c stable/11/contrib/unbound/validator/val_nsec.h stable/11/contrib/unbound/validator/validator.c stable/11/contrib/unbound/validator/validator.h stable/11/usr.sbin/unbound/config.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/contrib/unbound/Makefile.in stable/12/contrib/unbound/README.md stable/12/contrib/unbound/acx_nlnetlabs.m4 stable/12/contrib/unbound/config.guess stable/12/contrib/unbound/config.h.in stable/12/contrib/unbound/config.sub stable/12/contrib/unbound/configure stable/12/contrib/unbound/configure.ac stable/12/contrib/unbound/contrib/-filter-iterator.patch stable/12/contrib/unbound/contrib/unbound.service.in stable/12/contrib/unbound/contrib/unbound_munin_ stable/12/contrib/unbound/daemon/daemon.c stable/12/contrib/unbound/daemon/remote.c stable/12/contrib/unbound/daemon/stats.c stable/12/contrib/unbound/daemon/unbound.c stable/12/contrib/unbound/daemon/worker.c stable/12/contrib/unbound/dnstap/dnstap.c stable/12/contrib/unbound/dnstap/dnstap.h stable/12/contrib/unbound/dnstap/dtstream.c stable/12/contrib/unbound/dnstap/dtstream.h stable/12/contrib/unbound/dnstap/unbound-dnstap-socket.c stable/12/contrib/unbound/doc/Changelog stable/12/contrib/unbound/doc/README stable/12/contrib/unbound/doc/example.conf.in stable/12/contrib/unbound/doc/libunbound.3.in stable/12/contrib/unbound/doc/unbound-anchor.8.in stable/12/contrib/unbound/doc/unbound-checkconf.8.in stable/12/contrib/unbound/doc/unbound-control.8.in
svn commit: r368089 - in stable: 11/sys/kern 12/sys/kern
Author: cy
Date: Fri Nov 27 03:17:21 2020
New Revision: 368089
URL: https://svnweb.freebsd.org/changeset/base/368089
Log:
MFC r367980:
Fix a typo in a comment.
Modified:
stable/12/sys/kern/kern_ntptime.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/kern/kern_ntptime.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/kern/kern_ntptime.c
==
--- stable/12/sys/kern/kern_ntptime.c Thu Nov 26 23:54:13 2020
(r368088)
+++ stable/12/sys/kern/kern_ntptime.c Fri Nov 27 03:17:21 2020
(r368089)
@@ -590,7 +590,7 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
/*
* Apply any correction from adjtime(2). If more than one second
-* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500PPM)
+* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500 PPM)
* until the last second is slewed the final < 500 usecs.
*/
if (time_adjtime != 0) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r368089 - in stable: 11/sys/kern 12/sys/kern
Author: cy
Date: Fri Nov 27 03:17:21 2020
New Revision: 368089
URL: https://svnweb.freebsd.org/changeset/base/368089
Log:
MFC r367980:
Fix a typo in a comment.
Modified:
stable/11/sys/kern/kern_ntptime.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/kern/kern_ntptime.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/kern/kern_ntptime.c
==
--- stable/11/sys/kern/kern_ntptime.c Thu Nov 26 23:54:13 2020
(r368088)
+++ stable/11/sys/kern/kern_ntptime.c Fri Nov 27 03:17:21 2020
(r368089)
@@ -590,7 +590,7 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
/*
* Apply any correction from adjtime(2). If more than one second
-* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500PPM)
+* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500 PPM)
* until the last second is slewed the final < 500 usecs.
*/
if (time_adjtime != 0) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
Just came in from outside to check my buildworld. Removing the gh-bc subdir
in obj fixed it.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
In message <94afc036-0c96-589b-47a4-7d9972b64...@freebsd.org>, Stefan Esser
wri
tes:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --LNh7JZBKUks6iTmPthYYHSJRZLxtgUw39
> Content-Type: multipart/mixed; boundary="UukPFASfKyppXv6KjFIjzyho2LVowmUF8";
> protected-headers="v1"
> From: Stefan Esser
> To: Cy Schubert
> Cc: "O. Hartmann" , src-committ...@freebsd.org,
> svn-src-all@freebsd.org, svn-src-h...@freebsd.org
> Message-ID: <94afc036-0c96-589b-47a4-7d9972b64...@freebsd.org>
> Subject: Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals
> manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
> References: <202011261739.0aqhdpe5012...@repo.freebsd.org>
> <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de>
> <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org>
> <202011262003.0aqk3bte076...@slippy.cwsent.com>
>
> In-Reply-To:
>
> --UukPFASfKyppXv6KjFIjzyho2LVowmUF8
> Content-Type: text/plain; charset=windows-1252; format=flowed
> Content-Language: de-DE
> Content-Transfer-Encoding: quoted-printable
>
> FYI: Another "make buildworld" has succeeded on my system.
>
> I cannot reproduce the issue your report and need more
> information from your system, e.g. a TAR file with the
> contents of usr.bin/gh-bc, contrib/bc and your object
> directory ${.OBJDIR}.
>
> Regards, STefan
>
> Am 26.11.20 um 22:23 schrieb Stefan Esser:
> > Am 26.11.20 um 21:03 schrieb Cy Schubert:> But this is still a problem:=
>
> >>
> >> ld: error: undefined symbol: bc_lib_name
> >>>>> referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:75=
> 2)
> >>>>> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 lto.tmp:(bc_vm_boot)
> >>
> >> ld: error: undefined symbol: bc_lib
> >>>>> referenced by lex.c:225=20
> >>>>> (/opt/src/svn-current/contrib/bc/src/lex.c:225)
> >>>>> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 lto.tmp:(bc_vm_boot)
> >>>>> referenced by lex.c:227=20
> >>>>> (/opt/src/svn-current/contrib/bc/src/lex.c:227)
> >>>>> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 lto.tmp:(bc_vm_boot)
> >> cc: error: linker command failed with exit code 1 (use -v to see=20
> >> invocation)
> >> *** [gh-bc.full] Error code 1
> >=20
> > I cannot reproduce this issue on my system.
> >=20
> > The symbols are defined in files generated by gen/strgen.sh and
> > there was a change in the parameters passed to this script, but
> > I had fixed usr.bin/gh-bc/Makefile accordingly (first in the port
> > and then in base).
> >=20
> > The generated file lib.c should start like this:
> > -
> > // Copyright (c) 2018-2020 Gavin D. Howard and contributors.
> > // Licensed under the 2-clause BSD license.
> > // *** AUTOMATICALLY GENERATED FROM gen/lib.bc. DO NOT MODIFY. ***
> >=20
> > #if 1
> > extern const char *bc_lib_name;
> >=20
> > extern const char bc_lib[];
> >=20
> > const char *bc_lib_name =3D "gen/lib.bc";
> >=20
> > const char bc_lib[] =3D
> > "scale=3D20\n"
> > -
> >=20
> > This file is generated by this rule in usr.bin/gh-bc/Makefile:
> >=20
> > lib.c:=A0=A0=A0=A0=A0=A0=A0=A0=A0 lib.bc
> > =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 cd ${BCDIR} && sh gen/st=
> rgen.sh gen/lib.bc=20
> > ${.OBJDIR}/lib.c bc_lib bc_lib_name 1 1
> >=20
> > By a script that assigns parameters to variables:
> >=20
> > input=3D"$1"
> > output=3D"$2"
> > name=3D"$3"
> > label=3D"$4"
> > define=3D"$5"
> > remove_tabs=3D"$6"
> >=20
> > And label=3D"bc_lib_name" is used to generate lib.c as included
> > above (passed as 4th parameter).
> >=20
> > I'm rebuilding a clean world, now, but I'd be surprised if it failed
> > after succeeding before readying the commit ...
> >=20
> > Regards, STefan
> >=20
>
>
> --UukPFASfKyppXv6KjFIjzyho2LVowmUF8--
>
> --LNh7JZBKUks6iTmPthYYHSJRZLxtgUw39
> Content-Type: application/pgp-signature; name="OpenP
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
In message , Stefan Esser
wri
tes:
> This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
> --maOtBJEdTLpVHYJ8ME4Ow5t7gyU1h0CIy
> Content-Type: multipart/mixed; boundary="m8M7hYutSXzrBuT8orVd2JNQQPKxzBZwZ";
> protected-headers="v1"
> From: Stefan Esser
> To: Cy Schubert
> Cc: "O. Hartmann" , src-committ...@freebsd.org,
> svn-src-all@freebsd.org, svn-src-h...@freebsd.org
> Message-ID:
> Subject: Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals
> manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
> References: <202011261739.0aqhdpe5012...@repo.freebsd.org>
> <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de>
> <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org>
> <202011262003.0aqk3bte076...@slippy.cwsent.com>
> In-Reply-To: <202011262003.0aqk3bte076...@slippy.cwsent.com>
>
> --m8M7hYutSXzrBuT8orVd2JNQQPKxzBZwZ
> Content-Type: text/plain; charset=windows-1252; format=flowed
> Content-Language: en-US
> Content-Transfer-Encoding: quoted-printable
>
> Am 26.11.20 um 21:03 schrieb Cy Schubert:> But this is still a problem:
> >=20
> > ld: error: undefined symbol: bc_lib_name
> >>>> referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:752=
> )
> >>>>lto.tmp:(bc_vm_boot)
> >=20
> > ld: error: undefined symbol: bc_lib
> >>>> referenced by lex.c:225 (/opt/src/svn-current/contrib/bc/src/lex.c:2=
> 25)
> >>>>lto.tmp:(bc_vm_boot)
> >>>> referenced by lex.c:227 (/opt/src/svn-current/contrib/bc/src/lex.c:2=
> 27)
> >>>>lto.tmp:(bc_vm_boot)
> > cc: error: linker command failed with exit code 1 (use -v to see invoca=
> tion)
> > *** [gh-bc.full] Error code 1
>
> I cannot reproduce this issue on my system.
>
> The symbols are defined in files generated by gen/strgen.sh and
> there was a change in the parameters passed to this script, but
> I had fixed usr.bin/gh-bc/Makefile accordingly (first in the port
> and then in base).
>
> The generated file lib.c should start like this:
> -
> // Copyright (c) 2018-2020 Gavin D. Howard and contributors.
> // Licensed under the 2-clause BSD license.
> // *** AUTOMATICALLY GENERATED FROM gen/lib.bc. DO NOT MODIFY. ***
>
> #if 1
> extern const char *bc_lib_name;
>
> extern const char bc_lib[];
>
> const char *bc_lib_name =3D "gen/lib.bc";
>
> const char bc_lib[] =3D
> "scale=3D20\n"
> -
>
> This file is generated by this rule in usr.bin/gh-bc/Makefile:
>
> lib.c: lib.bc
> cd ${BCDIR} && sh gen/strgen.sh gen/lib.bc=20
> ${.OBJDIR}/lib.c bc_lib bc_lib_name 1 1
>
> By a script that assigns parameters to variables:
>
> input=3D"$1"
> output=3D"$2"
> name=3D"$3"
> label=3D"$4"
> define=3D"$5"
> remove_tabs=3D"$6"
>
> And label=3D"bc_lib_name" is used to generate lib.c as included
> above (passed as 4th parameter).
>
> I'm rebuilding a clean world, now, but I'd be surprised if it failed
> after succeeding before readying the commit ...
A clean build (sort of) did fix it: rm the appropriate subdir actually.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests
In message <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org>, Stefan Esser wri tes: > This is an OpenPGP/MIME signed message (RFC 4880 and 3156) > --2G5HCRtxQxuyxUK7KLlZTL2fMyBuBvAg7 > Content-Type: multipart/mixed; boundary="FsAoxbmUuUe0Y5w6qCnYUtYCPXSqZLgCr"; > protected-headers="v1" > From: Stefan Esser > To: "O. Hartmann" > Cc: src-committ...@freebsd.org, svn-src-all@freebsd.org, > svn-src-h...@freebsd.org > Message-ID: <95c3e226-6050-2f91-debf-317d6d114...@freebsd.org> > Subject: Re: svn commit: r368072 - in head/contrib/bc: . gen include manuals > manuals/bc manuals/dc src src/bc src/dc src/history src/rand tests > References: <202011261739.0aqhdpe5012...@repo.freebsd.org> > <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de> > In-Reply-To: <20201126191949.092c9...@thor.intern.walstatt.dynvpn.de> > > --FsAoxbmUuUe0Y5w6qCnYUtYCPXSqZLgCr > Content-Type: text/plain; charset=utf-8; format=flowed > Content-Language: en-US > Content-Transfer-Encoding: quoted-printable > > Am 26.11.20 um 19:19 schrieb O. Hartmann: > >> svn-src-h...@freebsd.org mailing list > >> https://lists.freebsd.org/mailman/listinfo/svn-src-head > >> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org= > " > > Buildworld fails with "don't know how to make bc/bc.c": > >=20 > > =3D=3D=3D> usr.sbin/ndp (all) > > - --- all_subdir_usr.bin --- > > make[4]: make[4]: don't know how to make bc/bc.c. Stop > > Hi Oliver, > > thanks - I had already noticed that for some reason the Makefile > in usr.bin/gh-bc had not been included in the commit. > > I just checked the command in the shell history and found that > I have used a wrong path in the commit: > > $ cd /usr/svn/base/head > $ svn ci contrib/bc usr.bin/bc > > And that should have been usr.bin/gh-bc ... > > Sorry for the breakage! I have committed the fix before seeing > your mail ... > > Regards, STefan But this is still a problem: ld: error: undefined symbol: bc_lib_name >>> referenced by vm.c:752 (/opt/src/svn-current/contrib/bc/src/vm.c:752) >>> lto.tmp:(bc_vm_boot) ld: error: undefined symbol: bc_lib >>> referenced by lex.c:225 (/opt/src/svn-current/contrib/bc/src/lex.c:225) >>> lto.tmp:(bc_vm_boot) >>> referenced by lex.c:227 (/opt/src/svn-current/contrib/bc/src/lex.c:227) >>> lto.tmp:(bc_vm_boot) cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [gh-bc.full] Error code 1 make[4]: stopped in /opt/src/svn-current/usr.bin/gh-bc -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367980 - head/sys/kern
Author: cy
Date: Tue Nov 24 06:42:32 2020
New Revision: 367980
URL: https://svnweb.freebsd.org/changeset/base/367980
Log:
Fix a typo in a comment.
MFC after:3 days
Modified:
head/sys/kern/kern_ntptime.c
Modified: head/sys/kern/kern_ntptime.c
==
--- head/sys/kern/kern_ntptime.cTue Nov 24 04:16:49 2020
(r367979)
+++ head/sys/kern/kern_ntptime.cTue Nov 24 06:42:32 2020
(r367980)
@@ -590,7 +590,7 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
/*
* Apply any correction from adjtime(2). If more than one second
-* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500PPM)
+* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500 PPM)
* until the last second is slewed the final < 500 usecs.
*/
if (time_adjtime != 0) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367779 - head/sys/contrib/openzfs/cmd/zpool
Author: cy
Date: Wed Nov 18 01:18:45 2020
New Revision: 367779
URL: https://svnweb.freebsd.org/changeset/base/367779
Log:
Restore identification of VDEVs using non-native block size.
NAME STATE READ WRITE CKSUM
dsk02ONLINE 0 0 0
mirror-0 ONLINE 0 0 0
ada1s4a ONLINE 0 0 0
ada2s4a ONLINE 0 0 0 block size: 512B configured,
4096B native
Reviewed by: tsoome (previous FreeBSD phab version)
Differential Revision:https://reviews.freebsd.org/D26880
Upstream commit: 3928ec53395fcc26be7844dd6b63df757166c281
Reviewed-by: Matt Macy
Reviewed-by: Toomas Soome
Reviewed-by: Brian Behlendorf
Signed off by:Cy Schubert
Closes #11088
Modified:
head/sys/contrib/openzfs/cmd/zpool/zpool_main.c
Modified: head/sys/contrib/openzfs/cmd/zpool/zpool_main.c
==
--- head/sys/contrib/openzfs/cmd/zpool/zpool_main.c Tue Nov 17 21:20:11
2020(r367778)
+++ head/sys/contrib/openzfs/cmd/zpool/zpool_main.c Wed Nov 18 01:18:45
2020(r367779)
@@ -2254,6 +2254,13 @@ print_status_config(zpool_handle_t *zhp, status_cbdata
break;
}
color_end();
+ } else if (children == 0 && !isspare &&
+ getenv("ZPOOL_STATUS_NON_NATIVE_ASHIFT_IGNORE") == NULL &&
+ VDEV_STAT_VALID(vs_physical_ashift, vsc) &&
+ vs->vs_configured_ashift < vs->vs_physical_ashift) {
+ (void) printf(
+ gettext(" block size: %dB configured, %dB native"),
+ 1 << vs->vs_configured_ashift, 1 << vs->vs_physical_ashift);
}
/* The root vdev has the scrub/resilver stats */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367692 - head/sys/sys
In message <0015bc22-4568-93cc-5c77-e97c4f5e2...@freebsd.org>, John Baldwin wri tes: > On 11/14/20 2:34 PM, Warner Losh wrote: > > true, but a version bump forces that and versions are cheap enough... > > Strictly speaking, version bumps don't force anything to recompile, they > just ensure that newer modules won't load on older kernels. In this case, > the change to sys/ucred.h will result in sys/ucred.h's mtime changing so > that any kernel modules being built via NO_CLEAN=yes will rebuild ok. > > I'm not quite sure where this mantra that version bumps force rebuilds > came from, but they don't. It's true that since it lives in > and most things include that, it mostly forces a rebuild, but that's > mostly a side effect, not due to explicit magic around __FreeBSD_version. Any update to sys/param.h causes the rebuild of any object that depends on the header file. It also causes any poudriere jail built on -CURRENT to delete all its packages and restart from scratch. Poudriere assumes it means ABI or API changes whereas version bumps could simply be markers of notable change that may not affect the ABI. In which case poudriere package rebuilds are gratuitous. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367459 - head/usr.sbin/syslogd
NP. That's happened to me a couple of times at $JOB.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
In message <4b605497-6dd1-72fe-fb05-b45c61ee6...@freebsd.org>, Bryan
Drewery wr
ites:
>
> Thanks. I had the commit in a branch that had a debug commit after. The
> brace was rebased wrong.
>
> On 11/7/2020 11:17 AM, Cy Schubert wrote:
> > Author: cy
> > Date: Sat Nov 7 19:17:37 2020
> > New Revision: 367459
> > URL: https://svnweb.freebsd.org/changeset/base/367459
> >=20
> > Log:
> > Fix build post-r367455.
> > =20
> > MFC after:2 weeks
> > X-MFC with: r367455
> >=20
> > Modified:
> > head/usr.sbin/syslogd/syslogd.c
> >=20
> > Modified: head/usr.sbin/syslogd/syslogd.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D
> > --- head/usr.sbin/syslogd/syslogd.c Sat Nov 7 18:15:29 2020(r36745
> 8)
> > +++ head/usr.sbin/syslogd/syslogd.c Sat Nov 7 19:17:37 2020(r36745
> 9)
> > @@ -1873,7 +1873,7 @@ fprintlog_write(struct filed *f, struct iovlist *=
> il, i
> > continue;
> > if (sl->sl_sa =3D=3D NULL ||
> > sl->sl_family =3D=3D AF_UNSPEC ||
> > - sl->sl_family =3D=3D AF_LOCAL) {
> > + sl->sl_family =3D=3D AF_LOCAL)
> > continue;
> > lsent =3D sendmsg(sl->sl_socket, , 0);
> > if (lsent =3D=3D (ssize_t)il->totalsize)
> >=20
>
>
> --=20
> Regards,
> Bryan Drewery
>
> --9CBC57D81FB1CF44779F663A
> Content-Type: application/pgp-keys;
> name="OpenPGP_0x35D771BB6E4697CF_and_old_rev.asc"
> Content-Transfer-Encoding: base64
> Content-Disposition: attachment;
> filename="OpenPGP_0x35D771BB6E4697CF_and_old_rev.asc"
>
> LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tDQoNCnhzQk5CRkpwaG1zQkNB
> RGlGZ21TNGJJendaaWpyUzMxU2pFTXpnK241ek5lbGxnTStIa1Nod2VocHFDaXloWGRXcnZI
> NmRUWmE2dTUNCjBwYlVJWDdkb1RSN1c3UFFIQ2pDVHF0cHd2Y2owZXVsWnZhK2lIRnArWHJi
> Z1NGSG4rVlZYZ2tZUDJNRnlTeVpSRmFiRDJxcXpKQkUNCkpvZmhwdjRIdlk2dVFJNUs5OXBN
> cUtyMVovbEhxc2lqWVl1NFJIMk9md0I1UGluSWQ3eGVsZHpXRW9uVm9DcityZnh6Ty9VcmdB
> NnYNCi8zbGF5R1pjS05IRmptYzNOcW9OMURYdGRhRUhxdGpJb3p6Ym5kVmtINmxrRnZJcEly
> STZpNW94OHB3cFZ4c3hMQ3IvNE11c2Q1Q1cNCmdIaWV0NWtTdzJTek5lQThGYnhkTFlDcFhO
> VnUrdUJBQ0ViQ1VQK0NTTnkzTlZmRVV4c0JBQkVCQUFITkpFSnllV0Z1SUVSeVpYZGwNCmNu
> a2dQR0prY21WM1pYSjVRRVp5WldWQ1UwUXViM0puUHNMQlhBUVFBUW9BQmdVQ1VtbUpsUUFL
> Q1JCdWVDckFQSnNNK1RmZEQvOTMNCmlqVUlCOW94bU5EcEZqMERtQ0IyWlRZZTN0T0Y0WE9x
> THJMTW9UaVpKbmNhU0xqRUhxcW8vaTYySFRtV2pSZjJoL0pwdGE4WmwzRCsNCmRpdlNkSjIr
> RFdBb29aOU5hanQzRnhlckhVbXVFWldUR3lJSC9tQnZubUI2R2pCb0NDdE56SVQwL3FGeklT
> R3RURFJQcHNwbHo5QXENCjczZHozczFadjUyWUt2a3d2MVp3d2svNGVmVGlqRTk0V3JOSXRv
> QkRXaCtXbmU3WkpMMVVVK0tOTktJWUNCQ3Z4Mjk3bGsvby9ZbkcNCmxNdHpIL0ZxVVIzVHU0
> UWo4MTE2aWVpVno2eVJ3eWI0OGJWYUtjYzEya2F5SjhOOFVEamZZYjZ3Wjlvc3RQcjVaSEJ4
> N0tIY1hUTEENCm5vTGhObDdPdVVKNGROU2luY2lZYTB3d0xDRTJ2ZkhIcjNDN05BOEpUM2ZL
> VElUVDZSekQ0VmtZN3BzUWN2blpBTC9ocGZsVXVldUUNCitnaWdZTmdSb00xZStrMENZRHow
> QkZmY1BkKytNQTdEbnNjNUVXOUJnc210bUVuY0o4Z3htV2xtM3VrMEJZRjZ0clpheTR3eXJa
> dkoNCm9vamNMVmkrYXAvbTUrYzRPbFZ0Uk9lVU9IUXVLdXQyZVk5bXkvU0lWcmZnUExBQ0hm
> eTd4d3E5ZXgyNFpaQU1IUUdyeHJTYWVZMmwNClhGV0gzWmtVc3NES1pJd0V1dVkzc09lSlY2
> TnRDWklhV2JtVjhQRS9wbGw0eERBSmVFT0lUUGlIbU9wRUJBVDdVQndWMTZqZTNhUEYNCjhF
> RDRhakc0RjAycXJpSC9YZWJncnR4eWZCSDFJMllFSlVNd1A4Z1R2VGxUOTJSd25PTTBmTEJj
> aHI3OXAvR1pXRnp3QXRRaXhNSk0NCkJCTVJBZ0FNQlFKU2E5MmNCWU1IaGgrQUFBb0pFR0hZ
> ZHNGRUNqUFN6aDhBblJkUXpFYlhFQVZ6dDJyV21GT1RVQUhGTHBvVUFKNDYNCkthNEYxcjBz
> WC8zeWpJSmJVSDYxRlkxbWJjTEFYQVFRQVFJQUJnVUNVbXZwY0FBS0NSRDF6Mkt6SUhzYm9Y
> MkVCLzR3NWxSUnM4ODINCjF3OXFHRkY5azJ2dWhxNEFKOWdNTHBJMEM5VFVOSk5RaU9sVEdh
> Tmp2MVNXSEQ1bVlqZ3IxRHBiTVdSY05HbXlDbnNYZjZCdDF5NDENCm1VUUV5NUZ6YUxVYTVR
> enFIdlIzWkd5NkNybFJDVmVqT01TMlZOQWxVOHI1YVh6MEVxTEhQNTVnb1FGYVE4aVEvY0Yv
> R1laeFlOaW4NCk9vYmh5K3V5ZTJiWE16azI2MFhlSkZ0S1Z6RUFlNmpoNlE1KythMWRnNm1q
> M0JROENEN3dhdERhY1k1WTZsb290UFRJQUN3cUdHb2YNCktCbHZNYW1MMVpWSXpKK0huamhs
> S3NtVzRBV2hMRFQxUDFudzNzOUJ0TEIxNUtzc0Q0TE54TGF0ZGpsaWRodWxkYm9xUkRwdExu
> NzMNCmlOM3dqVDdNQnJROGVGb0t5dlpNbFJONVBWNDl3c0JnQkJBQkNnQUtCUUpTYSt
svn commit: r367459 - head/usr.sbin/syslogd
Author: cy
Date: Sat Nov 7 19:17:37 2020
New Revision: 367459
URL: https://svnweb.freebsd.org/changeset/base/367459
Log:
Fix build post-r367455.
MFC after:2 weeks
X-MFC with: r367455
Modified:
head/usr.sbin/syslogd/syslogd.c
Modified: head/usr.sbin/syslogd/syslogd.c
==
--- head/usr.sbin/syslogd/syslogd.c Sat Nov 7 18:15:29 2020
(r367458)
+++ head/usr.sbin/syslogd/syslogd.c Sat Nov 7 19:17:37 2020
(r367459)
@@ -1873,7 +1873,7 @@ fprintlog_write(struct filed *f, struct iovlist *il, i
continue;
if (sl->sl_sa == NULL ||
sl->sl_family == AF_UNSPEC ||
- sl->sl_family == AF_LOCAL) {
+ sl->sl_family == AF_LOCAL)
continue;
lsent = sendmsg(sl->sl_socket, , 0);
if (lsent == (ssize_t)il->totalsize)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367455 - head/usr.sbin/syslogd
In message <202011071718.0a7hijdy003...@repo.freebsd.org>, Bryan Drewery
writes
:
> Author: bdrewery
> Date: Sat Nov 7 17:18:44 2020
> New Revision: 367455
> URL: https://svnweb.freebsd.org/changeset/base/367455
>
> Log:
> syslogd: Stop trying to send remote messages through special sockets
>
> Specifically this was causing the /dev/klog fd and the signal pipe
> handling fd to get a sendmsg(2) called on them and always returned
> [ENOTSOCK].
>
> r310350 combined these sockets into the main socket list and properly
> skipped AF_UNSPEC at the sendmsg(2) call but later in r344739 it was
> broken such that these special sockets were no longer excluded since
> the AF_UNSPEC check specifically excluded these special sockets. Only
> these special sockets have sl_sa = NULL. The sl_family checks should
> be redundant now but are left in case of future changes so the intent
> is clearer.
>
> MFC after: 2 weeks
>
> Modified:
> head/usr.sbin/syslogd/syslogd.c
>
> Modified: head/usr.sbin/syslogd/syslogd.c
> =
> =
> --- head/usr.sbin/syslogd/syslogd.c Sat Nov 7 16:58:38 2020(r36745
> 4)
> +++ head/usr.sbin/syslogd/syslogd.c Sat Nov 7 17:18:44 2020(r36745
> 5)
> @@ -1871,9 +1871,9 @@ fprintlog_write(struct filed *f, struct iovlist *il, i
> STAILQ_FOREACH(sl, , next) {
> if (sl->sl_socket < 0)
> continue;
> - if (sl->sl_sa != NULL &&
> - (sl->sl_family == AF_LOCAL ||
> - sl->sl_family == AF_UNSPEC))
> + if (sl->sl_sa == NULL ||
> + sl->sl_family == AF_UNSPEC ||
> + sl->sl_family == AF_LOCAL) {
The extraneous left brace broke the build.
> continue;
> lsent = sendmsg(sl->sl_socket, , 0);
> if (lsent == (ssize_t)il->totalsize)
>
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367155 - in stable: 10/contrib/ipfilter/man 11/contrib/ipfilter/man 12/contrib/ipfilter/man
Author: cy Date: Fri Oct 30 00:34:40 2020 New Revision: 367155 URL: https://svnweb.freebsd.org/changeset/base/367155 Log: MFC r367070: Remove a random equal sign from the example. It should not be there. It's a syntax error. PR: 210303 Reported by: leventelist at gmail.com Modified: stable/12/contrib/ipfilter/man/ipf.5 Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/man/ipf.5 stable/11/contrib/ipfilter/man/ipf.5 Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/contrib/ipfilter/man/ipf.5 == --- stable/12/contrib/ipfilter/man/ipf.5Fri Oct 30 00:32:14 2020 (r367154) +++ stable/12/contrib/ipfilter/man/ipf.5Fri Oct 30 00:34:40 2020 (r367155) @@ -355,7 +355,7 @@ block in proto tcp from any port >= 1024 to any port < pass in proto tcp from 10.1.0.0/24 to any port = 22 block out proto udp from any to 10.1.1.1 port = 135 pass in proto udp from 1.1.1.1 port = 123 to 10.1.1.1 port = 123 -pass in proto tcp from 127.0.0.0/8 to any port = 6000:6009 +pass in proto tcp from 127.0.0.0/8 to any port 6000:6009 .fi .PP If there is no desire to mention any specific source or destintion ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367155 - in stable: 10/contrib/ipfilter/man 11/contrib/ipfilter/man 12/contrib/ipfilter/man
Author: cy Date: Fri Oct 30 00:34:40 2020 New Revision: 367155 URL: https://svnweb.freebsd.org/changeset/base/367155 Log: MFC r367070: Remove a random equal sign from the example. It should not be there. It's a syntax error. PR: 210303 Reported by: leventelist at gmail.com Modified: stable/10/contrib/ipfilter/man/ipf.5 Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/ipfilter/man/ipf.5 stable/12/contrib/ipfilter/man/ipf.5 Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/contrib/ipfilter/man/ipf.5 == --- stable/10/contrib/ipfilter/man/ipf.5Fri Oct 30 00:32:14 2020 (r367154) +++ stable/10/contrib/ipfilter/man/ipf.5Fri Oct 30 00:34:40 2020 (r367155) @@ -355,7 +355,7 @@ block in proto tcp from any port >= 1024 to any port < pass in proto tcp from 10.1.0.0/24 to any port = 22 block out proto udp from any to 10.1.1.1 port = 135 pass in proto udp from 1.1.1.1 port = 123 to 10.1.1.1 port = 123 -pass in proto tcp from 127.0.0.0/8 to any port = 6000:6009 +pass in proto tcp from 127.0.0.0/8 to any port 6000:6009 .fi .PP If there is no desire to mention any specific source or destintion ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367155 - in stable: 10/contrib/ipfilter/man 11/contrib/ipfilter/man 12/contrib/ipfilter/man
Author: cy Date: Fri Oct 30 00:34:40 2020 New Revision: 367155 URL: https://svnweb.freebsd.org/changeset/base/367155 Log: MFC r367070: Remove a random equal sign from the example. It should not be there. It's a syntax error. PR: 210303 Reported by: leventelist at gmail.com Modified: stable/11/contrib/ipfilter/man/ipf.5 Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/man/ipf.5 stable/12/contrib/ipfilter/man/ipf.5 Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/contrib/ipfilter/man/ipf.5 == --- stable/11/contrib/ipfilter/man/ipf.5Fri Oct 30 00:32:14 2020 (r367154) +++ stable/11/contrib/ipfilter/man/ipf.5Fri Oct 30 00:34:40 2020 (r367155) @@ -355,7 +355,7 @@ block in proto tcp from any port >= 1024 to any port < pass in proto tcp from 10.1.0.0/24 to any port = 22 block out proto udp from any to 10.1.1.1 port = 135 pass in proto udp from 1.1.1.1 port = 123 to 10.1.1.1 port = 123 -pass in proto tcp from 127.0.0.0/8 to any port = 6000:6009 +pass in proto tcp from 127.0.0.0/8 to any port 6000:6009 .fi .PP If there is no desire to mention any specific source or destintion ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367154 - in stable: 11/contrib/ipfilter/lib 12/contrib/ipfilter/lib
Author: cy Date: Fri Oct 30 00:32:14 2020 New Revision: 367154 URL: https://svnweb.freebsd.org/changeset/base/367154 Log: MFC r367069: Continued ipfilter #ifdef cleanup. The r343701 log entry contains a complete description. Modified: stable/12/contrib/ipfilter/lib/kmem.h Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/ipfilter/lib/kmem.h Directory Properties: stable/11/ (props changed) Modified: stable/12/contrib/ipfilter/lib/kmem.h == --- stable/12/contrib/ipfilter/lib/kmem.h Fri Oct 30 00:06:36 2020 (r367153) +++ stable/12/contrib/ipfilter/lib/kmem.h Fri Oct 30 00:32:14 2020 (r367154) @@ -21,7 +21,7 @@ externint openkmem __P((char *, char *)); extern int kmemcpy __P((char *, long, int)); extern int kstrncpy __P((char *, long, int)); -#if defined(__NetBSD__) || defined(__OpenBSD) +#if defined(__NetBSD__) # include #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367154 - in stable: 11/contrib/ipfilter/lib 12/contrib/ipfilter/lib
Author: cy Date: Fri Oct 30 00:32:14 2020 New Revision: 367154 URL: https://svnweb.freebsd.org/changeset/base/367154 Log: MFC r367069: Continued ipfilter #ifdef cleanup. The r343701 log entry contains a complete description. Modified: stable/11/contrib/ipfilter/lib/kmem.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/contrib/ipfilter/lib/kmem.h Directory Properties: stable/12/ (props changed) Modified: stable/11/contrib/ipfilter/lib/kmem.h == --- stable/11/contrib/ipfilter/lib/kmem.h Fri Oct 30 00:06:36 2020 (r367153) +++ stable/11/contrib/ipfilter/lib/kmem.h Fri Oct 30 00:32:14 2020 (r367154) @@ -21,7 +21,7 @@ externint openkmem __P((char *, char *)); extern int kmemcpy __P((char *, long, int)); extern int kstrncpy __P((char *, long, int)); -#if defined(__NetBSD__) || defined(__OpenBSD) +#if defined(__NetBSD__) # include #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367049 - stable/12/libexec/rc/rc.d
In message <20201029161751.ga2...@kib.kiev.ua>, Konstantin Belousov writes: > On Mon, Oct 26, 2020 at 01:18:16AM +, Cy Schubert wrote: > > Author: cy > > Date: Mon Oct 26 01:18:15 2020 > > New Revision: 367049 > > URL: https://svnweb.freebsd.org/changeset/base/367049 > > > > Log: > > MFC r366857: > > Destroy cloned interfaces at netif stop, netif restart and shutdown. > > This is especially important during shutdown because a child interface > > of lagg with WOL enabled will not enable WOL at interface shutdown and > > thus no WOL to wake up the device (and machine). > > > > PR: 158734, 109980 > > Reported by: Antonio Huete Jimenez > > Marat N.Afanasyev > > reviewed by: kp > > > > Modified: > > stable/12/libexec/rc/rc.d/netif > > Directory Properties: > > stable/12/ (props changed) > > > > Modified: stable/12/libexec/rc/rc.d/netif > > === > === > > --- stable/12/libexec/rc/rc.d/netif Mon Oct 26 00:37:31 2020(r36704 > 8) > > +++ stable/12/libexec/rc/rc.d/netif Mon Oct 26 01:18:15 2020(r36704 > 9) > > @@ -28,7 +28,7 @@ > > # PROVIDE: netif > > # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl > > # REQUIRE: hostid ipfs > > -# KEYWORD: nojailvnet > > +# KEYWORD: nojailvnet shutdown > > > > . /etc/rc.subr > > . /etc/network.subr > After this change, shutdown of my stable/12 router looks like this: > > Stopping devd. > Waiting for PIDS: 1120. > Oct 29 18:09:52 tom minissdpd[1619]: setsockopt(udp, IP_DROP_MEMBERSHIP)(vlan > 1): Can't assign requested address > /etc/rc.shutdown: WARNING: vlan1 does not exist. Skipped. > /etc/rc.shutdown: WARNING: vlan2 does not exist. Skipped. > /etc/rc.shutdown: WARNING: vlan3 does not exist. Skipped. > /etc/rc.shutdown: WARNING: vlan4 does not exist. Skipped. > /etc/rc.shutdown: WARNING: vlan5 does not exist. Skipped. > Stopping Network: lo0 re0 re1 pflog0 gif0. > lo0: flags=8048 metric 0 mtu 16384 > options=680003 > groups: lo > nd6 options=21 > re0: flags=8802 metric 0 mtu 1500 > options=201b > ether e0:d5:5e:50:93:04 > media: Ethernet autoselect (1000baseT ) > status: active > nd6 options=29 > re1: flags=8802 metric 0 mtu 1500 > options=201b > ether e0:d5:5e:50:93:05 > media: Ethernet autoselect (100baseTX ) > status: active > nd6 options=29 > pflog0: flags=100 metric 0 mtu 33160 > groups: pflog > gif0: flags=8010 metric 0 mtu 1280 > options=8 > tunnel inet 176.36.249.139 --> 216.66.84.46 > groups: gif > nd6 options=21 > Destroyed clone interfaces: gif0. > Writing entropy file: . > . > Terminated > Oct 29 18:09:53 tom syslogd: exiting on signal 15 > pflog0: promiscuous mode disabled > Waiting (max 60 seconds) for system process `vnlru' to stop... done > Waiting (max 60 seconds) for system process `syncer' to stop... > Syncing disks, vnodes remaining... 14 2 2 1 1 1 0 0 0 0 done > The messages are innocuous. We could disable printing of the messages during shutdown though. The patch resolves an issue where one or both interfaces with WOL enabled are members of a lagg(4) and since the lagg(4) is not torn down during shutdown WOL isn't enabled in the NIC prior to power off. This results in no WOL when interfaces are members of a lagg(4). Without the patch my machines with lagg(4) fail to wake on lan after being powered off. Another alternative would be to tear down cloned interfaces in the kernel prior to calling device_shutdown or device_suspend for each physical interface, both of which enable WOL in drivers that support this feature. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367094 - in head: contrib/unbound contrib/unbound/contrib contrib/unbound/daemon contrib/unbound/dnstap contrib/unbound/doc contrib/unbound/dynlibmod contrib/unbound/iterator contrib/u...
Author: cy Date: Tue Oct 27 23:03:15 2020 New Revision: 367094 URL: https://svnweb.freebsd.org/changeset/base/367094 Log: MFV r367082: Update unbound 1.11.0 --> 1.12.0. MFC after:1 month. Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/README.md head/contrib/unbound/acx_nlnetlabs.m4 head/contrib/unbound/config.guess head/contrib/unbound/config.h.in head/contrib/unbound/config.sub head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/-filter-iterator.patch head/contrib/unbound/contrib/unbound.service.in head/contrib/unbound/contrib/unbound_munin_ head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/stats.c head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/dnstap/dnstap.c head/contrib/unbound/dnstap/dnstap.h head/contrib/unbound/dnstap/dtstream.c head/contrib/unbound/dnstap/dtstream.h head/contrib/unbound/dnstap/unbound-dnstap-socket.c head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/dynlibmod/dynlibmod.c head/contrib/unbound/iterator/iterator.c head/contrib/unbound/libunbound/context.c head/contrib/unbound/libunbound/libunbound.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/services/cache/dns.c head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/listen_dnsport.h head/contrib/unbound/services/mesh.c head/contrib/unbound/services/mesh.h head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/rpz.c head/contrib/unbound/sldns/parseutil.c head/contrib/unbound/sldns/parseutil.h head/contrib/unbound/sldns/rrdef.h head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/edns.c head/contrib/unbound/util/edns.h head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/mini_event.h head/contrib/unbound/util/module.h head/contrib/unbound/util/net_help.c head/contrib/unbound/util/net_help.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/netevent.h head/contrib/unbound/validator/val_anchor.c head/contrib/unbound/validator/val_anchor.h head/contrib/unbound/validator/val_neg.c head/contrib/unbound/validator/val_neg.h head/contrib/unbound/validator/val_nsec.c head/contrib/unbound/validator/val_nsec.h head/contrib/unbound/validator/validator.c head/contrib/unbound/validator/validator.h head/usr.sbin/unbound/config.h Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in == --- head/contrib/unbound/Makefile.inTue Oct 27 21:53:33 2020 (r367093) +++ head/contrib/unbound/Makefile.inTue Oct 27 23:03:15 2020 (r367094) @@ -231,6 +231,10 @@ STREAMTCP_SRC=testcode/streamtcp.c STREAMTCP_OBJ=streamtcp.lo STREAMTCP_OBJ_LINK=$(STREAMTCP_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \ $(SLDNS_OBJ) +DOHCLIENT_SRC=testcode/dohclient.c +DOHCLIENT_OBJ=dohclient.lo +DOHCLIENT_OBJ_LINK=$(DOHCLIENT_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \ +$(SLDNS_OBJ) PERF_SRC=testcode/perf.c PERF_OBJ=perf.lo PERF_OBJ_LINK=$(PERF_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) $(SLDNS_OBJ) @@ -272,7 +276,8 @@ ALL_SRC=$(COMMON_SRC) $(UNITTEST_SRC) $(DAEMON_SRC) \ $(ASYNCLOOK_SRC) $(STREAMTCP_SRC) $(PERF_SRC) $(DELAYER_SRC) \ $(CONTROL_SRC) $(UBANCHOR_SRC) $(PETAL_SRC) $(DNSTAP_SOCKET_SRC)\ $(PYTHONMOD_SRC) $(PYUNBOUND_SRC) $(WIN_DAEMON_THE_SRC) \ - $(SVCINST_SRC) $(SVCUNINST_SRC) $(ANCHORUPD_SRC) $(SLDNS_SRC) + $(SVCINST_SRC) $(SVCUNINST_SRC) $(ANCHORUPD_SRC) $(SLDNS_SRC) \ + $(DOHCLIENT_SRC) ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ $(TESTBOUND_OBJ) $(LOCKVERIFY_OBJ) $(PKTVIEW_OBJ) \ @@ -280,7 +285,8 @@ ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ $(ASYNCLOOK_OBJ) $(STREAMTCP_OBJ) $(PERF_OBJ) $(DELAYER_OBJ) \ $(CONTROL_OBJ) $(UBANCHOR_OBJ) $(PETAL_OBJ) $(DNSTAP_SOCKET_OBJ)\ $(COMPAT_OBJ) $(PYUNBOUND_OBJ) \ - $(SVCINST_OBJ) $(SVCUNINST_OBJ) $(ANCHORUPD_OBJ) $(SLDNS_OBJ) + $(SVCINST_OBJ) $(SVCUNINST_OBJ)
svn commit: r367083 - vendor/unbound/1.12.0
Author: cy Date: Tue Oct 27 15:10:50 2020 New Revision: 367083 URL: https://svnweb.freebsd.org/changeset/base/367083 Log: Tag unbound 1.12.0. Added: vendor/unbound/1.12.0/ - copied from r367082, vendor/unbound/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367082 - in vendor/unbound/dist: . contrib daemon dnstap doc dynlibmod iterator libunbound pythonmod pythonmod/doc/modules pythonmod/examples services services/cache sldns smallapp tes...
Author: cy Date: Tue Oct 27 15:09:16 2020 New Revision: 367082 URL: https://svnweb.freebsd.org/changeset/base/367082 Log: Vendor import of Unbound 1.12.0. Added: vendor/unbound/dist/testcode/dohclient.c (contents, props changed) vendor/unbound/dist/testdata/doh_downstream.tdir/ vendor/unbound/dist/testdata/doh_downstream.tdir/doh_downstream.conf (contents, props changed) vendor/unbound/dist/testdata/doh_downstream.tdir/doh_downstream.dsc vendor/unbound/dist/testdata/doh_downstream.tdir/doh_downstream.post vendor/unbound/dist/testdata/doh_downstream.tdir/doh_downstream.pre vendor/unbound/dist/testdata/doh_downstream.tdir/doh_downstream.test vendor/unbound/dist/testdata/doh_downstream.tdir/doh_downstream.testns vendor/unbound/dist/testdata/doh_downstream.tdir/unbound_server.key vendor/unbound/dist/testdata/doh_downstream.tdir/unbound_server.pem vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/ vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.conf (contents, props changed) vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.dsc vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.post vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.pre vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/doh_downstream_buffer_size.test vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/unbound_server.key vendor/unbound/dist/testdata/doh_downstream_buffer_size.tdir/unbound_server.pem vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/ vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.conf (contents, props changed) vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.dsc vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.post vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.pre vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/doh_downstream_endpoint.test vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/unbound_server.key vendor/unbound/dist/testdata/doh_downstream_endpoint.tdir/unbound_server.pem vendor/unbound/dist/testdata/doh_downstream_post.tdir/ vendor/unbound/dist/testdata/doh_downstream_post.tdir/doh_downstream_post.conf (contents, props changed) vendor/unbound/dist/testdata/doh_downstream_post.tdir/doh_downstream_post.dsc vendor/unbound/dist/testdata/doh_downstream_post.tdir/doh_downstream_post.post vendor/unbound/dist/testdata/doh_downstream_post.tdir/doh_downstream_post.pre vendor/unbound/dist/testdata/doh_downstream_post.tdir/doh_downstream_post.test vendor/unbound/dist/testdata/doh_downstream_post.tdir/doh_downstream_post.testns vendor/unbound/dist/testdata/doh_downstream_post.tdir/unbound_server.key vendor/unbound/dist/testdata/doh_downstream_post.tdir/unbound_server.pem vendor/unbound/dist/testdata/edns_client_tag.rpl vendor/unbound/dist/testdata/stat_values.tdir/ vendor/unbound/dist/testdata/stat_values.tdir/stat_values.conf (contents, props changed) vendor/unbound/dist/testdata/stat_values.tdir/stat_values.dsc vendor/unbound/dist/testdata/stat_values.tdir/stat_values.post vendor/unbound/dist/testdata/stat_values.tdir/stat_values.pre vendor/unbound/dist/testdata/stat_values.tdir/stat_values.test vendor/unbound/dist/testdata/stat_values.tdir/stat_values.testexpiredns vendor/unbound/dist/testdata/stat_values.tdir/stat_values.testns vendor/unbound/dist/testdata/stat_values.tdir/unbound_control.key vendor/unbound/dist/testdata/stat_values.tdir/unbound_control.pem vendor/unbound/dist/testdata/stat_values.tdir/unbound_server.key vendor/unbound/dist/testdata/stat_values.tdir/unbound_server.pem Deleted: vendor/unbound/dist/testdata/dlv_anchor.rpl vendor/unbound/dist/testdata/dlv_ask_higher.rpl vendor/unbound/dist/testdata/dlv_below_ta.rpl vendor/unbound/dist/testdata/dlv_delegation.rpl vendor/unbound/dist/testdata/dlv_ds_lookup.rpl vendor/unbound/dist/testdata/dlv_insecure.rpl vendor/unbound/dist/testdata/dlv_insecure_negcache.rpl vendor/unbound/dist/testdata/dlv_keyretry.rpl vendor/unbound/dist/testdata/dlv_negnx.rpl vendor/unbound/dist/testdata/dlv_optout.rpl vendor/unbound/dist/testdata/dlv_remove.rpl vendor/unbound/dist/testdata/dlv_remove_empty.rpl vendor/unbound/dist/testdata/dlv_remove_nodel.rpl vendor/unbound/dist/testdata/dlv_remove_pos.rpl vendor/unbound/dist/testdata/dlv_unused.rpl vendor/unbound/dist/testdata/domain_insec_dlv.rpl vendor/unbound/dist/testdata/fwddlv_parse.rpl vendor/unbound/dist/testdata/val_unalgo_dlv.rpl Modified: vendor/unbound/dist/.gitignore vendor/unbound/dist/Makefile.in vendor/unbound/dist/README.md vendor/unbound/dist/acx_nlnetlabs.m4 vendor/unbound/dist/config.guess
svn commit: r367070 - head/contrib/ipfilter/man
Author: cy Date: Tue Oct 27 04:35:47 2020 New Revision: 367070 URL: https://svnweb.freebsd.org/changeset/base/367070 Log: Remove a random equal sign from the example. It should not be there. It's a syntax error. PR: 210303 Reported by: leventelist at gmail.com MFC after:3 days Modified: head/contrib/ipfilter/man/ipf.5 Modified: head/contrib/ipfilter/man/ipf.5 == --- head/contrib/ipfilter/man/ipf.5 Tue Oct 27 04:35:36 2020 (r367069) +++ head/contrib/ipfilter/man/ipf.5 Tue Oct 27 04:35:47 2020 (r367070) @@ -355,7 +355,7 @@ block in proto tcp from any port >= 1024 to any port < pass in proto tcp from 10.1.0.0/24 to any port = 22 block out proto udp from any to 10.1.1.1 port = 135 pass in proto udp from 1.1.1.1 port = 123 to 10.1.1.1 port = 123 -pass in proto tcp from 127.0.0.0/8 to any port = 6000:6009 +pass in proto tcp from 127.0.0.0/8 to any port 6000:6009 .fi .PP If there is no desire to mention any specific source or destintion ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367069 - head/contrib/ipfilter/lib
Author: cy Date: Tue Oct 27 04:35:36 2020 New Revision: 367069 URL: https://svnweb.freebsd.org/changeset/base/367069 Log: Continued ipfilter #ifdef cleanup. The r343701 log entry contains a complete description. MFC after:3 days Modified: head/contrib/ipfilter/lib/kmem.h Modified: head/contrib/ipfilter/lib/kmem.h == --- head/contrib/ipfilter/lib/kmem.hMon Oct 26 19:13:22 2020 (r367068) +++ head/contrib/ipfilter/lib/kmem.hTue Oct 27 04:35:36 2020 (r367069) @@ -21,7 +21,7 @@ externint openkmem __P((char *, char *)); extern int kmemcpy __P((char *, long, int)); extern int kstrncpy __P((char *, long, int)); -#if defined(__NetBSD__) || defined(__OpenBSD) +#if defined(__NetBSD__) # include #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367050 - stable/11/etc/rc.d
Author: cy Date: Mon Oct 26 01:23:14 2020 New Revision: 367050 URL: https://svnweb.freebsd.org/changeset/base/367050 Log: This is a direct commit to stable/11 however it performs MFC r366857 applied to stable/12 with r367049. This is due to src/etc/rc.d/netif having been previously moved to src/libexec/rc.d/netif. Destroy cloned interfaces at netif stop, netif restart and shutdown. This is especially important during shutdown because a child interface of lagg with WOL enabled will not enable WOL at interface shutdown and thus no WOL to wake up the device (and machine). PR: 158734, 109980 Reported by: Antonio Huete Jimenez Marat N.Afanasyev reviewed by:kp Modified: stable/11/etc/rc.d/netif Modified: stable/11/etc/rc.d/netif == --- stable/11/etc/rc.d/netifMon Oct 26 01:18:15 2020(r367049) +++ stable/11/etc/rc.d/netifMon Oct 26 01:23:14 2020(r367050) @@ -28,7 +28,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: hostid ipfilter ipfs -# KEYWORD: nojailvnet +# KEYWORD: nojailvnet shutdown . /etc/rc.subr . /etc/network.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r367049 - stable/12/libexec/rc/rc.d
Author: cy Date: Mon Oct 26 01:18:15 2020 New Revision: 367049 URL: https://svnweb.freebsd.org/changeset/base/367049 Log: MFC r366857: Destroy cloned interfaces at netif stop, netif restart and shutdown. This is especially important during shutdown because a child interface of lagg with WOL enabled will not enable WOL at interface shutdown and thus no WOL to wake up the device (and machine). PR: 158734, 109980 Reported by: Antonio Huete Jimenez Marat N.Afanasyev reviewed by: kp Modified: stable/12/libexec/rc/rc.d/netif Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/rc/rc.d/netif == --- stable/12/libexec/rc/rc.d/netif Mon Oct 26 00:37:31 2020 (r367048) +++ stable/12/libexec/rc/rc.d/netif Mon Oct 26 01:18:15 2020 (r367049) @@ -28,7 +28,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: hostid ipfs -# KEYWORD: nojailvnet +# KEYWORD: nojailvnet shutdown . /etc/rc.subr . /etc/network.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367048 - head/lib/libc/sys
In message <202010260059.09q0xbxt003...@slippy.cwsent.com>, Cy Schubert writes: > In message <202010260037.09q0bvpn090...@repo.freebsd.org>, John-Mark Gurney > wri > tes: > > Author: jmg > > Date: Mon Oct 26 00:37:31 2020 > > New Revision: 367048 > > URL: https://svnweb.freebsd.org/changeset/base/367048 > > > > Log: > > update write(2)'s iovec limit w/ info about the iosize_max_clamp sysctl.. > . > > > > Modified: > > head/lib/libc/sys/write.2 > > > > Modified: head/lib/libc/sys/write.2 > > === > == > > = > > --- head/lib/libc/sys/write.2 Sun Oct 25 23:26:07 2020(r36704 > 7) > > +++ head/lib/libc/sys/write.2 Mon Oct 26 00:37:31 2020(r36704 > 8) > > @@ -28,7 +28,7 @@ > > .\" @(#)write.28.5 (Berkeley) 4/2/94 > > .\" $FreeBSD$ > > .\" > > -.Dd March 30, 2020 > > +.Dd October 25, 2020 > > .Dt WRITE 2 > > .Os > > .Sh NAME > > @@ -240,9 +240,13 @@ array was negative. > > .It Bq Er EINVAL > > The sum of the > > .Fa iov_len > > -values in the > > -.Fa iov > > -array overflowed a 32-bit integer. > > +values is greater than > > +.Dv SSIZE_MAX > > +(or greater than > > +.Dv INT_MAX , > > +if the sysctl > > +.Va debug.iosize_max_clamp > > Should we also include SEE ALSO reference to sysctl(8) or sysctl(3)? > Personally I think a reference to sysctl(8) would be more apropos. Or maybe both. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367048 - head/lib/libc/sys
In message <202010260037.09q0bvpn090...@repo.freebsd.org>, John-Mark Gurney wri tes: > Author: jmg > Date: Mon Oct 26 00:37:31 2020 > New Revision: 367048 > URL: https://svnweb.freebsd.org/changeset/base/367048 > > Log: > update write(2)'s iovec limit w/ info about the iosize_max_clamp sysctl... > > Modified: > head/lib/libc/sys/write.2 > > Modified: head/lib/libc/sys/write.2 > = > = > --- head/lib/libc/sys/write.2 Sun Oct 25 23:26:07 2020(r367047) > +++ head/lib/libc/sys/write.2 Mon Oct 26 00:37:31 2020(r367048) > @@ -28,7 +28,7 @@ > .\" @(#)write.2 8.5 (Berkeley) 4/2/94 > .\" $FreeBSD$ > .\" > -.Dd March 30, 2020 > +.Dd October 25, 2020 > .Dt WRITE 2 > .Os > .Sh NAME > @@ -240,9 +240,13 @@ array was negative. > .It Bq Er EINVAL > The sum of the > .Fa iov_len > -values in the > -.Fa iov > -array overflowed a 32-bit integer. > +values is greater than > +.Dv SSIZE_MAX > +(or greater than > +.Dv INT_MAX , > +if the sysctl > +.Va debug.iosize_max_clamp Should we also include SEE ALSO reference to sysctl(8) or sysctl(3)? Personally I think a reference to sysctl(8) would be more apropos. > +is non-zero). > .It Bq Er ENOBUFS > The mbuf pool has been completely exhausted when writing to a socket. > .El > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367038 - head/sbin/mount_nullfs
In message <20201025213509.GA1671@brick>, Edward Tomasz Napierala writes: > On 1025T0717, Cy Schubert wrote: > > In message c > > om> > > , Oliver Pinter writes: > > > On Sunday, October 25, 2020, Edward Tomasz Napierala > > > wrote: > > > > > > > Author: trasz > > > > Date: Sun Oct 25 14:09:00 2020 > > > > New Revision: 367038 > > > > URL: https://svnweb.freebsd.org/changeset/base/367038 > > > > > > > > Log: > > > > Remove the check that prevents creating "loops" from mount_nullfs(8). > > > > > > > > > > > The simple question is: why? > > > > I was about to ask that myself. > > > > The why is usually more important than the how. > > Two reasons. > > First, from what I can tell this is an artificial limitation which serves > no purpose. I thought it was to prevent some kind of deadlock between > vnodes, so I asked kib@, and he mentioned removing that very limitation > from the kernel code; thus, it looks to me like a historical leftover. > > Second, I've stumbled upon this when trying to nullfs-mount '/' on > '/compat/ubuntu/bsd/', which would be useful for autochroot functionality, > when (or if) it becomes a thing. Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r367038 - head/sbin/mount_nullfs
In message , Oliver Pinter writes: > On Sunday, October 25, 2020, Edward Tomasz Napierala > wrote: > > > Author: trasz > > Date: Sun Oct 25 14:09:00 2020 > > New Revision: 367038 > > URL: https://svnweb.freebsd.org/changeset/base/367038 > > > > Log: > > Remove the check that prevents creating "loops" from mount_nullfs(8). > > > > > The simple question is: why? I was about to ask that myself. The why is usually more important than the how. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366997 - head/sys/kern
In message <20201024172452.gd2...@kib.kiev.ua>, Konstantin Belousov writes: > On Sat, Oct 24, 2020 at 01:30:37PM +, Mateusz Guzik wrote: > > Author: mjg > > Date: Sat Oct 24 13:30:37 2020 > > New Revision: 366997 > > URL: https://svnweb.freebsd.org/changeset/base/366997 > > > > Log: > > vfs: fix a race where reclaim vholds freed vnodes > A description of the race in the commit message would be respectful to > other readers of the code, so that we do not need to reverse-eng the > change to understand what and why was fixed. +1 -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366857 - head/libexec/rc/rc.d
Author: cy Date: Mon Oct 19 20:37:38 2020 New Revision: 366857 URL: https://svnweb.freebsd.org/changeset/base/366857 Log: Destroy cloned interfaces at netif stop, netif restart and shutdown. This is especially important during shutdown because a child interface of lagg with WOL enabled will not enable WOL at interface shutdown and thus no WOL to wake up the device (and machine). PR: 158734, 109980 Reported by: Antonio Huete Jimenez Marat N.Afanasyev reviewed by: kp MFC after:1 week Differential Revision:https://reviews.freebsd.org/D26797 Modified: head/libexec/rc/rc.d/netif Modified: head/libexec/rc/rc.d/netif == --- head/libexec/rc/rc.d/netif Mon Oct 19 20:37:04 2020(r366856) +++ head/libexec/rc/rc.d/netif Mon Oct 19 20:37:38 2020(r366857) @@ -28,7 +28,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl # REQUIRE: hostid ipfs -# KEYWORD: nojailvnet +# KEYWORD: nojailvnet shutdown . /etc/rc.subr . /etc/network.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366531 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy
Date: Thu Oct 8 04:00:31 2020
New Revision: 366531
URL: https://svnweb.freebsd.org/changeset/base/366531
Log:
MFC r366287:
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
Modified:
stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
==
--- stable/11/sys/contrib/ipfilter/netinet/ip_nat.c Thu Oct 8 02:56:11
2020(r366530)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_nat.c Thu Oct 8 04:00:31
2020(r366531)
@@ -5116,8 +5116,8 @@ ipf_nat_out(fin, nat, natadd, nflags)
ipf_fix_outcksum(0, >fin_ip->ip_sum, msumd, 0);
}
-#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
-defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD__)
+#if !defined(_KERNEL) || defined(MENTAT) || \
+defined(BRIDGE_IPF) || defined(__FreeBSD__)
else {
/*
* Strictly speaking, this isn't necessary on BSD
@@ -5631,8 +5631,7 @@ ipf_nat_in(fin, nat, natadd, nflags)
}
fin->fin_ip->ip_dst = nat->nat_ndstip;
fin->fin_daddr = nat->nat_ndstaddr;
-#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
- defined(__osf__) || defined(linux)
+#if !defined(_KERNEL) || defined(MENTAT)
ipf_fix_outcksum(0, >fin_ip->ip_sum, ipsumd, 0);
#endif
break;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366531 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy
Date: Thu Oct 8 04:00:31 2020
New Revision: 366531
URL: https://svnweb.freebsd.org/changeset/base/366531
Log:
MFC r366287:
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
Modified:
stable/12/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/contrib/ipfilter/netinet/ip_nat.c
==
--- stable/12/sys/contrib/ipfilter/netinet/ip_nat.c Thu Oct 8 02:56:11
2020(r366530)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_nat.c Thu Oct 8 04:00:31
2020(r366531)
@@ -5116,8 +5116,8 @@ ipf_nat_out(fin, nat, natadd, nflags)
ipf_fix_outcksum(0, >fin_ip->ip_sum, msumd, 0);
}
-#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
-defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD__)
+#if !defined(_KERNEL) || defined(MENTAT) || \
+defined(BRIDGE_IPF) || defined(__FreeBSD__)
else {
/*
* Strictly speaking, this isn't necessary on BSD
@@ -5631,8 +5631,7 @@ ipf_nat_in(fin, nat, natadd, nflags)
}
fin->fin_ip->ip_dst = nat->nat_ndstip;
fin->fin_daddr = nat->nat_ndstaddr;
-#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
- defined(__osf__) || defined(linux)
+#if !defined(_KERNEL) || defined(MENTAT)
ipf_fix_outcksum(0, >fin_ip->ip_sum, ipsumd, 0);
#endif
break;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366421 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:33:05 2020 New Revision: 366421 URL: https://svnweb.freebsd.org/changeset/base/366421 Log: MFC r366203: Remove Linux and IRIX specific files. Deleted: stable/12/contrib/ipfilter/ipsend/larp.c stable/12/contrib/ipfilter/ipsend/linux.h stable/12/contrib/ipfilter/ipsend/lsock.c stable/12/contrib/ipfilter/ipsend/sirix.c stable/12/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Deleted: stable/11/contrib/ipfilter/ipsend/larp.c stable/11/contrib/ipfilter/ipsend/linux.h stable/11/contrib/ipfilter/ipsend/lsock.c stable/11/contrib/ipfilter/ipsend/sirix.c stable/11/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/11/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366421 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:33:05 2020 New Revision: 366421 URL: https://svnweb.freebsd.org/changeset/base/366421 Log: MFC r366203: Remove Linux and IRIX specific files. Deleted: stable/11/contrib/ipfilter/ipsend/larp.c stable/11/contrib/ipfilter/ipsend/linux.h stable/11/contrib/ipfilter/ipsend/lsock.c stable/11/contrib/ipfilter/ipsend/sirix.c stable/11/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Deleted: stable/12/contrib/ipfilter/ipsend/larp.c stable/12/contrib/ipfilter/ipsend/linux.h stable/12/contrib/ipfilter/ipsend/lsock.c stable/12/contrib/ipfilter/ipsend/sirix.c stable/12/contrib/ipfilter/ipsend/slinux.c Modified: Directory Properties: stable/12/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366420 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:31:35 2020 New Revision: 366420 URL: https://svnweb.freebsd.org/changeset/base/366420 Log: MFC r366202: Continuing the effort started in r343701, #ifdef cleanup, remove never to be used again checks. Modified: stable/12/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/11/ (props changed) Modified: stable/12/contrib/ipfilter/ipsend/iptests.c == --- stable/12/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 01:39:29 2020 (r366419) +++ stable/12/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 03:31:35 2020 (r366420) @@ -27,7 +27,7 @@ typedef int boolean_t; # endif # define _KERNEL # define KERNEL -# if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) +# if !defined(solaris) # include # else # ifdef solaris ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366420 - in stable: 11/contrib/ipfilter/ipsend 12/contrib/ipfilter/ipsend
Author: cy Date: Sun Oct 4 03:31:35 2020 New Revision: 366420 URL: https://svnweb.freebsd.org/changeset/base/366420 Log: MFC r366202: Continuing the effort started in r343701, #ifdef cleanup, remove never to be used again checks. Modified: stable/11/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/contrib/ipfilter/ipsend/iptests.c Directory Properties: stable/12/ (props changed) Modified: stable/11/contrib/ipfilter/ipsend/iptests.c == --- stable/11/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 01:39:29 2020 (r366419) +++ stable/11/contrib/ipfilter/ipsend/iptests.c Sun Oct 4 03:31:35 2020 (r366420) @@ -27,7 +27,7 @@ typedef int boolean_t; # endif # define _KERNEL # define KERNEL -# if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) +# if !defined(solaris) # include # else # ifdef solaris ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366381 - head/sys/modules/pwm
In message <20201003103357.24c2f3201ab4b2637fb8e...@bidouilliste.com>,
Emmanuel
Vadot writes:
> On Fri, 02 Oct 2020 21:12:01 -0700
> Cy Schubert wrote:
>
> > In message c
> > om>
> > , Mateusz Guzik writes:
> > > On 10/2/20, Emmanuel Vadot wrote:
> > > > Author: manu
> > > > Date: Fri Oct 2 19:56:54 2020
> > > > New Revision: 366381
> > > > URL: https://svnweb.freebsd.org/changeset/base/366381
> > > >
> > > > Log:
> > > > pwm_backlight: Restrict module to armv7 and aarch64
> > > >
> > > > Both powerpc64 and riscv uses fdt but don't use EXT_RESOURCES.
> > > >
> > > > Reported by: jenkins
> > > >
> > > > Modified:
> > > > head/sys/modules/pwm/Makefile
> > > >
> > > > Modified: head/sys/modules/pwm/Makefile
> > > > ===
>
> > > ===
> > > > --- head/sys/modules/pwm/Makefile Fri Oct 2 19:16:06 2020
> (r36638
> > > 0)
> > > > +++ head/sys/modules/pwm/Makefile Fri Oct 2 19:56:54 2020
> (r36638
> > > 1)
> > > > @@ -6,8 +6,10 @@ SUBDIR = \
> > > > pwmbus \
> > > > pwmc \
> > > >
> > > > +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE_ARCH} == "aarch64"
> > > > .if !empty(OPT_FDT)
> > > > SUBDIR += pwm_backlight
> > > > +.endif
> > > > .endif
> > > >
> > > > .include
> > >
> > > I don't know which commits are to blame, but the following is broken
> > > in tinderbox:
> > > arm GENERIC kernel failed, check _.arm.GENERIC for details
> > > arm GENERIC-NODEBUG kernel failed, check _.arm.GENERIC-NODEBUG for detail
> s
> > > arm TEGRA124 kernel failed, check _.arm.TEGRA124 for details
> > > arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details
> > > arm VYBRID kernel failed, check _.arm.VYBRID for details
> > > arm GENERIC-MMCCAM kernel failed, check _.arm.GENERIC-MMCCAM for details
> > > arm LINT kernel failed, check _.arm.LINT for details
> > > arm IMX53 kernel failed, check _.arm.IMX53 for details
> > > arm IMX6 kernel failed, check _.arm.IMX6 for details
> > > arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details
> > > arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details
> >
> > And on amd64 my laptop is useless now.
> >
> > Oct 2 18:23:58 slippy kernel: link_elf_obj: symbol
> > acpi_video_get_backlight_type undefined
> > Oct 2 18:23:58 slippy kernel: Warning: memory type debugfsint leaked
> > memory on destroy (2 allocations, 80 bytes leaked).
> > Oct 2 18:23:59 slippy kernel: linker_load_file: /boot/modules/i915kms.ko -
>
> > unsupported file type
> >
> > And this is also after updating drm-current-kmod.
> >
> >
> > --
> > Cheers,
> > Cy Schubert
> > FreeBSD UNIX: Web: https://FreeBSD.org
> > NTP: Web: https://nwtime.org
> >
> > The need of the many outweighs the greed of the few.
> >
> >
>
> Fixed in ports r551266, sorry.
Yes, that fixes it. Thanks.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366381 - head/sys/modules/pwm
In message <50246694-58eb-0a68-7c9f-309ae2777...@freebsd.org>, Jung-uk Kim writ
es:
>
> On 20. 10. 3., Cy Schubert wrote:
> > In message c
> > om>
> > , Mateusz Guzik writes:
> >> On 10/2/20, Emmanuel Vadot wrote:
> >>> Author: manu
> >>> Date: Fri Oct 2 19:56:54 2020
> >>> New Revision: 366381
> >>> URL: https://svnweb.freebsd.org/changeset/base/366381
> >>>
> >>> Log:
> >>> pwm_backlight: Restrict module to armv7 and aarch64
> >>>
> >>> Both powerpc64 and riscv uses fdt but don't use EXT_RESOURCES.
> >>>
> >>> Reported by:jenkins
> >>>
> >>> Modified:
> >>> head/sys/modules/pwm/Makefile
> >>>
> >>> Modified: head/sys/modules/pwm/Makefile
> >>> =
> ==
> >> ===
> >>> --- head/sys/modules/pwm/Makefile Fri Oct 2 19:16:06 2020(r36638
> >> 0)
> >>> +++ head/sys/modules/pwm/Makefile Fri Oct 2 19:56:54 2020(r36638
> >> 1)
> >>> @@ -6,8 +6,10 @@ SUBDIR = \
> >>> pwmbus \
> >>> pwmc \
> >>>
> >>> +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE_ARCH} == "aarch64"
> >>> .if !empty(OPT_FDT)
> >>> SUBDIR += pwm_backlight
> >>> +.endif
> >>> .endif
> >>>
> >>> .include
> >>
> >> I don't know which commits are to blame, but the following is broken
> >> in tinderbox:
> >> arm GENERIC kernel failed, check _.arm.GENERIC for details
> >> arm GENERIC-NODEBUG kernel failed, check _.arm.GENERIC-NODEBUG for details
> >> arm TEGRA124 kernel failed, check _.arm.TEGRA124 for details
> >> arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details
> >> arm VYBRID kernel failed, check _.arm.VYBRID for details
> >> arm GENERIC-MMCCAM kernel failed, check _.arm.GENERIC-MMCCAM for details
> >> arm LINT kernel failed, check _.arm.LINT for details
> >> arm IMX53 kernel failed, check _.arm.IMX53 for details
> >> arm IMX6 kernel failed, check _.arm.IMX6 for details
> >> arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details
> >> arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details
> >
> > And on amd64 my laptop is useless now.
> >
> > Oct 2 18:23:58 slippy kernel: link_elf_obj: symbol
> > acpi_video_get_backlight_type undefined
> > Oct 2 18:23:58 slippy kernel: Warning: memory type debugfsint leaked
> > memory on destroy (2 allocations, 80 bytes leaked).
> > Oct 2 18:23:59 slippy kernel: linker_load_file: /boot/modules/i915kms.ko -
>
> > unsupported file type
> >
> > And this is also after updating drm-current-kmod.
>
> Create files directory, add the attached patch there, and try again.
>
> Jung-uk Kim
>
>
> --- drivers/gpu/drm/i915/display/intel_opregion.c.orig2020-10-02 18:5
> 0:12 UTC
> +++ drivers/gpu/drm/i915/display/intel_opregion.c
> @@ -25,6 +25,8 @@
> *
> */
>
> +#include
> +
> #include
> #include
> #include
> @@ -450,10 +452,12 @@ static u32 asle_set_backlight(struct drm_i915_private
>
> DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
>
> +#if __FreeBSD_version < 1300118
> if (acpi_video_get_backlight_type() == acpi_backlight_native) {
> DRM_DEBUG_KMS("opregion backlight request ignored\n");
> return 0;
> }
> +#endif
>
> if (!(bclp & ASLE_BCLP_VALID))
> return ASLC_BACKLIGHT_FAILED;
>
This won't work. The machine is already at 1300118.
I'll try a #if 0 instead.
(I restored a zfs snapshot of /usr/src and /usr/obj.)
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366381 - head/sys/modules/pwm
In message
, Mateusz Guzik writes:
> On 10/2/20, Emmanuel Vadot wrote:
> > Author: manu
> > Date: Fri Oct 2 19:56:54 2020
> > New Revision: 366381
> > URL: https://svnweb.freebsd.org/changeset/base/366381
> >
> > Log:
> > pwm_backlight: Restrict module to armv7 and aarch64
> >
> > Both powerpc64 and riscv uses fdt but don't use EXT_RESOURCES.
> >
> > Reported by: jenkins
> >
> > Modified:
> > head/sys/modules/pwm/Makefile
> >
> > Modified: head/sys/modules/pwm/Makefile
> > ===
> ===
> > --- head/sys/modules/pwm/Makefile Fri Oct 2 19:16:06 2020(r36638
> 0)
> > +++ head/sys/modules/pwm/Makefile Fri Oct 2 19:56:54 2020(r36638
> 1)
> > @@ -6,8 +6,10 @@ SUBDIR = \
> > pwmbus \
> > pwmc \
> >
> > +.if ${MACHINE_ARCH} == "armv7" || ${MACHINE_ARCH} == "aarch64"
> > .if !empty(OPT_FDT)
> > SUBDIR += pwm_backlight
> > +.endif
> > .endif
> >
> > .include
>
> I don't know which commits are to blame, but the following is broken
> in tinderbox:
> arm GENERIC kernel failed, check _.arm.GENERIC for details
> arm GENERIC-NODEBUG kernel failed, check _.arm.GENERIC-NODEBUG for details
> arm TEGRA124 kernel failed, check _.arm.TEGRA124 for details
> arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details
> arm VYBRID kernel failed, check _.arm.VYBRID for details
> arm GENERIC-MMCCAM kernel failed, check _.arm.GENERIC-MMCCAM for details
> arm LINT kernel failed, check _.arm.LINT for details
> arm IMX53 kernel failed, check _.arm.IMX53 for details
> arm IMX6 kernel failed, check _.arm.IMX6 for details
> arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details
> arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details
And on amd64 my laptop is useless now.
Oct 2 18:23:58 slippy kernel: link_elf_obj: symbol
acpi_video_get_backlight_type undefined
Oct 2 18:23:58 slippy kernel: Warning: memory type debugfsint leaked
memory on destroy (2 allocations, 80 bytes leaked).
Oct 2 18:23:59 slippy kernel: linker_load_file: /boot/modules/i915kms.ko -
unsupported file type
And this is also after updating drm-current-kmod.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366344 - in head: lib/libmd sys/crypto/skein/amd64
In message
, Kyle Evans writes:
> On Thu, Oct 1, 2020 at 4:06 PM Ed Maste wrote:
> >
> > Author: emaste
> > Date: Thu Oct 1 21:05:50 2020
> > New Revision: 366344
> > URL: https://svnweb.freebsd.org/changeset/base/366344
> >
> > Log:
> > libmd: fix assembly optimized skein implementation
> >
> > The assembly implementation incorrectly used logical AND instead of
> > bitwise AND. Fix, and re-enable in libmd.
> >
> > Submitted by: Yang Zhong
> > Reviewed by: cem (earlier)
> > Sponsored by: The FreeBSD Foundation
> > Differential Revision:https://reviews.freebsd.org/D26614
> >
> > Modified:
> > head/lib/libmd/Makefile
> > head/sys/crypto/skein/amd64/skein_block_asm.S
> >
> > Modified: head/lib/libmd/Makefile
> > ===
> ===
> > --- head/lib/libmd/Makefile Thu Oct 1 20:08:27 2020(r366343)
> > +++ head/lib/libmd/Makefile Thu Oct 1 21:05:50 2020(r366344)
> > @@ -116,12 +116,12 @@ CFLAGS+= -DSHA1_ASM
> > SRCS+= rmd160.S
> > CFLAGS+= -DRMD160_ASM
> > .endif
> > -#.if exists(${MACHINE_ARCH}/skein_block_asm.S)
> > -## Fully unroll all loops in the assembly optimized version
> > -#ACFLAGS+= -DSKEIN_LOOP=0
> > -#SRCS+= skein_block_asm.S
> > -#CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to re
> place with assembly: 256+512+1024 = 1792
> > -#.endif
> > +.if exists(${MACHINE_ARCH}/skein_block_asm.S)
> > +# Fully unroll all loops in the assembly optimized version
> > +ACFLAGS+= -DSKEIN_LOOP=0
> > +SRCS+= skein_block_asm.S
> > +CFLAGS+= -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to rep
> lace with assembly: 256+512+1024 = 1792
> > +.endif
> > .if exists(${MACHINE_ARCH}/sha.S) || exists(${MACHINE_ARCH}/rmd160.S) || e
> xists(${MACHINE_ARCH}/skein_block_asm.S)
> > ACFLAGS+= -DELF -Wa,--noexecstack
> > .endif
> >
>
> We need some kind of magic to walk across this for -DNO_CLEAN builds
> -- skein_block.c has no reason to get rebuilt, but we need it to
> because we're now defining SKEIN_USE_ASM=1792, which will strip out
> some symbols.
>
> I haven't had time to look into what kind of magic we can apply here,
> kind of needed to skip ahead to get this build finished for some other
> testing.
I did rm -r for .../lib/libmd.
Strangely it only failed in the amd64 build. Not in i386.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r366350 - in head/sys/contrib/openzfs: . .github cmd/zfs config contrib/initramfs/scripts contrib/intel_qat include/os/freebsd/spl/sys include/os/linux/spl/sys include/sys include/s
Time to deorbit i386 once and for all. What a pain. --- spl_taskq.o --- /opt/src/svn-current/sys/contrib/openzfs/module/os/freebsd/spl/spl_taskq.c:1 74:3: error: implicit declaration of function 'fpu_kern_thread' is invalid in C99 [-Werror,-Wimplicit-function-declaration] fpu_kern_thread(FPU_KERN_NORMAL); ^ /opt/src/svn-current/sys/contrib/openzfs/module/os/freebsd/spl/spl_taskq.c:1 74:19: error: use of undeclared identifier 'FPU_KERN_NORMAL' fpu_kern_thread(FPU_KERN_NORMAL); ^ 2 errors generated. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. In message <202010012328.091nslq2085...@repo.freebsd.org>, Matt Macy writes: > Author: mmacy > Date: Thu Oct 1 23:28:21 2020 > New Revision: 366350 > URL: https://svnweb.freebsd.org/changeset/base/366350 > > Log: > OpenZFS: MFV 2.0-rc3-gfc5966 > > - Annotate FreeBSD sysctls with CTLFLAG_MPSAFE > - Reduce stack usage of Lua > - Don't save user FPU context in kernel threads > - Add support for procfs_list > - Code cleanup in zio_crypt > - Add DB_RF_NOPREFETCH to dbuf_read()s in dnode.c > - Drop references when skipping dmu_send due to EXDEV > - Eliminate gratuitous bzeroing in dbuf_stats_hash_table_data > - Fix legacy compat for platform IOCs > > Added: > head/sys/contrib/openzfs/.github/ > - copied from r366349, vendor-sys/openzfs/dist/.github/ > head/sys/contrib/openzfs/contrib/intel_qat/ > - copied from r366349, vendor-sys/openzfs/dist/contrib/intel_qat/ > head/sys/contrib/openzfs/tests/zfs-tests/cmd/badsend/ > - copied from r366349, vendor-sys/openzfs/dist/tests/zfs-tests/cmd/badse > nd/ > head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_invali > d.ksh > - copied unchanged from r366349, vendor-sys/openzfs/dist/tests/zfs-tests > /tests/functional/rsend/send_invalid.ksh > Modified: > head/sys/contrib/openzfs/cmd/zfs/zfs_main.c > head/sys/contrib/openzfs/config/kernel-config-defined.m4 > head/sys/contrib/openzfs/config/kernel-objtool.m4 > head/sys/contrib/openzfs/configure.ac > head/sys/contrib/openzfs/contrib/initramfs/scripts/zfs > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/kstat.h > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/procfs_list.h > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h > head/sys/contrib/openzfs/include/os/linux/spl/sys/procfs_list.h > head/sys/contrib/openzfs/include/sys/frame.h > head/sys/contrib/openzfs/include/sys/lua/luaconf.h > head/sys/contrib/openzfs/include/sys/zfs_context.h > head/sys/contrib/openzfs/include/sys/zstd/zstd.h > head/sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c > head/sys/contrib/openzfs/lib/libshare/os/linux/nfs.c > head/sys/contrib/openzfs/lib/libzpool/kernel.c > head/sys/contrib/openzfs/man/man8/zfs-userspace.8 > head/sys/contrib/openzfs/man/man8/zpool-remove.8 > head/sys/contrib/openzfs/module/lua/llimits.h > head/sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c > head/sys/contrib/openzfs/module/os/freebsd/spl/spl_procfs_list.c > head/sys/contrib/openzfs/module/os/freebsd/spl/spl_taskq.c > head/sys/contrib/openzfs/module/os/freebsd/zfs/kmod_core.c > head/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c > head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_compat.c > head/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c > head/sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c > head/sys/contrib/openzfs/module/os/linux/spl/spl-procfs-list.c > head/sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c > head/sys/contrib/openzfs/module/os/linux/zfs/zfs_debug.c > head/sys/contrib/openzfs/module/zfs/arc.c > head/sys/contrib/openzfs/module/zfs/dbuf_stats.c > head/sys/contrib/openzfs/module/zfs/dmu_send.c > head/sys/contrib/openzfs/module/zfs/dnode.c > head/sys/contrib/openzfs/module/zfs/dsl_crypt.c > head/sys/contrib/openzfs/module/zfs/spa_misc.c > head/sys/contrib/openzfs/module/zfs/spa_stats.c > head/sys/contrib/openzfs/module/zfs/zfs_log.c > head/sys/contrib/openzfs/module/zstd/zfs_zstd.c > head/sys/contrib/openzfs/tests/runfiles/common.run > head/sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am > head/sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg > head/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/Makefile.am > Directory Properties: > head/sys/contrib/openzfs/ (props changed) > > Modified: head/sys/contrib/openzfs/cmd/zfs/zfs_main.c > = >
svn commit: r366286 - head/contrib/ipfilter/lib
Author: cy
Date: Wed Sep 30 08:26:22 2020
New Revision: 366286
URL: https://svnweb.freebsd.org/changeset/base/366286
Log:
ipfilter getifname ifdef cleanup.
MFC after:2 months
Modified:
head/contrib/ipfilter/lib/getifname.c
Modified: head/contrib/ipfilter/lib/getifname.c
==
--- head/contrib/ipfilter/lib/getifname.c Wed Sep 30 08:26:00 2020
(r366285)
+++ head/contrib/ipfilter/lib/getifname.c Wed Sep 30 08:26:22 2020
(r366286)
@@ -19,11 +19,9 @@
char *getifname(ptr)
struct ifnet *ptr;
{
-#if SOLARIS || defined(__hpux)
-# if SOLARIS
+#if SOLARIS
# include
# include
-# endif
# include "../pfil/qif.h"
char *ifname;
qif_t qif;
@@ -42,13 +40,6 @@ char *getifname(ptr)
}
return ifname;
#else
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-defined(__OpenBSD__) || \
-(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
-#else
- char buf[LIFNAMSIZ];
- int len;
-# endif
struct ifnet netif;
if ((void *)ptr == (void *)-1)
@@ -58,24 +49,6 @@ char *getifname(ptr)
if (kmemcpy((char *), (u_long)ptr, sizeof(netif)) == -1)
return "X";
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-defined(__OpenBSD__) || defined(linux) || \
-(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
return strdup(netif.if_xname);
-# else
- if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
- return "X";
- if (netif.if_unit < 10)
- len = 2;
- else if (netif.if_unit < 1000)
- len = 3;
- else if (netif.if_unit < 1)
- len = 4;
- else
- len = 5;
- buf[sizeof(buf) - len] = '\0';
- sprintf(buf + strlen(buf), "%d", netif.if_unit % 1);
- return strdup(buf);
-# endif
#endif
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366287 - head/sys/contrib/ipfilter/netinet
Author: cy
Date: Wed Sep 30 08:26:25 2020
New Revision: 366287
URL: https://svnweb.freebsd.org/changeset/base/366287
Log:
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
MFC after:1 week
Modified:
head/sys/contrib/ipfilter/netinet/ip_nat.c
Modified: head/sys/contrib/ipfilter/netinet/ip_nat.c
==
--- head/sys/contrib/ipfilter/netinet/ip_nat.c Wed Sep 30 08:26:22 2020
(r366286)
+++ head/sys/contrib/ipfilter/netinet/ip_nat.c Wed Sep 30 08:26:25 2020
(r366287)
@@ -5116,8 +5116,8 @@ ipf_nat_out(fin, nat, natadd, nflags)
ipf_fix_outcksum(0, >fin_ip->ip_sum, msumd, 0);
}
-#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
-defined(linux) || defined(BRIDGE_IPF) || defined(__FreeBSD__)
+#if !defined(_KERNEL) || defined(MENTAT) || \
+defined(BRIDGE_IPF) || defined(__FreeBSD__)
else {
/*
* Strictly speaking, this isn't necessary on BSD
@@ -5631,8 +5631,7 @@ ipf_nat_in(fin, nat, natadd, nflags)
}
fin->fin_ip->ip_dst = nat->nat_ndstip;
fin->fin_daddr = nat->nat_ndstaddr;
-#if !defined(_KERNEL) || defined(MENTAT) || defined(__sgi) || \
- defined(__osf__) || defined(linux)
+#if !defined(_KERNEL) || defined(MENTAT)
ipf_fix_outcksum(0, >fin_ip->ip_sum, ipsumd, 0);
#endif
break;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366285 - head/contrib/ipfilter/lib
Author: cy
Date: Wed Sep 30 08:26:00 2020
New Revision: 366285
URL: https://svnweb.freebsd.org/changeset/base/366285
Log:
Resurrect ipfilter's getifname, replacing the stub with the real
function.
MFC after:2 months
Modified:
head/contrib/ipfilter/lib/getifname.c
Modified: head/contrib/ipfilter/lib/getifname.c
==
--- head/contrib/ipfilter/lib/getifname.c Wed Sep 30 08:23:43 2020
(r366284)
+++ head/contrib/ipfilter/lib/getifname.c Wed Sep 30 08:26:00 2020
(r366285)
@@ -16,7 +16,6 @@
* Given a pointer to an interface in the kernel, return a pointer to a
* string which is the interface name.
*/
-#if 0
char *getifname(ptr)
struct ifnet *ptr;
{
@@ -80,13 +79,3 @@ char *getifname(ptr)
# endif
#endif
}
-#else
-char *getifname(ptr)
- struct ifnet *ptr;
-{
-#if 0
- ptr = ptr;
-#endif
- return "X";
-}
-#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366282 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Wed Sep 30 03:38:13 2020 New Revision: 366282 URL: https://svnweb.freebsd.org/changeset/base/366282 Log: MFC r366204: Remove extraneous bracket. Modified: stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h Directory Properties: stable/12/ (props changed) Modified: stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h == --- stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h Wed Sep 30 02:28:46 2020(r366281) +++ stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h Wed Sep 30 03:38:13 2020(r366282) @@ -13,7 +13,7 @@ #define__IP_PROXY_H__ #ifndefSOLARIS -# if defined(sun) && defined(__SVR4)) +# if defined(sun) && defined(__SVR4) # define SOLARIS 1 # else # define SOLARIS 0 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366282 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
Author: cy Date: Wed Sep 30 03:38:13 2020 New Revision: 366282 URL: https://svnweb.freebsd.org/changeset/base/366282 Log: MFC r366204: Remove extraneous bracket. Modified: stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/sys/contrib/ipfilter/netinet/ip_proxy.h Directory Properties: stable/11/ (props changed) Modified: stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h == --- stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h Wed Sep 30 02:28:46 2020(r366281) +++ stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h Wed Sep 30 03:38:13 2020(r366282) @@ -13,7 +13,7 @@ #define__IP_PROXY_H__ #ifndefSOLARIS -# if defined(sun) && defined(__SVR4)) +# if defined(sun) && defined(__SVR4) # define SOLARIS 1 # else # define SOLARIS 0 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366202 - head/contrib/ipfilter/ipsend
Author: cy Date: Sun Sep 27 18:39:09 2020 New Revision: 366202 URL: https://svnweb.freebsd.org/changeset/base/366202 Log: Continuing the effort started in r343701, #ifdef cleanup, remove never to be used again checks. MFC after:1 week Modified: head/contrib/ipfilter/ipsend/iptests.c Modified: head/contrib/ipfilter/ipsend/iptests.c == --- head/contrib/ipfilter/ipsend/iptests.c Sun Sep 27 18:14:01 2020 (r366201) +++ head/contrib/ipfilter/ipsend/iptests.c Sun Sep 27 18:39:09 2020 (r366202) @@ -27,7 +27,7 @@ typedef int boolean_t; # endif # define _KERNEL # define KERNEL -# if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) +# if !defined(solaris) # include # else # ifdef solaris ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366204 - head/sys/contrib/ipfilter/netinet
Author: cy Date: Sun Sep 27 18:39:15 2020 New Revision: 366204 URL: https://svnweb.freebsd.org/changeset/base/366204 Log: Remove extraneous bracket. MFC after:3 days Modified: head/sys/contrib/ipfilter/netinet/ip_proxy.h Modified: head/sys/contrib/ipfilter/netinet/ip_proxy.h == --- head/sys/contrib/ipfilter/netinet/ip_proxy.hSun Sep 27 18:39:12 2020(r366203) +++ head/sys/contrib/ipfilter/netinet/ip_proxy.hSun Sep 27 18:39:15 2020(r366204) @@ -13,7 +13,7 @@ #define__IP_PROXY_H__ #ifndefSOLARIS -# if defined(sun) && defined(__SVR4)) +# if defined(sun) && defined(__SVR4) # define SOLARIS 1 # else # define SOLARIS 0 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366203 - head/contrib/ipfilter/ipsend
Author: cy Date: Sun Sep 27 18:39:12 2020 New Revision: 366203 URL: https://svnweb.freebsd.org/changeset/base/366203 Log: Remove Linux and IRIX specific files. MFC after:1 week Deleted: head/contrib/ipfilter/ipsend/larp.c head/contrib/ipfilter/ipsend/linux.h head/contrib/ipfilter/ipsend/lsock.c head/contrib/ipfilter/ipsend/sirix.c head/contrib/ipfilter/ipsend/slinux.c ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r366095 - in stable: 11/contrib/unbound 11/contrib/unbound/.github 11/contrib/unbound/cachedb 11/contrib/unbound/contrib 11/contrib/unbound/contrib/android 11/contrib/unbound/contrib/io...
Author: cy Date: Wed Sep 23 22:36:38 2020 New Revision: 366095 URL: https://svnweb.freebsd.org/changeset/base/366095 Log: MFC r364721-r364722 r364721: MFV 364468: Update unbound 1.10.1 --> 1.11.0. r364722: Update unbound version number. Added: stable/12/contrib/unbound/README-Travis.md - copied unchanged from r364721, head/contrib/unbound/README-Travis.md stable/12/contrib/unbound/contrib/android/ - copied from r364721, head/contrib/unbound/contrib/android/ stable/12/contrib/unbound/contrib/ios/ - copied from r364721, head/contrib/unbound/contrib/ios/ stable/12/contrib/unbound/dnstap/dnstap_fstrm.c - copied unchanged from r364721, head/contrib/unbound/dnstap/dnstap_fstrm.c stable/12/contrib/unbound/dnstap/dnstap_fstrm.h - copied unchanged from r364721, head/contrib/unbound/dnstap/dnstap_fstrm.h stable/12/contrib/unbound/dnstap/dtstream.c - copied unchanged from r364721, head/contrib/unbound/dnstap/dtstream.c stable/12/contrib/unbound/dnstap/dtstream.h - copied unchanged from r364721, head/contrib/unbound/dnstap/dtstream.h stable/12/contrib/unbound/dnstap/unbound-dnstap-socket.c - copied unchanged from r364721, head/contrib/unbound/dnstap/unbound-dnstap-socket.c stable/12/contrib/unbound/dynlibmod/ - copied from r364721, head/contrib/unbound/dynlibmod/ Modified: stable/12/contrib/unbound/.github/FUNDING.yml stable/12/contrib/unbound/.travis.yml stable/12/contrib/unbound/Makefile.in stable/12/contrib/unbound/acx_python.m4 stable/12/contrib/unbound/cachedb/cachedb.c stable/12/contrib/unbound/cachedb/cachedb.h stable/12/contrib/unbound/cachedb/redis.c stable/12/contrib/unbound/config.guess stable/12/contrib/unbound/config.h.in stable/12/contrib/unbound/config.sub stable/12/contrib/unbound/configure stable/12/contrib/unbound/configure.ac stable/12/contrib/unbound/contrib/-filter-iterator.patch stable/12/contrib/unbound/contrib/fastrpz.patch stable/12/contrib/unbound/contrib/libunbound.pc.in stable/12/contrib/unbound/contrib/unbound.service.in stable/12/contrib/unbound/daemon/acl_list.c stable/12/contrib/unbound/daemon/daemon.c stable/12/contrib/unbound/daemon/remote.c stable/12/contrib/unbound/daemon/unbound.c stable/12/contrib/unbound/daemon/worker.c stable/12/contrib/unbound/dns64/dns64.c stable/12/contrib/unbound/dnstap/dnstap.c stable/12/contrib/unbound/dnstap/dnstap.h stable/12/contrib/unbound/dnstap/dnstap.m4 stable/12/contrib/unbound/doc/Changelog stable/12/contrib/unbound/doc/README stable/12/contrib/unbound/doc/example.conf.in stable/12/contrib/unbound/doc/libunbound.3.in stable/12/contrib/unbound/doc/unbound-anchor.8.in stable/12/contrib/unbound/doc/unbound-checkconf.8.in stable/12/contrib/unbound/doc/unbound-control.8.in stable/12/contrib/unbound/doc/unbound-host.1.in stable/12/contrib/unbound/doc/unbound.8.in stable/12/contrib/unbound/doc/unbound.conf.5.in stable/12/contrib/unbound/edns-subnet/subnetmod.c stable/12/contrib/unbound/edns-subnet/subnetmod.h stable/12/contrib/unbound/iterator/iter_utils.c stable/12/contrib/unbound/iterator/iterator.c stable/12/contrib/unbound/iterator/iterator.h stable/12/contrib/unbound/libunbound/libworker.c stable/12/contrib/unbound/libunbound/unbound.h stable/12/contrib/unbound/respip/respip.c stable/12/contrib/unbound/services/authzone.c stable/12/contrib/unbound/services/authzone.h stable/12/contrib/unbound/services/listen_dnsport.c stable/12/contrib/unbound/services/listen_dnsport.h stable/12/contrib/unbound/services/localzone.c stable/12/contrib/unbound/services/mesh.c stable/12/contrib/unbound/services/modstack.c stable/12/contrib/unbound/services/outside_network.c stable/12/contrib/unbound/services/outside_network.h stable/12/contrib/unbound/services/rpz.c stable/12/contrib/unbound/services/rpz.h stable/12/contrib/unbound/sldns/parseutil.c stable/12/contrib/unbound/smallapp/unbound-anchor.c stable/12/contrib/unbound/smallapp/unbound-checkconf.c stable/12/contrib/unbound/smallapp/unbound-control-setup.sh.in stable/12/contrib/unbound/smallapp/unbound-control.c stable/12/contrib/unbound/smallapp/worker_cb.c stable/12/contrib/unbound/util/config_file.c stable/12/contrib/unbound/util/config_file.h stable/12/contrib/unbound/util/configlexer.lex stable/12/contrib/unbound/util/configparser.y stable/12/contrib/unbound/util/fptr_wlist.c stable/12/contrib/unbound/util/iana_ports.inc stable/12/contrib/unbound/util/mini_event.h stable/12/contrib/unbound/util/net_help.c stable/12/contrib/unbound/util/net_help.h stable/12/contrib/unbound/util/netevent.c stable/12/contrib/unbound/util/netevent.h stable/12/contrib/unbound/util/shm_side/shm_main.c stable/12/contrib/unbound/util/ub_event.c stable/12/contrib/unbound/validator/val_secalgo.c stable/12/contrib/unbound/validator/val_sigcrypt.c stable/12/usr.sbin/unbound/config.h Directory
svn commit: r366095 - in stable: 11/contrib/unbound 11/contrib/unbound/.github 11/contrib/unbound/cachedb 11/contrib/unbound/contrib 11/contrib/unbound/contrib/android 11/contrib/unbound/contrib/io...
Author: cy Date: Wed Sep 23 22:36:38 2020 New Revision: 366095 URL: https://svnweb.freebsd.org/changeset/base/366095 Log: MFC r364721-r364722 r364721: MFV 364468: Update unbound 1.10.1 --> 1.11.0. r364722: Update unbound version number. Added: stable/11/contrib/unbound/README-Travis.md - copied unchanged from r364721, head/contrib/unbound/README-Travis.md stable/11/contrib/unbound/contrib/android/ - copied from r364721, head/contrib/unbound/contrib/android/ stable/11/contrib/unbound/contrib/ios/ - copied from r364721, head/contrib/unbound/contrib/ios/ stable/11/contrib/unbound/dnstap/dnstap_fstrm.c - copied unchanged from r364721, head/contrib/unbound/dnstap/dnstap_fstrm.c stable/11/contrib/unbound/dnstap/dnstap_fstrm.h - copied unchanged from r364721, head/contrib/unbound/dnstap/dnstap_fstrm.h stable/11/contrib/unbound/dnstap/dtstream.c - copied unchanged from r364721, head/contrib/unbound/dnstap/dtstream.c stable/11/contrib/unbound/dnstap/dtstream.h - copied unchanged from r364721, head/contrib/unbound/dnstap/dtstream.h stable/11/contrib/unbound/dnstap/unbound-dnstap-socket.c - copied unchanged from r364721, head/contrib/unbound/dnstap/unbound-dnstap-socket.c stable/11/contrib/unbound/dynlibmod/ - copied from r364721, head/contrib/unbound/dynlibmod/ Modified: stable/11/contrib/unbound/.github/FUNDING.yml stable/11/contrib/unbound/.travis.yml stable/11/contrib/unbound/Makefile.in stable/11/contrib/unbound/acx_python.m4 stable/11/contrib/unbound/cachedb/cachedb.c stable/11/contrib/unbound/cachedb/cachedb.h stable/11/contrib/unbound/cachedb/redis.c stable/11/contrib/unbound/config.guess stable/11/contrib/unbound/config.h.in stable/11/contrib/unbound/config.sub stable/11/contrib/unbound/configure stable/11/contrib/unbound/configure.ac stable/11/contrib/unbound/contrib/-filter-iterator.patch stable/11/contrib/unbound/contrib/fastrpz.patch stable/11/contrib/unbound/contrib/libunbound.pc.in stable/11/contrib/unbound/contrib/unbound.service.in stable/11/contrib/unbound/daemon/acl_list.c stable/11/contrib/unbound/daemon/daemon.c stable/11/contrib/unbound/daemon/remote.c stable/11/contrib/unbound/daemon/unbound.c stable/11/contrib/unbound/daemon/worker.c stable/11/contrib/unbound/dns64/dns64.c stable/11/contrib/unbound/dnstap/dnstap.c stable/11/contrib/unbound/dnstap/dnstap.h stable/11/contrib/unbound/dnstap/dnstap.m4 stable/11/contrib/unbound/doc/Changelog stable/11/contrib/unbound/doc/README stable/11/contrib/unbound/doc/example.conf.in stable/11/contrib/unbound/doc/libunbound.3.in stable/11/contrib/unbound/doc/unbound-anchor.8.in stable/11/contrib/unbound/doc/unbound-checkconf.8.in stable/11/contrib/unbound/doc/unbound-control.8.in stable/11/contrib/unbound/doc/unbound-host.1.in stable/11/contrib/unbound/doc/unbound.8.in stable/11/contrib/unbound/doc/unbound.conf.5.in stable/11/contrib/unbound/edns-subnet/subnetmod.c stable/11/contrib/unbound/edns-subnet/subnetmod.h stable/11/contrib/unbound/iterator/iter_utils.c stable/11/contrib/unbound/iterator/iterator.c stable/11/contrib/unbound/iterator/iterator.h stable/11/contrib/unbound/libunbound/libworker.c stable/11/contrib/unbound/libunbound/unbound.h stable/11/contrib/unbound/respip/respip.c stable/11/contrib/unbound/services/authzone.c stable/11/contrib/unbound/services/authzone.h stable/11/contrib/unbound/services/listen_dnsport.c stable/11/contrib/unbound/services/listen_dnsport.h stable/11/contrib/unbound/services/localzone.c stable/11/contrib/unbound/services/mesh.c stable/11/contrib/unbound/services/modstack.c stable/11/contrib/unbound/services/outside_network.c stable/11/contrib/unbound/services/outside_network.h stable/11/contrib/unbound/services/rpz.c stable/11/contrib/unbound/services/rpz.h stable/11/contrib/unbound/sldns/parseutil.c stable/11/contrib/unbound/smallapp/unbound-anchor.c stable/11/contrib/unbound/smallapp/unbound-checkconf.c stable/11/contrib/unbound/smallapp/unbound-control-setup.sh.in stable/11/contrib/unbound/smallapp/unbound-control.c stable/11/contrib/unbound/smallapp/worker_cb.c stable/11/contrib/unbound/util/config_file.c stable/11/contrib/unbound/util/config_file.h stable/11/contrib/unbound/util/configlexer.lex stable/11/contrib/unbound/util/configparser.y stable/11/contrib/unbound/util/fptr_wlist.c stable/11/contrib/unbound/util/iana_ports.inc stable/11/contrib/unbound/util/mini_event.h stable/11/contrib/unbound/util/net_help.c stable/11/contrib/unbound/util/net_help.h stable/11/contrib/unbound/util/netevent.c stable/11/contrib/unbound/util/netevent.h stable/11/contrib/unbound/util/shm_side/shm_main.c stable/11/contrib/unbound/util/ub_event.c stable/11/contrib/unbound/validator/val_secalgo.c stable/11/contrib/unbound/validator/val_sigcrypt.c stable/11/usr.sbin/unbound/config.h Directory
svn commit: r366076 - in stable: 11/contrib/sqlite3 11/contrib/sqlite3/tea 12/contrib/sqlite3 12/contrib/sqlite3/tea
Author: cy
Date: Wed Sep 23 14:36:38 2020
New Revision: 366076
URL: https://svnweb.freebsd.org/changeset/base/366076
Log:
MFC r364720:
Update sqlite to 3.33.0 (333).
Release announcement at https://www.sqlite.org/releaselog/3_33_0.html.
Added:
stable/12/contrib/sqlite3/sqlite3rc.h
- copied unchanged from r364720, head/contrib/sqlite3/sqlite3rc.h
Modified:
stable/12/contrib/sqlite3/Makefile.am
stable/12/contrib/sqlite3/Makefile.in
stable/12/contrib/sqlite3/configure
stable/12/contrib/sqlite3/configure.ac
stable/12/contrib/sqlite3/shell.c
stable/12/contrib/sqlite3/sqlite3.c
stable/12/contrib/sqlite3/sqlite3.h
stable/12/contrib/sqlite3/tea/configure
stable/12/contrib/sqlite3/tea/configure.ac
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Added:
stable/11/contrib/sqlite3/sqlite3rc.h
- copied unchanged from r364720, head/contrib/sqlite3/sqlite3rc.h
Modified:
stable/11/contrib/sqlite3/Makefile.am
stable/11/contrib/sqlite3/Makefile.in
stable/11/contrib/sqlite3/configure
stable/11/contrib/sqlite3/configure.ac
stable/11/contrib/sqlite3/shell.c
stable/11/contrib/sqlite3/sqlite3.c
stable/11/contrib/sqlite3/sqlite3.h
stable/11/contrib/sqlite3/tea/configure
stable/11/contrib/sqlite3/tea/configure.ac
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/contrib/sqlite3/Makefile.am
==
--- stable/12/contrib/sqlite3/Makefile.am Wed Sep 23 12:54:42 2020
(r366075)
+++ stable/12/contrib/sqlite3/Makefile.am Wed Sep 23 14:36:38 2020
(r366076)
@@ -13,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Modified: stable/12/contrib/sqlite3/Makefile.in
==
--- stable/12/contrib/sqlite3/Makefile.in Wed Sep 23 12:54:42 2020
(r366075)
+++ stable/12/contrib/sqlite3/Makefile.in Wed Sep 23 14:36:38 2020
(r366076)
@@ -370,7 +370,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
man_MANS = sqlite3.1
Modified: stable/12/contrib/sqlite3/configure
==
--- stable/12/contrib/sqlite3/configure Wed Sep 23 12:54:42 2020
(r366075)
+++ stable/12/contrib/sqlite3/configure Wed Sep 23 14:36:38 2020
(r366076)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.32.3.
+# Generated by GNU Autoconf 2.69 for sqlite 3.33.0.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.32.3'
-PACKAGE_STRING='sqlite 3.32.3'
+PACKAGE_VERSION='3.33.0'
+PACKAGE_STRING='sqlite 3.33.0'
PACKAGE_BUGREPORT='http://www.sqlite.org'
PACKAGE_URL=''
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sqlite 3.32.3 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.33.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sqlite 3.32.3:";;
+ short | recursive ) echo "Configuration of sqlite 3.33.0:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sqlite configure 3.32.3
+sqlite configure 3.33.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sqlite $as_me 3.32.3, which was
+It was created by sqlite $as_me 3.33.0, which was
svn commit: r366076 - in stable: 11/contrib/sqlite3 11/contrib/sqlite3/tea 12/contrib/sqlite3 12/contrib/sqlite3/tea
Author: cy
Date: Wed Sep 23 14:36:38 2020
New Revision: 366076
URL: https://svnweb.freebsd.org/changeset/base/366076
Log:
MFC r364720:
Update sqlite to 3.33.0 (333).
Release announcement at https://www.sqlite.org/releaselog/3_33_0.html.
Added:
stable/11/contrib/sqlite3/sqlite3rc.h
- copied unchanged from r364720, head/contrib/sqlite3/sqlite3rc.h
Modified:
stable/11/contrib/sqlite3/Makefile.am
stable/11/contrib/sqlite3/Makefile.in
stable/11/contrib/sqlite3/configure
stable/11/contrib/sqlite3/configure.ac
stable/11/contrib/sqlite3/shell.c
stable/11/contrib/sqlite3/sqlite3.c
stable/11/contrib/sqlite3/sqlite3.h
stable/11/contrib/sqlite3/tea/configure
stable/11/contrib/sqlite3/tea/configure.ac
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Added:
stable/12/contrib/sqlite3/sqlite3rc.h
- copied unchanged from r364720, head/contrib/sqlite3/sqlite3rc.h
Modified:
stable/12/contrib/sqlite3/Makefile.am
stable/12/contrib/sqlite3/Makefile.in
stable/12/contrib/sqlite3/configure
stable/12/contrib/sqlite3/configure.ac
stable/12/contrib/sqlite3/shell.c
stable/12/contrib/sqlite3/sqlite3.c
stable/12/contrib/sqlite3/sqlite3.h
stable/12/contrib/sqlite3/tea/configure
stable/12/contrib/sqlite3/tea/configure.ac
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/contrib/sqlite3/Makefile.am
==
--- stable/11/contrib/sqlite3/Makefile.am Wed Sep 23 12:54:42 2020
(r366075)
+++ stable/11/contrib/sqlite3/Makefile.am Wed Sep 23 14:36:38 2020
(r366076)
@@ -13,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Modified: stable/11/contrib/sqlite3/Makefile.in
==
--- stable/11/contrib/sqlite3/Makefile.in Wed Sep 23 12:54:42 2020
(r366075)
+++ stable/11/contrib/sqlite3/Makefile.in Wed Sep 23 14:36:38 2020
(r366076)
@@ -370,7 +370,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
man_MANS = sqlite3.1
Modified: stable/11/contrib/sqlite3/configure
==
--- stable/11/contrib/sqlite3/configure Wed Sep 23 12:54:42 2020
(r366075)
+++ stable/11/contrib/sqlite3/configure Wed Sep 23 14:36:38 2020
(r366076)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.32.3.
+# Generated by GNU Autoconf 2.69 for sqlite 3.33.0.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.32.3'
-PACKAGE_STRING='sqlite 3.32.3'
+PACKAGE_VERSION='3.33.0'
+PACKAGE_STRING='sqlite 3.33.0'
PACKAGE_BUGREPORT='http://www.sqlite.org'
PACKAGE_URL=''
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sqlite 3.32.3 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.33.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sqlite 3.32.3:";;
+ short | recursive ) echo "Configuration of sqlite 3.33.0:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sqlite configure 3.32.3
+sqlite configure 3.33.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sqlite $as_me 3.32.3, which was
+It was created by sqlite $as_me 3.33.0, which was
Re: svn commit: r365984 - head/usr.bin/calendar/calendars
In message <20200922192424.mnzunuwnjtwfwilh@mutt-hbsd>, Shawn Webb writes: > > --ftu52o6ib5uewj7t > Content-Type: text/plain; charset=us-ascii > Content-Disposition: inline > Content-Transfer-Encoding: quoted-printable > > On Tue, Sep 22, 2020 at 09:18:43PM +0200, Gordon Bergling wrote: > > On Tue, Sep 22, 2020 at 09:01:46PM +0300, Andriy Gapon wrote: > > > On 22/09/2020 06:06, Conrad Meyer wrote: > > > > Big ol plus one from me. > > > >=20 > > > > On Mon, Sep 21, 2020 at 4:16 PM Cy Schubert m> wrote: > > > >> > > > >> In message <202009212255.08lmtpsp078...@repo.freebsd.org>, Greg Lehey > > > >> writes: > > > >>> Author: grog > > > >>> Date: Mon Sep 21 22:55:51 2020 > > > >>> New Revision: 365984 > > > >>> URL: https://svnweb.freebsd.org/changeset/base/365984 > > > >>> > > > >>> Log: > > > >>> Remove claim that Allied Forces created "West Germany" in 1953. = > I can > > > >>> find no historic substantiation for such a claim. The Federal > > > >>> Republic of Germany was created by Germans on 23 May 1949, as also > > > >>> noted in this file. > > > >>> > > > >>> Modified: > > > >>> head/usr.bin/calendar/calendars/calendar.history > > > >>> > > > >>> Modified: head/usr.bin/calendar/calendars/calendar.history > > > >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= > =3D=3D=3D=3D=3D > > > >>> =3D > > > >>> --- head/usr.bin/calendar/calendars/calendar.history Mon Sep 21 22= > :52:57 202 > > > >>> 0 (r365983) > > > >>> +++ head/usr.bin/calendar/calendars/calendar.history Mon Sep 21 22= > :55:51 202 > > > >>> 0 (r365984) > > > >>> @@ -521,7 +521,6 @@ > > > >>> 09/20Magellan leaves Spain on the first Round the World pa= > ssage, 151 > > > >>> 9 > > > >>> 09/20The Roxy Theater opens in Hollywood, 1973 > > > >>> 09/21J. R. R. Tolkien's The Hobbit is published, 1937 > > > >>> -09/22Allied forces form the independent nation West German= > y, 1953 > > > >>> 09/22US President Lincoln issues the Emancipation Proclama= > tion, 1862 > > > >>> 09/22Special prosecutor Leon Jeworski subpoenas US Preside= > nt Nixon, > > > >>> 1974 > > > >>> 09/22The first Soviet atomic bomb explodes, 1949 > > > >>> > > > >> > > > >> Does this file still need to be in FreeBSD? It may have been a novel= > ty back > > > >> in the day but IMO calendar.history has nothing to do with BSD, comp= > uters > > > >> or anything else of interest to FreeBSD. At the very least this file= > should > > > >> be moved to ports or better yet, removed entirely. I simply don't se= > e the > > > >> point of it being in the tree and distributed with an O/S, any O/S. > > >=20 > > > I think that the only reason for this file's existence in the source tr= > ee is for > > > Greg's staving off the commit bit reaper. > > > No offense meant. > > >=20 > > > P.S. > > > And occasional flame wars, it seems. > >=20 > > We already had a similar discussion in march 2020 after r358561 [1]. > >=20 > > In the short, the calendar utility has it's historic place, even it's > > just more a kind of tradition, like adding yourself as a FreeBSD committer > > to calendar.freebsd. > >=20 > > [1] https://lists.freebsd.org/pipermail/svn-src-all/2020-March/thread.html > > Would it make sense to prune calendar entries to only BSD-related > entries? +1 -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r365984 - head/usr.bin/calendar/calendars
In message <202009212255.08lmtpsp078...@repo.freebsd.org>, Greg Lehey writes: > Author: grog > Date: Mon Sep 21 22:55:51 2020 > New Revision: 365984 > URL: https://svnweb.freebsd.org/changeset/base/365984 > > Log: > Remove claim that Allied Forces created "West Germany" in 1953. I can > find no historic substantiation for such a claim. The Federal > Republic of Germany was created by Germans on 23 May 1949, as also > noted in this file. > > Modified: > head/usr.bin/calendar/calendars/calendar.history > > Modified: head/usr.bin/calendar/calendars/calendar.history > = > = > --- head/usr.bin/calendar/calendars/calendar.history Mon Sep 21 22:52:57 202 > 0 (r365983) > +++ head/usr.bin/calendar/calendars/calendar.history Mon Sep 21 22:55:51 202 > 0 (r365984) > @@ -521,7 +521,6 @@ > 09/20Magellan leaves Spain on the first Round the World passage, 151 > 9 > 09/20The Roxy Theater opens in Hollywood, 1973 > 09/21J. R. R. Tolkien's The Hobbit is published, 1937 > -09/22Allied forces form the independent nation West Germany, 1953 > 09/22US President Lincoln issues the Emancipation Proclamation, 1862 > 09/22Special prosecutor Leon Jeworski subpoenas US President Nixon, > 1974 > 09/22The first Soviet atomic bomb explodes, 1949 > Does this file still need to be in FreeBSD? It may have been a novelty back in the day but IMO calendar.history has nothing to do with BSD, computers or anything else of interest to FreeBSD. At the very least this file should be moved to ports or better yet, removed entirely. I simply don't see the point of it being in the tree and distributed with an O/S, any O/S. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r364817 - head/libexec/rc/rc.d
In message , Andriy Gapon wri tes: > On 27/08/2020 19:51, Brandon Bergren wrote: > > FWIW, on powerpc64, using /etc/zfs/zpool.cache is great because it avoids t > he problem of having to unmount /boot (which is an msdos filesystem because p > eitiboot doesn't understand ufs or zfs) to update the copy of zpool.cache tha > t is on the root filesystem in /boot instead of only changing the one in the > runtime /boot (which was mounted on top, and is never useful because it's not > mounted at the time that zpool.cache is actually needed to import pools.) > > > > In any case, the correct way on ZFS to control where the cachefile is writt > en is to set the cachefile property on the zpool to the specific path. The co > rrect behavior regarding boot time auto import of pools is to honor that prop > erty as found on the pool the boot filesystem was on, so that other pools sha > ring the same cachefile path will be imported. Multiple cache files and pools > not actually listed in a cachefile are valid scenarios for pools. > > > Just want to express my complete agreement. Agreed with the above, however: I still think that using a zpool import in rc.d is a regression. I understand why the OpenZFS folks did what they did. Linux with it's filesystem agnostic grub and initramfs monstrosity requires that they externalize this. I'm not happy about the regression but understand why they did it. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364867 - head/libexec/rc/rc.d
Author: cy
Date: Thu Aug 27 14:33:46 2020
New Revision: 364867
URL: https://svnweb.freebsd.org/changeset/base/364867
Log:
/etc/zfs/zpool.cache is the preferred (and new) location of zpool.cache.
Check for it first. Only use /boot/zfs/zpool.cache if the /etc/zfs
version is not found and good.
Reported by: avg
Suggested by: avg, kevans
Modified:
head/libexec/rc/rc.d/zpool
Modified: head/libexec/rc/rc.d/zpool
==
--- head/libexec/rc/rc.d/zpool Thu Aug 27 14:29:06 2020(r364866)
+++ head/libexec/rc/rc.d/zpool Thu Aug 27 14:33:46 2020(r364867)
@@ -20,9 +20,9 @@ zpool_start()
{
local cachefile
- for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
+ for cachefile in /etc/zfs/zpool.cache /boot/zfs/zpool.cache; do
if [ -r $cachefile ]; then
- zpool import -c $cachefile -a -N
+ zpool import -c $cachefile -a -N && break
fi
done
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r364817 - head/libexec/rc/rc.d
What would you suggest in this case, where /etc/zfs/zpool.cache is newer
than /boot/zfs/zpool.cache?
slippy$ lh /boot/zfs/zpool.cache /etc/zfs/zpool.cache
-rw-r--r-- 1 root wheel 4.6K Aug 25 07:19 /boot/zfs/zpool.cache
-rw-r--r-- 1 root wheel 4.7K Aug 27 06:20 /etc/zfs/zpool.cache
slippy$
Something like, for I in $(ls -t /etc/zfs/zpool.cache
/boot/zfs/zpool.cache) with the break?
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
In message <202008271354.07rdstew084...@slippy.cwsent.com>, Cy Schubert
writes:
> In message <202008271350.07rdogqn055...@slippy.cwsent.com>, Cy Schubert
> writes:
> > In message <7e55d429-482b-2277-b340-2b85c6874...@freebsd.org>, Andriy Gapon
>
> > wri
> > tes:
> > > On 26/08/2020 16:13, Cy Schubert wrote:
> > > > Author: cy
> > > > Date: Wed Aug 26 13:13:57 2020
> > > > New Revision: 364817
> > > > URL: https://svnweb.freebsd.org/changeset/base/364817
> > > >
> > > > Log:
> > > > As of r364746 (OpenZFS import) existing ZPOOLs are not imported
> > > > prior to zvol and mountcritlocal resulting in ZVOLs (swap and
> > >
> > > I probably missed some discussion, so I am curious why that is.
> >
> > This is because r364746 added the code below to rc.d/zfs and by then it was
>
> > too late. I simply moved it to a new file that allowed rc.d/zvol and
> > rc.d/mountcritlocal with legacy mounts to work again. This was copied from
> > rc.d/zfs, which was added by r364746. There was no need for a zpool import
> > under the previous version of ZFS, whereas it appears that OpenZFS requires
>
> > it.
>
> Let me add, one could say this is a regression.
>
> >
> > >
> > > > virtual machine UFS filesystems) being unavailable, leading to
> > > > boot failures.
> > > > We move the zpool import from zfs to a new zpool script, with the
> > > > -N option to avoid mounting datasets while making the ZPOOL's
> > > > datasets available for "legacy" mount (mountpoint=legacy) and ZVOLs
> > > > available for subsequent use for swap (in the zvol rc sript) or
> > > > for UFS or other filesystems in fstab(5), mounted by mountcritlocal.
> > > >
> > > > Reviewed by: freqlabs (previous version)
> > > > Differential Revision:https://reviews.freebsd.org/D26185
> > > >
> > > > Added:
> > > > head/libexec/rc/rc.d/zpool (contents, props changed)
> > > [snip]
> > > > +zpool_start()
> > > > +{
> > > > + local cachefile
> > > > +
> > > > + for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
> > > > + if [ -r $cachefile ]; then
> > > > + zpool import -c $cachefile -a -N
> > >
> > > I would add a break here, so that pools are imported either from one cach
> e
> > fi
> > > le
> > > or the other but not both. It makes sense to have two cache file definit
> io
> > ns
> > > for migration, but I think that it does not make sense to split pools bet
> we
> > en
> > > the cache files.
> >
> > Agreed.
> >
> > >
> > > > + fi
> > > > + done
> > > > +}
> > >
> > >
> > > --
> > > Andriy Gapon
>
>
> --
> Cheers,
> Cy Schubert
> FreeBSD UNIX: Web: https://FreeBSD.org
> NTP: Web: https://nwtime.org
>
> The need of the many outweighs the greed of the few.
>
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r364817 - head/libexec/rc/rc.d
In message <202008271350.07rdogqn055...@slippy.cwsent.com>, Cy Schubert
writes:
> In message <7e55d429-482b-2277-b340-2b85c6874...@freebsd.org>, Andriy Gapon
> wri
> tes:
> > On 26/08/2020 16:13, Cy Schubert wrote:
> > > Author: cy
> > > Date: Wed Aug 26 13:13:57 2020
> > > New Revision: 364817
> > > URL: https://svnweb.freebsd.org/changeset/base/364817
> > >
> > > Log:
> > > As of r364746 (OpenZFS import) existing ZPOOLs are not imported
> > > prior to zvol and mountcritlocal resulting in ZVOLs (swap and
> >
> > I probably missed some discussion, so I am curious why that is.
>
> This is because r364746 added the code below to rc.d/zfs and by then it was
> too late. I simply moved it to a new file that allowed rc.d/zvol and
> rc.d/mountcritlocal with legacy mounts to work again. This was copied from
> rc.d/zfs, which was added by r364746. There was no need for a zpool import
> under the previous version of ZFS, whereas it appears that OpenZFS requires
> it.
Let me add, one could say this is a regression.
>
> >
> > > virtual machine UFS filesystems) being unavailable, leading to
> > > boot failures.
> > > We move the zpool import from zfs to a new zpool script, with the
> > > -N option to avoid mounting datasets while making the ZPOOL's
> > > datasets available for "legacy" mount (mountpoint=legacy) and ZVOLs
> > > available for subsequent use for swap (in the zvol rc sript) or
> > > for UFS or other filesystems in fstab(5), mounted by mountcritlocal.
> > >
> > > Reviewed by:freqlabs (previous version)
> > > Differential Revision: https://reviews.freebsd.org/D26185
> > >
> > > Added:
> > > head/libexec/rc/rc.d/zpool (contents, props changed)
> > [snip]
> > > +zpool_start()
> > > +{
> > > + local cachefile
> > > +
> > > + for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
> > > + if [ -r $cachefile ]; then
> > > + zpool import -c $cachefile -a -N
> >
> > I would add a break here, so that pools are imported either from one cache
> fi
> > le
> > or the other but not both. It makes sense to have two cache file definitio
> ns
> > for migration, but I think that it does not make sense to split pools betwe
> en
> > the cache files.
>
> Agreed.
>
> >
> > > + fi
> > > + done
> > > +}
> >
> >
> > --
> > Andriy Gapon
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r364817 - head/libexec/rc/rc.d
In message <7e55d429-482b-2277-b340-2b85c6874...@freebsd.org>, Andriy Gapon
wri
tes:
> On 26/08/2020 16:13, Cy Schubert wrote:
> > Author: cy
> > Date: Wed Aug 26 13:13:57 2020
> > New Revision: 364817
> > URL: https://svnweb.freebsd.org/changeset/base/364817
> >
> > Log:
> > As of r364746 (OpenZFS import) existing ZPOOLs are not imported
> > prior to zvol and mountcritlocal resulting in ZVOLs (swap and
>
> I probably missed some discussion, so I am curious why that is.
This is because r364746 added the code below to rc.d/zfs and by then it was
too late. I simply moved it to a new file that allowed rc.d/zvol and
rc.d/mountcritlocal with legacy mounts to work again. This was copied from
rc.d/zfs, which was added by r364746. There was no need for a zpool import
under the previous version of ZFS, whereas it appears that OpenZFS requires
it.
>
> > virtual machine UFS filesystems) being unavailable, leading to
> > boot failures.
> > We move the zpool import from zfs to a new zpool script, with the
> > -N option to avoid mounting datasets while making the ZPOOL's
> > datasets available for "legacy" mount (mountpoint=legacy) and ZVOLs
> > available for subsequent use for swap (in the zvol rc sript) or
> > for UFS or other filesystems in fstab(5), mounted by mountcritlocal.
> >
> > Reviewed by: freqlabs (previous version)
> > Differential Revision:https://reviews.freebsd.org/D26185
> >
> > Added:
> > head/libexec/rc/rc.d/zpool (contents, props changed)
> [snip]
> > +zpool_start()
> > +{
> > + local cachefile
> > +
> > + for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
> > + if [ -r $cachefile ]; then
> > + zpool import -c $cachefile -a -N
>
> I would add a break here, so that pools are imported either from one cache fi
> le
> or the other but not both. It makes sense to have two cache file definitions
> for migration, but I think that it does not make sense to split pools between
> the cache files.
Agreed.
>
> > + fi
> > + done
> > +}
>
>
> --
> Andriy Gapon
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364835 - head/libexec/rc/rc.d
Author: cy Date: Wed Aug 26 20:30:00 2020 New Revision: 364835 URL: https://svnweb.freebsd.org/changeset/base/364835 Log: To avoid breakage for those who build/install without ZFS only rely on rc.d/zpool's BEFORE specification. Reported by: rpokala Modified: head/libexec/rc/rc.d/mountcritlocal Modified: head/libexec/rc/rc.d/mountcritlocal == --- head/libexec/rc/rc.d/mountcritlocal Wed Aug 26 19:32:28 2020 (r364834) +++ head/libexec/rc/rc.d/mountcritlocal Wed Aug 26 20:30:00 2020 (r364835) @@ -4,7 +4,7 @@ # # PROVIDE: mountcritlocal -# REQUIRE: root hostid_save mdconfig zvol +# REQUIRE: root hostid_save mdconfig # KEYWORD: nojail shutdown . /etc/rc.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r364806 - in head/sys/contrib/openzfs: include/os/freebsd/spl/sys module/os/freebsd/spl
If these are local FreeBSD changes then one *should* commit directly to
contrib/. vendor is for virgin vendor sources, i.e. without our
modifications. svn does a fair job of merging from vendor to contrib
(though occasionally it gets it wrong).
Ideally we should push our changes back to the vendor, import those into
vendor, then merge the official vendor sources/updates only after we
receive them from the vendor or after the vendor has officially accepted
them. But to put our changes into the vendor branch is wrong.
--
Cheers,
Cy Schubert
FreeBSD UNIX: Web: https://FreeBSD.org
NTP: Web: https://nwtime.org
The need of the many outweighs the greed of the few.
In message
, Matthew Macy writes:
> Do not commit directly to sys/contrib. PR, vendor branch update, then merge.
>
> On Wed, Aug 26, 2020 at 12:29 AM Toomas Soome wrote:
> >
> > Author: tsoome
> > Date: Wed Aug 26 07:29:17 2020
> > New Revision: 364806
> > URL: https://svnweb.freebsd.org/changeset/base/364806
> >
> > Log:
> > remove pragma ident lines
> >
> > The #pragma ident is historical relict and not needed any more, this
> > pragma is actually unknown for common compilers and is only causing
> > trouble.
> >
> > Modified:
> > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h
> > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h
> > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h
> > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h
> > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list_impl.h
> > head/sys/contrib/openzfs/include/os/freebsd/spl/sys/zmod.h
> > head/sys/contrib/openzfs/module/os/freebsd/spl/list.c
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h
> > ===
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h Wed
> Aug 26 07:00:07 2020(r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/acl_impl.h Wed
> Aug 26 07:29:17 2020(r364806)
> > @@ -26,8 +26,6 @@
> > #ifndef _SYS_ACL_IMPL_H
> > #define_SYS_ACL_IMPL_H
> >
> > -#pragma ident "%Z%%M% %I% %E% SMI"
> > -
> > #ifdef __cplusplus
> > extern "C" {
> > #endif
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h
> > ===
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h Wed
> Aug 26 07:00:07 2020(r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h Wed
> Aug 26 07:29:17 2020(r364806)
> > @@ -31,8 +31,6 @@
> > #ifndef _SYS_CMN_ERR_H
> > #define_SYS_CMN_ERR_H
> >
> > -#pragma ident "%Z%%M% %I% %E% SMI"
> > -
> > #if !defined(_ASM)
> > #include
> > #endif
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h
> > ===
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h Wed
> Aug 26 07:00:07 2020(r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/extdirent.h Wed
> Aug 26 07:29:17 2020(r364806)
> > @@ -26,8 +26,6 @@
> > #ifndef _SYS_EXTDIRENT_H
> > #define_SYS_EXTDIRENT_H
> >
> > -#pragma ident "%Z%%M% %I% %E% SMI"
> > -
> > #ifdef __cplusplus
> > extern "C" {
> > #endif
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h
> > ===
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h Wed Aug 26
> 07:00:07 2020(r364805)
> > +++ head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list.h Wed Aug 26
> 07:29:17 2020(r364806)
> > @@ -26,8 +26,6 @@
> > #ifndef_SYS_LIST_H
> > #define_SYS_LIST_H
> >
> > -#pragma ident "%Z%%M% %I% %E% SMI"
> > -
> > #include
> >
> > #ifdef __cplusplus
> >
> > Modified: head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list_impl.h
> > ===
> ===
> > --- head/sys/contrib/openzfs/include/os/freebsd/spl/sys/list_impl.h Wed
> Aug 26 07:00:07 2020(r364805)
> &
svn commit: r364817 - head/libexec/rc/rc.d
Author: cy
Date: Wed Aug 26 13:13:57 2020
New Revision: 364817
URL: https://svnweb.freebsd.org/changeset/base/364817
Log:
As of r364746 (OpenZFS import) existing ZPOOLs are not imported
prior to zvol and mountcritlocal resulting in ZVOLs (swap and
virtual machine UFS filesystems) being unavailable, leading to
boot failures.
We move the zpool import from zfs to a new zpool script, with the
-N option to avoid mounting datasets while making the ZPOOL's
datasets available for "legacy" mount (mountpoint=legacy) and ZVOLs
available for subsequent use for swap (in the zvol rc sript) or
for UFS or other filesystems in fstab(5), mounted by mountcritlocal.
Reviewed by: freqlabs (previous version)
Differential Revision:https://reviews.freebsd.org/D26185
Added:
head/libexec/rc/rc.d/zpool (contents, props changed)
Modified:
head/libexec/rc/rc.d/Makefile
head/libexec/rc/rc.d/mountcritlocal
head/libexec/rc/rc.d/zfs
head/libexec/rc/rc.d/zvol
Modified: head/libexec/rc/rc.d/Makefile
==
--- head/libexec/rc/rc.d/Makefile Wed Aug 26 12:54:18 2020
(r364816)
+++ head/libexec/rc/rc.d/Makefile Wed Aug 26 13:13:57 2020
(r364817)
@@ -318,6 +318,7 @@ CONFGROUPS+=ZFS
ZFS+= zfs
ZFS+= zfsbe
ZFS+= zfsd
+ZFS+= zpool
ZFS+= zvol
.endif
Modified: head/libexec/rc/rc.d/mountcritlocal
==
--- head/libexec/rc/rc.d/mountcritlocal Wed Aug 26 12:54:18 2020
(r364816)
+++ head/libexec/rc/rc.d/mountcritlocal Wed Aug 26 13:13:57 2020
(r364817)
@@ -4,7 +4,7 @@
#
# PROVIDE: mountcritlocal
-# REQUIRE: root hostid_save mdconfig
+# REQUIRE: root hostid_save mdconfig zvol
# KEYWORD: nojail shutdown
. /etc/rc.subr
Modified: head/libexec/rc/rc.d/zfs
==
--- head/libexec/rc/rc.d/zfsWed Aug 26 12:54:18 2020(r364816)
+++ head/libexec/rc/rc.d/zfsWed Aug 26 13:13:57 2020(r364817)
@@ -25,13 +25,6 @@ zfs_start_jail()
zfs_start_main()
{
- local cachefile
-
- for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
- if [ -r $cachefile ]; then
- zpool import -c $cachefile -a
- fi
- done
zfs mount -va
zfs share -a
if [ ! -r /etc/zfs/exports ]; then
Added: head/libexec/rc/rc.d/zpool
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rc/rc.d/zpool Wed Aug 26 13:13:57 2020(r364817)
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: zpool
+# REQUIRE: hostid
+# BEFORE: zvol mountcritlocal
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="zpool"
+desc="Import ZPOOLs"
+rcvar="zfs_enable"
+start_cmd="zpool_start"
+required_modules="zfs"
+
+zpool_start()
+{
+ local cachefile
+
+ for cachefile in /boot/zfs/zpool.cache /etc/zfs/zpool.cache; do
+ if [ -r $cachefile ]; then
+ zpool import -c $cachefile -a -N
+ fi
+ done
+}
+
+load_rc_config $name
+run_rc_command "$1"
Modified: head/libexec/rc/rc.d/zvol
==
--- head/libexec/rc/rc.d/zvol Wed Aug 26 12:54:18 2020(r364816)
+++ head/libexec/rc/rc.d/zvol Wed Aug 26 13:13:57 2020(r364817)
@@ -4,7 +4,7 @@
#
# PROVIDE: zvol
-# REQUIRE: hostid
+# REQUIRE: zpool
# BEFORE: dumpon
# KEYWORD: nojail
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r364746 - in head: . cddl/compat/opensolaris/include cddl/contrib/opensolaris/cmd/lockstat cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cm
In message <202008250221.07p2lrst044...@repo.freebsd.org>, Matt Macy writes: > Author: mmacy > Date: Tue Aug 25 02:21:27 2020 > New Revision: 364746 > URL: https://svnweb.freebsd.org/changeset/base/364746 > > Log: > Merge OpenZFS support in to HEAD. > > The primary benefit is maintaining a completely shared > code base with the community allowing FreeBSD to receive > new features sooner and with less effort. > > I would advise against doing 'zpool upgrade' > or creating indispensable pools using new > features until this change has had a month+ > to soak. > > Work on merging FreeBSD support in to what was > at the time "ZFS on Linux" began in August 2018. > I first publicly proposed transitioning FreeBSD > to (new) OpenZFS on December 18th, 2018. FreeBSD > support in OpenZFS was finally completed in December > 2019. A CFT for downstreaming OpenZFS support in > to FreeBSD was first issued on July 8th. All issues > that were reported have been addressed or, for > a couple of less critical matters there are > pull requests in progress with OpenZFS. iXsystems > has tested and dogfooded extensively internally. > The TrueNAS 12 release is based on OpenZFS with > some additional features that have not yet made > it upstream. > > Improvements include: > project quotas, encrypted datasets, > allocation classes, vectorized raidz, > vectorized checksums, various command line > improvements, zstd compression. > > Thanks to those who have helped along the way: > Ryan Moeller, Allan Jude, Zack Welch, and many > others. > > Sponsored by: iXsystems, Inc. > Differential Revision: https://reviews.freebsd.org/D25872 > Relnotes? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364722 - head/usr.sbin/unbound
Author: cy Date: Mon Aug 24 18:17:13 2020 New Revision: 364722 URL: https://svnweb.freebsd.org/changeset/base/364722 Log: Update unbound version number. MFC after:1 month X-MFC with: r364721 Modified: head/usr.sbin/unbound/config.h Modified: head/usr.sbin/unbound/config.h == --- head/usr.sbin/unbound/config.h Mon Aug 24 18:14:04 2020 (r364721) +++ head/usr.sbin/unbound/config.h Mon Aug 24 18:17:13 2020 (r364722) @@ -687,7 +687,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.10.1" +#define PACKAGE_VERSION "1.11.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -709,7 +709,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,9,6,0 +#define RSRC_PACKAGE_VERSION 1,11,0,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364721 - in head/contrib/unbound: . .github cachedb contrib contrib/android contrib/ios daemon dns64 dnstap doc dynlibmod edns-subnet iterator libunbound respip services sldns smallapp...
Author: cy Date: Mon Aug 24 18:14:04 2020 New Revision: 364721 URL: https://svnweb.freebsd.org/changeset/base/364721 Log: MFV 364468: Update unbound 1.10.1 --> 1.11.0. MFH: 1 month Added: head/contrib/unbound/README-Travis.md - copied unchanged from r364468, vendor/unbound/dist/README-Travis.md head/contrib/unbound/contrib/android/ - copied from r364468, vendor/unbound/dist/contrib/android/ head/contrib/unbound/contrib/ios/ - copied from r364468, vendor/unbound/dist/contrib/ios/ head/contrib/unbound/dnstap/dnstap_fstrm.c - copied unchanged from r364468, vendor/unbound/dist/dnstap/dnstap_fstrm.c head/contrib/unbound/dnstap/dnstap_fstrm.h - copied unchanged from r364468, vendor/unbound/dist/dnstap/dnstap_fstrm.h head/contrib/unbound/dnstap/dtstream.c - copied unchanged from r364468, vendor/unbound/dist/dnstap/dtstream.c head/contrib/unbound/dnstap/dtstream.h - copied unchanged from r364468, vendor/unbound/dist/dnstap/dtstream.h head/contrib/unbound/dnstap/unbound-dnstap-socket.c - copied unchanged from r364468, vendor/unbound/dist/dnstap/unbound-dnstap-socket.c head/contrib/unbound/dynlibmod/ - copied from r364468, vendor/unbound/dist/dynlibmod/ Modified: head/contrib/unbound/.github/FUNDING.yml head/contrib/unbound/.travis.yml head/contrib/unbound/Makefile.in head/contrib/unbound/acx_python.m4 head/contrib/unbound/cachedb/cachedb.c head/contrib/unbound/cachedb/cachedb.h head/contrib/unbound/cachedb/redis.c head/contrib/unbound/config.guess head/contrib/unbound/config.h.in head/contrib/unbound/config.sub head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/contrib/-filter-iterator.patch head/contrib/unbound/contrib/fastrpz.patch head/contrib/unbound/contrib/libunbound.pc.in head/contrib/unbound/contrib/unbound.service.in head/contrib/unbound/daemon/acl_list.c head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/dns64/dns64.c head/contrib/unbound/dnstap/dnstap.c head/contrib/unbound/dnstap/dnstap.h head/contrib/unbound/dnstap/dnstap.m4 head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1.in head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/edns-subnet/subnetmod.c head/contrib/unbound/edns-subnet/subnetmod.h head/contrib/unbound/iterator/iter_utils.c head/contrib/unbound/iterator/iterator.c head/contrib/unbound/iterator/iterator.h head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/respip/respip.c head/contrib/unbound/services/authzone.c head/contrib/unbound/services/authzone.h head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/listen_dnsport.h head/contrib/unbound/services/localzone.c head/contrib/unbound/services/mesh.c head/contrib/unbound/services/modstack.c head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/outside_network.h head/contrib/unbound/services/rpz.c head/contrib/unbound/services/rpz.h head/contrib/unbound/sldns/parseutil.c head/contrib/unbound/smallapp/unbound-anchor.c head/contrib/unbound/smallapp/unbound-checkconf.c head/contrib/unbound/smallapp/unbound-control-setup.sh.in head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/smallapp/worker_cb.c head/contrib/unbound/util/config_file.c head/contrib/unbound/util/config_file.h head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.y head/contrib/unbound/util/fptr_wlist.c head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/mini_event.h head/contrib/unbound/util/net_help.c head/contrib/unbound/util/net_help.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/netevent.h head/contrib/unbound/util/shm_side/shm_main.c head/contrib/unbound/util/ub_event.c head/contrib/unbound/validator/val_secalgo.c head/contrib/unbound/validator/val_sigcrypt.c Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/.github/FUNDING.yml == --- head/contrib/unbound/.github/FUNDING.ymlMon Aug 24 18:13:44 2020 (r364720) +++ head/contrib/unbound/.github/FUNDING.ymlMon Aug 24 18:14:04 2020 (r364721) @@ -1,12 +1,2 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
svn commit: r364720 - in head/contrib/sqlite3: . tea
Author: cy
Date: Mon Aug 24 18:13:44 2020
New Revision: 364720
URL: https://svnweb.freebsd.org/changeset/base/364720
Log:
MFV 364467:
Update sqlite to 3.33.0 (333).
Release announcement at https://www.sqlite.org/releaselog/3_33_0.html.
MFC after:1 month
Added:
head/contrib/sqlite3/sqlite3rc.h
- copied unchanged from r364467, vendor/sqlite3/dist/sqlite3rc.h
Modified:
head/contrib/sqlite3/Makefile.am
head/contrib/sqlite3/Makefile.in
head/contrib/sqlite3/configure
head/contrib/sqlite3/configure.ac
head/contrib/sqlite3/shell.c
head/contrib/sqlite3/sqlite3.c
head/contrib/sqlite3/sqlite3.h
head/contrib/sqlite3/tea/configure
head/contrib/sqlite3/tea/configure.ac
Directory Properties:
head/contrib/sqlite3/ (props changed)
Modified: head/contrib/sqlite3/Makefile.am
==
--- head/contrib/sqlite3/Makefile.amMon Aug 24 17:57:08 2020
(r364719)
+++ head/contrib/sqlite3/Makefile.amMon Aug 24 18:13:44 2020
(r364720)
@@ -13,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Modified: head/contrib/sqlite3/Makefile.in
==
--- head/contrib/sqlite3/Makefile.inMon Aug 24 17:57:08 2020
(r364719)
+++ head/contrib/sqlite3/Makefile.inMon Aug 24 18:13:44 2020
(r364720)
@@ -370,7 +370,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
man_MANS = sqlite3.1
Modified: head/contrib/sqlite3/configure
==
--- head/contrib/sqlite3/configure Mon Aug 24 17:57:08 2020
(r364719)
+++ head/contrib/sqlite3/configure Mon Aug 24 18:13:44 2020
(r364720)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.32.3.
+# Generated by GNU Autoconf 2.69 for sqlite 3.33.0.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.32.3'
-PACKAGE_STRING='sqlite 3.32.3'
+PACKAGE_VERSION='3.33.0'
+PACKAGE_STRING='sqlite 3.33.0'
PACKAGE_BUGREPORT='http://www.sqlite.org'
PACKAGE_URL=''
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sqlite 3.32.3 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.33.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sqlite 3.32.3:";;
+ short | recursive ) echo "Configuration of sqlite 3.33.0:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sqlite configure 3.32.3
+sqlite configure 3.33.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sqlite $as_me 3.32.3, which was
+It was created by sqlite $as_me 3.33.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2818,7 +2818,7 @@ fi
# Define the identity of the package.
PACKAGE='sqlite'
- VERSION='3.32.3'
+ VERSION='3.33.0'
cat >>confdefs.h <<_ACEOF
@@ -14438,7 +14438,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sqlite $as_me 3.32.3, which was
+This file was extended by sqlite $as_me 3.33.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES= $CONFIG_FILES
@@ -14495,7
svn commit: r364470 - vendor/unbound/1.11.0
Author: cy Date: Fri Aug 21 23:00:15 2020 New Revision: 364470 URL: https://svnweb.freebsd.org/changeset/base/364470 Log: Tag unbound 1.11.0. Added: vendor/unbound/1.11.0/ - copied from r364469, vendor/unbound/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364469 - vendor/sqlite3/sqlite-3330000
Author: cy Date: Fri Aug 21 22:58:37 2020 New Revision: 364469 URL: https://svnweb.freebsd.org/changeset/base/364469 Log: Tag sqlite 3.33.0 (333). Added: vendor/sqlite3/sqlite-333/ - copied from r364468, vendor/sqlite3/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364468 - in vendor/unbound/dist: . .github cachedb contrib contrib/android contrib/ios daemon dns64 dnstap doc dynlibmod dynlibmod/examples edns-subnet iterator libunbound respip servi...
Author: cy Date: Fri Aug 21 22:56:05 2020 New Revision: 364468 URL: https://svnweb.freebsd.org/changeset/base/364468 Log: Vendor import of Unbound 1.11.0. Added: vendor/unbound/dist/README-Travis.md vendor/unbound/dist/contrib/android/ vendor/unbound/dist/contrib/android/15-android.conf (contents, props changed) vendor/unbound/dist/contrib/android/install_expat.sh (contents, props changed) vendor/unbound/dist/contrib/android/install_ndk.sh (contents, props changed) vendor/unbound/dist/contrib/android/install_openssl.sh (contents, props changed) vendor/unbound/dist/contrib/android/install_tools.sh (contents, props changed) vendor/unbound/dist/contrib/android/setenv_android.sh (contents, props changed) vendor/unbound/dist/contrib/ios/ vendor/unbound/dist/contrib/ios/15-ios.conf (contents, props changed) vendor/unbound/dist/contrib/ios/install_expat.sh (contents, props changed) vendor/unbound/dist/contrib/ios/install_openssl.sh (contents, props changed) vendor/unbound/dist/contrib/ios/install_tools.sh (contents, props changed) vendor/unbound/dist/contrib/ios/openssl.patch vendor/unbound/dist/contrib/ios/setenv_ios.sh (contents, props changed) vendor/unbound/dist/dnstap/dnstap_fstrm.c (contents, props changed) vendor/unbound/dist/dnstap/dnstap_fstrm.h (contents, props changed) vendor/unbound/dist/dnstap/dtstream.c (contents, props changed) vendor/unbound/dist/dnstap/dtstream.h (contents, props changed) vendor/unbound/dist/dnstap/unbound-dnstap-socket.c (contents, props changed) vendor/unbound/dist/dynlibmod/ vendor/unbound/dist/dynlibmod/dynlibmod.c (contents, props changed) vendor/unbound/dist/dynlibmod/dynlibmod.h (contents, props changed) vendor/unbound/dist/dynlibmod/examples/ vendor/unbound/dist/dynlibmod/examples/helloworld.c (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/bad.dscp vendor/unbound/dist/testdata/04-checkconf.tdir/bad.include-toplevel.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/bad.include-toplevel.2 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/bad.include-toplevel.3 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/bad.include-toplevel.4 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/bad.include-toplevel.5 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/bad.include-toplevel.6 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/bad.include-toplevel.7 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/good.include-toplevel vendor/unbound/dist/testdata/04-checkconf.tdir/good.min vendor/unbound/dist/testdata/04-checkconf.tdir/include.include.withclauses.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.include.withclauses.2 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.include.withclauses.3 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.include.withoutclauses.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.include.withoutclauses.2 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.include.withoutclauses.3 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.includetop.withclauses.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.includetop.withclauses.2 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.includetop.withclauses.3 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.includetop.withoutclauses.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.includetop.withoutclauses.2 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.includetop.withoutclauses.3 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withclauses.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withclauses.2 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withclauses.3 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withoutclauses.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withoutclauses.2 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withoutclauses.3 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withsomeclauses.1 (contents, props changed) vendor/unbound/dist/testdata/04-checkconf.tdir/include.withsomeclauses.2 (contents, props changed)
svn commit: r364467 - in vendor/sqlite3/dist: . tea
Author: cy
Date: Fri Aug 21 22:54:38 2020
New Revision: 364467
URL: https://svnweb.freebsd.org/changeset/base/364467
Log:
Import sqlite 3.32.3 (333).
Added:
vendor/sqlite3/dist/sqlite3rc.h (contents, props changed)
Modified:
vendor/sqlite3/dist/Makefile.am
vendor/sqlite3/dist/Makefile.in
vendor/sqlite3/dist/configure
vendor/sqlite3/dist/configure.ac
vendor/sqlite3/dist/shell.c
vendor/sqlite3/dist/sqlite3.c
vendor/sqlite3/dist/sqlite3.h
vendor/sqlite3/dist/tea/configure
vendor/sqlite3/dist/tea/configure.ac
Modified: vendor/sqlite3/dist/Makefile.am
==
--- vendor/sqlite3/dist/Makefile.am Fri Aug 21 22:31:45 2020
(r364466)
+++ vendor/sqlite3/dist/Makefile.am Fri Aug 21 22:54:38 2020
(r364467)
@@ -13,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
Modified: vendor/sqlite3/dist/Makefile.in
==
--- vendor/sqlite3/dist/Makefile.in Fri Aug 21 22:31:45 2020
(r364466)
+++ vendor/sqlite3/dist/Makefile.in Fri Aug 21 22:54:38 2020
(r364467)
@@ -370,7 +370,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_STMTVTAB
-DSQLITE_ENABLE_DBSTAT_VTAB $(SHELL_CFLAGS)
include_HEADERS = sqlite3.h sqlite3ext.h
-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt
Replace.cs Makefile.fallback
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = sqlite3.pc
man_MANS = sqlite3.1
Modified: vendor/sqlite3/dist/configure
==
--- vendor/sqlite3/dist/configure Fri Aug 21 22:31:45 2020
(r364466)
+++ vendor/sqlite3/dist/configure Fri Aug 21 22:54:38 2020
(r364467)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.32.3.
+# Generated by GNU Autoconf 2.69 for sqlite 3.33.0.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sqlite'
PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.32.3'
-PACKAGE_STRING='sqlite 3.32.3'
+PACKAGE_VERSION='3.33.0'
+PACKAGE_STRING='sqlite 3.33.0'
PACKAGE_BUGREPORT='http://www.sqlite.org'
PACKAGE_URL=''
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sqlite 3.32.3 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.33.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sqlite 3.32.3:";;
+ short | recursive ) echo "Configuration of sqlite 3.33.0:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sqlite configure 3.32.3
+sqlite configure 3.33.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sqlite $as_me 3.32.3, which was
+It was created by sqlite $as_me 3.33.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2818,7 +2818,7 @@ fi
# Define the identity of the package.
PACKAGE='sqlite'
- VERSION='3.32.3'
+ VERSION='3.33.0'
cat >>confdefs.h <<_ACEOF
@@ -14438,7 +14438,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sqlite $as_me 3.32.3, which was
+This file was extended by sqlite $as_me 3.33.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES= $CONFIG_FILES
@@ -14495,7 +14495,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/&/g'`"
ac_cs_version="\\
-sqlite config.status 3.32.3
+sqlite config.status 3.33.0
configured
svn commit: r364357 - stable/12/libexec/rc/rc.d
Author: cy Date: Tue Aug 18 20:41:03 2020 New Revision: 364357 URL: https://svnweb.freebsd.org/changeset/base/364357 Log: MFC r364133: When booting a system with WITHOUT_IPFILTER the following errors are encountered at boot time: rcorder: requirement `ipfs' in file `/etc/rc.d/netif' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/netif' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/netwait' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/net_watchdog' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/securelevel' has no providers. Listing its own requrements in BEFORE rather than use REQUIRE of non-optional scripts resolves this issue. The issue was discovered and patched by glebius at Netflix. Submitted by: glebius Reported by: glebius Modified: stable/12/libexec/rc/rc.d/ipfilter stable/12/libexec/rc/rc.d/ipmon stable/12/libexec/rc/rc.d/ipnat stable/12/libexec/rc/rc.d/netif stable/12/libexec/rc/rc.d/netwait stable/12/libexec/rc/rc.d/securelevel Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/rc/rc.d/ipfilter == --- stable/12/libexec/rc/rc.d/ipfilter Tue Aug 18 20:20:45 2020 (r364356) +++ stable/12/libexec/rc/rc.d/ipfilter Tue Aug 18 20:41:03 2020 (r364357) @@ -5,6 +5,7 @@ # PROVIDE: ipfilter # REQUIRE: FILESYSTEMS +# BEFORE: ipmon ipnat netif netwait securelevel # KEYWORD: nojailvnet . /etc/rc.subr Modified: stable/12/libexec/rc/rc.d/ipmon == --- stable/12/libexec/rc/rc.d/ipmon Tue Aug 18 20:20:45 2020 (r364356) +++ stable/12/libexec/rc/rc.d/ipmon Tue Aug 18 20:41:03 2020 (r364357) @@ -4,7 +4,7 @@ # # PROVIDE: ipmon -# REQUIRE: FILESYSTEMS hostname sysctl ipfilter +# REQUIRE: FILESYSTEMS hostname sysctl # BEFORE: SERVERS # KEYWORD: nojailvnet Modified: stable/12/libexec/rc/rc.d/ipnat == --- stable/12/libexec/rc/rc.d/ipnat Tue Aug 18 20:20:45 2020 (r364356) +++ stable/12/libexec/rc/rc.d/ipnat Tue Aug 18 20:41:03 2020 (r364357) @@ -4,7 +4,6 @@ # # PROVIDE: ipnat -# REQUIRE: ipfilter # KEYWORD: nojailvnet . /etc/rc.subr Modified: stable/12/libexec/rc/rc.d/netif == --- stable/12/libexec/rc/rc.d/netif Tue Aug 18 20:20:45 2020 (r364356) +++ stable/12/libexec/rc/rc.d/netif Tue Aug 18 20:41:03 2020 (r364357) @@ -27,7 +27,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl -# REQUIRE: hostid ipfilter ipfs +# REQUIRE: hostid ipfs # KEYWORD: nojailvnet . /etc/rc.subr Modified: stable/12/libexec/rc/rc.d/netwait == --- stable/12/libexec/rc/rc.d/netwait Tue Aug 18 20:20:45 2020 (r364356) +++ stable/12/libexec/rc/rc.d/netwait Tue Aug 18 20:41:03 2020 (r364357) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: netwait -# REQUIRE: devd ipfilter ipfw pf routing +# REQUIRE: devd ipfw pf routing # KEYWORD: nojail # # The netwait script helps handle two situations: Modified: stable/12/libexec/rc/rc.d/securelevel == --- stable/12/libexec/rc/rc.d/securelevel Tue Aug 18 20:20:45 2020 (r364356) +++ stable/12/libexec/rc/rc.d/securelevel Tue Aug 18 20:41:03 2020 (r364357) @@ -4,7 +4,7 @@ # # PROVIDE: securelevel -# REQUIRE: adjkerntz ipfw ipfilter pf +# REQUIRE: adjkerntz ipfw pf . /etc/rc.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364194 - in stable: 11/contrib/ipfilter/iplang 12/contrib/ipfilter/iplang
Author: cy
Date: Thu Aug 13 14:26:25 2020
New Revision: 364194
URL: https://svnweb.freebsd.org/changeset/base/364194
Log:
MFC r363916:
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
Modified:
stable/11/contrib/ipfilter/iplang/iplang_y.y
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/contrib/ipfilter/iplang/iplang_y.y
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/contrib/ipfilter/iplang/iplang_y.y
==
--- stable/11/contrib/ipfilter/iplang/iplang_y.yThu Aug 13 14:21:05
2020(r364193)
+++ stable/11/contrib/ipfilter/iplang/iplang_y.yThu Aug 13 14:26:25
2020(r364194)
@@ -30,11 +30,9 @@
#include
#include
#include
-#ifndeflinux
# include
# include
# include
-#endif
#include
#include
#include
@@ -589,29 +587,7 @@ struct statetoopt tosecopts[] = {
{ 0, 0 }
};
-#ifdef bsdi
-struct ether_addr *
-ether_aton(s)
- char *s;
-{
- static struct ether_addr n;
- u_int i[6];
- if (sscanf(s, " %x:%x:%x:%x:%x:%x ", [0], [1],
- [2], [3], [4], [5]) == 6) {
- n.ether_addr_octet[0] = (u_char)i[0];
- n.ether_addr_octet[1] = (u_char)i[1];
- n.ether_addr_octet[2] = (u_char)i[2];
- n.ether_addr_octet[3] = (u_char)i[3];
- n.ether_addr_octet[4] = (u_char)i[4];
- n.ether_addr_octet[5] = (u_char)i[5];
- return
- }
- return NULL;
-}
-#endif
-
-
struct in_addr getipv4addr(arg)
char *arg;
{
@@ -645,7 +621,6 @@ struct ether_addr *buf;
{
struct ether_addr *e;
-#if !defined(hpux) && !defined(linux)
e = ether_aton(arg);
if (!e)
fprintf(stderr, "Invalid ethernet address: %s\n", arg);
@@ -657,9 +632,6 @@ struct ether_addr *buf;
sizeof(e->ether_addr_octet));
# endif
return e;
-#else
- return NULL;
-#endif
}
@@ -1584,9 +1556,7 @@ int arg;
void set_icmpmtu(arg)
int arg;
{
-#ifBSD >= 199306
icmp->icmp_nextmtu = htons(arg);
-#endif
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364194 - in stable: 11/contrib/ipfilter/iplang 12/contrib/ipfilter/iplang
Author: cy
Date: Thu Aug 13 14:26:25 2020
New Revision: 364194
URL: https://svnweb.freebsd.org/changeset/base/364194
Log:
MFC r363916:
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
Modified:
stable/12/contrib/ipfilter/iplang/iplang_y.y
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/contrib/ipfilter/iplang/iplang_y.y
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/contrib/ipfilter/iplang/iplang_y.y
==
--- stable/12/contrib/ipfilter/iplang/iplang_y.yThu Aug 13 14:21:05
2020(r364193)
+++ stable/12/contrib/ipfilter/iplang/iplang_y.yThu Aug 13 14:26:25
2020(r364194)
@@ -30,11 +30,9 @@
#include
#include
#include
-#ifndeflinux
# include
# include
# include
-#endif
#include
#include
#include
@@ -589,29 +587,7 @@ struct statetoopt tosecopts[] = {
{ 0, 0 }
};
-#ifdef bsdi
-struct ether_addr *
-ether_aton(s)
- char *s;
-{
- static struct ether_addr n;
- u_int i[6];
- if (sscanf(s, " %x:%x:%x:%x:%x:%x ", [0], [1],
- [2], [3], [4], [5]) == 6) {
- n.ether_addr_octet[0] = (u_char)i[0];
- n.ether_addr_octet[1] = (u_char)i[1];
- n.ether_addr_octet[2] = (u_char)i[2];
- n.ether_addr_octet[3] = (u_char)i[3];
- n.ether_addr_octet[4] = (u_char)i[4];
- n.ether_addr_octet[5] = (u_char)i[5];
- return
- }
- return NULL;
-}
-#endif
-
-
struct in_addr getipv4addr(arg)
char *arg;
{
@@ -645,7 +621,6 @@ struct ether_addr *buf;
{
struct ether_addr *e;
-#if !defined(hpux) && !defined(linux)
e = ether_aton(arg);
if (!e)
fprintf(stderr, "Invalid ethernet address: %s\n", arg);
@@ -657,9 +632,6 @@ struct ether_addr *buf;
sizeof(e->ether_addr_octet));
# endif
return e;
-#else
- return NULL;
-#endif
}
@@ -1584,9 +1556,7 @@ int arg;
void set_icmpmtu(arg)
int arg;
{
-#ifBSD >= 199306
icmp->icmp_nextmtu = htons(arg);
-#endif
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r364133 - head/libexec/rc/rc.d
Author: cy Date: Tue Aug 11 23:36:38 2020 New Revision: 364133 URL: https://svnweb.freebsd.org/changeset/base/364133 Log: When booting a system with WITHOUT_IPFILTER the following errors are encountered at boot time: rcorder: requirement `ipfs' in file `/etc/rc.d/netif' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/netif' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/netwait' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/net_watchdog' has no providers. rcorder: requirement `ipfilter' in file `/etc/rc.d/securelevel' has no providers. Listing its own requrements in BEFORE rather than use REQUIRE of non-optional scripts resolves this issue. The issue was discovered and patched by glebius at Netflix. Submitted by: glebius Reported by: glebius MFC after:1 week Modified: head/libexec/rc/rc.d/ipfilter head/libexec/rc/rc.d/ipmon head/libexec/rc/rc.d/ipnat head/libexec/rc/rc.d/netif head/libexec/rc/rc.d/netwait head/libexec/rc/rc.d/securelevel Modified: head/libexec/rc/rc.d/ipfilter == --- head/libexec/rc/rc.d/ipfilter Tue Aug 11 22:33:56 2020 (r364132) +++ head/libexec/rc/rc.d/ipfilter Tue Aug 11 23:36:38 2020 (r364133) @@ -5,6 +5,7 @@ # PROVIDE: ipfilter # REQUIRE: FILESYSTEMS +# BEFORE: ipmon ipnat netif netwait securelevel # KEYWORD: nojailvnet . /etc/rc.subr Modified: head/libexec/rc/rc.d/ipmon == --- head/libexec/rc/rc.d/ipmon Tue Aug 11 22:33:56 2020(r364132) +++ head/libexec/rc/rc.d/ipmon Tue Aug 11 23:36:38 2020(r364133) @@ -4,7 +4,7 @@ # # PROVIDE: ipmon -# REQUIRE: FILESYSTEMS hostname sysctl ipfilter +# REQUIRE: FILESYSTEMS hostname sysctl # BEFORE: SERVERS # KEYWORD: nojailvnet Modified: head/libexec/rc/rc.d/ipnat == --- head/libexec/rc/rc.d/ipnat Tue Aug 11 22:33:56 2020(r364132) +++ head/libexec/rc/rc.d/ipnat Tue Aug 11 23:36:38 2020(r364133) @@ -4,7 +4,6 @@ # # PROVIDE: ipnat -# REQUIRE: ipfilter # KEYWORD: nojailvnet . /etc/rc.subr Modified: head/libexec/rc/rc.d/netif == --- head/libexec/rc/rc.d/netif Tue Aug 11 22:33:56 2020(r364132) +++ head/libexec/rc/rc.d/netif Tue Aug 11 23:36:38 2020(r364133) @@ -27,7 +27,7 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS iovctl serial sppp sysctl -# REQUIRE: hostid ipfilter ipfs +# REQUIRE: hostid ipfs # KEYWORD: nojailvnet . /etc/rc.subr Modified: head/libexec/rc/rc.d/netwait == --- head/libexec/rc/rc.d/netwaitTue Aug 11 22:33:56 2020 (r364132) +++ head/libexec/rc/rc.d/netwaitTue Aug 11 23:36:38 2020 (r364133) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: netwait -# REQUIRE: devd ipfilter ipfw pf routing +# REQUIRE: devd ipfw pf routing # KEYWORD: nojail # # The netwait script helps handle two situations: Modified: head/libexec/rc/rc.d/securelevel == --- head/libexec/rc/rc.d/securelevelTue Aug 11 22:33:56 2020 (r364132) +++ head/libexec/rc/rc.d/securelevelTue Aug 11 23:36:38 2020 (r364133) @@ -4,7 +4,7 @@ # # PROVIDE: securelevel -# REQUIRE: adjkerntz ipfw ipfilter pf +# REQUIRE: adjkerntz ipfw pf . /etc/rc.subr ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363916 - head/contrib/ipfilter/iplang
Author: cy
Date: Wed Aug 5 15:33:32 2020
New Revision: 363916
URL: https://svnweb.freebsd.org/changeset/base/363916
Log:
Continued ipfilter #ifdef cleanup. The r343701 log entry contains a
complete description.
MFC after:1 week
Modified:
head/contrib/ipfilter/iplang/iplang_y.y
Modified: head/contrib/ipfilter/iplang/iplang_y.y
==
--- head/contrib/ipfilter/iplang/iplang_y.y Wed Aug 5 15:20:07 2020
(r363915)
+++ head/contrib/ipfilter/iplang/iplang_y.y Wed Aug 5 15:33:32 2020
(r363916)
@@ -30,11 +30,9 @@
#include
#include
#include
-#ifndeflinux
# include
# include
# include
-#endif
#include
#include
#include
@@ -589,29 +587,7 @@ struct statetoopt tosecopts[] = {
{ 0, 0 }
};
-#ifdef bsdi
-struct ether_addr *
-ether_aton(s)
- char *s;
-{
- static struct ether_addr n;
- u_int i[6];
- if (sscanf(s, " %x:%x:%x:%x:%x:%x ", [0], [1],
- [2], [3], [4], [5]) == 6) {
- n.ether_addr_octet[0] = (u_char)i[0];
- n.ether_addr_octet[1] = (u_char)i[1];
- n.ether_addr_octet[2] = (u_char)i[2];
- n.ether_addr_octet[3] = (u_char)i[3];
- n.ether_addr_octet[4] = (u_char)i[4];
- n.ether_addr_octet[5] = (u_char)i[5];
- return
- }
- return NULL;
-}
-#endif
-
-
struct in_addr getipv4addr(arg)
char *arg;
{
@@ -645,7 +621,6 @@ struct ether_addr *buf;
{
struct ether_addr *e;
-#if !defined(hpux) && !defined(linux)
e = ether_aton(arg);
if (!e)
fprintf(stderr, "Invalid ethernet address: %s\n", arg);
@@ -657,9 +632,6 @@ struct ether_addr *buf;
sizeof(e->ether_addr_octet));
# endif
return e;
-#else
- return NULL;
-#endif
}
@@ -1584,9 +1556,7 @@ int arg;
void set_icmpmtu(arg)
int arg;
{
-#ifBSD >= 199306
icmp->icmp_nextmtu = htons(arg);
-#endif
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363769 - in stable/11: contrib/ipfilter/iplang contrib/ipfilter/ipsend sys/contrib/ipfilter/netinet
Author: cy Date: Sun Aug 2 04:25:36 2020 New Revision: 363769 URL: https://svnweb.freebsd.org/changeset/base/363769 Log: MFC r363284-r363285, r363670 r363284: pfil_run_hooks() can be called recursively, so we have to define FASTROUTE_RECURSION in fil.c Submitted by: chris...@netbsd.org Reported by: chris...@netbsd.org Obtained from:NetBSD r1.31 r363285: Fix incorrect byte order in ipfstat -f output. - make sure frag is initialized to 0 - initialize ipfr_p field NetBSD PR:55137 Submitted by: chris...@netbsd.org Reported by: chris...@netbsd.org Obtained from:NetBSD fil.c r1.32, ip_frag.c r1.8 r363670: Continued ipfilter #ifdef cleanup. The r343701 log entry contains a complete description. Modified: stable/11/contrib/ipfilter/iplang/iplang_y.y stable/11/contrib/ipfilter/ipsend/arp.c stable/11/contrib/ipfilter/ipsend/ipresend.c stable/11/contrib/ipfilter/ipsend/ipsend.c stable/11/contrib/ipfilter/ipsend/iptest.c stable/11/contrib/ipfilter/ipsend/iptests.c stable/11/contrib/ipfilter/ipsend/sock.c stable/11/sys/contrib/ipfilter/netinet/fil.c stable/11/sys/contrib/ipfilter/netinet/ip_frag.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/ipfilter/iplang/iplang_y.y == --- stable/11/contrib/ipfilter/iplang/iplang_y.ySun Aug 2 04:25:11 2020(r363768) +++ stable/11/contrib/ipfilter/iplang/iplang_y.ySun Aug 2 04:25:36 2020(r363769) @@ -45,11 +45,6 @@ #include "ipf.h" #include "iplang.h" -#if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \ -__FreeBSD_version < 400020) && (!SOLARIS || SOLARIS2 < 10) -extern struct ether_addr *ether_aton __P((char *)); -#endif - extern int opts; extern struct ipopt_names ionames[]; extern int state, state, lineNum, token; @@ -58,11 +53,7 @@ extern charyytext[]; extern FILE*yyin; intyylex __P((void)); #defineYYDEBUG 1 -#if !defined(ultrix) && !defined(hpux) intyydebug = 1; -#else -extern int yydebug; -#endif iface_t *iflist = NULL, **iftail = iface_t *cifp = NULL; Modified: stable/11/contrib/ipfilter/ipsend/arp.c == --- stable/11/contrib/ipfilter/ipsend/arp.c Sun Aug 2 04:25:11 2020 (r363768) +++ stable/11/contrib/ipfilter/ipsend/arp.c Sun Aug 2 04:25:36 2020 (r363769) @@ -11,17 +11,13 @@ static const char rcsid[] = "@(#)$Id$"; #endif #include #include -#if !defined(ultrix) && !defined(hpux) && !defined(__hpux) && !defined(__osf__) && !defined(_AIX51) # include -#endif #include #include #include #include #include -#ifndefultrix # include -#endif #include #include #include Modified: stable/11/contrib/ipfilter/ipsend/ipresend.c == --- stable/11/contrib/ipfilter/ipsend/ipresend.cSun Aug 2 04:25:11 2020(r363768) +++ stable/11/contrib/ipfilter/ipsend/ipresend.cSun Aug 2 04:25:36 2020(r363769) @@ -38,15 +38,7 @@ int opts = 0; # ifdef sun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0"; -# else -#ifdef __bsdi__ -char default_device[] = "ef0"; -#else char default_device[] = "lan0"; -#endif -# endif # endif #else char default_device[] = DEFAULT_DEVICE; Modified: stable/11/contrib/ipfilter/ipsend/ipsend.c == --- stable/11/contrib/ipfilter/ipsend/ipsend.c Sun Aug 2 04:25:11 2020 (r363768) +++ stable/11/contrib/ipfilter/ipsend/ipsend.c Sun Aug 2 04:25:36 2020 (r363769) @@ -33,15 +33,7 @@ extern voidiplang __P((FILE *)); char options[68]; intopts; -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "le0"; -# endif /* __bsdi__ */ -# endif /* ultrix */ static voidusage __P((char *)); Modified: stable/11/contrib/ipfilter/ipsend/iptest.c == --- stable/11/contrib/ipfilter/ipsend/iptest.c Sun Aug 2 04:25:11 2020 (r363768) +++ stable/11/contrib/ipfilter/ipsend/iptest.c Sun Aug 2 04:25:36 2020 (r363769) @@ -34,15 +34,7 @@ char options[68]; # ifdefsun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "lan0"; -# endif -# endif # endif static voidusage __P((char *)); Modified: stable/11/contrib/ipfilter/ipsend/iptests.c
svn commit: r363768 - in stable/12: contrib/ipfilter/iplang contrib/ipfilter/ipsend libexec/rc/rc.d sys/contrib/ipfilter/netinet
Author: cy Date: Sun Aug 2 04:25:11 2020 New Revision: 363768 URL: https://svnweb.freebsd.org/changeset/base/363768 Log: MFC r363284-r363285, r363452, r363670 r363284: pfil_run_hooks() can be called recursively, so we have to define FASTROUTE_RECURSION in fil.c Submitted by: chris...@netbsd.org Reported by: chris...@netbsd.org Obtained from:NetBSD r1.31 r363285: Fix incorrect byte order in ipfstat -f output. - make sure frag is initialized to 0 - initialize ipfr_p field NetBSD PR:55137 Submitted by: chris...@netbsd.org Reported by: chris...@netbsd.org Obtained from:NetBSD fil.c r1.32, ip_frag.c r1.8 r363452: Load ipfilter, ipnat, and ippool rules, and start ipmon in a vnet jail. PR: 248109 Reported by: jo...@a1poweruser.com r363670: Continued ipfilter #ifdef cleanup. The r343701 log entry contains a complete description. Modified: stable/12/contrib/ipfilter/iplang/iplang_y.y stable/12/contrib/ipfilter/ipsend/arp.c stable/12/contrib/ipfilter/ipsend/ipresend.c stable/12/contrib/ipfilter/ipsend/ipsend.c stable/12/contrib/ipfilter/ipsend/iptest.c stable/12/contrib/ipfilter/ipsend/iptests.c stable/12/contrib/ipfilter/ipsend/sock.c stable/12/libexec/rc/rc.d/ipfilter stable/12/libexec/rc/rc.d/ipmon stable/12/libexec/rc/rc.d/ipnat stable/12/libexec/rc/rc.d/ippool stable/12/sys/contrib/ipfilter/netinet/fil.c stable/12/sys/contrib/ipfilter/netinet/ip_frag.c Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/ipfilter/iplang/iplang_y.y == --- stable/12/contrib/ipfilter/iplang/iplang_y.ySat Aug 1 16:02:32 2020(r363767) +++ stable/12/contrib/ipfilter/iplang/iplang_y.ySun Aug 2 04:25:11 2020(r363768) @@ -45,11 +45,6 @@ #include "ipf.h" #include "iplang.h" -#if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \ -__FreeBSD_version < 400020) && (!SOLARIS || SOLARIS2 < 10) -extern struct ether_addr *ether_aton __P((char *)); -#endif - extern int opts; extern struct ipopt_names ionames[]; extern int state, state, lineNum, token; @@ -58,11 +53,7 @@ extern charyytext[]; extern FILE*yyin; intyylex __P((void)); #defineYYDEBUG 1 -#if !defined(ultrix) && !defined(hpux) intyydebug = 1; -#else -extern int yydebug; -#endif iface_t *iflist = NULL, **iftail = iface_t *cifp = NULL; Modified: stable/12/contrib/ipfilter/ipsend/arp.c == --- stable/12/contrib/ipfilter/ipsend/arp.c Sat Aug 1 16:02:32 2020 (r363767) +++ stable/12/contrib/ipfilter/ipsend/arp.c Sun Aug 2 04:25:11 2020 (r363768) @@ -11,17 +11,13 @@ static const char rcsid[] = "@(#)$Id$"; #endif #include #include -#if !defined(ultrix) && !defined(hpux) && !defined(__hpux) && !defined(__osf__) && !defined(_AIX51) # include -#endif #include #include #include #include #include -#ifndefultrix # include -#endif #include #include #include Modified: stable/12/contrib/ipfilter/ipsend/ipresend.c == --- stable/12/contrib/ipfilter/ipsend/ipresend.cSat Aug 1 16:02:32 2020(r363767) +++ stable/12/contrib/ipfilter/ipsend/ipresend.cSun Aug 2 04:25:11 2020(r363768) @@ -38,15 +38,7 @@ int opts = 0; # ifdef sun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0"; -# else -#ifdef __bsdi__ -char default_device[] = "ef0"; -#else char default_device[] = "lan0"; -#endif -# endif # endif #else char default_device[] = DEFAULT_DEVICE; Modified: stable/12/contrib/ipfilter/ipsend/ipsend.c == --- stable/12/contrib/ipfilter/ipsend/ipsend.c Sat Aug 1 16:02:32 2020 (r363767) +++ stable/12/contrib/ipfilter/ipsend/ipsend.c Sun Aug 2 04:25:11 2020 (r363768) @@ -33,15 +33,7 @@ extern voidiplang __P((FILE *)); char options[68]; intopts; -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "le0"; -# endif /* __bsdi__ */ -# endif /* ultrix */ static voidusage __P((char *)); Modified: stable/12/contrib/ipfilter/ipsend/iptest.c == --- stable/12/contrib/ipfilter/ipsend/iptest.c Sat Aug 1 16:02:32 2020 (r363767) +++ stable/12/contrib/ipfilter/ipsend/iptest.c Sun Aug 2 04:25:11 2020 (r363768) @@ -34,15 +34,7 @@ char options[68]; # ifdefsun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0";
svn commit: r363685 - in stable: 10/contrib/ipfilter/man 11/contrib/ipfilter/man 12/contrib/ipfilter/man
Author: cy Date: Thu Jul 30 02:52:55 2020 New Revision: 363685 URL: https://svnweb.freebsd.org/changeset/base/363685 Log: MFC r363453: Document the IPFILTER_PREDEFINED environment variable. PR: 248088 Reported by: jo...@a1poweruser.com Modified: stable/12/contrib/ipfilter/man/ipf.8 Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/man/ipf.8 stable/11/contrib/ipfilter/man/ipf.8 Directory Properties: stable/10/ (props changed) stable/11/ (props changed) Modified: stable/12/contrib/ipfilter/man/ipf.8 == --- stable/12/contrib/ipfilter/man/ipf.8Thu Jul 30 02:37:15 2020 (r363684) +++ stable/12/contrib/ipfilter/man/ipf.8Thu Jul 30 02:52:55 2020 (r363685) @@ -158,6 +158,15 @@ display the statistics prior to them being zeroed. Zero global statistics held in the kernel for filtering only (this doesn't affect fragment or state statistics). .DT +.SH ENVIRONMENT +.NM utilizes the following environment variable. +.TP +.B IPF_PREDEFINED +ipfilter variables, see VARIABLES in ipf(5), can be specified in this +environment variable providing shell access to ipfilter and ipnat variables. +For example, +.br +IPF_PREDEFINED='my_server="10.1.1.1"; my_client="10.1.1.2";' .SH FILES /dev/ipauth .br ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363685 - in stable: 10/contrib/ipfilter/man 11/contrib/ipfilter/man 12/contrib/ipfilter/man
Author: cy Date: Thu Jul 30 02:52:55 2020 New Revision: 363685 URL: https://svnweb.freebsd.org/changeset/base/363685 Log: MFC r363453: Document the IPFILTER_PREDEFINED environment variable. PR: 248088 Reported by: jo...@a1poweruser.com Modified: stable/10/contrib/ipfilter/man/ipf.8 Directory Properties: stable/10/ (props changed) Changes in other areas also in this revision: Modified: stable/11/contrib/ipfilter/man/ipf.8 stable/12/contrib/ipfilter/man/ipf.8 Directory Properties: stable/11/ (props changed) stable/12/ (props changed) Modified: stable/10/contrib/ipfilter/man/ipf.8 == --- stable/10/contrib/ipfilter/man/ipf.8Thu Jul 30 02:37:15 2020 (r363684) +++ stable/10/contrib/ipfilter/man/ipf.8Thu Jul 30 02:52:55 2020 (r363685) @@ -158,6 +158,15 @@ display the statistics prior to them being zeroed. Zero global statistics held in the kernel for filtering only (this doesn't affect fragment or state statistics). .DT +.SH ENVIRONMENT +.NM utilizes the following environment variable. +.TP +.B IPF_PREDEFINED +ipfilter variables, see VARIABLES in ipf(5), can be specified in this +environment variable providing shell access to ipfilter and ipnat variables. +For example, +.br +IPF_PREDEFINED='my_server="10.1.1.1"; my_client="10.1.1.2";' .SH FILES /dev/ipauth .br ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363685 - in stable: 10/contrib/ipfilter/man 11/contrib/ipfilter/man 12/contrib/ipfilter/man
Author: cy Date: Thu Jul 30 02:52:55 2020 New Revision: 363685 URL: https://svnweb.freebsd.org/changeset/base/363685 Log: MFC r363453: Document the IPFILTER_PREDEFINED environment variable. PR: 248088 Reported by: jo...@a1poweruser.com Modified: stable/11/contrib/ipfilter/man/ipf.8 Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/contrib/ipfilter/man/ipf.8 stable/12/contrib/ipfilter/man/ipf.8 Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/contrib/ipfilter/man/ipf.8 == --- stable/11/contrib/ipfilter/man/ipf.8Thu Jul 30 02:37:15 2020 (r363684) +++ stable/11/contrib/ipfilter/man/ipf.8Thu Jul 30 02:52:55 2020 (r363685) @@ -158,6 +158,15 @@ display the statistics prior to them being zeroed. Zero global statistics held in the kernel for filtering only (this doesn't affect fragment or state statistics). .DT +.SH ENVIRONMENT +.NM utilizes the following environment variable. +.TP +.B IPF_PREDEFINED +ipfilter variables, see VARIABLES in ipf(5), can be specified in this +environment variable providing shell access to ipfilter and ipnat variables. +For example, +.br +IPF_PREDEFINED='my_server="10.1.1.1"; my_client="10.1.1.2";' .SH FILES /dev/ipauth .br ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r363670 - in head/contrib/ipfilter: iplang ipsend
Author: cy Date: Wed Jul 29 19:36:24 2020 New Revision: 363670 URL: https://svnweb.freebsd.org/changeset/base/363670 Log: Continued ipfilter #ifdef cleanup. The r343701 log entry contains a complete description. MFC after:1 week Modified: head/contrib/ipfilter/iplang/iplang_y.y head/contrib/ipfilter/ipsend/arp.c head/contrib/ipfilter/ipsend/ipresend.c head/contrib/ipfilter/ipsend/ipsend.c head/contrib/ipfilter/ipsend/iptest.c head/contrib/ipfilter/ipsend/iptests.c head/contrib/ipfilter/ipsend/sock.c Modified: head/contrib/ipfilter/iplang/iplang_y.y == --- head/contrib/ipfilter/iplang/iplang_y.y Wed Jul 29 19:22:50 2020 (r363669) +++ head/contrib/ipfilter/iplang/iplang_y.y Wed Jul 29 19:36:24 2020 (r363670) @@ -45,11 +45,6 @@ #include "ipf.h" #include "iplang.h" -#if !defined(__NetBSD__) && (!defined(__FreeBSD_version) && \ -__FreeBSD_version < 400020) && (!SOLARIS || SOLARIS2 < 10) -extern struct ether_addr *ether_aton __P((char *)); -#endif - extern int opts; extern struct ipopt_names ionames[]; extern int state, state, lineNum, token; @@ -58,11 +53,7 @@ extern charyytext[]; extern FILE*yyin; intyylex __P((void)); #defineYYDEBUG 1 -#if !defined(ultrix) && !defined(hpux) intyydebug = 1; -#else -extern int yydebug; -#endif iface_t *iflist = NULL, **iftail = iface_t *cifp = NULL; Modified: head/contrib/ipfilter/ipsend/arp.c == --- head/contrib/ipfilter/ipsend/arp.c Wed Jul 29 19:22:50 2020 (r363669) +++ head/contrib/ipfilter/ipsend/arp.c Wed Jul 29 19:36:24 2020 (r363670) @@ -11,17 +11,13 @@ static const char rcsid[] = "@(#)$Id$"; #endif #include #include -#if !defined(ultrix) && !defined(hpux) && !defined(__hpux) && !defined(__osf__) && !defined(_AIX51) # include -#endif #include #include #include #include #include -#ifndefultrix # include -#endif #include #include #include Modified: head/contrib/ipfilter/ipsend/ipresend.c == --- head/contrib/ipfilter/ipsend/ipresend.c Wed Jul 29 19:22:50 2020 (r363669) +++ head/contrib/ipfilter/ipsend/ipresend.c Wed Jul 29 19:36:24 2020 (r363670) @@ -38,15 +38,7 @@ int opts = 0; # ifdef sun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0"; -# else -#ifdef __bsdi__ -char default_device[] = "ef0"; -#else char default_device[] = "lan0"; -#endif -# endif # endif #else char default_device[] = DEFAULT_DEVICE; Modified: head/contrib/ipfilter/ipsend/ipsend.c == --- head/contrib/ipfilter/ipsend/ipsend.c Wed Jul 29 19:22:50 2020 (r363669) +++ head/contrib/ipfilter/ipsend/ipsend.c Wed Jul 29 19:36:24 2020 (r363670) @@ -33,15 +33,7 @@ extern voidiplang __P((FILE *)); char options[68]; intopts; -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "le0"; -# endif /* __bsdi__ */ -# endif /* ultrix */ static voidusage __P((char *)); Modified: head/contrib/ipfilter/ipsend/iptest.c == --- head/contrib/ipfilter/ipsend/iptest.c Wed Jul 29 19:22:50 2020 (r363669) +++ head/contrib/ipfilter/ipsend/iptest.c Wed Jul 29 19:36:24 2020 (r363670) @@ -34,15 +34,7 @@ char options[68]; # ifdefsun char default_device[] = "le0"; # else -# ifdef ultrix -char default_device[] = "ln0"; -# else -# ifdef __bsdi__ -char default_device[] = "ef0"; -# else char default_device[] = "lan0"; -# endif -# endif # endif static voidusage __P((char *)); Modified: head/contrib/ipfilter/ipsend/iptests.c == --- head/contrib/ipfilter/ipsend/iptests.c Wed Jul 29 19:22:50 2020 (r363669) +++ head/contrib/ipfilter/ipsend/iptests.c Wed Jul 29 19:36:24 2020 (r363670) @@ -36,18 +36,13 @@ typedef int boolean_t; # endif # undef _KERNEL # undef KERNEL -#if !defined(solaris) && !defined(linux) && !defined(__sgi) +#if !defined(solaris) # include # include # include #endif -#if !defined(ultrix) && !defined(hpux) && !defined(linux) && \ -!defined(__sgi) && !defined(__osf__) && !defined(_AIX51) # include -#endif -#ifndefultrix # include -#endif #if defined(solaris) # include #else @@ -57,11 +52,9 @@ typedef int boolean_t; #include #include #endif -#if BSD >= 199103 # include # include # include -#endif
